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

  - Add new abstract class 'org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper' that implements 'org.hibernate.tool.orm.jbt.api.wrp.Wrapper' and overrides method 'equals(Object)'
  - Make all Wrapper implementations extend the above new class

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

Author: koentsje

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

@@ -3,5 +3,5 @@
 public interface Wrapper {
 
 	default Object getWrappedObject() { return this; }
-
+	
 }

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

@@ -6,14 +6,17 @@
 import org.hibernate.tool.api.export.ArtifactCollector;
 import org.hibernate.tool.internal.export.common.DefaultArtifactCollector;
 import org.hibernate.tool.orm.jbt.api.wrp.ArtifactCollectorWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 public class ArtifactCollectorWrapperFactory {
 
 	public static ArtifactCollectorWrapper createArtifactCollectorWrapper() {
 		return new ArtifactCollectorWrapperImpl();
 	}
 
-	private static class ArtifactCollectorWrapperImpl implements ArtifactCollectorWrapper {
+	private static class ArtifactCollectorWrapperImpl 
+			extends AbstractWrapper
+			implements ArtifactCollectorWrapper {
 
 		private ArtifactCollector wrappedArtifactCollector = new DefaultArtifactCollector();
 

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

@@ -10,14 +10,17 @@
 import org.hibernate.tool.orm.jbt.api.wrp.PersistentClassWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.PropertyWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 public class Cfg2HbmToolWrapperFactory {
 
 	public static Cfg2HbmToolWrapper createCfg2HbmToolWrapper() {
 		return new Cfg2HbmToolWrapperImpl();
 	}
 
-	private static class Cfg2HbmToolWrapperImpl implements Cfg2HbmToolWrapper {
+	private static class Cfg2HbmToolWrapperImpl 
+			extends AbstractWrapper
+			implements Cfg2HbmToolWrapper {
 
 		private Cfg2HbmTool wrappedCfg2HbmTool = new Cfg2HbmTool();
 

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

@@ -6,6 +6,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.ClassMetadataWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.SessionWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TypeWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.type.Type;
 
 public class ClassMetadataWrapperFactory {
@@ -14,7 +15,9 @@ public static ClassMetadataWrapper createClassMetadataWrapper(final EntityPersis
 		return new ClassMetadataWrapperImpl(entityPersister);
 	}
 
-	private static class ClassMetadataWrapperImpl implements ClassMetadataWrapper {
+	private static class ClassMetadataWrapperImpl 
+			extends AbstractWrapper
+			implements ClassMetadataWrapper {
 
 		private EntityPersister wrappedClassMetadata = null;
 		private TypeWrapper[] propertyTypeWrappers = null;

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

@@ -3,6 +3,7 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.tool.orm.jbt.api.wrp.CollectionMetadataWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TypeWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.type.Type;
 
 public class CollectionMetadataWrapperFactory {
@@ -11,7 +12,9 @@ public static CollectionMetadataWrapper createCollectionMetadataWrapper(final Co
 		return new CollectionMetadataWrapperImpl(collectionPersister);
 	}
 
-	private static class CollectionMetadataWrapperImpl implements CollectionMetadataWrapper {
+	private static class CollectionMetadataWrapperImpl
+			extends AbstractWrapper
+			implements CollectionMetadataWrapper {
 
 		private CollectionPersister wrappedCollectionMetadata = null;
 

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

@@ -6,6 +6,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.ColumnWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.ConfigurationWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.ValueWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.tool.orm.jbt.util.MetadataHelper;
 
 public class ColumnWrapperFactory {
@@ -18,7 +19,9 @@ public static ColumnWrapper createColumnWrapper(final Column column) {
 		return new ColumnWrapperImpl(column);
 	}
 
-	private static class ColumnWrapperImpl implements ColumnWrapper {
+	private static class ColumnWrapperImpl
+			extends AbstractWrapper
+			implements ColumnWrapper {
 
 		private Column wrappedColumn = null;
 

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

@@ -17,6 +17,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.SessionFactoryWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
 import org.hibernate.tool.orm.jbt.internal.util.ExtendedConfiguration;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.tool.orm.jbt.util.JpaConfiguration;
 import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
 import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
@@ -41,7 +42,9 @@ private static ConfigurationWrapper createConfigurationWrapper(final Configurati
 		return new ConfigurationWrapperImpl(wrappedConfiguration);
 	}
 
-	private static class ConfigurationWrapperImpl implements ConfigurationWrapper {
+	private static class ConfigurationWrapperImpl
+			extends AbstractWrapper
+			implements ConfigurationWrapper {
 
 		private Configuration wrappedConfiguration = null;
 

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

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.hibernate.tool.orm.jbt.api.wrp.CriteriaWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 import jakarta.persistence.Query;
 
@@ -12,7 +13,9 @@ public static CriteriaWrapper createCriteriaWrapper(final Query wrappedCriteria)
 		return new CriteriaWrapperImpl(wrappedCriteria);
 	}
 
-	private static class CriteriaWrapperImpl implements CriteriaWrapper {
+	private static class CriteriaWrapperImpl
+			extends AbstractWrapper
+			implements CriteriaWrapper {
 
 		private Query query = null;
 

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

@@ -23,6 +23,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.DatabaseReaderWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.RevengStrategyWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 public class DatabaseReaderWrapperFactory {
 
@@ -32,7 +33,9 @@ public static DatabaseReaderWrapper createDatabaseReaderWrapper(
 		return new DatabaseReaderWrapperImpl(properties, (RevengStrategy)revengStrategy.getWrappedObject());
 	}
 
-	static class DatabaseReaderWrapperImpl implements DatabaseReaderWrapper {
+	static class DatabaseReaderWrapperImpl 
+			extends AbstractWrapper
+			implements DatabaseReaderWrapper {
 
 		DatabaseReader databaseReader = null;
 		RevengMetadataCollector revengMetadataCollector = null;

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

@@ -5,14 +5,17 @@
 import org.hibernate.tool.api.export.ExporterConstants;
 import org.hibernate.tool.internal.export.ddl.DdlExporter;
 import org.hibernate.tool.orm.jbt.api.wrp.DdlExporterWrapper;
+import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 public class DdlExporterWrapperFactory {
 
 	public static DdlExporterWrapper createDdlExporterWrapper(final DdlExporter wrappedDdlExporter) {
 		return new DdlExporterWrapperImpl(wrappedDdlExporter);
 	}
 
-	private static class DdlExporterWrapperImpl implements DdlExporterWrapper {
+	private static class DdlExporterWrapperImpl 
+			extends AbstractWrapper
+			implements DdlExporterWrapper {
 
 		private DdlExporter ddlExporter = null;