HV-1480 Setting the key or the index already makes the node iterable

So we don't need to do it twice. Note that this change uncovers the fact
that in ConstraintValidatorContext, calling atKey() or atIndex() makes
the node iterable.

It was already the case before and I think it's acceptable.

It brings its own performance improvements as it avoids initializing 1
NodeImpl and creating 1 copy of the Path.

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java

@@ -670,15 +670,13 @@ public void iterableValue(String nodeName, Object value) {
 
 		@Override
 		public void indexedValue(String nodeName, int index, Object value) {
-			valueContext.markCurrentPropertyAsIterable();
-			valueContext.setIndex( index );
+			valueContext.markCurrentPropertyAsIterableAndSetIndex( index );
 			doValidate( value, nodeName );
 		}
 
 		@Override
 		public void keyedValue(String nodeName, Object key, Object value) {
-			valueContext.markCurrentPropertyAsIterable();
-			valueContext.setKey( key );
+			valueContext.markCurrentPropertyAsIterableAndSetKey( key );
 			doValidate( value, nodeName );
 		}
 

engine/src/main/java/org/hibernate/validator/internal/engine/ValueContext.java

@@ -159,12 +159,12 @@ public final void markCurrentPropertyAsIterable() {
 		propertyPath.makeLeafNodeIterable();
 	}
 
-	public final void setKey(Object key) {
-		propertyPath.setLeafNodeMapKey( key );
+	public final void markCurrentPropertyAsIterableAndSetKey(Object key) {
+		propertyPath.makeLeafNodeIterableAndSetMapKey( key );
 	}
 
-	public final void setIndex(Integer index) {
-		propertyPath.setLeafNodeIndex( index );
+	public final void markCurrentPropertyAsIterableAndSetIndex(Integer index) {
+		propertyPath.makeLeafNodeIterableAndSetIndex( index );
 	}
 
 	/**

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorContextImpl.java

@@ -320,14 +320,14 @@ public DeferredNodeBuilder inContainer(Class<?> containerClass, Integer typeArgu
 
 		@Override
 		public NodeBuilder atKey(Object key) {
-			propertyPath.setLeafNodeMapKey( key );
+			propertyPath.makeLeafNodeIterableAndSetMapKey( key );
 			addLeafNode();
 			return new NodeBuilder( messageTemplate, propertyPath );
 		}
 
 		@Override
 		public NodeBuilder atIndex(Integer index) {
-			propertyPath.setLeafNodeIndex( index );
+			propertyPath.makeLeafNodeIterableAndSetIndex( index );
 			addLeafNode();
 			return new NodeBuilder( messageTemplate, propertyPath );
 		}

engine/src/main/java/org/hibernate/validator/internal/engine/path/NodeImpl.java

@@ -207,7 +207,7 @@ public static NodeImpl makeIterable(NodeImpl node) {
 		);
 	}
 
-	public static NodeImpl setIndex(NodeImpl node, Integer index) {
+	public static NodeImpl makeIterableAndSetIndex(NodeImpl node, Integer index) {
 		return new NodeImpl(
 				node.name,
 				node.parent,
@@ -223,7 +223,7 @@ public static NodeImpl setIndex(NodeImpl node, Integer index) {
 		);
 	}
 
-	public static NodeImpl setMapKey(NodeImpl node, Object key) {
+	public static NodeImpl makeIterableAndSetMapKey(NodeImpl node, Object key) {
 		return new NodeImpl(
 				node.name,
 				node.parent,

engine/src/main/java/org/hibernate/validator/internal/engine/path/PathImpl.java

@@ -202,20 +202,20 @@ public NodeImpl makeLeafNodeIterable() {
 		return currentLeafNode;
 	}
 
-	public NodeImpl setLeafNodeIndex(Integer index) {
+	public NodeImpl makeLeafNodeIterableAndSetIndex(Integer index) {
 		requiresWriteableNodeList();
 
-		currentLeafNode = NodeImpl.setIndex( currentLeafNode, index );
+		currentLeafNode = NodeImpl.makeIterableAndSetIndex( currentLeafNode, index );
 
 		nodeList.set( nodeList.size() - 1, currentLeafNode );
 		hashCode = -1;
 		return currentLeafNode;
 	}
 
-	public NodeImpl setLeafNodeMapKey(Object key) {
+	public NodeImpl makeLeafNodeIterableAndSetMapKey(Object key) {
 		requiresWriteableNodeList();
 
-		currentLeafNode = NodeImpl.setMapKey( currentLeafNode, key );
+		currentLeafNode = NodeImpl.makeIterableAndSetMapKey( currentLeafNode, key );
 
 		nodeList.set( nodeList.size() - 1, currentLeafNode );
 		hashCode = -1;
@@ -394,10 +394,10 @@ private static PathImpl parseProperty(String propertyName) {
 				if ( indexOrKey != null && indexOrKey.length() > 0 ) {
 					try {
 						Integer i = Integer.parseInt( indexOrKey );
-						path.setLeafNodeIndex( i );
+						path.makeLeafNodeIterableAndSetIndex( i );
 					}
 					catch (NumberFormatException e) {
-						path.setLeafNodeMapKey( indexOrKey );
+						path.makeLeafNodeIterableAndSetMapKey( indexOrKey );
 					}
 				}
 

engine/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraint.java

@@ -194,15 +194,13 @@ public void iterableValue(String nodeName, Object value) {
 
 		@Override
 		public void indexedValue(String nodeName, int index, Object value) {
-			valueContext.markCurrentPropertyAsIterable();
-			valueContext.setIndex( index );
+			valueContext.markCurrentPropertyAsIterableAndSetIndex( index );
 			doValidate( value, nodeName );
 		}
 
 		@Override
 		public void keyedValue(String nodeName, Object key, Object value) {
-			valueContext.markCurrentPropertyAsIterable();
-			valueContext.setKey( key );
+			valueContext.markCurrentPropertyAsIterableAndSetKey( key );
 			doValidate( value, nodeName );
 		}