HV-1502 Remove an unnecessary intermediary map in AnnotationDef

Author: gsmet

engine/src/main/java/org/hibernate/validator/cfg/AnnotationDef.java

@@ -14,7 +14,6 @@
 import java.util.Map;
 
 import org.hibernate.validator.internal.util.CollectionHelper;
-import org.hibernate.validator.internal.util.StringHelper;
 import org.hibernate.validator.internal.util.annotation.AnnotationDescriptor;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
@@ -32,6 +31,7 @@
  * @author Hardy Ferentschik
  * @author Gunnar Morling
  * @author Marko Bekhta
+ * @author Guillaume Smet
  */
 public abstract class AnnotationDef<C extends AnnotationDef<C, A>, A extends Annotation> {
 
@@ -42,16 +42,9 @@ public abstract class AnnotationDef<C extends AnnotationDef<C, A>, A extends Ann
 	// public getters as they would pollute the fluent definition API.
 
 	/**
-	 * The constraint annotation type of this definition.
+	 * The annotation descriptor builder.
 	 */
-	protected final Class<A> annotationType;
-
-	/**
-	 * A map with the annotation parameters of this definition. Contains only parameters
-	 * of non annotation types. Keys are property names of this definition's annotation
-	 * type, values are annotation parameter values of the appropriate types.
-	 */
-	protected final Map<String, Object> parameters;
+	protected final AnnotationDescriptor.Builder<A> annotationDescriptorBuilder;
 
 	/**
 	 * A map with annotation parameters of this definition which are annotations
@@ -71,15 +64,13 @@ public abstract class AnnotationDef<C extends AnnotationDef<C, A>, A extends Ann
 	private final Map<String, Class<?>> annotationsAsParametersTypes;
 
 	protected AnnotationDef(Class<A> annotationType) {
-		this.annotationType = annotationType;
-		this.parameters = new HashMap<>();
+		this.annotationDescriptorBuilder = new AnnotationDescriptor.Builder<>( annotationType );
 		this.annotationsAsParameters = new HashMap<>();
 		this.annotationsAsParametersTypes = new HashMap<>();
 	}
 
 	protected AnnotationDef(AnnotationDef<?, A> original) {
-		this.annotationType = original.annotationType;
-		this.parameters = original.parameters;
+		this.annotationDescriptorBuilder = original.annotationDescriptorBuilder;
 		this.annotationsAsParameters = original.annotationsAsParameters;
 		this.annotationsAsParametersTypes = original.annotationsAsParametersTypes;
 	}
@@ -90,7 +81,7 @@ private C getThis() {
 	}
 
 	protected C addParameter(String key, Object value) {
-		parameters.put( key, value );
+		annotationDescriptorBuilder.setAttribute( key, value );
 		return getThis();
 	}
 
@@ -105,16 +96,11 @@ protected C addAnnotationAsParameter(String key, AnnotationDef<?, ?> value) {
 				return resultingList;
 			}
 		} );
-		annotationsAsParametersTypes.putIfAbsent( key, value.annotationType );
+		annotationsAsParametersTypes.putIfAbsent( key, value.annotationDescriptorBuilder.getType() );
 		return getThis();
 	}
 
 	protected AnnotationDescriptor<A> createAnnotationDescriptor() {
-		AnnotationDescriptor.Builder<A> annotationDescriptorBuilder = new AnnotationDescriptor.Builder<>( annotationType );
-		for ( Map.Entry<String, Object> parameter : parameters.entrySet() ) {
-			annotationDescriptorBuilder.setAttribute( parameter.getKey(), parameter.getValue() );
-		}
-
 		for ( Map.Entry<String, List<AnnotationDef<?, ?>>> annotationAsParameter : annotationsAsParameters.entrySet() ) {
 			annotationDescriptorBuilder.setAttribute(
 					annotationAsParameter.getKey(),
@@ -149,8 +135,7 @@ public String toString() {
 		final StringBuilder sb = new StringBuilder();
 		sb.append( this.getClass().getSimpleName() );
 		sb.append( '{' );
-		sb.append( "annotationType=" ).append( StringHelper.toShortString( annotationType ) );
-		sb.append( ", parameters=" ).append( parameters );
+		sb.append( annotationDescriptorBuilder );
 		sb.append( '}' );
 		return sb.toString();
 	}

engine/src/main/java/org/hibernate/validator/cfg/ConstraintDef.java

@@ -10,8 +10,6 @@
 
 import javax.validation.Payload;
 
-import org.hibernate.validator.internal.util.StringHelper;
-
 /**
  * Base class for all constraint definition types. Each sub type represents a
  * single constraint annotation type and allows to add this constraint to a bean
@@ -56,15 +54,4 @@ public C payload(Class<? extends Payload>... payload) {
 		addParameter( "payload", payload );
 		return getThis();
 	}
-
-	@Override
-	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( this.getClass().getSimpleName() );
-		sb.append( '{' );
-		sb.append( "constraintType=" ).append( StringHelper.toShortString( annotationType ) );
-		sb.append( ", parameters=" ).append( parameters );
-		sb.append( '}' );
-		return sb.toString();
-	}
 }

engine/src/main/java/org/hibernate/validator/internal/util/annotation/AnnotationDescriptor.java

@@ -22,6 +22,7 @@
 import java.util.TreeSet;
 
 import org.hibernate.validator.internal.util.CollectionHelper;
+import org.hibernate.validator.internal.util.StringHelper;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetAnnotationAttributes;
@@ -161,7 +162,7 @@ public int hashCode() {
 	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder();
-		result.append( '@' ).append( type.getName() ).append( '(' );
+		result.append( '@' ).append( StringHelper.toShortString( type ) ).append( '(' );
 		for ( String s : getRegisteredAttributesInAlphabeticalOrder() ) {
 			result.append( s ).append( '=' ).append( attributes.get( s ) ).append( ", " );
 		}
@@ -272,6 +273,10 @@ public boolean hasAttribute(String key) {
 			return attributes.containsKey( key );
 		}
 
+		public Class<S> getType() {
+			return type;
+		}
+
 		public AnnotationDescriptor<S> build() {
 			return new AnnotationDescriptor<S>( type, getAnnotationAttributes() );
 		}
@@ -307,6 +312,29 @@ else if ( m.getDefaultValue() != null ) {
 			}
 			return result;
 		}
+
+		@Override
+		public String toString() {
+			StringBuilder result = new StringBuilder();
+			result.append( '@' ).append( StringHelper.toShortString( type ) ).append( '(' );
+			for ( String s : getRegisteredAttributesInAlphabeticalOrder() ) {
+				result.append( s ).append( '=' ).append( attributes.get( s ) ).append( ", " );
+			}
+			// remove last separator:
+			if ( attributes.size() > 0 ) {
+				result.delete( result.length() - 2, result.length() );
+				result.append( ")" );
+			}
+			else {
+				result.delete( result.length() - 1, result.length() );
+			}
+
+			return result.toString();
+		}
+
+		private SortedSet<String> getRegisteredAttributesInAlphabeticalOrder() {
+			return new TreeSet<String>( attributes.keySet() );
+		}
 	}
 
 	/**