You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/01/06 17:23:04 UTC
[1/4] incubator-tamaya git commit: TAMAYA-42: removed function
providing the temporal map for filters.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master a2a36f16a -> 1bdd4b719
TAMAYA-42: removed function providing the temporal map for filters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/448c75f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/448c75f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/448c75f1
Branch: refs/heads/master
Commit: 448c75f1ac956e6c2046bb02c44d1a2cc263e2fa
Parents: 37725cd
Author: anatole <an...@apache.org>
Authored: Tue Jan 6 17:22:00 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 6 17:22:00 2015 +0100
----------------------------------------------------------------------
api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/448c75f1/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java b/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
index c8626fc..a19188c 100644
--- a/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
+++ b/api/src/main/java/org/apache/tamaya/spi/PropertyFilter.java
@@ -44,10 +44,8 @@ public interface PropertyFilter{
*
* @param key the key accessed, not null.
* @param valueToBeFiltered the value to be filtered, not null.
- * @param propertyValueProvider accessor for reading additional (eg metadata) properties to perform correct
- * filtering, never null.
* @return the filtered map, never null.
*/
- String filterProperty(String key, String valueToBeFiltered, Function<String,String> propertyValueProvider);
+ String filterProperty(String key, String valueToBeFiltered);
}
[3/4] incubator-tamaya git commit: TAMAYA-42: removed function
providing the temporal map for filters.
Posted by an...@apache.org.
TAMAYA-42: removed function providing the temporal map for filters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/e53022e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/e53022e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/e53022e8
Branch: refs/heads/master
Commit: e53022e82e6c4da083567d3bcf847088cb2be361
Parents: 340cf7b
Author: anatole <an...@apache.org>
Authored: Tue Jan 6 17:22:42 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 6 17:22:42 2015 +0100
----------------------------------------------------------------------
.../resolver/internal/DefaultExpressionEvaluator.java | 11 +++++------
.../resolver/internal/EnvironmentPropertyResolver.java | 3 +--
.../resolver/internal/ExpressionResolutionFilter.java | 4 ++--
.../tamaya/resolver/internal/SystemPropertyResolver.java | 3 +--
.../apache/tamaya/resolver/spi/ExpressionEvaluator.java | 3 +--
.../apache/tamaya/resolver/spi/ExpressionResolver.java | 6 +-----
6 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
index 82af73d..e08d257 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
-import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -110,7 +109,7 @@ public class DefaultExpressionEvaluator implements ExpressionEvaluator {
* @return the resolved value, or the input in case where no expression was detected.
*/
@Override
- public String filterProperty(String key, String valueToBeFiltered, Function<String,String> propertyValueProvider){
+ public String filterProperty(String key, String valueToBeFiltered){
StringTokenizer tokenizer = new StringTokenizer(valueToBeFiltered, "${}\\", true);
boolean escaped = false;
StringBuilder resolvedValue = new StringBuilder();
@@ -154,7 +153,7 @@ public class DefaultExpressionEvaluator implements ExpressionEvaluator {
return valueToBeFiltered;
}
// evaluate sub-expression
- current.append(evaluateInternal(subExpression, propertyValueProvider));
+ current.append(evaluateInternal(subExpression));
break;
default:
current.append(token);
@@ -166,19 +165,19 @@ public class DefaultExpressionEvaluator implements ExpressionEvaluator {
return resolvedValue.toString();
}
- private String evaluateInternal(String subExpression, Function<String,String> propertyValueProvider) {
+ private String evaluateInternal(String subExpression) {
String value = null;
// 1 check for explicit prefix
for(ExpressionResolver resolver:resolvers){
if(subExpression.startsWith(resolver.getResolverPrefix())){
- value = resolver.evaluate(subExpression.substring(resolver.getResolverPrefix().length()), propertyValueProvider);
+ value = resolver.evaluate(subExpression.substring(resolver.getResolverPrefix().length()));
break;
}
}
if(value==null){
for(ExpressionResolver resolver:resolvers){
try{
- value = resolver.evaluate(subExpression, propertyValueProvider);
+ value = resolver.evaluate(subExpression);
if(value!=null){
return value;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/EnvironmentPropertyResolver.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/EnvironmentPropertyResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/EnvironmentPropertyResolver.java
index 57830e7..de71b58 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/EnvironmentPropertyResolver.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/EnvironmentPropertyResolver.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.resolver.internal;
import org.apache.tamaya.resolver.spi.ExpressionResolver;
import java.util.Optional;
-import java.util.function.Function;
/**
* Property resolver implementation that interprets the resolver expressions as environment properties.
@@ -34,7 +33,7 @@ public final class EnvironmentPropertyResolver implements ExpressionResolver{
}
@Override
- public String evaluate(String expression, Function<String, String> propertyResolver){
+ public String evaluate(String expression){
return Optional.ofNullable(System.getenv(expression)).orElse(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
index f82b980..231d729 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java
@@ -77,8 +77,8 @@ public class ExpressionResolutionFilter implements PropertyFilter {
* @return the resolved value, or the input in case where no expression was detected.
*/
@Override
- public String filterProperty(String key, String valueToBeFiltered, Function<String,String> propertyValueProvider){
- return evaluator.filterProperty(key, valueToBeFiltered, propertyValueProvider);
+ public String filterProperty(String key, String valueToBeFiltered){
+ return evaluator.filterProperty(key, valueToBeFiltered);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/SystemPropertyResolver.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/SystemPropertyResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/SystemPropertyResolver.java
index bf318fb..866126c 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/SystemPropertyResolver.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/SystemPropertyResolver.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.resolver.internal;
import java.util.Optional;
-import java.util.function.Function;
import org.apache.tamaya.resolver.spi.ExpressionResolver;
@@ -34,7 +33,7 @@ public final class SystemPropertyResolver implements ExpressionResolver{
}
@Override
- public String evaluate(String expression, Function<String, String> propertyResolver){
+ public String evaluate(String expression){
return Optional.ofNullable(System.getProperty(expression)).orElse(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java
index b10ff23..62f535c 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java
@@ -28,8 +28,7 @@ public interface ExpressionEvaluator {
* Evaluates the current expression.
* @param key the key, not null.
* @param valueToBeFiltered the value to be filtered/evaluated.
- * @param propertyValueProvider the provider for looking up additional keys.
* @return the filtered/evaluated value, including null.
*/
- String filterProperty(String key, String valueToBeFiltered, Function<String,String> propertyValueProvider);
+ String filterProperty(String key, String valueToBeFiltered);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e53022e8/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionResolver.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionResolver.java
index 497450e..768bcce 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionResolver.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionResolver.java
@@ -41,11 +41,7 @@ public interface ExpressionResolver {
*
* @param expression the expression to be evaluated, not null. If a resolver was addressed explicitly,
* the prefix is removed prior to calling this method.
- * @param propertyResolver a functional instance to resolve additional properties as needed, e.g. reading
- * additional system, environment properties, or meta-properties. This abstraction
- * gives the evaluator access to the contextual configuration instance which
- * contains expressions.
* @return the evaluated expression, or null, if the evaluator is not able to resolve the expression.
*/
- String evaluate(String expression, Function<String, String> propertyResolver);
+ String evaluate(String expression);
}
[2/4] incubator-tamaya git commit: TAMAYA-42: removed function
providing the temporal map for filters.
Posted by an...@apache.org.
TAMAYA-42: removed function providing the temporal map for filters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/340cf7bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/340cf7bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/340cf7bd
Branch: refs/heads/master
Commit: 340cf7bd1f62d27b99766b9174e82ff3483175c9
Parents: 448c75f
Author: anatole <an...@apache.org>
Authored: Tue Jan 6 17:22:18 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 6 17:22:18 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/core/internal/DefaultConfiguration.java | 6 ++----
.../org/apache/tamaya/core/testdata/TestPropertyFilter.java | 2 +-
.../tamaya/core/testdata/TestPropertyFilterRemoving.java | 5 +++--
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/340cf7bd/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index 2efff12..ce15617 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -94,8 +94,7 @@ public class DefaultConfiguration implements Configuration {
boolean changed = false;
// Apply filters to values, prevent values filtered to null!
for (PropertyFilter filter : configurationContext.getPropertyFilters()) {
- String newValue = filter.filterProperty(key, unfilteredValue,
- (String k) -> key.equals(k) ? null : get(k).orElse(null));
+ String newValue = filter.filterProperty(key, unfilteredValue);
if (newValue != null && !newValue.equals(unfilteredValue)) {
changed = true;
if (LOG.isLoggable(Level.FINEST)) {
@@ -163,8 +162,7 @@ public class DefaultConfiguration implements Configuration {
AtomicInteger changes = new AtomicInteger();
for (PropertyFilter filter : configurationContext.getPropertyFilters()) {
inputMap.replaceAll((k, v) -> {
- String newValue = filter.filterProperty(k, v,
- (String k2) -> k2.equals(k) ? v : get(k2).orElse(null));
+ String newValue = filter.filterProperty(k, v);
if (newValue != null && !newValue.equals(v)) {
changes.incrementAndGet();
LOG.finest(() -> "Filter - " + k + ": " + v + " -> " + newValue + " by " + filter);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/340cf7bd/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
index 4a0feaa..0713fee 100644
--- a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
+++ b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilter.java
@@ -29,7 +29,7 @@ import java.util.function.Function;
@Priority(100)
public class TestPropertyFilter implements PropertyFilter{
@Override
- public String filterProperty(String key, String valueToBeFiltered, Function<String, String> propertyValueProvider) {
+ public String filterProperty(String key, String valueToBeFiltered) {
if("name4".equals(key)){
return valueToBeFiltered + "(filtered)";
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/340cf7bd/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
index 64edf97..0244d6a 100644
--- a/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
+++ b/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
@@ -18,6 +18,7 @@
*/
package org.apache.tamaya.core.testdata;
+import org.apache.tamaya.Configuration;
import org.apache.tamaya.spi.PropertyFilter;
import javax.annotation.Priority;
@@ -29,12 +30,12 @@ import java.util.function.Function;
@Priority(200)
public class TestPropertyFilterRemoving implements PropertyFilter{
@Override
- public String filterProperty(String key, String valueToBeFiltered, Function<String, String> propertyValueProvider) {
+ public String filterProperty(String key, String valueToBeFiltered) {
if("name5".equals(key)){
return null;
}
else if("name3".equals(key)){
- return "Mapped to name: " + propertyValueProvider.apply("name");
+ return "Mapped to name: " + Configuration.current().get("name").orElse("NoName found!");
}
return valueToBeFiltered;
}
Re: [4/4] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master'
Posted by Mark Struberg <st...@yahoo.de>.
Hi Anatole!
Please always do a
$> git pull --rebase
otherwise we will have all those nasty merge noise in the log. Isn't exactly helping when tracking changes...
LieGrue,
strub
> On Tuesday, 6 January 2015, 17:23, "anatole@apache.org" <an...@apache.org> wrote:
> > Merge remote-tracking branch 'origin/master'
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1bdd4b71
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1bdd4b71
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1bdd4b71
>
> Branch: refs/heads/master
> Commit: 1bdd4b7195b6882713d0be2b6acf32686751edd6
> Parents: e53022e a2a36f1
> Author: anatole <an...@apache.org>
> Authored: Tue Jan 6 17:22:53 2015 +0100
>
> Committer: anatole <an...@apache.org>
> Committed: Tue Jan 6 17:22:53 2015 +0100
>
> ----------------------------------------------------------------------
> .../apache/tamaya/spi/ConfigurationContext.java | 2 +-
> .../core/internal/DefaultConfiguration.java | 2 +-
> .../internal/DefaultConfigurationContext.java | 3 -
> .../core/internal/PropertiesFileLoader.java | 102 ++++++++++++++++++
> .../core/internal/PropertyConverterManager.java | 21 ++--
> .../core/propertysource/DefaultOrdinal.java | 7 +-
> .../PropertiesFilePropertySource.java | 47 +++++++++
> .../PropertiesPropertySource.java | 51 +++++++++
> .../propertysource/SystemPropertySource.java | 15 ++-
> .../provider/JavaConfigurationProvider.java | 60 +++++++++++
> .../test/internal/PropetiesFileLoaderTest.java | 76 ++++++++++++++
> .../PropertiesFilePropertySourceTest.java | 71 +++++++++++++
> .../provider/JavaConfigurationProviderTest.java | 53 ++++++++++
> ...org.apache.tamaya.spi.PropertySourceProvider | 3 +-
> .../test/resources/javaconfiguration.properties | 22 ++++
> .../test/resources/overrideOrdinal.properties | 25 +++++
> core/src/test/resources/testfile.properties | 22 ++++
> extras/json/pom.xml | 63 +++++++++++
> .../tamaya/extras/json/FileBasedResource.java | 50 +++++++++
> .../tamaya/extras/json/InputResource.java | 27 +++++
> .../tamaya/extras/json/JSONPropertySource.java | 104 +++++++++++++++++++
> .../apache/tamaya/extras/json/JSONVisitor.java | 76 ++++++++++++++
> .../resources/configs/valid/simple-config.json | 5 +
> extras/pom.xml | 41 ++++++++
> pom.xml | 8 ++
> 25 files changed, 930 insertions(+), 26 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1bdd4b71/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
>
> ----------------------------------------------------------------------
>
Re: [4/4] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master'
Posted by Mark Struberg <st...@yahoo.de>.
Hi Anatole!
Please always do a
$> git pull --rebase
otherwise we will have all those nasty merge noise in the log. Isn't exactly helping when tracking changes...
LieGrue,
strub
> On Tuesday, 6 January 2015, 17:23, "anatole@apache.org" <an...@apache.org> wrote:
> > Merge remote-tracking branch 'origin/master'
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1bdd4b71
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1bdd4b71
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1bdd4b71
>
> Branch: refs/heads/master
> Commit: 1bdd4b7195b6882713d0be2b6acf32686751edd6
> Parents: e53022e a2a36f1
> Author: anatole <an...@apache.org>
> Authored: Tue Jan 6 17:22:53 2015 +0100
>
> Committer: anatole <an...@apache.org>
> Committed: Tue Jan 6 17:22:53 2015 +0100
>
> ----------------------------------------------------------------------
> .../apache/tamaya/spi/ConfigurationContext.java | 2 +-
> .../core/internal/DefaultConfiguration.java | 2 +-
> .../internal/DefaultConfigurationContext.java | 3 -
> .../core/internal/PropertiesFileLoader.java | 102 ++++++++++++++++++
> .../core/internal/PropertyConverterManager.java | 21 ++--
> .../core/propertysource/DefaultOrdinal.java | 7 +-
> .../PropertiesFilePropertySource.java | 47 +++++++++
> .../PropertiesPropertySource.java | 51 +++++++++
> .../propertysource/SystemPropertySource.java | 15 ++-
> .../provider/JavaConfigurationProvider.java | 60 +++++++++++
> .../test/internal/PropetiesFileLoaderTest.java | 76 ++++++++++++++
> .../PropertiesFilePropertySourceTest.java | 71 +++++++++++++
> .../provider/JavaConfigurationProviderTest.java | 53 ++++++++++
> ...org.apache.tamaya.spi.PropertySourceProvider | 3 +-
> .../test/resources/javaconfiguration.properties | 22 ++++
> .../test/resources/overrideOrdinal.properties | 25 +++++
> core/src/test/resources/testfile.properties | 22 ++++
> extras/json/pom.xml | 63 +++++++++++
> .../tamaya/extras/json/FileBasedResource.java | 50 +++++++++
> .../tamaya/extras/json/InputResource.java | 27 +++++
> .../tamaya/extras/json/JSONPropertySource.java | 104 +++++++++++++++++++
> .../apache/tamaya/extras/json/JSONVisitor.java | 76 ++++++++++++++
> .../resources/configs/valid/simple-config.json | 5 +
> extras/pom.xml | 41 ++++++++
> pom.xml | 8 ++
> 25 files changed, 930 insertions(+), 26 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1bdd4b71/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
>
> ----------------------------------------------------------------------
>
[4/4] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master'
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1bdd4b71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1bdd4b71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1bdd4b71
Branch: refs/heads/master
Commit: 1bdd4b7195b6882713d0be2b6acf32686751edd6
Parents: e53022e a2a36f1
Author: anatole <an...@apache.org>
Authored: Tue Jan 6 17:22:53 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Jan 6 17:22:53 2015 +0100
----------------------------------------------------------------------
.../apache/tamaya/spi/ConfigurationContext.java | 2 +-
.../core/internal/DefaultConfiguration.java | 2 +-
.../internal/DefaultConfigurationContext.java | 3 -
.../core/internal/PropertiesFileLoader.java | 102 ++++++++++++++++++
.../core/internal/PropertyConverterManager.java | 21 ++--
.../core/propertysource/DefaultOrdinal.java | 7 +-
.../PropertiesFilePropertySource.java | 47 +++++++++
.../PropertiesPropertySource.java | 51 +++++++++
.../propertysource/SystemPropertySource.java | 15 ++-
.../provider/JavaConfigurationProvider.java | 60 +++++++++++
.../test/internal/PropetiesFileLoaderTest.java | 76 ++++++++++++++
.../PropertiesFilePropertySourceTest.java | 71 +++++++++++++
.../provider/JavaConfigurationProviderTest.java | 53 ++++++++++
...org.apache.tamaya.spi.PropertySourceProvider | 3 +-
.../test/resources/javaconfiguration.properties | 22 ++++
.../test/resources/overrideOrdinal.properties | 25 +++++
core/src/test/resources/testfile.properties | 22 ++++
extras/json/pom.xml | 63 +++++++++++
.../tamaya/extras/json/FileBasedResource.java | 50 +++++++++
.../tamaya/extras/json/InputResource.java | 27 +++++
.../tamaya/extras/json/JSONPropertySource.java | 104 +++++++++++++++++++
.../apache/tamaya/extras/json/JSONVisitor.java | 76 ++++++++++++++
.../resources/configs/valid/simple-config.json | 5 +
extras/pom.xml | 41 ++++++++
pom.xml | 8 ++
25 files changed, 930 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1bdd4b71/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------