[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 78abcdd  fixed some TCK tests
78abcdd is described below

commit 78abcdd7aff8234ef4d806ecdc7ce129990bfe67
Author: Thomas Andraschko <tandrasc...@apache.org>
AuthorDate: Thu Feb 9 10:07:42 2023 +0100

    fixed some TCK tests
---
 .../java/org/apache/bval/jsr/xml/ValidationParser.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 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 43ae9a9..d85ac10 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
@@ -113,13 +113,21 @@ public class ValidationParser {
         Set<String> constraintMappings = 
xmlConfig.getConstraintMapping().stream()
                 .map(s -> s.trim())
                 .collect(Collectors.toSet());
+        Set<String> valueExtractor = xmlConfig.getValueExtractor().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(), constraintMappings,
+        String messageInterpolator = xmlConfig.getMessageInterpolator() == 
null ? null : xmlConfig.getMessageInterpolator().trim();
+        String parameterNameProvider = xmlConfig.getParameterNameProvider() == 
null ? null : xmlConfig.getParameterNameProvider().trim();
+        String traversableResolver = xmlConfig.getTraversableResolver() == 
null ? null : xmlConfig.getTraversableResolver().trim();
+        String constraintValidatorFactory = 
xmlConfig.getConstraintValidatorFactory() == null ? null : 
xmlConfig.getConstraintValidatorFactory().trim();
+        String defaultProvider = xmlConfig.getDefaultProvider() == null ? null 
: xmlConfig.getDefaultProvider().trim();
+
+        return new BootstrapConfigurationImpl(defaultProvider, 
constraintValidatorFactory,
+            messageInterpolator, traversableResolver,
+            parameterNameProvider, constraintMappings,
             executableValidationEnabled, defaultValidatedExecutableTypes, 
toMap(xmlConfig.getProperty()),
-            clockProvider, new HashSet<>(xmlConfig.getValueExtractor()));
+            clockProvider, valueExtractor);
     }
 
     public InputStream open(String mappingFileName) {