You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/03 16:51:59 UTC
[15/29] git commit: have deprecated predicates methods point to new
classes, use a private unused to preserve the anonymous inner (code review)
have deprecated predicates methods point to new classes, use a private unused to preserve the anonymous inner (code review)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ec3701a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ec3701a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ec3701a8
Branch: refs/heads/master
Commit: ec3701a8bb931c719dad366d762ae609080941e2
Parents: d87e117
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Oct 27 06:09:12 2014 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Oct 31 09:38:20 2014 -0500
----------------------------------------------------------------------
.../brooklyn/entity/basic/EntityPredicates.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ec3701a8/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
index 41a214e..0531441 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
@@ -364,9 +364,15 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use #locationsInclude */
+ /** @deprecated since 0.7.0 use {@link #locationsInclude(Location)} */
@Deprecated
public static <T> Predicate<Entity> withLocation(final Location location) {
+ return locationsInclude(location);
+ }
+
+ /** @deprecated since 0.7.0 use {@link #locationsInclude(Location)}, introduced to allow deserialization of anonymous inner class */
+ @SuppressWarnings("unused") @Deprecated
+ private static <T> Predicate<Entity> withLocationOld(final Location location) {
return new SerializablePredicate<Entity>() {
@Override
public boolean apply(@Nullable Entity input) {
@@ -392,8 +398,14 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use #isManaged */
+ /** @deprecated since 0.7.0 use {@link #isManaged()} */ @Deprecated
public static <T> Predicate<Entity> managed() {
+ return isManaged();
+ }
+
+ /** @deprecated since 0.7.0 use {@link #isManaged()}, introduced to allow deserialization of anonymous inner class */
+ @SuppressWarnings("unused") @Deprecated
+ private static <T> Predicate<Entity> managedOld() {
return new SerializablePredicate<Entity>() {
@Override
public boolean apply(@Nullable Entity input) {