Repository: incubator-brooklyn Updated Branches: refs/heads/master e85886371 -> ffbd6eff3
Delete deprecated getTagsSupport, getTags, addTag, etc Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/08358465 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/08358465 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/08358465 Branch: refs/heads/master Commit: 08358465d6012bf48a908a0edd0ca2e27ec1b3dc Parents: 4fc4669 Author: Aled Sage <[email protected]> Authored: Tue Jul 28 22:33:22 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Sat Aug 1 00:13:30 2015 +0100 ---------------------------------------------------------------------- .../java/brooklyn/basic/BrooklynObject.java | 7 ----- api/src/main/java/brooklyn/entity/Entity.java | 27 -------------------- .../brooklyn/basic/AbstractBrooklynObject.java | 6 ----- .../catalog/internal/CatalogItemDo.java | 6 ----- .../brooklyn/entity/basic/AbstractEntity.java | 19 -------------- .../basic/EntityTransientCopyInternal.java | 3 --- .../access/PortForwardManagerClient.java | 5 ---- .../brooklyn/entity/basic/EntitiesTest.java | 2 +- 8 files changed, 1 insertion(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/api/src/main/java/brooklyn/basic/BrooklynObject.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/basic/BrooklynObject.java b/api/src/main/java/brooklyn/basic/BrooklynObject.java index cb80695..bf1e4e7 100644 --- a/api/src/main/java/brooklyn/basic/BrooklynObject.java +++ b/api/src/main/java/brooklyn/basic/BrooklynObject.java @@ -57,13 +57,6 @@ public interface BrooklynObject extends Identifiable, Configurable { */ TagSupport tags(); - /** - * @since 0.7.0-M2 - * @deprecated since 0.7.0-M2; use {@link #tags()} - */ - @Deprecated - TagSupport getTagSupport(); - public interface TagSupport { /** * @return An immutable copy of the set of tags on this entity. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/api/src/main/java/brooklyn/entity/Entity.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/entity/Entity.java b/api/src/main/java/brooklyn/entity/Entity.java index 0d45a35..d1372fd 100644 --- a/api/src/main/java/brooklyn/entity/Entity.java +++ b/api/src/main/java/brooklyn/entity/Entity.java @@ -20,9 +20,7 @@ package brooklyn.entity; import java.util.Collection; import java.util.Map; -import java.util.Set; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import brooklyn.basic.BrooklynObject; @@ -263,29 +261,4 @@ public interface Entity extends BrooklynObject { * Adds the given feed to this entity. Also calls feed.setEntity if available. */ <T extends Feed> T addFeed(T feed); - - /** - * @since 0.7 - * @deprecated since 0.7; see {@link #tags()} - */ - @Deprecated - Set<Object> getTags(); - /** - * @since 0.7 - * @deprecated since 0.7; see {@link #tags()} - */ - @Deprecated - boolean addTag(@Nonnull Object tag); - /** - * @since 0.7 - * @deprecated since 0.7; see {@link #tags()} - */ - @Deprecated - boolean removeTag(@Nonnull Object tag); - /** - * @since 0.7 - * @deprecated since 0.7; see {@link #tags()} - */ - @Deprecated - boolean containsTag(@Nonnull Object tag); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java index 9195b35..a020796 100644 --- a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java +++ b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java @@ -200,12 +200,6 @@ public abstract class AbstractBrooklynObject implements BrooklynObjectInternal { return new BasicTagSupport(); } - @Override - @Deprecated - public TagSupport getTagSupport() { - return tags(); - } - protected class BasicTagSupport implements TagSupport { @Override public Set<Object> getTags() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java index 1fb0707..50dfba6 100644 --- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java +++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java @@ -124,12 +124,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj } @Override - @Deprecated - public TagSupport getTagSupport() { - return tags(); - } - - @Override public String getDescription() { return itemDto.getDescription(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java index d636e47..aa40158 100644 --- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java +++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java @@ -1723,23 +1723,4 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E super.onTagsChanged(); getManagementSupport().getEntityChangeListener().onTagsChanged(); } - - public Set<Object> getTags() { - return tags().getTags(); - } - - @Override - public boolean addTag(Object tag) { - return tags().addTag(tag); - } - - @Override - public boolean removeTag(Object tag) { - return tags().removeTag(tag); - } - - @Override - public boolean containsTag(Object tag) { - return tags().containsTag(tag); - } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java index 14b9736..9322436 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java @@ -83,9 +83,6 @@ public interface EntityTransientCopyInternal { Maybe<Object> getConfigRaw(ConfigKey<?> key, boolean includeInherited); Maybe<Object> getConfigRaw(HasConfigKey<?> key, boolean includeInherited); TagSupport tags(); - @Deprecated TagSupport getTagSupport(); - @Deprecated Set<Object> getTags(); - @Deprecated boolean containsTag(@Nonnull Object tag); String getCatalogItemId(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java b/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java index c796ef6..e9638fc 100644 --- a/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java +++ b/core/src/main/java/brooklyn/location/access/PortForwardManagerClient.java @@ -394,11 +394,6 @@ public class PortForwardManagerClient implements PortForwardManager { } @Override - public TagSupport getTagSupport() { - return getDelegate().getTagSupport(); - } - - @Override public <T> T setConfig(ConfigKey<T> key, T val) { return getDelegate().setConfig(key, val); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/08358465/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java index 9c3236c..851d556 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java @@ -125,7 +125,7 @@ public class EntitiesTest extends BrooklynAppUnitTestSupport { Assert.assertTrue(entity.tags().containsTag(entity.getParent())); Assert.assertFalse(entity.tags().containsTag(entity)); - entity.removeTag(2); + entity.tags().removeTag(2); Assert.assertEquals(entity.tags().getTags(), MutableSet.of(app)); }
