You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by rm...@apache.org on 2018/02/22 17:39:52 UTC

bval git commit: fixing methodtype filtering

Repository: bval
Updated Branches:
  refs/heads/bv2 e35fb3317 -> d28ee4d5d


fixing methodtype filtering


Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/d28ee4d5
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/d28ee4d5
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/d28ee4d5

Branch: refs/heads/bv2
Commit: d28ee4d5d15076b84d83911513be98b194e8a928
Parents: e35fb33
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Thu Feb 22 18:39:41 2018 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Thu Feb 22 18:39:48 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/bval/jsr/descriptor/BeanD.java     | 5 +++--
 bval-tck11/work-tests-suite.xml                                 | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bval/blob/d28ee4d5/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
index 44a641a..e1e97ee 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
@@ -93,8 +93,9 @@ public class BeanD extends ElementD<Class<?>, MetadataReader.ForBean> implements
     @SuppressWarnings("unlikely-arg-type")
     @Override
     public Set<MethodDescriptor> getConstrainedMethods(MethodType methodType, MethodType... methodTypes) {
-        return methods.get().values().stream().filter(EnumSet.of(methodType, methodTypes)::contains)
-            .collect(ToUnmodifiable.set());
+        EnumSet<MethodType> filter = EnumSet.of(methodType, methodTypes);
+        return methods.get().values().stream().filter(m -> filter.contains(m.getMethodType()))
+                      .collect(ToUnmodifiable.set());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/bval/blob/d28ee4d5/bval-tck11/work-tests-suite.xml
----------------------------------------------------------------------
diff --git a/bval-tck11/work-tests-suite.xml b/bval-tck11/work-tests-suite.xml
index b064c1c..950fa8f 100644
--- a/bval-tck11/work-tests-suite.xml
+++ b/bval-tck11/work-tests-suite.xml
@@ -21,7 +21,7 @@ think to add -Dvalidation.provider=org.apache.bval.jsr303.ApacheValidationProvid
 <suite name="tmp" verbose="1">
   <test name="tmp">
     <classes>
-      <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.executable.ExecutableValidationTest">
+      <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.executable.global.ExecutableValidationBasedOnGlobalConfigurationTest">
       </class>
     </classes>
   </test>