You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2016/09/25 21:24:21 UTC
[33/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-136:
Adding PropertyValue for PropertySource SPI. All changes and test fixes in
all modules/examples relevant for release.
TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/1f67dc56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/1f67dc56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/1f67dc56
Branch: refs/heads/master
Commit: 1f67dc565ca25e9cd8bbd0902c03a714b7932dfa
Parents: 19b7071
Author: anatole <an...@apache.org>
Authored: Tue Feb 2 17:15:53 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Feb 2 17:15:53 2016 +0100
----------------------------------------------------------------------
.../tamaya/builder/SimplePropertySource.java | 7 +--
.../builder/ConfigurationBuilderTest.java | 46 ++++++++++----------
.../builder/TestANonSPIPropertyFilter.java | 3 +-
.../builder/TestBNonSPIPropertyFilter.java | 3 +-
.../tamaya/builder/TestPropertyFilter.java | 3 +-
.../tamaya/builder/TestPropertySource.java | 5 ++-
.../builder/TestPropertySourceProvider.java | 9 ++--
.../builder/TestPropertySourceProviderB.java | 9 ++--
8 files changed, 46 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java b/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
index 0d5561e..085bd9a 100644
--- a/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
+++ b/src/main/java/org/apache/tamaya/builder/SimplePropertySource.java
@@ -19,6 +19,7 @@
package org.apache.tamaya.builder;
import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.HashMap;
import java.util.Map;
@@ -42,10 +43,10 @@ public class SimplePropertySource implements PropertySource {
@Override
public int getOrdinal(){
- String configuredOrdinal = get(TAMAYA_ORDINAL);
+ PropertyValue configuredOrdinal = get(TAMAYA_ORDINAL);
if(configuredOrdinal!=null){
try{
- return Integer.parseInt(configuredOrdinal);
+ return Integer.parseInt(configuredOrdinal.getValue());
} catch(Exception e){
Logger.getLogger(getClass().getName()).log(Level.WARNING,
"Configured Ordinal is not an int number: " + configuredOrdinal, e);
@@ -64,7 +65,7 @@ public class SimplePropertySource implements PropertySource {
}
@Override
- public String get(String key) {
+ public PropertyValue get(String key) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java b/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
index d48fe08..43196f7 100644
--- a/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
+++ b/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
@@ -103,7 +103,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("one").when(source).getName();
- doReturn("a").when(source).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","a", "test")).when(source).get("keyOfA");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(source);
@@ -121,12 +121,12 @@ public class ConfigurationBuilderTest {
PropertySource sourceOne = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("one").when(sourceOne).getName();
- doReturn("b").when(sourceOne).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","b", "test")).when(sourceOne).get("keyOfA");
doReturn(10).when(sourceOne).getOrdinal();
PropertySource sourceTwo = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("two").when(sourceTwo).getName();
- doReturn("a").when(sourceTwo).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","a", "test")).when(sourceTwo).get("keyOfA");
doReturn(10).when(sourceTwo).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(sourceOne)
@@ -167,12 +167,12 @@ public class ConfigurationBuilderTest {
PropertySource sourceOne = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("one").when(sourceOne).getName();
- doReturn("b").when(sourceOne).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","b", "test")).when(sourceOne).get("keyOfA");
doReturn(10).when(sourceOne).getOrdinal();
PropertySource sourceTwo = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("two").when(sourceTwo).getName();
- doReturn("a").when(sourceTwo).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","a", "test")).when(sourceTwo).get("keyOfA");
doReturn(20).when(sourceTwo).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(sourceOne)
@@ -191,12 +191,12 @@ public class ConfigurationBuilderTest {
PropertySource sourceOne = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("one").when(sourceOne).getName();
- doReturn("b").when(sourceOne).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","b", "test")).when(sourceOne).get("keyOfA");
doReturn(30).when(sourceOne).getOrdinal();
PropertySource sourceTwo = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("two").when(sourceTwo).getName();
- doReturn("a").when(sourceTwo).get("keyOfA");
+ doReturn(PropertyValue.of("keyOfA","a", "test")).when(sourceTwo).get("keyOfA");
doReturn(20).when(sourceTwo).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(sourceOne, sourceTwo);
@@ -215,13 +215,13 @@ public class ConfigurationBuilderTest {
doReturn("one").when(sourceOne).getName();
doReturn(null).when(sourceOne).get(anyString());
- doReturn("b").when(sourceOne).get("b");
+ doReturn(PropertyValue.of("b","b", "test")).when(sourceOne).get("b");
doReturn(30).when(sourceOne).getOrdinal();
PropertySource sourceTwo = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("two").when(sourceTwo).getName();
doReturn(null).when(sourceTwo).get(anyString());
- doReturn("a").when(sourceTwo).get("a");
+ doReturn(PropertyValue.of("a","a", "test")).when(sourceTwo).get("a");
doReturn(30).when(sourceTwo).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(sourceOne)
@@ -239,13 +239,13 @@ public class ConfigurationBuilderTest {
doReturn("one").when(sourceOne).getName();
doReturn(null).when(sourceOne).get(anyString());
- doReturn("b").when(sourceOne).get("b");
+ doReturn(PropertyValue.of("b","b", "test")).when(sourceOne).get("b");
doReturn(30).when(sourceOne).getOrdinal();
PropertySource sourceTwo = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("two").when(sourceTwo).getName();
doReturn(null).when(sourceTwo).get(anyString());
- doReturn("a").when(sourceTwo).get("a");
+ doReturn(PropertyValue.of("a","a", "test")).when(sourceTwo).get("a");
doReturn(30).when(sourceTwo).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(sourceOne, null, sourceTwo);
@@ -285,7 +285,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -315,7 +315,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -345,7 +345,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -378,7 +378,7 @@ public class ConfigurationBuilderTest {
public void canAddNonSPIPropertyFilter() {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
- doReturn("M").when(source).get("key");
+ doReturn(PropertyValue.of("key","M", "test")).when(source).get("key");
doReturn("source").when(source).getName();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -397,7 +397,7 @@ public class ConfigurationBuilderTest {
public void canAddNonSPIPropertyFiltersViaConsecutiveCalls() {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
- doReturn("M").when(source).get("key");
+ doReturn(PropertyValue.of("key","M", "test")).when(source).get("key");
doReturn("source").when(source).getName();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -418,7 +418,7 @@ public class ConfigurationBuilderTest {
public void canAddMultipleNonSPIPropertyFiltersWhileOneIsNull() {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
- doReturn("M").when(source).get("key");
+ doReturn(PropertyValue.of("key","M", "test")).when(source).get("key");
doReturn("source").when(source).getName();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -440,7 +440,7 @@ public class ConfigurationBuilderTest {
public void overhandedNullPropertyFilterIsSafelyHandled() {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
- doReturn("M").when(source).get("key");
+ doReturn(PropertyValue.of("key","M", "test")).when(source).get("key");
doReturn("source").when(source).getName();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -460,7 +460,7 @@ public class ConfigurationBuilderTest {
public void canAddMultipleNonSPIPropertyFilter() {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
- doReturn("M").when(source).get("key");
+ doReturn(PropertyValue.of("key","M", "test")).when(source).get("key");
doReturn("source").when(source).getName();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -574,7 +574,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(source)
@@ -591,7 +591,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder().addPropertySources(source)
@@ -667,7 +667,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -708,7 +708,7 @@ public class ConfigurationBuilderTest {
PropertySource source = mock(PropertySource.class, NOT_MOCKED_ANSWER);
doReturn("source").when(source).getName();
- doReturn("A").when(source).get("key");
+ doReturn(PropertyValue.of("key","A", "test")).when(source).get("key");
doReturn(100).when(source).getOrdinal();
ConfigurationBuilder builder = new ConfigurationBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java b/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
index e113010..896e0bc 100644
--- a/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
+++ b/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
@@ -18,11 +18,12 @@
*/
package org.apache.tamaya.builder;
+import org.apache.tamaya.spi.FilterContext;
import org.apache.tamaya.spi.PropertyFilter;
public class TestANonSPIPropertyFilter implements PropertyFilter {
@Override
- public String filterProperty(String key, String value) {
+ public String filterProperty(String value, FilterContext context) {
String result = value;
if (!result.contains(("ABC"))) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java b/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
index 2ce81fc..a9c0ac2 100644
--- a/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
+++ b/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
@@ -18,11 +18,12 @@
*/
package org.apache.tamaya.builder;
+import org.apache.tamaya.spi.FilterContext;
import org.apache.tamaya.spi.PropertyFilter;
public class TestBNonSPIPropertyFilter implements PropertyFilter {
@Override
- public String filterProperty(String key, String value) {
+ public String filterProperty(String value, FilterContext context) {
String result = value;
if (!result.contains(("XYZ"))) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestPropertyFilter.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestPropertyFilter.java b/src/test/java/org/apache/tamaya/builder/TestPropertyFilter.java
index 80c4cb3..e22fca8 100644
--- a/src/test/java/org/apache/tamaya/builder/TestPropertyFilter.java
+++ b/src/test/java/org/apache/tamaya/builder/TestPropertyFilter.java
@@ -18,11 +18,12 @@
*/
package org.apache.tamaya.builder;
+import org.apache.tamaya.spi.FilterContext;
import org.apache.tamaya.spi.PropertyFilter;
public class TestPropertyFilter implements PropertyFilter {
@Override
- public String filterProperty(String key, String value) {
+ public String filterProperty(String value, FilterContext context) {
String result = value;
if (!result.contains(("inBerlin"))) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestPropertySource.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestPropertySource.java b/src/test/java/org/apache/tamaya/builder/TestPropertySource.java
index e30c244..f1ebfea 100644
--- a/src/test/java/org/apache/tamaya/builder/TestPropertySource.java
+++ b/src/test/java/org/apache/tamaya/builder/TestPropertySource.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.builder;
import org.apache.tamaya.core.propertysource.BasePropertySource;
import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.Collections;
import java.util.Hashtable;
@@ -47,8 +48,8 @@ public class TestPropertySource extends BasePropertySource
}
@Override
- public String get(String key) {
- return getProperties().get(key);
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key, getProperties().get(key), getName());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestPropertySourceProvider.java b/src/test/java/org/apache/tamaya/builder/TestPropertySourceProvider.java
index 0dcd68c..5a2f400 100644
--- a/src/test/java/org/apache/tamaya/builder/TestPropertySourceProvider.java
+++ b/src/test/java/org/apache/tamaya/builder/TestPropertySourceProvider.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.builder;
import org.apache.tamaya.core.propertysource.BasePropertySource;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertySourceProvider;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.ArrayList;
import java.util.Collection;
@@ -54,8 +55,8 @@ public class TestPropertySourceProvider
}
@Override
- public String get(String key) {
- return getProperties().get(key);
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key, getProperties().get(key), getName());
}
@Override
@@ -73,8 +74,8 @@ public class TestPropertySourceProvider
}
@Override
- public String get(String key) {
- return getProperties().get(key);
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key, getProperties().get(key), getName());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/1f67dc56/src/test/java/org/apache/tamaya/builder/TestPropertySourceProviderB.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/tamaya/builder/TestPropertySourceProviderB.java b/src/test/java/org/apache/tamaya/builder/TestPropertySourceProviderB.java
index e06c75c..9cfe725 100644
--- a/src/test/java/org/apache/tamaya/builder/TestPropertySourceProviderB.java
+++ b/src/test/java/org/apache/tamaya/builder/TestPropertySourceProviderB.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.builder;
import org.apache.tamaya.core.propertysource.BasePropertySource;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertySourceProvider;
+import org.apache.tamaya.spi.PropertyValue;
import java.util.ArrayList;
import java.util.Collection;
@@ -54,8 +55,8 @@ public class TestPropertySourceProviderB
}
@Override
- public String get(String key) {
- return getProperties().get(key);
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key,getProperties().get(key), getName());
}
@Override
@@ -73,8 +74,8 @@ public class TestPropertySourceProviderB
}
@Override
- public String get(String key) {
- return getProperties().get(key);
+ public PropertyValue get(String key) {
+ return PropertyValue.of(key, getProperties().get(key), getName());
}
@Override