From f944815d9200faae9a09375e48d9259b28efaa1d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Sun, 10 Sep 2017 20:48:49 +0200
Subject: [PATCH] Ignore Hibernate Validator style ".<collection element>"
 suffix for field path

Issue: SPR-15916
---
 .../validation/beanvalidation/SpringValidatorAdapter.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index 3614dfe0f2a..a86b15cc342 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -177,7 +177,9 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
 	 * @see org.springframework.validation.FieldError#getField()
 	 */
 	protected String determineField(ConstraintViolation<Object> violation) {
-		return violation.getPropertyPath().toString();
+		String path = violation.getPropertyPath().toString();
+		int elementIndex = path.indexOf(".<");
+		return (elementIndex >= 0 ? path.substring(0, elementIndex) : path);
 	}
 
 	/**