Mark field INSTANCE as private or deprecated for removal if method instance() present

quaff · beikov · commit 464ad489d6dd · 2024-09-13T11:03:04.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java
@@ -15,7 +15,9 @@
  * @author Gavin King
  * @author Steve Ebersole
  */
+@SuppressWarnings("rawtypes")
 public class ComparableComparator<T extends Comparable> implements Comparator<T>, Serializable {
+
 	public static final Comparator INSTANCE = new ComparableComparator();
 
 	@SuppressWarnings("unchecked")
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/RowVersionComparator.java
@@ -19,13 +19,12 @@ private RowVersionComparator() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public int compare(byte[] o1, byte[] o2) {
 		final int lengthToCheck = Math.min( o1.length, o2.length );
 
 		for ( int i = 0 ; i < lengthToCheck ; i++ ) {
 			// must do an unsigned int comparison
-			final int comparison = ComparableComparator.INSTANCE.compare(
+			final int comparison = ComparableComparator.<Integer>instance().compare(
 						Byte.toUnsignedInt( o1[i] ),
 						Byte.toUnsignedInt( o2[i] )
 			);
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java
@@ -836,7 +836,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {
 			};
 		}
 		else {
-			return ImmutableMutabilityPlan.INSTANCE;
+			return ImmutableMutabilityPlan.instance();
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java
@@ -695,7 +695,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {
 			};
 		}
 		else {
-			return ImmutableMutabilityPlan.INSTANCE;
+			return ImmutableMutabilityPlan.instance();
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
@@ -176,7 +176,7 @@ private List<Object[]> executeSelect(Object id, SharedSessionContractImplementor
 				jdbcSelect,
 				jdbcParamBindings,
 				new NoCallbackExecutionContext( session ),
-				RowTransformerArrayImpl.INSTANCE,
+				RowTransformerArrayImpl.instance(),
 				null,
 				FILTER,
 				1
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
@@ -438,13 +438,13 @@ public Object assemble(Serializable cached, SharedSessionContract session) {
 			};
 		}
 		else {
-			return ImmutableMutabilityPlan.INSTANCE;
+			return ImmutableMutabilityPlan.instance();
 		}
 	}
 
 	@SuppressWarnings("rawtypes")
 	public static AttributeMetadata getAttributeMetadata(PropertyAccess propertyAccess) {
-		return new SimpleAttributeMetadata( propertyAccess, ImmutableMutabilityPlan.INSTANCE, false, true, false, false, true, null);// todo (6.0) : not sure if CascadeStyle=null is correct
+		return new SimpleAttributeMetadata( propertyAccess, ImmutableMutabilityPlan.instance(), false, true, false, false, true, null);// todo (6.0) : not sure if CascadeStyle=null is correct
 	}
 
 	@SuppressWarnings("rawtypes")
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java
@@ -85,6 +85,6 @@ default boolean isIncludedInOptimisticLocking() {
 
 	@Override
 	default MutabilityPlan getMutabilityPlan() {
-		return ImmutableMutabilityPlan.INSTANCE;
+		return ImmutableMutabilityPlan.instance();
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java
@@ -316,7 +316,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T
 			rowTransformer = RowTransformerSingularReturnImpl.instance();
 		}
 		else {
-			rowTransformer = RowTransformerArrayImpl.INSTANCE;
+			rowTransformer = RowTransformerArrayImpl.instance();
 		}
 		//noinspection unchecked
 		return jdbcServices.getJdbcSelectExecutor().list(
diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java
@@ -188,7 +188,7 @@ protected List<Object> extractResults(ResultSet resultSet) {
 			//noinspection unchecked
 			final RowReader<Object> rowReader = (RowReader<Object>) ResultsHelper.createRowReader(
 					getSessionFactory(),
-					RowTransformerStandardImpl.INSTANCE,
+					RowTransformerStandardImpl.instance(),
 					null,
 					jdbcValues
 			);
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerArrayImpl.java
@@ -17,7 +17,7 @@ public class RowTransformerArrayImpl implements RowTransformer<Object[]> {
 	/**
 	 * Singleton access
 	 */
-	public static final RowTransformerArrayImpl INSTANCE = new RowTransformerArrayImpl();
+	private static final RowTransformerArrayImpl INSTANCE = new RowTransformerArrayImpl();
 
 	public static RowTransformerArrayImpl instance() {
 		return INSTANCE;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerListImpl.java
@@ -19,9 +19,11 @@ public class RowTransformerListImpl<T> implements RowTransformer<List<Object>> {
 	/**
 	 * Singleton access
 	 */
-	public static final RowTransformerListImpl INSTANCE = new RowTransformerListImpl();
+	@SuppressWarnings( "rawtypes" )
+	private static final RowTransformerListImpl INSTANCE = new RowTransformerListImpl();
 
-	public static RowTransformerListImpl instance() {
+	@SuppressWarnings( "unchecked" )
+	public static <X> RowTransformerListImpl<X> instance() {
 		return INSTANCE;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerSingularReturnImpl.java
@@ -22,7 +22,7 @@ public class RowTransformerSingularReturnImpl<R> implements RowTransformer<R> {
 	 * Singleton access
 	 */
 	@SuppressWarnings("rawtypes")
-	public static final RowTransformerSingularReturnImpl INSTANCE = new RowTransformerSingularReturnImpl();
+	private static final RowTransformerSingularReturnImpl INSTANCE = new RowTransformerSingularReturnImpl();
 
 	@SuppressWarnings("unchecked")
 	public static <R> RowTransformer<R> instance() {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/RowTransformerStandardImpl.java
@@ -22,7 +22,7 @@ public class RowTransformerStandardImpl<T> implements RowTransformer<T> {
 	 * Singleton access
 	 */
 	@SuppressWarnings("rawtypes")
-	public static final RowTransformerStandardImpl INSTANCE = new RowTransformerStandardImpl();
+	private static final RowTransformerStandardImpl INSTANCE = new RowTransformerStandardImpl();
 
 	@SuppressWarnings("unchecked")
 	public static <T> RowTransformer<T> instance() {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/StandardRowReader.java
@@ -73,9 +73,9 @@ public StandardRowReader(
 		this.sortedForResolveInstance = (Initializer<InitializerData>[]) sortedForResolveInitializers;
 		this.sortedForResolveInstanceData = new InitializerData[sortedForResolveInstance.length];
 		this.hasCollectionInitializers = hasCollectionInitializers;
-		this.rowTransformer = rowTransformer == RowTransformerArrayImpl.INSTANCE && resultAssemblers.length != 1
-				|| rowTransformer == RowTransformerStandardImpl.INSTANCE
-				|| rowTransformer == RowTransformerSingularReturnImpl.INSTANCE && resultAssemblers.length == 1
+		this.rowTransformer = rowTransformer == RowTransformerArrayImpl.instance() && resultAssemblers.length != 1
+				|| rowTransformer == RowTransformerStandardImpl.instance()
+				|| rowTransformer == RowTransformerSingularReturnImpl.instance() && resultAssemblers.length == 1
 				? null
 				: rowTransformer;
 		this.domainResultJavaType = domainResultJavaType;
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/ScrollableResultsConsumer.java
@@ -26,7 +26,11 @@
 public class ScrollableResultsConsumer<R> implements ResultsConsumer<ScrollableResultsImplementor<R>, R> {
 	/**
 	 * Singleton access to the standard scrollable-results consumer instance
+	 *
+	 * @deprecated in favor of {@link #instance()}
 	 */
+	@SuppressWarnings( "rawtypes" )
+	@Deprecated( forRemoval = true )
 	public static final ScrollableResultsConsumer INSTANCE = new ScrollableResultsConsumer();
 
 	@SuppressWarnings("unchecked")
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/spi/SingleResultConsumer.java
@@ -27,8 +27,8 @@ public class SingleResultConsumer<T> implements ResultsConsumer<T, T> {
 
 	private static final SingleResultConsumer<?> INSTANCE = new SingleResultConsumer<>();
 
+	@SuppressWarnings( "unchecked" )
 	public static <T> SingleResultConsumer<T> instance() {
-		//noinspection unchecked
 		return (SingleResultConsumer<T>) INSTANCE;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractClassJavaType.java
@@ -46,13 +46,12 @@ protected AbstractClassJavaType(Class<? extends T> type) {
 	 * @param type The Java type.
 	 * @param mutabilityPlan The plan for handling mutability aspects of the java type.
 	 */
-	@SuppressWarnings("unchecked")
 	protected AbstractClassJavaType(Class<? extends T> type, MutabilityPlan<? extends T> mutabilityPlan) {
 		this(
 				type,
 				mutabilityPlan,
 				Comparable.class.isAssignableFrom( type )
-						? (Comparator<T>) ComparableComparator.INSTANCE
+						? ComparableComparator.instance()
 						: null
 		);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/Immutability.java
@@ -22,7 +22,10 @@
 public class Immutability implements MutabilityPlan<Object> {
 	/**
 	 * Singleton access
+	 *
+	 * @deprecated in favor of {@link #instance()}
 	 */
+	@Deprecated( forRemoval = true )
 	public static final Immutability INSTANCE = new Immutability();
 
 	public static <X> MutabilityPlan<X> instance() {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ImmutableMutabilityPlan.java
@@ -21,6 +21,14 @@
  * @author Steve Ebersole
  */
 public class ImmutableMutabilityPlan<T> implements MutabilityPlan<T> {
+
+	/**
+	 * Singleton access
+	 *
+	 * @deprecated in favor of {@link #instance()}
+	 */
+	@SuppressWarnings( "rawtypes" )
+	@Deprecated( forRemoval = true )
 	public static final ImmutableMutabilityPlan INSTANCE = new ImmutableMutabilityPlan();
 
 	public static <X> ImmutableMutabilityPlan<X> instance() {

Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {`
`836`	`836`	`};`
`837`	`837`	`}`
`838`	`838`	`else {`
`839`		`- return ImmutableMutabilityPlan.INSTANCE;`
	`839`	`+ return ImmutableMutabilityPlan.instance();`
`840`	`840`	`}`
`841`	`841`	`}`
`842`	`842`	`}`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ public Object assemble(Serializable cached, SharedSessionContract session) {`
`695`	`695`	`};`
`696`	`696`	`}`
`697`	`697`	`else {`
`698`		`- return ImmutableMutabilityPlan.INSTANCE;`
	`698`	`+ return ImmutableMutabilityPlan.instance();`
`699`	`699`	`}`
`700`	`700`	`}`
`701`	`701`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private List<Object[]> executeSelect(Object id, SharedSessionContractImplementor`
`176`	`176`	`jdbcSelect,`
`177`	`177`	`jdbcParamBindings,`
`178`	`178`	`new NoCallbackExecutionContext( session ),`
`179`		`- RowTransformerArrayImpl.INSTANCE,`
	`179`	`+ RowTransformerArrayImpl.instance(),`
`180`	`180`	`null,`
`181`	`181`	`FILTER,`
`182`	`182`	`1`
Original file line number	Diff line number	Diff line change
`@@ -438,13 +438,13 @@ public Object assemble(Serializable cached, SharedSessionContract session) {`
`438`	`438`	`};`
`439`	`439`	`}`
`440`	`440`	`else {`
`441`		`- return ImmutableMutabilityPlan.INSTANCE;`
	`441`	`+ return ImmutableMutabilityPlan.instance();`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`@SuppressWarnings("rawtypes")`
`446`	`446`	`public static AttributeMetadata getAttributeMetadata(PropertyAccess propertyAccess) {`
`447`		`- return new SimpleAttributeMetadata( propertyAccess, ImmutableMutabilityPlan.INSTANCE, false, true, false, false, true, null);// todo (6.0) : not sure if CascadeStyle=null is correct`
	`447`	`+ return new SimpleAttributeMetadata( propertyAccess, ImmutableMutabilityPlan.instance(), false, true, false, false, true, null);// todo (6.0) : not sure if CascadeStyle=null is correct`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`@SuppressWarnings("rawtypes")`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,6 @@ default boolean isIncludedInOptimisticLocking() {`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`default MutabilityPlan getMutabilityPlan() {`
`88`		`- return ImmutableMutabilityPlan.INSTANCE;`
	`88`	`+ return ImmutableMutabilityPlan.instance();`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public <T> MappingModelExpressible<T> getResolvedMappingModelType(SqmParameter<T`
`316`	`316`	`rowTransformer = RowTransformerSingularReturnImpl.instance();`
`317`	`317`	`}`
`318`	`318`	`else {`
`319`		`- rowTransformer = RowTransformerArrayImpl.INSTANCE;`
	`319`	`+ rowTransformer = RowTransformerArrayImpl.instance();`
`320`	`320`	`}`
`321`	`321`	`//noinspection unchecked`
`322`	`322`	`return jdbcServices.getJdbcSelectExecutor().list(`