HV-1206 Enforcing that @ExtractedValue is given exactly once per extractor type

gunnarmorling · gunnarmorling · commit eba840dfe83a · 2017-01-16T15:42:29.000+01:00
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/BooleanArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/BooleanArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class BooleanArrayValueExtractor implements ValueExtractor<boolean[]> {
+class BooleanArrayValueExtractor implements ValueExtractor<boolean @ExtractedValue[]> {
 
 	static final BooleanArrayValueExtractor INSTANCE = new BooleanArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ByteArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ByteArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class ByteArrayValueExtractor implements ValueExtractor<byte[]> {
+class ByteArrayValueExtractor implements ValueExtractor<byte @ExtractedValue[]> {
 
 	static final ByteArrayValueExtractor INSTANCE = new ByteArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/CharArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/CharArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class CharArrayValueExtractor implements ValueExtractor<char[]> {
+class CharArrayValueExtractor implements ValueExtractor<char @ExtractedValue[]> {
 
 	static final CharArrayValueExtractor INSTANCE = new CharArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/DoubleArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/DoubleArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class DoubleArrayValueExtractor implements ValueExtractor<double[]> {
+class DoubleArrayValueExtractor implements ValueExtractor<double @ExtractedValue[]> {
 
 	static final DoubleArrayValueExtractor INSTANCE = new DoubleArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/FloatArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/FloatArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class FloatArrayValueExtractor implements ValueExtractor<float[]> {
+class FloatArrayValueExtractor implements ValueExtractor<float @ExtractedValue[]> {
 
 	static final FloatArrayValueExtractor INSTANCE = new FloatArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/IntArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/IntArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class IntArrayValueExtractor implements ValueExtractor<int[]> {
+class IntArrayValueExtractor implements ValueExtractor<int @ExtractedValue[]> {
 
 	static final IntArrayValueExtractor INSTANCE = new IntArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyIterableValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyIterableValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class LegacyIterableValueExtractor implements ValueExtractor<Iterable<?>> {
+class LegacyIterableValueExtractor implements ValueExtractor<@ExtractedValue Iterable<?>> {
 
 	static final LegacyIterableValueExtractor INSTANCE = new LegacyIterableValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyListValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyListValueExtractor.java
@@ -8,9 +8,10 @@
 
 import java.util.List;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class LegacyListValueExtractor implements ValueExtractor<List<?>> {
+class LegacyListValueExtractor implements ValueExtractor<@ExtractedValue List<?>> {
 
 	static final LegacyListValueExtractor INSTANCE = new LegacyListValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyMapValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyMapValueExtractor.java
@@ -8,9 +8,10 @@
 
 import java.util.Map;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class LegacyMapValueExtractor implements ValueExtractor<Map<?, ?>> {
+class LegacyMapValueExtractor implements ValueExtractor<@ExtractedValue Map<?, ?>> {
 
 	static final LegacyMapValueExtractor INSTANCE = new LegacyMapValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyOptionalValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LegacyOptionalValueExtractor.java
@@ -8,6 +8,7 @@
 
 import java.util.Optional;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
 /**
@@ -16,7 +17,7 @@
  * @author Gunnar Morling
  */
 // TODO should we keep that, or only support {@code Optional<@Valid Foo>}.
-public class LegacyOptionalValueExtractor implements ValueExtractor<Optional<?>> {
+public class LegacyOptionalValueExtractor implements ValueExtractor<@ExtractedValue Optional<?>> {
 
 	static final LegacyOptionalValueExtractor INSTANCE = new LegacyOptionalValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LongArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/LongArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class LongArrayValueExtractor implements ValueExtractor<long[]> {
+class LongArrayValueExtractor implements ValueExtractor<long @ExtractedValue[]> {
 
 	static final LongArrayValueExtractor INSTANCE = new LongArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ObjectArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ObjectArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class ObjectArrayValueExtractor implements ValueExtractor<Object[]> {
+class ObjectArrayValueExtractor implements ValueExtractor<Object @ExtractedValue[]> {
 
 	static final ObjectArrayValueExtractor INSTANCE = new ObjectArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ObjectValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ObjectValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class ObjectValueExtractor implements ValueExtractor<Object> {
+class ObjectValueExtractor implements ValueExtractor<@ExtractedValue Object> {
 
 	static final ObjectValueExtractor INSTANCE = new ObjectValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ShortArrayValueExtractor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ShortArrayValueExtractor.java
@@ -6,9 +6,10 @@
  */
 package org.hibernate.validator.internal.engine.cascading;
 
+import javax.validation.valueextraction.ExtractedValue;
 import javax.validation.valueextraction.ValueExtractor;
 
-class ShortArrayValueExtractor implements ValueExtractor<short[]> {
+class ShortArrayValueExtractor implements ValueExtractor<short @ExtractedValue[]> {
 
 	static final ShortArrayValueExtractor INSTANCE = new ShortArrayValueExtractor();
 
diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorDescriptor.java b/engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorDescriptor.java
@@ -17,6 +17,8 @@
 
 import org.hibernate.validator.internal.util.StringHelper;
 import org.hibernate.validator.internal.util.TypeHelper;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 /**
  * Describes a {@link ValueExtractor}.
@@ -25,6 +27,8 @@
  */
 public class ValueExtractorDescriptor {
 
+	private static final Log LOG = LoggerFactory.make();
+
 	private final ValueExtractor<?> valueExtractor;
 	private final Type extractedType;
 	private final TypeVariable<?> extractedTypeParameter;
@@ -41,23 +45,37 @@ private static TypeVariable<?> getExtractedTypeParameter(Class<?> extractorImple
 		AnnotatedType extractedType = ( (AnnotatedParameterizedType) genericInterface ).getAnnotatedActualTypeArguments()[0];
 		Class<?> extractedTypeRaw = (Class<?>) TypeHelper.getErasedType( extractedType.getType() );
 
+		TypeVariable<?> extractedTypeParameter = null;
+
+		if ( extractedType.isAnnotationPresent( ExtractedValue.class ) ) {
+			if ( extractedType instanceof AnnotatedArrayType ) {
+				extractedTypeParameter = ArrayElement.INSTANCE;
+			}
+			else {
+				extractedTypeParameter = AnnotatedObject.INSTANCE;
+			}
+		}
+
 		if ( extractedType instanceof AnnotatedParameterizedType ) {
 			AnnotatedParameterizedType parameterizedExtractedType = (AnnotatedParameterizedType) extractedType;
-
 			int i = 0;
 			for ( AnnotatedType typeArgument : parameterizedExtractedType.getAnnotatedActualTypeArguments() ) {
-				// TODO raise error if given several times
 				if ( typeArgument.isAnnotationPresent( ExtractedValue.class ) ) {
-					return extractedTypeRaw.getTypeParameters()[i];
+					if ( extractedTypeParameter != null ) {
+						throw LOG.getValueExtractorDeclaresExtractedValueMultipleTimesException( extractorImplementationType );
+					}
+
+					extractedTypeParameter = extractedTypeRaw.getTypeParameters()[i];
 				}
 				i++;
 			}
 		}
-		else if ( extractedType instanceof AnnotatedArrayType ) {
-			return ArrayElement.INSTANCE;
+
+		if ( extractedTypeParameter == null ) {
+			throw LOG.getValueExtractorFailsToDeclareExtractedValueException( extractorImplementationType );
 		}
 
-		return AnnotatedObject.INSTANCE;
+		return extractedTypeParameter;
 	}
 
 	private static Type getExtractedType(Class<?> extractorImplementationType) {
diff --git a/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java b/engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java
@@ -692,4 +692,10 @@ ConstraintDeclarationException getInconsistentValueUnwrappingConfigurationBetwee
 
 	@Message(id = 202, value = "Unable to get the current time from the clock provider")
 	ValidationException getUnableToGetCurrentTimeFromClockProvider(@Cause Exception e);
+
+	@Message(id = 203, value = "Value extractor type %1s fails to declare the extracted type parameter using @ExtractedValue.")
+	ValidationException getValueExtractorFailsToDeclareExtractedValueException(@FormatWith(ClassObjectFormatter.class) Class<?> extractorType);
+
+	@Message(id = 204, value = "Only one type parameter must be marked with @ExtractedValue for value extractor type %1s.")
+	ValidationException getValueExtractorDeclaresExtractedValueMultipleTimesException(@FormatWith(ClassObjectFormatter.class) Class<?> extractorType);
 }
