move TypeBeanInstanceProducer as per the todo

gavinking · gavinking · commit df974fd1fb86 · 2024-11-14T14:18:48.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -17,7 +17,6 @@
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
-import org.hibernate.boot.model.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeBeanInstanceProducer.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeBeanInstanceProducer.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.boot.model;
+package org.hibernate.boot.internal;
 
 import org.hibernate.InstantiationException;
 import org.hibernate.Internal;
@@ -19,7 +19,7 @@
  *
  * @author Christian Beikov
  */
-@Internal //TODO: move this to org.hibernate.boot.internal, where its only usage is
+@Internal
 public class TypeBeanInstanceProducer implements BeanInstanceProducer, TypeBootstrapContext {
 	private final ConfigurationService configurationService;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -14,6 +14,7 @@
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.internal.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -61,7 +62,7 @@ public interface BootstrapContext {
 	/**
 	 * The {@link BeanInstanceProducer} to use when creating custom type references.
 	 *
-	 * @implNote Usually a {@link org.hibernate.boot.model.TypeBeanInstanceProducer}.
+	 * @implNote Usually a {@link TypeBeanInstanceProducer}.
 	 */
 	BeanInstanceProducer getCustomTypeProducer();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -53,8 +53,8 @@ protected <T> T processSchemaResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getSchemas( catalog, schemaPattern ) ) {
+					getJdbcDatabaseMetaData()
+							.getSchemas( catalog, schemaPattern ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -68,8 +68,8 @@ protected <T> T processTableResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getTables( catalog, schemaPattern, tableNamePattern, types) ) {
+					getJdbcDatabaseMetaData()
+							.getTables( catalog, schemaPattern, tableNamePattern, types) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -83,8 +83,8 @@ protected <T> T processColumnsResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {
+					getJdbcDatabaseMetaData()
+							.getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -97,8 +97,8 @@ protected <T> T processPrimaryKeysResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {
+					getJdbcDatabaseMetaData()
+							.getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -113,8 +113,8 @@ protected <T> T processIndexInfoResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getIndexInfo( catalog, schema, table, unique, approximate ) ) {
+					getJdbcDatabaseMetaData()
+							.getIndexInfo( catalog, schema, table, unique, approximate ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -127,8 +127,8 @@ protected <T> T processImportedKeysResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getImportedKeys( catalog, schema, table ) ) {
+					getJdbcDatabaseMetaData()
+							.getImportedKeys( catalog, schema, table ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -144,9 +144,9 @@ protected <T> T processCrossReferenceResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getCrossReference( parentCatalog, parentSchema, parentTable,
-									 foreignCatalog, foreignSchema, foreignTable) ) {
+					getJdbcDatabaseMetaData()
+							.getCrossReference( parentCatalog, parentSchema, parentTable,
+									foreignCatalog, foreignSchema, foreignTable) ) {
 			return processor.process( resultSet );
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
@@ -17,7 +17,7 @@
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.internal.ClassmateContext;
-import org.hibernate.boot.model.TypeBeanInstanceProducer;
+import org.hibernate.boot.internal.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ protected <T> T processSchemaResultSet(`
`53`	`53`	`ExtractionContext.ResultSetProcessor<T> processor)`
`54`	`54`	`throws SQLException {`
`55`	`55`	`try ( ResultSet resultSet =`
`56`		`- getJdbcDatabaseMetaData()`
`57`		`- .getSchemas( catalog, schemaPattern ) ) {`
	`56`	`+ getJdbcDatabaseMetaData()`
	`57`	`+ .getSchemas( catalog, schemaPattern ) ) {`
`58`	`58`	`return processor.process( resultSet );`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -68,8 +68,8 @@ protected <T> T processTableResultSet(`
`68`	`68`	`ExtractionContext.ResultSetProcessor<T> processor)`
`69`	`69`	`throws SQLException {`
`70`	`70`	`try ( ResultSet resultSet =`
`71`		`- getJdbcDatabaseMetaData()`
`72`		`- .getTables( catalog, schemaPattern, tableNamePattern, types) ) {`
	`71`	`+ getJdbcDatabaseMetaData()`
	`72`	`+ .getTables( catalog, schemaPattern, tableNamePattern, types) ) {`
`73`	`73`	`return processor.process( resultSet );`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -83,8 +83,8 @@ protected <T> T processColumnsResultSet(`
`83`	`83`	`ExtractionContext.ResultSetProcessor<T> processor)`
`84`	`84`	`throws SQLException {`
`85`	`85`	`try ( ResultSet resultSet =`
`86`		`- getJdbcDatabaseMetaData()`
`87`		`- .getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {`
	`86`	`+ getJdbcDatabaseMetaData()`
	`87`	`+ .getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {`
`88`	`88`	`return processor.process( resultSet );`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -97,8 +97,8 @@ protected <T> T processPrimaryKeysResultSet(`
`97`	`97`	`ExtractionContext.ResultSetProcessor<T> processor)`
`98`	`98`	`throws SQLException {`
`99`	`99`	`try ( ResultSet resultSet =`
`100`		`- getJdbcDatabaseMetaData()`
`101`		`- .getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {`
	`100`	`+ getJdbcDatabaseMetaData()`
	`101`	`+ .getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {`
`102`	`102`	`return processor.process( resultSet );`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -113,8 +113,8 @@ protected <T> T processIndexInfoResultSet(`
`113`	`113`	`ExtractionContext.ResultSetProcessor<T> processor)`
`114`	`114`	`throws SQLException {`
`115`	`115`	`try ( ResultSet resultSet =`
`116`		`- getJdbcDatabaseMetaData()`
`117`		`- .getIndexInfo( catalog, schema, table, unique, approximate ) ) {`
	`116`	`+ getJdbcDatabaseMetaData()`
	`117`	`+ .getIndexInfo( catalog, schema, table, unique, approximate ) ) {`
`118`	`118`	`return processor.process( resultSet );`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -127,8 +127,8 @@ protected <T> T processImportedKeysResultSet(`
`127`	`127`	`ExtractionContext.ResultSetProcessor<T> processor)`
`128`	`128`	`throws SQLException {`
`129`	`129`	`try ( ResultSet resultSet =`
`130`		`- getJdbcDatabaseMetaData()`
`131`		`- .getImportedKeys( catalog, schema, table ) ) {`
	`130`	`+ getJdbcDatabaseMetaData()`
	`131`	`+ .getImportedKeys( catalog, schema, table ) ) {`
`132`	`132`	`return processor.process( resultSet );`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -144,9 +144,9 @@ protected <T> T processCrossReferenceResultSet(`
`144`	`144`	`ExtractionContext.ResultSetProcessor<T> processor)`
`145`	`145`	`throws SQLException {`
`146`	`146`	`try ( ResultSet resultSet =`
`147`		`- getJdbcDatabaseMetaData()`
`148`		`- .getCrossReference( parentCatalog, parentSchema, parentTable,`
`149`		`- foreignCatalog, foreignSchema, foreignTable) ) {`
	`147`	`+ getJdbcDatabaseMetaData()`
	`148`	`+ .getCrossReference( parentCatalog, parentSchema, parentTable,`
	`149`	`+ foreignCatalog, foreignSchema, foreignTable) ) {`
`150`	`150`	`return processor.process( resultSet );`
`151`	`151`	`}`
`152`	`152`	`}`