brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject brooklyn-server git commit: fix location of exclude_blank in aggregators hierarchy
Date Thu, 25 Aug 2016 15:17:28 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 2efbd86be -> 41f723f86


fix location of exclude_blank in aggregators hierarchy


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/41f723f8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/41f723f8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/41f723f8

Branch: refs/heads/master
Commit: 41f723f86b30df235718ffec519574d807adbfa2
Parents: 2efbd86
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Aug 25 16:04:23 2016 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Aug 25 16:17:19 2016 +0100

----------------------------------------------------------------------
 .../org/apache/brooklyn/enricher/stock/AbstractAggregator.java     | 2 +-
 .../main/java/org/apache/brooklyn/enricher/stock/Aggregator.java   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/41f723f8/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
index 5a36177..2ba494b 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractAggregator.java
@@ -68,7 +68,7 @@ public abstract class AbstractAggregator<T,U> extends AbstractEnricher
implement
     public static final ConfigKey<Predicate<? super Entity>> ENTITY_FILTER =
ConfigKeys.newConfigKey(new TypeToken<Predicate<? super Entity>>() {}, "enricher.aggregating.entityFilter");
 
     public static final ConfigKey<Predicate<?>> VALUE_FILTER = ConfigKeys.newConfigKey(new
TypeToken<Predicate<?>>() {}, "enricher.aggregating.valueFilter");
-    public static final ConfigKey<Boolean> EXCLUDE_BLANK = Aggregator.EXCLUDE_BLANK;
+    public static final ConfigKey<Boolean> EXCLUDE_BLANK = ConfigKeys.newBooleanConfigKey("enricher.aggregator.excludeBlank",
"Whether explicit nulls or blank strings should be excluded (default false); may only apply
if no value filter set", false);
 
     protected Entity producer;
     protected Sensor<U> targetSensor;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/41f723f8/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
index a21aec3..23a9e81 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
@@ -60,8 +60,6 @@ public class Aggregator<T,U> extends AbstractAggregator<T,U>
implements SensorEv
         + "such as 'average' (for numbers), 'sum' (for numbers), or 'list' (the default,
putting any collection of items into a list)");
     public static final ConfigKey<Function<? super Collection<?>, ?>> TRANSFORMATION
= ConfigKeys.newConfigKey(new TypeToken<Function<? super Collection<?>, ?>>()
{}, "enricher.transformation");
     
-    public static final ConfigKey<Boolean> EXCLUDE_BLANK = ConfigKeys.newBooleanConfigKey("enricher.aggregator.excludeBlank",
"Whether explicit nulls or blank strings should be excluded (default false); may only apply
if no value filter set", false);
-
     /**
      * @see QuorumChecks
      */


Mime
View raw message