Skip to content

Commit fd3019e

Browse files
committed
HBX-3249: Refactor class MappingExporter and improve tests
- Collapse HbmXmlOrigin as an inner class into MappingExporter - Move 'testHbmXmlOrigin' to 'MappingExporterTest' - Remove 'HbmXmlOrigin' and 'HbmXmlOriginTest' Signed-off-by: Koen Aers <koen.aers@gmail.com>
1 parent a7966b1 commit fd3019e

File tree

4 files changed

+32
-53
lines changed

4 files changed

+32
-53
lines changed

orm/src/main/java/org/hibernate/tool/internal/export/mapping/HbmXmlOrigin.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

orm/src/main/java/org/hibernate/tool/internal/export/mapping/MappingExporter.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import jakarta.xml.bind.Marshaller;
55
import org.apache.commons.collections4.list.UnmodifiableList;
66
import org.hibernate.boot.MetadataSources;
7+
import org.hibernate.boot.jaxb.Origin;
8+
import org.hibernate.boot.jaxb.SourceType;
79
import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
810
import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
911
import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
@@ -21,6 +23,7 @@
2123
import java.io.File;
2224
import java.io.FileInputStream;
2325
import java.io.IOException;
26+
import java.io.Serial;
2427
import java.util.ArrayList;
2528
import java.util.Collections;
2629
import java.util.List;
@@ -147,4 +150,21 @@ private void marshall(
147150
}
148151
}
149152

153+
static class HbmXmlOrigin extends Origin {
154+
155+
@Serial
156+
private static final long serialVersionUID = 1L;
157+
158+
private final File hbmXmlFile;
159+
160+
public HbmXmlOrigin(File hbmXmlFile) {
161+
super( SourceType.FILE, hbmXmlFile.getAbsolutePath() );
162+
this.hbmXmlFile = hbmXmlFile;
163+
}
164+
165+
public File getHbmXmlFile() {
166+
return hbmXmlFile;
167+
}
168+
169+
}
150170
}

orm/src/test/java/org/hibernate/tool/internal/export/mapping/HbmXmlOriginTest.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import jakarta.xml.bind.Unmarshaller;
66
import org.apache.commons.collections4.list.UnmodifiableList;
77
import org.hibernate.boot.jaxb.Origin;
8+
import org.hibernate.boot.jaxb.SourceType;
89
import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
910
import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
1011
import org.hibernate.boot.jaxb.internal.MappingBinder;
@@ -28,6 +29,7 @@
2829
import java.util.List;
2930
import java.util.Objects;
3031

32+
import static org.hibernate.tool.internal.export.mapping.MappingExporter.HbmXmlOrigin;
3133
import static org.junit.jupiter.api.Assertions.*;
3234

3335
public class MappingExporterTest {
@@ -239,6 +241,16 @@ public void testStart() throws Exception {
239241
System.out.println(mappingXml);
240242
}
241243

244+
@Test
245+
public void testHbmXmlOrigin() {
246+
File hbmXmlFile = new File(tempDir, "foo.hbm.xml");
247+
HbmXmlOrigin hxo = new HbmXmlOrigin(hbmXmlFile);
248+
assertNotNull(hxo);
249+
assertEquals(hbmXmlFile, hxo.getHbmXmlFile());
250+
assertEquals(hbmXmlFile.getAbsolutePath(), hxo.getName());
251+
assertEquals(SourceType.FILE, hxo.getType());
252+
}
253+
242254
private static final Marshaller DUMMY_MARSHALLER = (Marshaller) Proxy.newProxyInstance(
243255
MappingExporterTest.class.getClassLoader(),
244256
new Class<?>[]{Marshaller.class},

0 commit comments

Comments
 (0)