HV-1831 Clean up another experiment that shouldn't have been committed

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/engine/validationcontext/AbstractValidationContext.java

@@ -7,10 +7,9 @@
 package org.hibernate.validator.internal.engine.validationcontext;
 
 import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -103,19 +102,19 @@ abstract class AbstractValidationContext<T> implements BaseBeanValidationContext
 	 * The set of already processed meta constraints per bean - path ({@link BeanPathMetaConstraintProcessedUnit}).
 	 */
 	@Lazy
-	private HashSet<BeanPathMetaConstraintProcessedUnit> processedPathUnits;
+	private Set<BeanPathMetaConstraintProcessedUnit> processedPathUnits;
 
 	/**
 	 * The set of already processed groups per bean ({@link BeanGroupProcessedUnit}).
 	 */
 	@Lazy
-	private HashSet<BeanGroupProcessedUnit> processedGroupUnits;
+	private Set<BeanGroupProcessedUnit> processedGroupUnits;
 
 	/**
 	 * Maps an object to a list of paths in which it has been validated. The objects are the bean instances.
 	 */
 	@Lazy
-	private HashMap<ProcessedBean, ArrayList<PathImpl>> processedPathsPerBean;
+	private Map<Object, Set<PathImpl>> processedPathsPerBean;
 
 	/**
 	 * Contains all failing constraints so far.
@@ -339,7 +338,7 @@ private String interpolate(
 	}
 
 	private boolean isAlreadyValidatedForPath(Object value, PathImpl path) {
-		ArrayList<PathImpl> pathSet = getInitializedProcessedPathsPerBean().get( new ProcessedBean( value ) );
+		Set<PathImpl> pathSet = getInitializedProcessedPathsPerBean().get( value );
 		if ( pathSet == null ) {
 			return false;
 		}
@@ -375,13 +374,12 @@ private boolean isAlreadyValidatedForCurrentGroup(Object value, Class<?> group)
 
 	private void markCurrentBeanAsProcessedForCurrentPath(Object bean, PathImpl path) {
 		// HV-1031 The path object is mutated as we traverse the object tree, hence copy it before saving it
-		HashMap<ProcessedBean, ArrayList<PathImpl>> processedPathsPerBean = getInitializedProcessedPathsPerBean();
+		Map<Object, Set<PathImpl>> processedPathsPerBean = getInitializedProcessedPathsPerBean();
 
-		ProcessedBean processedBean = new ProcessedBean( bean );
-		ArrayList<PathImpl> processedPaths = processedPathsPerBean.get( processedBean );
+		Set<PathImpl> processedPaths = processedPathsPerBean.get( bean );
 		if ( processedPaths == null ) {
-			processedPaths = new ArrayList<>();
-			processedPathsPerBean.put( processedBean, processedPaths );
+			processedPaths = new HashSet<>();
+			processedPathsPerBean.put( bean, processedPaths );
 		}
 
 		processedPaths.add( PathImpl.createCopy( path ) );
@@ -398,16 +396,16 @@ private Set<BeanPathMetaConstraintProcessedUnit> getInitializedProcessedPathUnit
 		return processedPathUnits;
 	}
 
-	private HashSet<BeanGroupProcessedUnit> getInitializedProcessedGroupUnits() {
+	private Set<BeanGroupProcessedUnit> getInitializedProcessedGroupUnits() {
 		if ( processedGroupUnits == null ) {
 			processedGroupUnits = new HashSet<>();
 		}
 		return processedGroupUnits;
 	}
 
-	private HashMap<ProcessedBean, ArrayList<PathImpl>> getInitializedProcessedPathsPerBean() {
+	private Map<Object, Set<PathImpl>> getInitializedProcessedPathsPerBean() {
 		if ( processedPathsPerBean == null ) {
-			processedPathsPerBean = new HashMap<>();
+			processedPathsPerBean = new IdentityHashMap<>();
 		}
 		return processedPathsPerBean;
 	}
@@ -512,31 +510,4 @@ private int createHashCode() {
 			return result;
 		}
 	}
-
-	private static final class ProcessedBean {
-
-		private Object bean;
-		private int hashCode = -1;
-
-		ProcessedBean(Object bean) {
-			this.bean = bean;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			return this.bean == ((ProcessedBean) o).bean;
-		}
-
-		@Override
-		public int hashCode() {
-			if ( hashCode == -1 ) {
-				hashCode = createHashCode();
-			}
-			return hashCode;
-		}
-
-		private int createHashCode() {
-			return System.identityHashCode( bean );
-		}
-	}
 }