Skip to content

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

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 8, 2025
Merged

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

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
2 changes: 1 addition & 1 deletion maven/src/functionalTest/java/org/hibernate/tool/maven/TransformHbmTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private void writePomFile() throws Exception {
}

private void copyHbmFile() throws Exception {
URL originUrl = TransformHbmTestIT.class.getResource("simple.hbm.xml");
URL originUrl = getClass().getResource("simple.hbm.xml");
assertNotNull(originUrl);
Path originPath = Paths.get(Objects.requireNonNull(originUrl).toURI());
File destinationDir = new File(projectPath.toFile(), "src/main/resources/");
Expand Down
1 change: 0 additions & 1 deletion orm/src/main/java/org/hibernate/tool/internal/util/DummyDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ public int getDatabaseMinorVersion() {
});
}


}
66 changes: 37 additions & 29 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 @@ -191,35 +191,43 @@ public void testMarshall() throws Exception {

@Test
public void testTransformBindings() throws Exception {
File simpleHbmXmlFile = new File(this.tempDir, "simple.hbm.xml");
Files.writeString(simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML);
MappingBinder mappingBinder = new MappingBinder(
MappingBinder.class.getClassLoader()::getResourceAsStream,
UnsupportedFeatureHandling.ERROR);
Binding<JaxbHbmHibernateMapping> hbmBinding = mappingBinder.bind(
new FileInputStream(simpleHbmXmlFile),
new HbmXmlOrigin(simpleHbmXmlFile));
List<Binding<JaxbHbmHibernateMapping>> bindings = new ArrayList<>();
bindings.add(hbmBinding);
Method transformBindingsMethod = MappingExporter.class.getDeclaredMethod(
"transformBindings",
List.class);
assertNotNull(transformBindingsMethod);
transformBindingsMethod.setAccessible(true);
List<?> transformedBindings = (List<?>)transformBindingsMethod.invoke(mappingExporter, bindings);
assertNotNull(transformedBindings);
assertEquals(1, transformedBindings.size());
Object object = transformedBindings.get(0);
assertInstanceOf(Binding.class, object);
Binding<?> entityBinding = (Binding<?>)object;
Origin origin = entityBinding.getOrigin();
assertInstanceOf(HbmXmlOrigin.class, origin);
assertSame(simpleHbmXmlFile, ((HbmXmlOrigin)origin).getHbmXmlFile());
Object root = entityBinding.getRoot();
assertInstanceOf(JaxbEntityMappingsImpl.class, root);
JaxbEntityMappingsImpl entityMappings = (JaxbEntityMappingsImpl)root;
assertEquals(1, entityMappings.getEntities().size());
assertEquals("Foo", entityMappings.getEntities().get(0).getClazz());
FileInputStream simpleHbmXmlInputStream = null;
try {
File simpleHbmXmlFile = new File( this.tempDir, "simple.hbm.xml" );
Files.writeString( simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML );
MappingBinder mappingBinder = new MappingBinder(
MappingBinder.class.getClassLoader()::getResourceAsStream,
UnsupportedFeatureHandling.ERROR );
simpleHbmXmlInputStream = new FileInputStream( simpleHbmXmlFile );
Binding<JaxbHbmHibernateMapping> hbmBinding = mappingBinder.bind(
simpleHbmXmlInputStream,
new HbmXmlOrigin( simpleHbmXmlFile ) );
List<Binding<JaxbHbmHibernateMapping>> bindings = new ArrayList<>();
bindings.add( hbmBinding );
Method transformBindingsMethod = MappingExporter.class.getDeclaredMethod(
"transformBindings",
List.class );
assertNotNull( transformBindingsMethod );
transformBindingsMethod.setAccessible( true );
List<?> transformedBindings = (List<?>) transformBindingsMethod.invoke( mappingExporter, bindings );
assertNotNull( transformedBindings );
assertEquals( 1, transformedBindings.size() );
Object object = transformedBindings.get( 0 );
assertInstanceOf( Binding.class, object );
Binding<?> entityBinding = (Binding<?>) object;
Origin origin = entityBinding.getOrigin();
assertInstanceOf( HbmXmlOrigin.class, origin );
assertSame( simpleHbmXmlFile, ((HbmXmlOrigin) origin).getHbmXmlFile() );
Object root = entityBinding.getRoot();
assertInstanceOf( JaxbEntityMappingsImpl.class, root );
JaxbEntityMappingsImpl entityMappings = (JaxbEntityMappingsImpl) root;
assertEquals( 1, entityMappings.getEntities().size() );
assertEquals( "Foo", entityMappings.getEntities().get( 0 ).getClazz() );
} finally {
if ( simpleHbmXmlInputStream != null ) {
simpleHbmXmlInputStream.close();
}
}
}

@Test
Expand Down