[bval] branch master updated: fixed some TCK tests

[tandraschko]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git


The following commit(s) were added to refs/heads/master by this push:
     new c13f0c5  fixed some TCK tests
c13f0c5 is described below

commit c13f0c5c56d62bbbbfaaa2ab7bd5aefd21ab8071
Author: Thomas Andraschko <tandrasc...@apache.org>
AuthorDate: Thu Feb 9 10:03:50 2023 +0100

    fixed some TCK tests
---
 .../main/java/org/apache/bval/jsr/xml/ValidationParser.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java 
b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
index 20306fb..43ae9a9 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
@@ -109,11 +109,17 @@ public class ValidationParser {
                 
.map(DefaultValidatedExecutableTypesType::getExecutableType).map(EnumSet::copyOf)
                 .orElse(EnumSet.noneOf(ExecutableType.class));
         }
+
+        Set<String> constraintMappings = 
xmlConfig.getConstraintMapping().stream()
+                .map(s -> s.trim())
+                .collect(Collectors.toSet());
+        String clockProvider = xmlConfig.getClockProvider() == null ? null : 
xmlConfig.getClockProvider().trim();
+
         return new BootstrapConfigurationImpl(xmlConfig.getDefaultProvider(), 
xmlConfig.getConstraintValidatorFactory(),
             xmlConfig.getMessageInterpolator(), 
xmlConfig.getTraversableResolver(),
-            xmlConfig.getParameterNameProvider(), new 
HashSet<>(xmlConfig.getConstraintMapping()),
+            xmlConfig.getParameterNameProvider(), constraintMappings,
             executableValidationEnabled, defaultValidatedExecutableTypes, 
toMap(xmlConfig.getProperty()),
-            xmlConfig.getClockProvider(), new 
HashSet<>(xmlConfig.getValueExtractor()));
+            clockProvider, new HashSet<>(xmlConfig.getValueExtractor()));
     }
 
     public InputStream open(String mappingFileName) {
@@ -121,7 +127,6 @@ public class ValidationParser {
             // Classloader needs a path without a starting /
             mappingFileName = mappingFileName.substring(1);
         }
-        mappingFileName = mappingFileName.trim();
         try {
             final InputStream in = getInputStream(mappingFileName);
             Exceptions.raiseIf(in == null, ValidationException::new,