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 2016/02/11 20:31:43 UTC
incubator-tamaya git commit: Synched with head.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master a012f4ad3 -> 904d1ece3
Synched with head.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/904d1ece
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/904d1ece
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/904d1ece
Branch: refs/heads/master
Commit: 904d1ece3be514fb96a88f9057c07f0f8936d542
Parents: a012f4a
Author: anatole <an...@apache.org>
Authored: Thu Feb 11 20:31:24 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Thu Feb 11 20:31:24 2016 +0100
----------------------------------------------------------------------
.../apache/tamaya/filter/ConfigurationFilter.java | 15 ++++++++++++---
.../org/apache/tamaya/filter/ProgrammableFilter.java | 6 +++---
.../apache/tamaya/filter/RegexPropertyFilter.java | 2 +-
.../filter/internal/DefaultMetadataFilter.java | 2 +-
4 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/904d1ece/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
----------------------------------------------------------------------
diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
index 99ab27f..30ba3e2 100644
--- a/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
+++ b/modules/filter/src/main/java/org/apache/tamaya/filter/ConfigurationFilter.java
@@ -62,12 +62,21 @@ public final class ConfigurationFilter implements PropertyFilter{
};
/**
+ * Flag if metadata entries (starting with an '_') are filtered out on when accessing multiple properties, default
+ * is {@code true}.
+ * @return true, if metadata entries (starting with an '_') are to be filtered.
+ */
+ public static boolean isMetadataFiltered(){
+ return THREADED_METADATA_FILTERED.get();
+ }
+
+ /**
* Seactivates metadata filtering also on global map access for this thread.
* @see #clearFilters()
- * @param active true,to enable metadata filtering (default).
+ * @param filtered true,to enable metadata filtering (default).
*/
- public static void setMetadataFilter(boolean active){
- THREADED_METADATA_FILTERED.set(active);
+ public static void setMetadataFiltered(boolean filtered){
+ THREADED_METADATA_FILTERED.set(filtered);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/904d1ece/modules/filter/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java
----------------------------------------------------------------------
diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java
index 8589faa..18a7e08 100644
--- a/modules/filter/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java
+++ b/modules/filter/src/main/java/org/apache/tamaya/filter/ProgrammableFilter.java
@@ -80,8 +80,8 @@ public final class ProgrammableFilter implements PropertyFilter{
* @param filters the filters to be applied.
*/
public void setFilters(Collection<PropertyFilter> filters) {
- filters.clear();
- filters.addAll(filters);
+ this.filters.clear();
+ this.filters.addAll(filters);
}
/**
@@ -102,7 +102,7 @@ public final class ProgrammableFilter implements PropertyFilter{
@Override
public String toString() {
- return "FilterConfig{" +
+ return "ProgrammableFilter{" +
"filters=" + filters +
'}';
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/904d1ece/modules/filter/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java
----------------------------------------------------------------------
diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java
index 616f2cf..1ed43ba 100644
--- a/modules/filter/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java
+++ b/modules/filter/src/main/java/org/apache/tamaya/filter/RegexPropertyFilter.java
@@ -48,7 +48,7 @@ public final class RegexPropertyFilter implements PropertyFilter{
@Override
public String toString() {
- return "RegexPredicate{" +
+ return "RegexPropertyFilter{" +
"expression='" + expression + '\'' +
'}';
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/904d1ece/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
----------------------------------------------------------------------
diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
index 1119cba..95e9d25 100644
--- a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
+++ b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java
@@ -32,7 +32,7 @@ public final class DefaultMetadataFilter implements PropertyFilter{
// When accessing keys explicitly, do not hide anything.
return valueToBeFiltered;
}
- if(ConfigurationFilter.THREADED_METADATA_FILTERED.get()) {
+ if(ConfigurationFilter.isMetadataFiltered()) {
if (context.getKey().startsWith("_")) {
// Hide metadata entries.
return null;