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

Author: quaff

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")

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] )
 );

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();
 }
 }
 }

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();
 }
 }
 

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

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")

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();
 }
 }

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(

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
 );

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;