HV-1695 Avoid creating an empty map for group conversions

gsmet · gsmet · commit 115d72e78d24 · 2019-02-21T15:59:47.000+01:00
diff --git a/engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java b/engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java
@@ -551,6 +551,10 @@ private Map<Class<?>, Class<?>> getGroupConversions(AnnotatedType annotatedType)
 	}
 
 	private Map<Class<?>, Class<?>> getGroupConversions(ConvertGroup groupConversion, ConvertGroup.List groupConversionList) {
+		if ( groupConversion == null && ( groupConversionList == null || groupConversionList.value().length == 0 ) ) {
+			return Collections.emptyMap();
+		}
+
 		Map<Class<?>, Class<?>> groupConversions = newHashMap();
 
 		if ( groupConversion != null ) {

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,10 @@ private Map<Class<?>, Class<?>> getGroupConversions(AnnotatedType annotatedType)`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`private Map<Class<?>, Class<?>> getGroupConversions(ConvertGroup groupConversion, ConvertGroup.List groupConversionList) {`
	`554`	`+ if ( groupConversion == null && ( groupConversionList == null \|\| groupConversionList.value().length == 0 ) ) {`
	`555`	`+ return Collections.emptyMap();`
	`556`	`+ }`
	`557`	`+`
`554`	`558`	`Map<Class<?>, Class<?>> groupConversions = newHashMap();`
`555`	`559`
`556`	`560`	`if ( groupConversion != null ) {`