HV-2018 Use filters in CDI extension instead of the stream

Author: marko-bekhta

cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidationProviderHelper.java

@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import jakarta.enterprise.inject.Any;
 import jakarta.enterprise.inject.Default;
@@ -27,6 +26,7 @@
 import org.hibernate.validator.internal.engine.ValidatorImpl;
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.classhierarchy.ClassHierarchyHelper;
+import org.hibernate.validator.internal.util.classhierarchy.Filter;
 
 /**
  * Provides functionality for dealing with validation provider types.
@@ -146,27 +146,45 @@ private static Set<Annotation> determineRequiredQualifiers(
 	public Set<Type> determineValidatorFactoryCdiTypes() {
 		return Collections.unmodifiableSet(
 				CollectionHelper.<Type>newHashSet(
-						ClassHierarchyHelper.getHierarchy( getValidatorFactoryBeanClass() )
-								.stream()
-								// We do not include Hibernate Validator internal types:
-								.filter( klass -> !( isHibernateValidator && isHibernateValidatorInternalType( klass ) ) )
-								.collect( Collectors.toSet() )
+						ClassHierarchyHelper.getHierarchy(
+								getValidatorFactoryBeanClass(),
+								isHibernateValidator ? HibernateValidatorInternalTypeFilter.INSTANCE : AcceptAllFilter.INSTANCE
+						)
 				)
 		);
 	}
 
 	public Set<Type> determineValidatorCdiTypes() {
 		return Collections.unmodifiableSet(
 				CollectionHelper.<Type>newHashSet(
-						ClassHierarchyHelper.getHierarchy( getValidatorBeanClass() )
-								.stream()
-								// We do not include Hibernate Validator internal types:
-								.filter( klass -> !( isHibernateValidator && isHibernateValidatorInternalType( klass ) ) )
-								.collect( Collectors.toSet() )
+						ClassHierarchyHelper.getHierarchy(
+								getValidatorBeanClass(),
+								isHibernateValidator ? HibernateValidatorInternalTypeFilter.INSTANCE : AcceptAllFilter.INSTANCE
+						)
 				)
 		);
 	}
 
+	private static class HibernateValidatorInternalTypeFilter implements Filter {
+
+		public static final HibernateValidatorInternalTypeFilter INSTANCE = new HibernateValidatorInternalTypeFilter();
+
+		@Override
+		public boolean accepts(Class<?> clazz) {
+			return !isHibernateValidatorInternalType( clazz );
+		}
+	}
+
+	private static class AcceptAllFilter implements Filter {
+
+		public static final AcceptAllFilter INSTANCE = new AcceptAllFilter();
+
+		@Override
+		public boolean accepts(Class<?> clazz) {
+			return true;
+		}
+	}
+
 	@Override
 	public String toString() {
 		return "ValidationProviderHelper [isDefaultProvider="