Delete deprecated getName/setName Instead in Enricher/Policy use getDisplayName, and setDisplayName, so it is consistent with Entity.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/12c8eebf Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/12c8eebf Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/12c8eebf Branch: refs/heads/master Commit: 12c8eebf8989a0e1917d64c38301f2d152965b5e Parents: f5f0126 Author: Aled Sage <[email protected]> Authored: Tue Jul 28 22:28:23 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Sat Aug 1 00:13:30 2015 +0100 ---------------------------------------------------------------------- api/src/main/java/brooklyn/policy/Enricher.java | 9 --------- api/src/main/java/brooklyn/policy/EntityAdjunct.java | 6 ------ api/src/main/java/brooklyn/policy/Policy.java | 11 ----------- .../brooklyn/policy/basic/AbstractEntityAdjunct.java | 12 ------------ 4 files changed, 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12c8eebf/api/src/main/java/brooklyn/policy/Enricher.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/policy/Enricher.java b/api/src/main/java/brooklyn/policy/Enricher.java index 244af79..22a7ba6 100644 --- a/api/src/main/java/brooklyn/policy/Enricher.java +++ b/api/src/main/java/brooklyn/policy/Enricher.java @@ -42,15 +42,6 @@ public interface Enricher extends EntityAdjunct, Rebindable, Configurable { String getId(); /** - * Get the name assigned to this enricher. - * - * @deprecated since 0.7; use {@link #getDisplayName()} - */ - @Deprecated - @Override - String getName(); - - /** * Information about the type of this entity; analogous to Java's object.getClass. */ @Beta http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12c8eebf/api/src/main/java/brooklyn/policy/EntityAdjunct.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/policy/EntityAdjunct.java b/api/src/main/java/brooklyn/policy/EntityAdjunct.java index 4405ea2..7f16dbb 100644 --- a/api/src/main/java/brooklyn/policy/EntityAdjunct.java +++ b/api/src/main/java/brooklyn/policy/EntityAdjunct.java @@ -34,12 +34,6 @@ public interface EntityAdjunct extends BrooklynObject { String getId(); /** - * @deprecated since 0.7; use {@link #getDisplayName()} - */ - @Deprecated - String getName(); - - /** * Whether the adjunct is destroyed */ boolean isDestroyed(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12c8eebf/api/src/main/java/brooklyn/policy/Policy.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/policy/Policy.java b/api/src/main/java/brooklyn/policy/Policy.java index 0713042..c314ec0 100644 --- a/api/src/main/java/brooklyn/policy/Policy.java +++ b/api/src/main/java/brooklyn/policy/Policy.java @@ -40,17 +40,6 @@ public interface Policy extends EntityAdjunct, Rebindable, Configurable { String getId(); /** - * Get the name assigned to this policy. - * - * @return the name assigned to the policy. - * - * @deprecated since 0.7; use {@link #getDisplayName()} - */ - @Deprecated - @Override - String getName(); - - /** * Information about the type of this entity; analogous to Java's object.getClass. */ @Beta http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12c8eebf/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java index 1b91ce9..070ac5f 100644 --- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java +++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java @@ -356,22 +356,10 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple return getClass().getCanonicalName(); } - @Override - @Deprecated - public String getName() { - return getDisplayName(); - } - public void setDisplayName(String name) { this.name = name; } - /** - * @deprecated since 0.7.0; see {@link #setDisplayName(String)} - */ - @Deprecated - public void setName(String name) { setDisplayName(name); } - public void setEntity(EntityLocal entity) { if (destroyed.get()) throw new IllegalStateException("Cannot set entity on a destroyed entity adjunct"); this.entity = entity;
