Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master ab204aa02 -> a2b9f3662
Removed redudant implementation class. Fixed tests and regex filter. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/71dc3c72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/71dc3c72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/71dc3c72 Branch: refs/heads/master Commit: 71dc3c72e24fd3a73ed81f7c66861304c2049b47 Parents: ab204aa Author: anatole <[email protected]> Authored: Fri Nov 11 16:49:24 2016 +0100 Committer: anatole <[email protected]> Committed: Fri Nov 11 16:49:24 2016 +0100 ---------------------------------------------------------------------- .../apache/tamaya/spisupport/RegexPropertyFilter.java | 7 ++++--- .../apache/tamaya/spisupport/SimplePropertySource.java | 13 +++++++++++++ .../tamaya/spisupport/RegexPropertyFilterTest.java | 13 +++++++------ 3 files changed, 24 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/71dc3c72/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/RegexPropertyFilter.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/RegexPropertyFilter.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/RegexPropertyFilter.java index 85580a7..e186015 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/RegexPropertyFilter.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/RegexPropertyFilter.java @@ -40,7 +40,7 @@ public final class RegexPropertyFilter implements PropertyFilter{ * @param expressions the regular expression for inclusion, not null. */ public void setIncludes(String... expressions){ - this.includes= Arrays.asList(expressions); + this.includes = Arrays.asList(expressions); } /** @@ -56,10 +56,11 @@ public final class RegexPropertyFilter implements PropertyFilter{ public String filterProperty(String valueToBeFiltered, FilterContext context) { if(includes!=null){ for(String expression:includes){ - if(!context.getKey().matches(expression)){ - return null; + if(context.getKey().matches(expression)){ + return valueToBeFiltered; } } + return null; } if(excludes!=null){ for(String expression:excludes){ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/71dc3c72/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SimplePropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SimplePropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SimplePropertySource.java index 8f4f69b..641e25d 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SimplePropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SimplePropertySource.java @@ -75,6 +75,19 @@ public class SimplePropertySource extends BasePropertySource { } /** + * Creates a new Properties based PropertySource. + * + * @param name the property source name, not null. + * @param properties the properties, not null + * @param defaultOrdinal the default ordinal + */ + public SimplePropertySource(String name, Map<String, String> properties, int defaultOrdinal){ + super(defaultOrdinal); + this.properties = new HashMap<>(properties); + this.name = Objects.requireNonNull(name); + } + + /** * Creates a new Properties based PropertySource based on the given properties map. * * @param name the name, not null. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/71dc3c72/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/RegexPropertyFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/RegexPropertyFilterTest.java b/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/RegexPropertyFilterTest.java index 789edd0..79f2fb9 100644 --- a/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/RegexPropertyFilterTest.java +++ b/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/RegexPropertyFilterTest.java @@ -33,16 +33,17 @@ public class RegexPropertyFilterTest { @org.junit.Test public void testFilterProperty() throws Exception { RegexPropertyFilter filter = new RegexPropertyFilter(); - filter.setIncludes("test\\..*"); + filter.setIncludes("test1.*"); Map<String,String> map = new HashMap<>(); map.put("test1", "test1"); map.put("test2", "test2"); - map.put("test.test3", "test.test3"); - assertEquals(filter.filterProperty("test1", new FilterContext("test1", map, true)), "test1"); - assertEquals(filter.filterProperty("test2", new FilterContext("test2", map, true)), "test2"); - assertNull(filter.filterProperty("test.test3", new FilterContext("test.test3", map, true))); + map.put("test1.test3", "test.test3"); + assertEquals(filter.filterProperty("test1.", new FilterContext("test1.", map, true)), "test1."); + assertNull(filter.filterProperty("test2", new FilterContext("test2.", map, true))); + assertEquals(filter.filterProperty("test1.test3", new FilterContext("test1.test3", map, true)), "test1.test3"); filter = new RegexPropertyFilter(); - assertNull(filter.filterProperty("test1", new FilterContext("test1", map, true))); + filter.setIncludes("test1.*"); + assertNotNull(filter.filterProperty("test1", new FilterContext("test1", map, true))); assertNull(filter.filterProperty("test2", new FilterContext("test2", map, true))); assertNull(filter.filterProperty("test.test3", new FilterContext("test.test3", map, true))); }
