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

koentsje · koentsje · commit 5154a9ea6e82 · 2024-06-10T17:37:57.000+02:00
- Move interface 'org.hibernate.tool.orm.jbt.wrp.Wrapper' to 'org.hibernate.tool.orm.jbt.api.wrp.Wrapper'

Signed-off-by: Koen Aers &lt;koen.aers@gmail.com&gt;
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ArtifactCollectorWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ArtifactCollectorWrapper.java
@@ -3,8 +3,6 @@
 import java.io.File;
 import java.util.Set;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ArtifactCollectorWrapper extends Wrapper {
 
 	Set<String> getFileTypes();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/Cfg2HbmToolWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/Cfg2HbmToolWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface Cfg2HbmToolWrapper extends Wrapper {
 
 	String getTag(PersistentClassWrapper pcw);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ClassMetadataWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ClassMetadataWrapper extends Wrapper {
 
 	String getEntityName();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/CollectionMetadataWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface CollectionMetadataWrapper extends Wrapper {
 	
 	TypeWrapper getElementType();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ColumnWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ColumnWrapper extends Wrapper {
 	
 	static final int DEFAULT_LENGTH = 255;
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ConfigurationWrapper.java
@@ -4,7 +4,6 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
 import org.w3c.dom.Document;
 import org.xml.sax.EntityResolver;
 
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/CriteriaWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/CriteriaWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface CriteriaWrapper extends Wrapper {
 	
 	void setMaxResults(int intValue);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/DatabaseReaderWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/DatabaseReaderWrapper.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface DatabaseReaderWrapper extends Wrapper {
 	Map<String, List<TableWrapper>> collectDatabaseTables();
 }
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/DdlExporterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/DdlExporterWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.Properties;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface DdlExporterWrapper extends Wrapper {
 	
 	void setExport(boolean b);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/EnvironmentWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/EnvironmentWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface EnvironmentWrapper extends Wrapper {
 	
 	String getTransactionManagerStrategy();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ExporterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ExporterWrapper.java
@@ -4,8 +4,6 @@
 import java.io.StringWriter;
 import java.util.Properties;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ExporterWrapper extends Wrapper {
 	
 	void setConfiguration(ConfigurationWrapper configuration);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ForeignKeyWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ForeignKeyWrapper.java
@@ -3,8 +3,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ForeignKeyWrapper extends Wrapper {
 	
 	TableWrapper getReferencedTable();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/GenericExporterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/GenericExporterWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface GenericExporterWrapper extends Wrapper {
 	
 	void setFilePattern(String filePattern);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HbmExporterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HbmExporterWrapper.java
@@ -3,8 +3,6 @@
 import java.io.File;
 import java.util.Map;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface HbmExporterWrapper extends Wrapper {
 	
 	void start();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HqlCodeAssistWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HqlCodeAssistWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface HqlCodeAssistWrapper extends Wrapper {
 	
 	void codeComplete(String query, int position, Object handler);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HqlCompletionProposalWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/HqlCompletionProposalWrapper.java
@@ -1,7 +1,6 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
 import org.hibernate.mapping.Property;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
 
 public interface HqlCompletionProposalWrapper extends Wrapper {
 
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/JoinWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/JoinWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.Iterator;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface JoinWrapper extends Wrapper {
 
 	Iterator<PropertyWrapper> getPropertyIterator();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/NamingStrategyWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/NamingStrategyWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface NamingStrategyWrapper extends Wrapper {
 	
 	String collectionTableName(
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/OverrideRepositoryWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/OverrideRepositoryWrapper.java
@@ -2,8 +2,6 @@
 
 import java.io.File;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface OverrideRepositoryWrapper extends Wrapper {
 	
 	void addFile(File file);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapper.java
@@ -3,8 +3,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface PersistentClassWrapper extends Wrapper {
 
 	boolean isAssignableToRootClass();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PrimaryKeyWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PrimaryKeyWrapper.java
@@ -3,8 +3,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface PrimaryKeyWrapper extends Wrapper {
 
 	void addColumn(ColumnWrapper column);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PropertyWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/PropertyWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface PropertyWrapper extends Wrapper {
 
 	ValueWrapper getValue();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/QueryExporterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/QueryExporterWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface QueryExporterWrapper extends Wrapper {
 
 	void setQueries(List<String> queries);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/QueryWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/QueryWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface QueryWrapper extends Wrapper {
 
 	List<?> list();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/RevengSettingsWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/RevengSettingsWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface RevengSettingsWrapper extends Wrapper {
 
 	void setDefaultPackageName(String s);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/RevengStrategyWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/RevengStrategyWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface RevengStrategyWrapper extends Wrapper {
 
 	void setSettings(RevengSettingsWrapper revengSettings);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SchemaExportWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface SchemaExportWrapper extends Wrapper {
 	
 	void create();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SessionFactoryWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface SessionFactoryWrapper extends Wrapper {
 
 	void close();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 import jakarta.persistence.Query;
 
 public interface SessionWrapper extends Wrapper {
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TableFilterWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TableFilterWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface TableFilterWrapper extends Wrapper {
 
 	void setExclude(boolean b);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TableWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TableWrapper.java
@@ -2,8 +2,6 @@
 
 import java.util.Iterator;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface TableWrapper extends Wrapper {
 
 	String getName();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TypeFactoryWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TypeFactoryWrapper.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-public interface TypeFactoryWrapper {
+public interface TypeFactoryWrapper extends Wrapper {
 
 	TypeWrapper getBooleanType();
 	TypeWrapper getByteType();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TypeWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/TypeWrapper.java
@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface TypeWrapper extends Wrapper {
 
 	String toString(Object object);
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ValueWrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/ValueWrapper.java
@@ -3,8 +3,6 @@
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
-
 public interface ValueWrapper extends Wrapper {
 
 	boolean isSimpleValue();
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/Wrapper.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/Wrapper.java
@@ -1,4 +1,4 @@
-package org.hibernate.tool.orm.jbt.wrp;
+package org.hibernate.tool.orm.jbt.api.wrp;
 
 public interface Wrapper {
 	
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/Cfg2HbmToolWrapperFactory.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/Cfg2HbmToolWrapperFactory.java
@@ -9,7 +9,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.Cfg2HbmToolWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.PersistentClassWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.PropertyWrapper;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
 
 public class Cfg2HbmToolWrapperFactory {
 
diff --git a/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/SpecialRootClass.java b/jbt/src/main/java/org/hibernate/tool/orm/jbt/util/SpecialRootClass.java
@@ -10,7 +10,7 @@
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
 import org.hibernate.mapping.Value;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
 
 public class SpecialRootClass extends RootClass {
 	
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java
@@ -66,6 +66,7 @@
 import org.hibernate.tool.orm.jbt.api.wrp.TableFilterWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TypeFactoryWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
 import org.hibernate.tool.orm.jbt.internal.factory.ConfigurationWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.RevengStrategyWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.TableWrapperFactory;
@@ -76,7 +77,6 @@
 import org.hibernate.tool.orm.jbt.util.NativeConfiguration;
 import org.hibernate.tool.orm.jbt.util.RevengConfiguration;
 import org.hibernate.tool.orm.jbt.util.SpecialRootClass;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
 import org.junit.jupiter.api.Test;
 
 public class WrapperFactoryTest {
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/NamingStrategyWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/NamingStrategyWrapperTest.java
@@ -6,7 +6,6 @@
 import org.hibernate.cfg.DefaultNamingStrategy;
 import org.hibernate.cfg.NamingStrategy;
 import org.hibernate.tool.orm.jbt.internal.factory.NamingStrategyWrapperFactory;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapperTest.java b/jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapperTest.java
@@ -31,7 +31,6 @@
 import org.hibernate.tool.orm.jbt.internal.factory.ValueWrapperFactory;
 import org.hibernate.tool.orm.jbt.util.DummyMetadataBuildingContext;
 import org.hibernate.tool.orm.jbt.util.SpecialRootClass;
-import org.hibernate.tool.orm.jbt.wrp.Wrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`import java.util.List;`
`4`	`4`	`import java.util.Map;`
`5`	`5`
`6`		`-import org.hibernate.tool.orm.jbt.wrp.Wrapper;`
`7`		`-`
`8`	`6`	`public interface DatabaseReaderWrapper extends Wrapper {`
`9`	`7`	`Map<String, List<TableWrapper>> collectDatabaseTables();`
`10`	`8`	`}`