You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2018/03/23 22:39:38 UTC
bval git commit: fix valueExtractor loading (was hiding service
loader instances)
Repository: bval
Updated Branches:
refs/heads/bv2 8423cf168 -> 313512196
fix valueExtractor loading (was hiding service loader instances)
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/31351219
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/31351219
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/31351219
Branch: refs/heads/bv2
Commit: 313512196115f40197e028b2311d66b05c7fba0e
Parents: 8423cf1
Author: Matt Benson <mb...@apache.org>
Authored: Fri Mar 23 17:39:31 2018 -0500
Committer: Matt Benson <mb...@apache.org>
Committed: Fri Mar 23 17:39:31 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/bval/jsr/ConfigurationImpl.java | 2 +-
.../org/apache/bval/jsr/valueextraction/ValueExtractors.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/31351219/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
index 84b4421..d726d4c 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
@@ -371,7 +371,7 @@ public class ConfigurationImpl implements ApacheValidatorConfiguration, Configur
@Override
public Set<ValueExtractor<?>> getValueExtractors() {
- return Collections.unmodifiableSet(new LinkedHashSet<>(valueExtractors.getValueExtractors().values()));
+ return Collections.unmodifiableSet(new LinkedHashSet<>(valueExtractors.getLocalValueExtractors().values()));
}
public void deferBootstrapOverrides() {
http://git-wip-us.apache.org/repos/asf/bval/blob/31351219/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
index 632b9da..00577e3 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
@@ -176,6 +176,10 @@ public class ValueExtractors {
});
}
+ public Map<ContainerElementKey, ValueExtractor<?>> getLocalValueExtractors() {
+ return valueExtractors.optional().map(Collections::unmodifiableMap).orElseGet(Collections::emptyMap);
+ }
+
public Map<ContainerElementKey, ValueExtractor<?>> getValueExtractors() {
final Lazy<Map<ContainerElementKey, ValueExtractor<?>>> result = new Lazy<>(HashMap::new);
populate(result);