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/10/30 10:51:15 UTC
[2/9] incubator-tamaya git commit: TAMAYA-126: Removed refs to Java 8,
fixed compile issues.
TAMAYA-126: Removed refs to Java 8, fixed compile issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1ab02404
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1ab02404
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1ab02404
Branch: refs/heads/master
Commit: 1ab0240404ed4a18cf94c9aeb40e7d6a551df295
Parents: e4eb8c6
Author: Anatole Tresch <an...@apache.org>
Authored: Fri Oct 30 09:49:04 2015 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Fri Oct 30 09:49:04 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/functions/ConfigurationFunctions.java | 2 +-
.../org/apache/tamaya/functions/FilteredConfiguration.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1ab02404/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
index cb5b25d..e537ca1 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/ConfigurationFunctions.java
@@ -119,7 +119,7 @@ public final class ConfigurationFunctions {
return new ConfigOperator() {
@Override
public Configuration operate(Configuration config) {
- return new FilteredConfiguration(config, filter, null);
+ return new FilteredConfiguration(config, filter, "FilterClass: " + filter.getClass().getName());
}
};
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1ab02404/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
index defa236..886215b 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/FilteredConfiguration.java
@@ -34,10 +34,12 @@ class FilteredConfiguration implements Configuration {
private final Configuration baseConfiguration;
private final BiPredicate<String, String> filter;
+ private String filterType;
- FilteredConfiguration(Configuration baseConfiguration, BiPredicate<String, String> filter) {
+ FilteredConfiguration(Configuration baseConfiguration, BiPredicate<String, String> filter, String filterType) {
this.baseConfiguration = Objects.requireNonNull(baseConfiguration);
this.filter = Objects.requireNonNull(filter);
+ this.filterType = filterType!=null?filterType:this.filter.toString();
}
@Override
@@ -111,7 +113,7 @@ class FilteredConfiguration implements Configuration {
public String toString() {
return "FilteredConfiguration{" +
"baseConfiguration=" + baseConfiguration +
- ", filter=" + filter +
+ ", filter=" + filterType +
'}';
}