HBX-2789: Review WrapperFactory class and create only new Wrapper intances

  - Change the returned classes in some methods of interface 'org.hibernate.tool.orm.jbt.api.wpr.ExporterWrapper'
    * Method 'getGenericExporter()' returns 'org.hibernate.tool.orm.jbt.api.wpr.GenericExporterWrapper'
    * Method 'getHbm2DDLExporter()' returns 'org.hibernate.tool.orm.jbt.api.wpr.DdlExporterWrapper'
    * Method 'getQueryExporter()' returns 'org.hibernate.tool.orm.jbt.api.wpr.QueryExporterWrapper'
  - Adapt the implementations of class 'org.hibernate.tool.orm.jbt.internal.factory.ExporterWrapperFactory.ExporterWrapperImpl' to the above change
  - Adapt the affected test methods in test class 'org.hibernate.tool.orm.jbt.api.wpr.ExporterWrapperTest'

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ExporterWrapper.java

@@ -18,11 +18,11 @@ public interface ExporterWrapper extends Wrapper {
 
 	Properties getProperties();
 
-	ExporterWrapper getGenericExporter();
+	GenericExporterWrapper getGenericExporter();
 
-	ExporterWrapper getHbm2DDLExporter();
+	DdlExporterWrapper getHbm2DDLExporter();
 
-	ExporterWrapper getQueryExporter();
+	QueryExporterWrapper getQueryExporter();
 
 	void setCustomProperties(Properties properties);
 

jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/ExporterWrapperFactory.java

@@ -13,7 +13,10 @@
 import org.hibernate.tool.internal.export.query.QueryExporter;
 import org.hibernate.tool.orm.jbt.api.wrp.ArtifactCollectorWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.ConfigurationWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.DdlExporterWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.ExporterWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.GenericExporterWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.QueryExporterWrapper;
 import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.tool.orm.jbt.util.ConfigurationMetadataDescriptor;
 import org.hibernate.tool.orm.jbt.util.DummyMetadataDescriptor;
@@ -92,27 +95,27 @@ public Properties getProperties() {
 		}
 
 		@Override
-		public ExporterWrapper getGenericExporter() {
+		public GenericExporterWrapper getGenericExporter() {
 			if (exporter instanceof GenericExporter) {
-				return this;
+				return GenericExporterWrapperFactory.createGenericExporterWrapper((GenericExporter)exporter);
 			} else {
 				return null;
 			}
 		}
 
 		@Override
-		public ExporterWrapper getHbm2DDLExporter() {
+		public DdlExporterWrapper getHbm2DDLExporter() {
 			if (exporter instanceof DdlExporter) {
-				return this;
+				return DdlExporterWrapperFactory.createDdlExporterWrapper((DdlExporter)exporter);
 			} else {
 				return null;
 			}
 		}
 
 		@Override
-		public ExporterWrapper getQueryExporter() {
+		public QueryExporterWrapper getQueryExporter() {
 			if (exporter instanceof QueryExporter) {
-				return this;
+				return QueryExporterWrapperFactory.createQueryExporterWrapper((QueryExporter)exporter);
 			} else {
 				return null;
 			}

jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/ExporterWrapperTest.java

@@ -129,8 +129,8 @@ public void testGetGenericExporter() {
 		assertNull(exporterWrapper.getGenericExporter());
 		// try now with a GenericExporter
 		exporterWrapper = ExporterWrapperFactory.createExporterWrapper(GenericExporter.class.getName());
-		ExporterWrapper genericExporterWrapper = exporterWrapper.getGenericExporter();
-		assertSame(exporterWrapper, genericExporterWrapper);
+		GenericExporterWrapper genericExporterWrapper = exporterWrapper.getGenericExporter();
+		assertSame(exporterWrapper.getWrappedObject(), genericExporterWrapper.getWrappedObject());
 	}
 
 	@Test
@@ -139,8 +139,8 @@ public void testGetHbm2DDlExporter() {
 		assertNull(exporterWrapper.getHbm2DDLExporter());
 		// try now with a DdlExporter
 		exporterWrapper = ExporterWrapperFactory.createExporterWrapper(DdlExporter.class.getName());
-		ExporterWrapper ddlExporterWrapper = exporterWrapper.getHbm2DDLExporter();
-		assertSame(exporterWrapper, ddlExporterWrapper);
+		DdlExporterWrapper ddlExporterWrapper = exporterWrapper.getHbm2DDLExporter();
+		assertSame(exporterWrapper.getWrappedObject(), ddlExporterWrapper.getWrappedObject());
 	}
 
 	@Test
@@ -149,8 +149,8 @@ public void testGetQueryExporter() {
 		assertNull(exporterWrapper.getQueryExporter());
 		// try now with a QueryExporter
 		exporterWrapper = ExporterWrapperFactory.createExporterWrapper(QueryExporter.class.getName());
-		ExporterWrapper queryExporterWrapper = exporterWrapper.getQueryExporter();
-		assertSame(exporterWrapper, queryExporterWrapper);
+		QueryExporterWrapper queryExporterWrapper = exporterWrapper.getQueryExporter();
+		assertSame(exporterWrapper.getWrappedObject(), queryExporterWrapper.getWrappedObject());
 	}
 
 	@Test