Repository: incubator-brooklyn Updated Branches: refs/heads/master 80ab770eb -> 776ad43d3
Rebind backwards compatibility Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ff32c248 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ff32c248 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ff32c248 Branch: refs/heads/master Commit: ff32c2485d9bd102d067a6676c0261486d0be257 Parents: 99962a1 Author: Svetoslav Neykov <[email protected]> Authored: Mon May 18 21:40:30 2015 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Mon May 18 21:40:30 2015 +0300 ---------------------------------------------------------------------- .../main/java/brooklyn/enricher/Enrichers.java | 43 ++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ff32c248/core/src/main/java/brooklyn/enricher/Enrichers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/enricher/Enrichers.java b/core/src/main/java/brooklyn/enricher/Enrichers.java index c8ee899..d036b11 100644 --- a/core/src/main/java/brooklyn/enricher/Enrichers.java +++ b/core/src/main/java/brooklyn/enricher/Enrichers.java @@ -183,6 +183,8 @@ public class Enrichers { protected final AttributeSensor<S> aggregating; protected AttributeSensor<T> publishing; protected Entity fromEntity; + /** @deprecated since 0.7.0, kept for backwards compatibility for rebind, but not used otherwise */ + @Deprecated protected Function<? super Collection<S>, ? extends T> computing; // use supplier so latest values of other fields can be used protected Supplier<Function<? super Collection<S>, ? extends T>> computingSupplier; protected Boolean fromMembers; @@ -224,6 +226,26 @@ public class Enrichers { this.computingSupplier = (Supplier)Suppliers.ofInstance(checkNotNull(val)); return self(); } + @SuppressWarnings({ "unchecked", "rawtypes", "unused" }) + private B computingSumLegacy() { + // since 0.7.0, kept in case we need to rebind to this + Function<Collection<S>, Number> function = new Function<Collection<S>, Number>() { + @Override public Number apply(Collection<S> input) { + return sum((Collection)input, (Number)defaultValueForUnreportedSensors, (Number)valueToReportIfNoSensors, (TypeToken) publishing.getTypeToken()); + }}; + this.computing((Function)function); + return self(); + } + @SuppressWarnings({ "unchecked", "rawtypes", "unused" }) + private B computingAverageLegacy() { + // since 0.7.0, kept in case we need to rebind to this + Function<Collection<S>, Number> function = new Function<Collection<S>, Number>() { + @Override public Number apply(Collection<S> input) { + return average((Collection)input, (Number)defaultValueForUnreportedSensors, (Number)valueToReportIfNoSensors, (TypeToken) publishing.getTypeToken()); + }}; + this.computing((Function)function); + return self(); + } public B computingSum() { this.computingSupplier = new Supplier<Function<? super Collection<S>, ? extends T>>() { @Override @@ -235,16 +257,6 @@ public class Enrichers { }; return self(); } - @SuppressWarnings({ "unchecked", "rawtypes", "unused" }) - private B computingSumLegacy() { - // since 0.7.0, kept in case we need to rebind to this - Function<Collection<S>, Number> function = new Function<Collection<S>, Number>() { - @Override public Number apply(Collection<S> input) { - return sum((Collection)input, (Number)defaultValueForUnreportedSensors, (Number)valueToReportIfNoSensors, (TypeToken) publishing.getTypeToken()); - }}; - this.computing((Function)function); - return self(); - } public B computingAverage() { this.computingSupplier = new Supplier<Function<? super Collection<S>, ? extends T>>() { @@ -257,17 +269,6 @@ public class Enrichers { }; return self(); } - @SuppressWarnings({ "unchecked", "rawtypes", "unused" }) - private B computingAverageLegacy() { - // since 0.7.0, kept in case we need to rebind to this - Function<Collection<S>, Number> function = new Function<Collection<S>, Number>() { - @Override public Number apply(Collection<S> input) { - return average((Collection)input, (Number)defaultValueForUnreportedSensors, (Number)valueToReportIfNoSensors, (TypeToken) publishing.getTypeToken()); - }}; - this.computing((Function)function); - return self(); - } - public B defaultValueForUnreportedSensors(S val) { this.defaultValueForUnreportedSensors = val; return self();
