HV-1623 Clean ups around cascadable properties in PropertyMetaData

marko-bekhta · gsmet · commit 556d27783cdb · 2018-06-11T09:58:31.000+02:00
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/FieldCascadable.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/FieldCascadable.java
@@ -0,0 +1,43 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.metadata.aggregated;
+
+import java.lang.annotation.ElementType;
+
+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
+import org.hibernate.validator.internal.metadata.facets.Cascadable;
+import org.hibernate.validator.internal.properties.Property;
+
+/**
+ * A {@link Cascadable} backed by a field of a Java bean.
+ *
+ * @author Gunnar Morling
+ * @author Marko Bekhta
+ */
+public class FieldCascadable extends PropertyCascadable {
+
+	FieldCascadable(Property property, CascadingMetaData cascadingMetaData) {
+		super( property, cascadingMetaData );
+	}
+
+	@Override
+	public ElementType getElementType() {
+		return ElementType.FIELD;
+	}
+
+	public static class Builder extends PropertyCascadable.Builder {
+
+		protected Builder(ValueExtractorManager valueExtractorManager, Property property, CascadingMetaDataBuilder cascadingMetaDataBuilder) {
+			super( valueExtractorManager, property, cascadingMetaDataBuilder );
+		}
+
+		@Override
+		protected Cascadable create(Property property, CascadingMetaData cascadingMetaData) {
+			return new FieldCascadable( property, cascadingMetaData );
+		}
+	}
+}
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/GetterCascadable.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/GetterCascadable.java
@@ -0,0 +1,43 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.metadata.aggregated;
+
+import java.lang.annotation.ElementType;
+
+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
+import org.hibernate.validator.internal.metadata.facets.Cascadable;
+import org.hibernate.validator.internal.properties.Property;
+
+/**
+ * A {@link Cascadable} backed by a getter of a Java bean.
+ *
+ * @author Gunnar Morling
+ * @author Marko Bekhta
+ */
+public class GetterCascadable extends PropertyCascadable {
+
+	GetterCascadable(Property property, CascadingMetaData cascadingMetaData) {
+		super( property, cascadingMetaData );
+	}
+
+	@Override
+	public ElementType getElementType() {
+		return ElementType.METHOD;
+	}
+
+	public static class Builder extends PropertyCascadable.Builder {
+
+		protected Builder(ValueExtractorManager valueExtractorManager, Property property, CascadingMetaDataBuilder cascadingMetaDataBuilder) {
+			super( valueExtractorManager, property, cascadingMetaDataBuilder );
+		}
+
+		@Override
+		protected Cascadable create(Property property, CascadingMetaData cascadingMetaData) {
+			return new GetterCascadable( property, cascadingMetaData );
+		}
+	}
+}
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyCascadable.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyCascadable.java
@@ -6,38 +6,30 @@
  */
 package org.hibernate.validator.internal.metadata.aggregated;
 
-import java.lang.annotation.ElementType;
 import java.lang.reflect.Type;
 
 import org.hibernate.validator.internal.engine.path.PathImpl;
 import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
 import org.hibernate.validator.internal.metadata.facets.Cascadable;
+import org.hibernate.validator.internal.metadata.raw.ConstrainedElement.ConstrainedElementKind;
 import org.hibernate.validator.internal.properties.Property;
-import org.hibernate.validator.internal.properties.javabean.JavaBeanField;
 
 /**
  * A {@link Cascadable} backed by a field of a Java bean.
  *
  * @author Gunnar Morling
  * @author Marko Bekhta
  */
