HBX-3249: Refactor class MappingExporter and improve tests

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

@@ -4,6 +4,8 @@
 import jakarta.xml.bind.Marshaller;
 import org.apache.commons.collections4.list.UnmodifiableList;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.jaxb.Origin;
+import org.hibernate.boot.jaxb.SourceType;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
 import org.hibernate.boot.jaxb.hbm.transform.HbmXmlTransformer;
 import org.hibernate.boot.jaxb.hbm.transform.UnsupportedFeatureHandling;
@@ -21,7 +23,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.Serial;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 import java.util.logging.Logger;
@@ -30,9 +34,17 @@ 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;
+    private final Marshaller marshaller;
+
+    public MappingExporter() {
+        mappingBinder = createMappingBinder();
+        marshaller = createMarshaller();
+     }
+
     public void setHbmFiles(List<File> fileList) {
         hbmXmlFiles = new UnmodifiableList<>( fileList );
     }
@@ -48,9 +60,23 @@ public Properties getProperties() {
 
     @Override
     public void start() {
-        MappingBinder mappingBinder = createMappingBinder();
-        List<Binding<JaxbHbmHibernateMapping>> hbmMappings = getHbmMappings(mappingBinder);
-        performTransformation(hbmMappings, mappingBinder, createServiceRegistry(), formatResult);
+        List<Binding<JaxbHbmHibernateMapping>> hbmBindings = getHbmBindings();
+        List<Binding<JaxbEntityMappingsImpl>> transformedBindings = transformBindings(hbmBindings);
+        for (int i = 0; i < hbmBindings.size(); i++) {
+            marshall(
+                    transformedBindings.get(i).getRoot(),
+                    ((HbmXmlOrigin)hbmBindings.get(i).getOrigin()).getHbmXmlFile());
+        }
+    }
+
+    private List<Binding<JaxbEntityMappingsImpl>> transformBindings(
+            List<Binding<JaxbHbmHibernateMapping>> hbmBindings) {
+        MetadataSources metadataSources = new MetadataSources( createServiceRegistry() );
+        hbmBindings.forEach( metadataSources::addHbmXmlBinding );
+        return HbmXmlTransformer.transform(
+                hbmBindings,
+                (MetadataImplementor) metadataSources.buildMetadata(),
+                UnsupportedFeatureHandling.ERROR);
     }
 
     private ServiceRegistry createServiceRegistry() {
@@ -67,20 +93,19 @@ private MappingBinder createMappingBinder() {
                 UnsupportedFeatureHandling.ERROR);
     }
 
-    private List<Binding<JaxbHbmHibernateMapping>> getHbmMappings(MappingBinder mappingBinder) {
+    private List<Binding<JaxbHbmHibernateMapping>> getHbmBindings() {
         List<Binding<JaxbHbmHibernateMapping>> result = new ArrayList<>();
         hbmXmlFiles.forEach((hbmXmlFile) -> {
             final String fullPath = hbmXmlFile.getAbsolutePath();
             LOGGER.info("Adding file: '" + fullPath + "' to the list to be transformed.");
             HbmXmlOrigin origin = new HbmXmlOrigin( hbmXmlFile );
-            Binding<JaxbHbmHibernateMapping> binding = bindMapping( mappingBinder, origin );
+            Binding<JaxbHbmHibernateMapping> binding = bindHbmXml( origin );
             result.add(binding);
         });
         return result;
     }
 
-    private Binding<JaxbHbmHibernateMapping> bindMapping(
-            MappingBinder mappingBinder, HbmXmlOrigin origin) {
+    private Binding<JaxbHbmHibernateMapping> bindHbmXml(HbmXmlOrigin origin) {
         File hbmXmlFile = origin.getHbmXmlFile();
         try ( final FileInputStream fileStream = new FileInputStream(hbmXmlFile) ) {
             return mappingBinder.bind( fileStream, origin );
@@ -91,7 +116,7 @@ private Binding<JaxbHbmHibernateMapping> bindMapping(
         }
     }
 
-    private Marshaller createMarshaller(MappingBinder mappingBinder) {
+    private Marshaller createMarshaller() {
         try {
             return mappingBinder.mappingJaxbContext().createMarshaller();
         }
@@ -101,10 +126,8 @@ 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"));
@@ -127,26 +150,21 @@ private void marshall(
         }
     }
 
-    private void performTransformation(
-            List<Binding<JaxbHbmHibernateMapping>> hbmBindings,
-            MappingBinder mappingBinder,
-            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);
+    static class  HbmXmlOrigin extends Origin {
+
+        @Serial
+        private static final long serialVersionUID = 1L;
+
+        private final File hbmXmlFile;
+
+        public HbmXmlOrigin(File hbmXmlFile) {
+            super( SourceType.FILE, hbmXmlFile.getAbsolutePath() );
+            this.hbmXmlFile = hbmXmlFile;
         }
-    }
 
+        public File getHbmXmlFile() {
+            return hbmXmlFile;
+        }
+
+    }
 }