HV-1623 Throw exception in case of unexpected constrainedElement class in property metadata

- need to throw an exception rather than just create it
- removed the usage of Optional as it isn't needed anymore

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java

@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -35,7 +34,7 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedExecutable;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedField;
-import org.hibernate.validator.internal.properties.Constrainable;
+import org.hibernate.validator.internal.properties.Getter;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
 import org.hibernate.validator.internal.util.CollectionHelper;
@@ -192,41 +191,39 @@ public final void add(ConstrainedElement constrainedElement) {
 			if ( constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ||
 					constrainedElement.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements() ) {
 
-				Optional<Constrainable> constrainable = getConstrainableFromConstrainedElement( constrainedElement );
+				Property property = getConstrainableFromConstrainedElement( constrainedElement );
 
-				if ( constrainable.isPresent() ) {
-					Property property = constrainable.get().as( Property.class );
-					Cascadable.Builder builder = cascadableBuilders.get( property );
-					if ( builder == null ) {
-						builder = AbstractPropertyCascadable.AbstractBuilder.builder( valueExtractorManager, property,
-								constrainedElement.getCascadingMetaDataBuilder() );
-						cascadableBuilders.put( property, builder );
-					}
-					else {
-						builder.mergeCascadingMetaData( constrainedElement.getCascadingMetaDataBuilder() );
-					}
-				}
-			}
-		}
-
-		private Optional<Constrainable> getConstrainableFromConstrainedElement(ConstrainedElement constrainedElement) {
-			if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) {
-				if ( constrainedElement instanceof ConstrainedField ) {
-					return Optional.of( ( (ConstrainedField) constrainedElement ).getField() );
+				Cascadable.Builder builder = cascadableBuilders.get( property );
+				if ( builder == null ) {
+					builder = AbstractPropertyCascadable.AbstractBuilder.builder( valueExtractorManager, property,
+							constrainedElement.getCascadingMetaDataBuilder() );
+					cascadableBuilders.put( property, builder );
 				}
 				else {
-					LOG.getUnexpectedConstraintElementType( ConstrainedField.class, constrainedElement.getClass() );
+					builder.mergeCascadingMetaData( constrainedElement.getCascadingMetaDataBuilder() );
 				}
 			}
-			else if ( constrainedElement.getKind() == ConstrainedElementKind.GETTER ) {
-				if ( constrainedElement instanceof ConstrainedExecutable ) {
-					return Optional.of( ( (ConstrainedExecutable) constrainedElement ).getCallable() );
-				}
-				else {
-					LOG.getUnexpectedConstraintElementType( ConstrainedExecutable.class, constrainedElement.getClass() );
-				}
+		}
+
+		private Property getConstrainableFromConstrainedElement(ConstrainedElement constrainedElement) {
+			switch ( constrainedElement.getKind() ) {
+				case FIELD:
+					if ( constrainedElement instanceof ConstrainedField ) {
+						return ( (ConstrainedField) constrainedElement ).getField();
+					}
+					else {
+						throw LOG.getUnexpectedConstraintElementType( ConstrainedField.class, constrainedElement.getClass() );
+					}
+				case GETTER:
+					if ( constrainedElement instanceof ConstrainedExecutable ) {
+						return ( (ConstrainedExecutable) constrainedElement ).getCallable().as( Getter.class );
+					}
+					else {
+						throw LOG.getUnexpectedConstraintElementType( ConstrainedExecutable.class, constrainedElement.getClass() );
+					}
+				default:
+					throw LOG.getUnsupportedConstraintElementType( constrainedElement.getKind() );
 			}
-			return Optional.empty();
 		}
 
 		@Override

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

@@ -48,6 +48,7 @@
 import org.hibernate.validator.internal.engine.messageinterpolation.parser.MessageDescriptorFormatException;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement;
 import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.util.logging.formatter.ArrayOfClassesObjectFormatter;
@@ -861,6 +862,6 @@ ConstraintDefinitionException getConstraintValidatorDefinitionConstraintMismatch
 	@Message(id = 244, value = "ConstrainedElement expected class was %1$s, but instead received %2$s.")
 	AssertionError getUnexpectedConstraintElementType(@FormatWith(ClassObjectFormatter.class) Class<?> expecting, @FormatWith(ClassObjectFormatter.class) Class<?> got);
 
-	@Message(id = 245, value = "Allowed ElementTypes are %2$s, but instead received %1$s.")
-	AssertionError getUnexpectedElementType(ElementType received, @FormatWith(ObjectArrayFormatter.class) ElementType... got);
+	@Message(id = 245, value = "Allowed constraint element types are FIELD and GETTER, but instead received %1$s.")
+	AssertionError getUnsupportedConstraintElementType(ConstrainedElement.ConstrainedElementKind kind);
 }