HBX-3249: Refactor class MappingExporter and improve tests

  - Remove unneeded 'mappingBinder' argument from 'createMarshaller'
  - Create 'marshaller' instance variable and populate it in the constructor
  - Remove the 'marshaller' local variable in the 'start' method
  - Remove the 'marshaller' argument from the 'marshall' method

Signed-off-by: Koen Aers <koen.aers@gmail.com>

Author: koentsje

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

@@ -35,9 +35,11 @@ public class MappingExporter implements Exporter {
     private boolean formatResult = true;
 
     private final MappingBinder mappingBinder;
+    private final Marshaller marshaller;
 
     public MappingExporter() {
         mappingBinder = createMappingBinder();
+        marshaller = createMarshaller();
      }
 
     public void setHbmFiles(List<File> fileList) {
@@ -56,7 +58,6 @@ public Properties getProperties() {
     @Override
     public void start() {
         List<Binding<JaxbHbmHibernateMapping>> hbmBindings = getHbmBindings();
-        Marshaller marshaller = createMarshaller(mappingBinder);
         MetadataSources metadataSources = new MetadataSources( createServiceRegistry() );
         hbmBindings.forEach( metadataSources::addHbmXmlBinding );
         List<Binding<JaxbEntityMappingsImpl>> transformedBindings = HbmXmlTransformer.transform(
@@ -68,7 +69,7 @@ public void start() {
             Binding<JaxbHbmHibernateMapping> hbmBinding = hbmBindings.get( i );
             Binding<JaxbEntityMappingsImpl> transformedBinding = transformedBindings.get( i );
             HbmXmlOrigin origin = (HbmXmlOrigin)hbmBinding.getOrigin();
-            marshall(marshaller, transformedBinding.getRoot(), origin.getHbmXmlFile());
+            marshall(transformedBinding.getRoot(), origin.getHbmXmlFile());
         }
     }
 
@@ -109,7 +110,7 @@ private Binding<JaxbHbmHibernateMapping> bindHbmXml(HbmXmlOrigin origin) {
         }
     }
 
-    private Marshaller createMarshaller(MappingBinder mappingBinder) {
+    private Marshaller createMarshaller() {
         try {
             return mappingBinder.mappingJaxbContext().createMarshaller();
         }
@@ -119,7 +120,6 @@ private Marshaller createMarshaller(MappingBinder mappingBinder) {
     }
 
     private void marshall(
-            Marshaller marshaller,
             JaxbEntityMappingsImpl mappings,
             File hbmXmlFile) {
         File mappingXmlFile =  new File(

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

@@ -45,6 +45,9 @@ public void testConstructor() throws Exception {
         Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
         mappingBinderField.setAccessible(true);
         assertNotNull(mappingBinderField.get(mappingExporter));
+        Field marshallerField = MappingExporter.class.getDeclaredField("marshaller");
+        marshallerField.setAccessible(true);
+        assertNotNull(marshallerField.get(mappingExporter));
     }
 
     @Test
@@ -140,32 +143,35 @@ public void testGetHbmBindings() throws Exception {
 
     @Test
     public void testCreateMarshaller() throws Exception {
-        Method createMarshallerMethod = MappingExporter.class.getDeclaredMethod(
-                "createMarshaller",
-                MappingBinder.class);
+        Method createMarshallerMethod = MappingExporter.class.getDeclaredMethod("createMarshaller");
         assertNotNull(createMarshallerMethod);
         createMarshallerMethod.setAccessible(true);
         final MappingBinder mappingBinder = new TestMappingBinder(new File("foo"), "foobar");
+        Field mappingBinderField = MappingExporter.class.getDeclaredField("mappingBinder");
+        mappingBinderField.setAccessible(true);
+        mappingBinderField.set(mappingExporter, mappingBinder);
         assertSame(
                 DUMMY_MARSHALLER,
-                createMarshallerMethod.invoke(mappingExporter, mappingBinder));
+                createMarshallerMethod.invoke(mappingExporter));
     }
 
     @Test
     public void testMarshall() throws Exception {
         Method marshallMethod = MappingExporter.class.getDeclaredMethod(
                 "marshall",
-                Marshaller.class,
                 JaxbEntityMappingsImpl.class,
                 File.class);
         assertNotNull(marshallMethod);
         marshallMethod.setAccessible(true);
+        Field marshallerField = MappingExporter.class.getDeclaredField("marshaller");
+        marshallerField.setAccessible(true);
+        marshallerField.set(mappingExporter, DUMMY_MARSHALLER);
         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);
+        marshallMethod.invoke(mappingExporter, null, hbmFile);
         lines = Files.readAllLines(mappingFile.toPath());
         assertEquals(4, lines.size());
     }