You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/05/19 17:04:28 UTC

[09/12] brooklyn-server git commit: Delete deprecated AbstractFeed constructors

Delete deprecated AbstractFeed constructors

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

Branch: refs/heads/master
Commit: ed60d6f207360895f09b160e4a41884cb00d1f86
Parents: 55eb11f
Author: Aled Sage <al...@gmail.com>
Authored: Thu May 18 16:48:38 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri May 19 13:27:04 2017 +0100

----------------------------------------------------------------------
 .../apache/brooklyn/core/feed/AbstractFeed.java | 20 --------------------
 1 file changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ed60d6f2/core/src/main/java/org/apache/brooklyn/core/feed/AbstractFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/AbstractFeed.java b/core/src/main/java/org/apache/brooklyn/core/feed/AbstractFeed.java
index 675dc83..fba15ca 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/AbstractFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/AbstractFeed.java
@@ -18,11 +18,8 @@
  */
 package org.apache.brooklyn.core.feed;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Collection;
 
-import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.EntityLocal;
 import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
 import org.apache.brooklyn.api.mgmt.rebind.mementos.FeedMemento;
@@ -57,23 +54,6 @@ public abstract class AbstractFeed extends AbstractEntityAdjunct implements Feed
     public AbstractFeed() {
     }
     
-    /**
-     * @deprecated since 0.7.0; use no-arg constructor; call {@link #setEntity(EntityLocal)}
-     */
-    @Deprecated
-    public AbstractFeed(Entity entity) {
-        this(entity, false);
-    }
-    
-    /**
-     * @deprecated since 0.7.0; use no-arg constructor; call {@link #setEntity(EntityLocal)} and {@code setConfig(ONLY_IF_SERVICE_UP, onlyIfServiceUp)}
-     */
-    @Deprecated
-    public AbstractFeed(Entity entity, boolean onlyIfServiceUp) {
-        this.entity = checkNotNull((EntityInternal)entity, "entity");
-        setConfig(ONLY_IF_SERVICE_UP, onlyIfServiceUp);
-    }
-
     // Ensure idempotent, as called in builders (in case not registered with entity), and also called
     // when registering with entity
     @Override