HV-1245 Fix the ValueExtractor determination logic

hibernate · Mar 10, 2017 · baba923 · baba923
1 parent a640751
commit baba923
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/...rc/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorManager.java b/...rc/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorManager.java
@@ -15,6 +15,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -142,7 +143,7 @@ public ValueExtractorDescriptor getValueExtractor(Class<?> valueType, TypeVariab
 				typeParameterBoundToExtractorType = typeParameter;
 			}
 
-			if ( typeParameterBoundToExtractorType.equals( extractorDescriptor.getExtractedTypeParameter() ) ) {
+			if ( Objects.equals( extractorDescriptor.getExtractedTypeParameter(), typeParameterBoundToExtractorType ) ) {
 				typeParameterCompatibleExtractors.add( extractorDescriptor );
 			}
 		}
@@ -188,13 +189,7 @@ public boolean equals(Object obj) {
 	}
 
 	private TypeVariable<?> bind(TypeVariable<?> typeParameter, Map<TypeVariable<?>, TypeVariable<?>> bindings) {
-		TypeVariable<?> bound = null;
-
-		if ( bindings != null ) {
-			bound = bindings.get( typeParameter );
-		}
-
-		return bound != null ? bound : typeParameter == AnnotatedObject.INSTANCE ? AnnotatedObject.INSTANCE : ArrayElement.INSTANCE;
+		return bindings != null ? bindings.get( typeParameter ) : null;
 	}
 
 	private static boolean isJavaFxInClasspath() {