Skip to content

HBX-3249: Refactor class MappingExporter and improve tests #5840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koentsje merged 1 commit into from
Dec 3, 2025
Merged

HBX-3249: Refactor class MappingExporter and improve tests #5840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 19 additions & 27 deletions orm/src/main/java/org/hibernate/tool/internal/export/mapping/MappingExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.logging.Logger;
Expand All @@ -30,14 +31,14 @@ public class MappingExporter implements Exporter {

private static final Logger LOGGER = Logger.getLogger( MappingExporter.class.getName() );

private UnmodifiableList<File> hbmXmlFiles;
private UnmodifiableList<File> hbmXmlFiles = new UnmodifiableList<>(Collections.emptyList());
private boolean formatResult = true;

private final MappingBinder mappingBinder;

public MappingExporter() {
mappingBinder = createMappingBinder();
}
}

public void setHbmFiles(List<File> fileList) {
hbmXmlFiles = new UnmodifiableList<>( fileList );
Expand All @@ -54,8 +55,21 @@ public Properties getProperties() {

@Override
public void start() {
List<Binding<JaxbHbmHibernateMapping>> hbmMappings = getHbmMappings();
performTransformation(hbmMappings, createServiceRegistry(), formatResult);
List<Binding<JaxbHbmHibernateMapping>> hbmBindings = getHbmMappings();
Marshaller marshaller = createMarshaller(mappingBinder);
MetadataSources metadataSources = new MetadataSources( createServiceRegistry() );
hbmBindings.forEach( metadataSources::addHbmXmlBinding );
List<Binding<JaxbEntityMappingsImpl>> transformedBindings = HbmXmlTransformer.transform(
hbmBindings,
(MetadataImplementor) metadataSources.buildMetadata(),
UnsupportedFeatureHandling.ERROR
);
for (int i = 0; i < hbmBindings.size(); i++) {
Binding<JaxbHbmHibernateMapping> hbmBinding = hbmBindings.get( i );
Binding<JaxbEntityMappingsImpl> transformedBinding = transformedBindings.get( i );
HbmXmlOrigin origin = (HbmXmlOrigin)hbmBinding.getOrigin();
marshall(marshaller, transformedBinding.getRoot(), origin.getHbmXmlFile());
}
}

private ServiceRegistry createServiceRegistry() {
Expand Down Expand Up @@ -108,8 +122,7 @@ private Marshaller createMarshaller(MappingBinder mappingBinder) {
private void marshall(
Marshaller marshaller,
JaxbEntityMappingsImpl mappings,
File hbmXmlFile,
boolean formatResult) {
File hbmXmlFile) {
File mappingXmlFile = new File(
hbmXmlFile.getParentFile(),
hbmXmlFile.getName().replace(".hbm.xml", ".mapping.xml"));
Expand All @@ -132,25 +145,4 @@ private void marshall(
}
}

private void performTransformation(
List<Binding<JaxbHbmHibernateMapping>> hbmBindings,
ServiceRegistry serviceRegistry,
boolean formatResult) {
Marshaller marshaller = createMarshaller(mappingBinder);
MetadataSources metadataSources = new MetadataSources( serviceRegistry );
hbmBindings.forEach( metadataSources::addHbmXmlBinding );
List<Binding<JaxbEntityMappingsImpl>> transformedBindings = HbmXmlTransformer.transform(
hbmBindings,
(MetadataImplementor) metadataSources.buildMetadata(),
UnsupportedFeatureHandling.ERROR
);
for (int i = 0; i < hbmBindings.size(); i++) {
Binding<JaxbHbmHibernateMapping> hbmBinding = hbmBindings.get( i );
Binding<JaxbEntityMappingsImpl> transformedBinding = transformedBindings.get( i );
HbmXmlOrigin origin = (HbmXmlOrigin)hbmBinding.getOrigin();
File hbmXmlFile = origin.getHbmXmlFile();
marshall(marshaller, transformedBinding.getRoot(), hbmXmlFile, formatResult);
}
}

}
7 changes: 3 additions & 4 deletions orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void testSetHbmFiles() throws NoSuchFieldException, IllegalAccessExceptio
origin.add( fooFile );
assertNotNull(hbmFilesField);
hbmFilesField.setAccessible(true);
assertNull(hbmFilesField.get(mappingExporter));
assertTrue(((List<?>)hbmFilesField.get(mappingExporter)).isEmpty());
mappingExporter.setHbmFiles(origin);
List<?> destination = (List<?>) hbmFilesField.get(mappingExporter);
assertEquals(1, destination.size());
Expand Down Expand Up @@ -155,16 +155,15 @@ public void testMarshall() throws Exception {
"marshall",
Marshaller.class,
JaxbEntityMappingsImpl.class,
File.class,
boolean.class);
File.class);
assertNotNull(marshallMethod);
marshallMethod.setAccessible(true);
File hbmFile = new File(this.tempDir, "foo.hbm.xml");
File mappingFile = new File(this.tempDir, "foo.mapping.xml");
Files.writeString(mappingFile.toPath(), "<foo><bar>foobar</bar></foo>");
List<String> lines = Files.readAllLines(mappingFile.toPath());
assertEquals(1, lines.size());
marshallMethod.invoke(mappingExporter, DUMMY_MARSHALLER, null, hbmFile, true);
marshallMethod.invoke(mappingExporter, DUMMY_MARSHALLER, null, hbmFile);
lines = Files.readAllLines(mappingFile.toPath());
assertEquals(4, lines.size());
}
Expand Down