-public class PropertyCascadable implements Cascadable {
+public abstract class PropertyCascadable implements Cascadable {
 
 	private final Property property;
 	private final Type cascadableType;
 	private final CascadingMetaData cascadingMetaData;
-	private final ElementType elementType;
 
 	PropertyCascadable(Property property, CascadingMetaData cascadingMetaData) {
 		this.property = property;
 		this.cascadableType = property.getType();
 		this.cascadingMetaData = cascadingMetaData;
-		this.elementType = property instanceof JavaBeanField ? ElementType.FIELD : ElementType.METHOD;
-	}
-
-	@Override
-	public ElementType getElementType() {
-		return elementType;
 	}
 
 	@Override
@@ -60,13 +52,13 @@ public CascadingMetaData getCascadingMetaData() {
 		return cascadingMetaData;
 	}
 
-	public static class Builder implements Cascadable.Builder {
+	public abstract static class Builder implements Cascadable.Builder {
 
 		private final ValueExtractorManager valueExtractorManager;
 		private final Property property;
 		private CascadingMetaDataBuilder cascadingMetaDataBuilder;
 
-		public Builder(ValueExtractorManager valueExtractorManager, Property property, CascadingMetaDataBuilder cascadingMetaDataBuilder) {
+		protected Builder(ValueExtractorManager valueExtractorManager, Property property, CascadingMetaDataBuilder cascadingMetaDataBuilder) {
 			this.valueExtractorManager = valueExtractorManager;
 			this.property = property;
 			this.cascadingMetaDataBuilder = cascadingMetaDataBuilder;
@@ -78,8 +70,20 @@ public void mergeCascadingMetaData(CascadingMetaDataBuilder cascadingMetaData) {
 		}
 
 		@Override
-		public PropertyCascadable build() {
-			return new PropertyCascadable( property, cascadingMetaDataBuilder.build( valueExtractorManager, property ) );
+		public Cascadable build() {
+			return create( property, cascadingMetaDataBuilder.build( valueExtractorManager, property ) );
+		}
+
+		protected abstract Cascadable create(Property property, CascadingMetaData build);
+
+		public static Cascadable.Builder builder(ConstrainedElementKind constrainedElementKind, ValueExtractorManager valueExtractorManager, Property property, CascadingMetaDataBuilder cascadingMetaDataBuilder) {
+			if ( ConstrainedElementKind.FIELD == constrainedElementKind ) {
+				return new FieldCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );
+			}
+			else if ( ConstrainedElementKind.METHOD == constrainedElementKind ) {
+				return new GetterCascadable.Builder( valueExtractorManager, property, cascadingMetaDataBuilder );
+			}
+			throw new IllegalStateException( "It should either be field or method." );
 		}
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java
@@ -18,6 +18,7 @@
 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;
 
@@ -38,7 +39,6 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedExecutable;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedField;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedType;
-import org.hibernate.validator.internal.properties.Callable;
 import org.hibernate.validator.internal.properties.Constrainable;
 import org.hibernate.validator.internal.properties.Property;
 import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
@@ -211,31 +211,31 @@ public final void add(ConstrainedElement constrainedElement) {
 
 			if ( constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ||
 					constrainedElement.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements() ) {
-				if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) {
-					Property property = ( (ConstrainedField) constrainedElement ).getProperty();
-					Cascadable.Builder builder = cascadableBuilders.get( property );
 
+				Optional<Constrainable> constrainable = getConstrainableFromConstrainedElement( constrainedElement );
+
+				if ( constrainable.isPresent() ) {
+					Property property = constrainable.get().as( Property.class );
+					Cascadable.Builder builder = cascadableBuilders.get( property );
 					if ( builder == null ) {
-						builder = new PropertyCascadable.Builder( valueExtractorManager, property, constrainedElement.getCascadingMetaDataBuilder() );
+						builder = PropertyCascadable.Builder.builder( constrainedElement.getKind(), valueExtractorManager, property, constrainedElement.getCascadingMetaDataBuilder() );
 						cascadableBuilders.put( property, builder );
 					}
 					else {
 						builder.mergeCascadingMetaData( constrainedElement.getCascadingMetaDataBuilder() );
 					}
 				}
-				else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
-					Callable method = ( (ConstrainedExecutable) constrainedElement ).getCallable();
-					Cascadable.Builder builder = cascadableBuilders.get( method );
+			}
+		}
 
-					if ( builder == null ) {
-						builder = new PropertyCascadable.Builder( valueExtractorManager, method.as( Property.class ), constrainedElement.getCascadingMetaDataBuilder() );
-						cascadableBuilders.put( method, builder );
-					}
-					else {
-						builder.mergeCascadingMetaData( constrainedElement.getCascadingMetaDataBuilder() );
-					}
-				}
+		private Optional<Constrainable> getConstrainableFromConstrainedElement(ConstrainedElement constrainedElement) {
+			if ( constrainedElement.getKind() == ConstrainedElementKind.FIELD ) {
+				return Optional.of( ( (ConstrainedField) constrainedElement ).getProperty() );
+			}
+			else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
+				return Optional.of( ( (ConstrainedExecutable) constrainedElement ).getCallable() );
 			}
+			return Optional.empty();
 		}
 
 		@Override
@@ -256,7 +256,7 @@ private MetaConstraint<?> withGetterLocation(ConstraintLocation getterConstraint
 			ConstraintLocation converted = null;
 
 			// fast track if it's a regular constraint
-			if ( !(constraint.getLocation() instanceof TypeArgumentConstraintLocation) ) {
+			if ( !( constraint.getLocation() instanceof TypeArgumentConstraintLocation ) ) {
 				// Change the constraint location to a GetterConstraintLocation if it is not already one
 				if ( constraint.getLocation() instanceof GetterPropertyConstraintLocation ) {
 					converted = constraint.getLocation();
