HHH-18118 fixed comparison of class field with itself

Author: dk2k

hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityRepresentationStrategyMap.java

@@ -39,8 +39,6 @@ public class EntityRepresentationStrategyMap implements EntityRepresentationStra
 	private final ProxyFactory proxyFactory;
 	private final EntityInstantiatorDynamicMap instantiator;
 
-	private final Map<String, PropertyAccess> propertyAccessMap = new ConcurrentHashMap<>();
-
 	public EntityRepresentationStrategyMap(
 			PersistentClass bootType,
 			RuntimeModelCreationContext creationContext) {
@@ -51,14 +49,6 @@ public EntityRepresentationStrategyMap(
 		this.proxyFactory = createProxyFactory( bootType );
 		this.instantiator = new EntityInstantiatorDynamicMap( bootType );
 
-		for ( Property property : bootType.getPropertyClosure() ) {
-			//TODO: redesign how PropertyAccessors are acquired...
-			final PropertyAccess propertyAccess = PropertyAccessStrategyMapImpl.INSTANCE
-					.buildPropertyAccess( null, property.getName(), true );
-
-			propertyAccessMap.put(property.getName(), propertyAccess);
-		}
-
 		createProxyFactory( bootType );
 	}
 

hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/PatternRenderer.java

@@ -59,7 +59,6 @@ public PatternRenderer(String pattern, SqlAstNodeRenderingMode argumentRendering
 	 * @param argumentRenderingModes The rendering modes for arguments
 	 */
 	public PatternRenderer(String pattern, SqlAstNodeRenderingMode[] argumentRenderingModes) {
-		final Set<Integer> paramNumbers = new HashSet<>();
 		final List<String> chunkList = new ArrayList<>();
 		final List<Integer> paramList = new ArrayList<>();
 		final StringBuilder chunk = new StringBuilder( 10 );
@@ -98,8 +97,7 @@ else if ( c  == '?' ) {
 					vararg = paramList.size();
 				}
 				else {
-					int paramNumber = Integer.valueOf( index.toString() );
-					paramNumbers.add( paramNumber );
+					int paramNumber = Integer.parseInt( index.toString() );
 					paramList.add( paramNumber );
 					index.setLength(0);
 					if ( paramNumber > max ) {

hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesSourceProcessingStateStandardImpl.java

@@ -41,7 +41,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
 	private List<EntityHolder> loadingEntityHolders;
 	private List<EntityHolder> reloadedEntityHolders;
 	private Map<CollectionKey, LoadingCollectionEntry> loadingCollectionMap;
-	private List<CollectionInitializer<?>> arrayInitializers;
 
 	private final PreLoadEvent preLoadEvent;
 	private final PostLoadEvent postLoadEvent;
@@ -130,12 +129,6 @@ public void registerLoadingCollection(CollectionKey key, LoadingCollectionEntry
 		}
 
 		loadingCollectionMap.put( key, loadingCollectionEntry );
-		if ( loadingCollectionEntry.getInitializer() instanceof ArrayInitializer ) {
-			if ( arrayInitializers == null ) {
-				arrayInitializers = new ArrayList<>();
-			}
-			arrayInitializers.add( loadingCollectionEntry.getInitializer() );
-		}
 	}
 
 	@Override