Skip to content

Commit 3aa8de7

Browse files
committed
HV-2029 Update how group convert rules are collected from annotations
1 parent bed975c commit 3aa8de7

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

engine/src/main/java/org/hibernate/validator/internal/metadata/provider/AnnotationMetaDataProvider.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,13 @@ private Map<Class<?>, Class<?>> getGroupConversions(AnnotatedType annotatedType)
546546
);
547547
}
548548

549+
private Map<Class<?>, Class<?>> getGroupConversions(JavaBeanAnnotatedElement element) {
550+
return getGroupConversions(
551+
element.getAnnotation( ConvertGroup.class ),
552+
element.getAnnotation( ConvertGroup.List.class )
553+
);
554+
}
555+
549556
private Map<Class<?>, Class<?>> getGroupConversions(ConvertGroup groupConversion, ConvertGroup.List groupConversionList) {
550557
if ( groupConversion == null && ( groupConversionList == null || groupConversionList.value().length == 0 ) ) {
551558
return Collections.emptyMap();
@@ -800,7 +807,7 @@ private Set<MetaConstraint<?>> findTypeUseConstraints(Constrainable constrainabl
800807
private CascadingMetaDataBuilder getCascadingMetaData(JavaBeanAnnotatedElement annotatedElement,
801808
Map<TypeVariable<?>, CascadingMetaDataBuilder> containerElementTypesCascadingMetaData) {
802809
return CascadingMetaDataBuilder.annotatedObject( annotatedElement.getType(), annotatedElement.isAnnotationPresent( Valid.class ),
803-
containerElementTypesCascadingMetaData, getGroupConversions( annotatedElement.getAnnotatedType() ) );
810+
containerElementTypesCascadingMetaData, getGroupConversions( annotatedElement ) );
804811
}
805812

806813
/**

0 commit comments

Comments
 (0)