[bval] branch master updated: fixed some TCK tests
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 8e1e72f fixed some TCK tests
8e1e72f is described below
commit 8e1e72fb1991442933d9c2f17cf87c62c9fa60bd
Author: Thomas Andraschko
AuthorDate: Thu Feb 9 10:27:00 2023 +0100
fixed some TCK tests
---
.../src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
index 98a2044..ba2f4f3 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
@@ -520,15 +520,18 @@ public class XmlBuilder {
}
@SuppressWarnings("unchecked")
-private Class loadClass(final String fqn) {
+private Class loadClass(String fqn) {
ClassLoader loader =
Reflection.loaderFromThreadOrClass(XmlBuilder.class);
if (loader == null) {
loader = getClass().getClassLoader();
}
try {
+if (fqn != null) {
+fqn = fqn.replace("\n", "").replace("\r",
"").replaceAll("\\s", "").trim();
+}
return (Class) Class.forName(fqn, true, loader);
} catch (ClassNotFoundException ex) {
-throw Exceptions.create(ValidationException::new, ex, "Unable to
load class: %d", fqn);
+throw Exceptions.create(ValidationException::new, ex, "Unable to
load class: %s", fqn);
}
}
[bval] branch master updated: fixed some TCK tests
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
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 constraintMappings =
xmlConfig.getConstraintMapping().stream()
.map(s -> s.trim())
.collect(Collectors.toSet());
+Set 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) {
[bval] branch master updated: fixed some TCK tests
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 c13f0c5c56d62faaa2ab7bd5aefd21ab8071
Author: Thomas Andraschko
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 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,
[bval] branch master updated: fixed some TCK tests
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 31a5100 fixed some TCK tests
31a5100 is described below
commit 31a510066a54aa0e4101cee195451c4a6bf132bc
Author: Thomas Andraschko
AuthorDate: Thu Feb 9 09:44:56 2023 +0100
fixed some TCK tests
---
bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java | 1 +
bval-tck/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
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 e4702e0..20306fb 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
@@ -121,6 +121,7 @@ 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,
diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml
index efef7d2..34cdadc 100644
--- a/bval-tck/pom.xml
+++ b/bval-tck/pom.xml
@@ -31,7 +31,7 @@ under the License.
Aggregates dependencies and runs the JSR-380 TCK
-3.0.0
+3.0.1
4.0.0-SNAPSHOT
1.7.0.Alpha14
org.apache.bval.jsr.ApacheValidationProvider
