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:06 UTC
[3/4] incubator-tamaya git commit: TAMAYA-42: removed function
providing the temporal map for filters.
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);
}