HV-2001 Do not include impl classes of Validator and factory among be…

…an types if they come from HV itself
hibernate · Jul 23, 2024 · 0b342ce · 0b342ce
1 parent 3538292
commit 0b342ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java b/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java
@@ -10,6 +10,8 @@
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.Set;
+import java.util.stream.Collectors;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.spi.Bean;
@@ -44,6 +46,11 @@ public ValidatorBean(BeanManager beanManager, Bean<?> validatorFactoryBean,
 		this.types = Collections.unmodifiableSet(
 				CollectionHelper.<Type>newHashSet(
 						ClassHierarchyHelper.getHierarchy( validationProviderHelper.getValidatorBeanClass() )
+								.stream()
+								// We do not include impl class of a validator if it comes from Hibernate Validator.
+								// In this case we only want to share the interfaces:
+								.filter( c -> !( validationProviderHelper.isHibernateValidator() && c.equals( validationProviderHelper.getValidatorBeanClass() ) ) )
+								.collect( Collectors.toSet() )
 				)
 		);
 	}

diff --git a/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorFactoryBean.java b/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorFactoryBean.java
@@ -18,6 +18,19 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.hibernate.validator.HibernateValidatorConfiguration;
+import org.hibernate.validator.cdi.spi.BeanNames;
+import org.hibernate.validator.cdi.spi.InjectingConstraintValidatorFactory;
+import org.hibernate.validator.constraintvalidation.spi.BuiltInConstraintValidatorUtils;
+import org.hibernate.validator.internal.engine.PredefinedScopeConfigurationImpl;
+import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;
+import org.hibernate.validator.internal.util.CollectionHelper;
+import org.hibernate.validator.internal.util.actions.GetClassLoader;
+import org.hibernate.validator.internal.util.actions.GetInstancesFromServiceLoader;
+import org.hibernate.validator.internal.util.actions.LoadClass;
+import org.hibernate.validator.internal.util.classhierarchy.ClassHierarchyHelper;
+import org.hibernate.validator.metadata.BeanMetaDataClassNormalizer;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.Instance;
@@ -38,19 +51,6 @@
 import jakarta.validation.ValidatorFactory;
 import jakarta.validation.valueextraction.ValueExtractor;
 
-import org.hibernate.validator.HibernateValidatorConfiguration;
-import org.hibernate.validator.cdi.spi.BeanNames;
-import org.hibernate.validator.cdi.spi.InjectingConstraintValidatorFactory;
-import org.hibernate.validator.constraintvalidation.spi.BuiltInConstraintValidatorUtils;
-import org.hibernate.validator.internal.engine.PredefinedScopeConfigurationImpl;
-import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorDescriptor;
-import org.hibernate.validator.internal.util.CollectionHelper;
-import org.hibernate.validator.internal.util.classhierarchy.ClassHierarchyHelper;
-import org.hibernate.validator.internal.util.actions.GetClassLoader;
-import org.hibernate.validator.internal.util.actions.GetInstancesFromServiceLoader;
-import org.hibernate.validator.internal.util.actions.LoadClass;
-import org.hibernate.validator.metadata.BeanMetaDataClassNormalizer;
-
 /**
  * A {@link Bean} representing a {@link ValidatorFactory}. There is one instance of this type representing the default
  * validator factory and optionally another instance representing the HV validator factory in case the default provider
@@ -74,6 +74,11 @@ public ValidatorFactoryBean(BeanManager beanManager, ValidationProviderHelper va
 		this.types = Collections.unmodifiableSet(
 				CollectionHelper.<Type>newHashSet(
 						ClassHierarchyHelper.getHierarchy( validationProviderHelper.getValidatorFactoryBeanClass() )
+								.stream()
+								// We do not include impl class of a validator factory if it comes from Hibernate Validator.
+								// In this case we only want to share the interfaces:
+								.filter( c -> !( validationProviderHelper.isHibernateValidator() && c.equals( validationProviderHelper.getValidatorFactoryBeanClass() ) ) )
+								.collect( Collectors.toSet() )
 				)
 		);
 	}

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -348,10 +348,6 @@
                                         org.hibernate.validator.*.internal.* to org.hibernate.validator.cdi;
                                         *;
                                     </exports>
-                                    <opens>
-                                        <!-- As both Validator and ValidatorFactory have to be accessible by CDI ... -->
-                                        org.hibernate.validator.internal.engine;
-                                    </opens>
                                     <uses>
                                         jakarta.validation.valueextraction.ValueExtractor;
                                         jakarta.validation.ConstraintValidator