You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/10/24 13:54:29 UTC

[04/13] git commit: Rename entityInternal.getFeedSupport() to feeds()

Rename entityInternal.getFeedSupport() to feeds()


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

Branch: refs/heads/master
Commit: 2e84f3fe99480cee5debbaae9326e34d1c1fefc7
Parents: fb9e4bd
Author: Aled Sage <al...@gmail.com>
Authored: Thu Oct 23 11:53:03 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Oct 23 13:57:09 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/entity/basic/AbstractEntity.java   | 91 +++++++++++---------
 .../brooklyn/entity/basic/EntityInternal.java   |  9 +-
 .../entity/rebind/BasicEntityRebindSupport.java |  2 +-
 .../rebind/PeriodicDeltaChangeListener.java     |  4 +-
 .../entity/rebind/dto/MementosGenerators.java   |  2 +-
 .../java/brooklyn/event/feed/AbstractFeed.java  |  2 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  | 12 +--
 .../entity/rebind/RebindFeedWithHaTest.java     |  4 +-
 .../event/feed/jmx/RebindJmxFeedTest.java       |  4 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |  4 +-
 10 files changed, 75 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/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 6cb340e..2cb8b66 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -1249,59 +1249,68 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
     // -------- FEEDS --------------------
 
     /**
-     * Convenience, which calls {@link EntityInternal#getFeedSupport()} and {@link FeedSupport#addFeed(Feed)}.
+     * Convenience, which calls {@link EntityInternal#feeds()} and {@link FeedSupport#addFeed(Feed)}.
      */
     public <T extends Feed> T addFeed(T feed) {
-        return getFeedSupport().addFeed(feed);
+        return feeds().addFeed(feed);
     }
 
+    @Override
+    public FeedSupport feeds() {
+        return new BasicFeedSupport();
+    }
+    
+    @Override
+    @Deprecated
     public FeedSupport getFeedSupport() {
-        return new FeedSupport() {
-            @Override
-            public Collection<Feed> getFeeds() {
-                return ImmutableList.<Feed>copyOf(feeds);
-            }
+        return feeds();
+    }
+    
+    protected class BasicFeedSupport implements FeedSupport {
+        @Override
+        public Collection<Feed> getFeeds() {
+            return ImmutableList.<Feed>copyOf(feeds);
+        }
 
-            @Override
-            public <T extends Feed> T addFeed(T feed) {
-                Feed old = findApparentlyEqualAndWarnIfNotSameUniqueTag(feeds, feed);
-                if (old != null) {
-                    LOG.debug("Removing "+old+" when adding "+feed+" to "+this);
-                    removeFeed(old);
-                }
-                
-                feeds.add(feed);
-                if (!AbstractEntity.this.equals(((AbstractFeed)feed).getEntity()))
-                    ((AbstractFeed)feed).setEntity(AbstractEntity.this);
+        @Override
+        public <T extends Feed> T addFeed(T feed) {
+            Feed old = findApparentlyEqualAndWarnIfNotSameUniqueTag(feeds, feed);
+            if (old != null) {
+                LOG.debug("Removing "+old+" when adding "+feed+" to "+this);
+                removeFeed(old);
+            }
+            
+            feeds.add(feed);
+            if (!AbstractEntity.this.equals(((AbstractFeed)feed).getEntity()))
+                ((AbstractFeed)feed).setEntity(AbstractEntity.this);
 
-                getManagementContext().getRebindManager().getChangeListener().onManaged(feed);
-                getManagementSupport().getEntityChangeListener().onFeedAdded(feed);
-                // TODO Could add equivalent of AbstractEntity.POLICY_ADDED for feeds; no use-case for that yet
+            getManagementContext().getRebindManager().getChangeListener().onManaged(feed);
+            getManagementSupport().getEntityChangeListener().onFeedAdded(feed);
+            // TODO Could add equivalent of AbstractEntity.POLICY_ADDED for feeds; no use-case for that yet
 
-                return feed;
-            }
+            return feed;
+        }
 
-            @Override
-            public boolean removeFeed(Feed feed) {
-                feed.stop();
-                boolean changed = feeds.remove(feed);
-                
-                if (changed) {
-                    getManagementContext().getRebindManager().getChangeListener().onUnmanaged(feed);
-                    getManagementSupport().getEntityChangeListener().onFeedRemoved(feed);
-                }
-                return changed;
+        @Override
+        public boolean removeFeed(Feed feed) {
+            feed.stop();
+            boolean changed = feeds.remove(feed);
+            
+            if (changed) {
+                getManagementContext().getRebindManager().getChangeListener().onUnmanaged(feed);
+                getManagementSupport().getEntityChangeListener().onFeedRemoved(feed);
             }
+            return changed;
+        }
 
-            @Override
-            public boolean removeAllFeeds() {
-                boolean changed = false;
-                for (Feed feed : feeds) {
-                    changed = removeFeed(feed) || changed;
-                }
-                return changed;
+        @Override
+        public boolean removeAllFeeds() {
+            boolean changed = false;
+            for (Feed feed : feeds) {
+                changed = removeFeed(feed) || changed;
             }
-        };
+            return changed;
+        }
     }
     
     // -------- SENSORS --------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
index 43413e0..63d11be 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
@@ -133,8 +133,15 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
     @Beta
     Effector<?> getEffector(String effectorName);
     
-    FeedSupport getFeedSupport();
+    FeedSupport feeds();
     
+    /**
+     * @since 0.7.0-M2
+     * @deprecated since 0.7.0-M2; use {@link #feeds()}
+     */
+    @Deprecated
+    FeedSupport getFeedSupport();
+
     Map<String, String> toMetadataRecord();
     
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
index 5018320..bb31a1f 100644
--- a/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
+++ b/core/src/main/java/brooklyn/entity/rebind/BasicEntityRebindSupport.java
@@ -155,7 +155,7 @@ public class BasicEntityRebindSupport extends AbstractBrooklynObjectRebindSuppor
             AbstractFeed feed = (AbstractFeed) rebindContext.getFeed(feedId);
             if (feed != null) {
                 try {
-                    ((EntityInternal)entity).getFeedSupport().addFeed(feed);
+                    ((EntityInternal)entity).feeds().addFeed(feed);
                 } catch (Exception e) {
                     rebindContext.getExceptionHandler().onAddFeedFailed(entity, feed, e);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
index 452ed53..9b71633 100644
--- a/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
+++ b/core/src/main/java/brooklyn/entity/rebind/PeriodicDeltaChangeListener.java
@@ -280,7 +280,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
                 referencedEnrichers.addAll(entity.getEnrichers());
             }
             if (persistFeedsEnabled) {
-                referencedFeeds.addAll(((EntityInternal)entity).getFeedSupport().getFeeds());
+                referencedFeeds.addAll(((EntityInternal)entity).feeds().getFeeds());
             }
         }
         
@@ -454,7 +454,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener {
                     deltaCollector.removedEnricherIds.add(enricher.getId());
                     deltaCollector.enrichers.remove(enricher);
                 }
-                for (Feed feed : ((EntityInternal)entity).getFeedSupport().getFeeds()) {
+                for (Feed feed : ((EntityInternal)entity).feeds().getFeeds()) {
                     deltaCollector.removedFeedIds.add(feed.getId());
                     deltaCollector.feeds.remove(feed);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
index 579d989..d5e6724 100644
--- a/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
+++ b/core/src/main/java/brooklyn/entity/rebind/dto/MementosGenerators.java
@@ -190,7 +190,7 @@ public class MementosGenerators {
             builder.enrichers.add(enricher.getId()); 
         }
         
-        for (Feed feed : entity.getFeedSupport().getFeeds()) {
+        for (Feed feed : entity.feeds().getFeeds()) {
             builder.feeds.add(feed.getId()); 
         }
         

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
index 1198bdc..5bb6da5 100644
--- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
+++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
@@ -76,7 +76,7 @@ public abstract class AbstractFeed extends AbstractEntityAdjunct implements Feed
     public void setEntity(EntityLocal entity) {
         super.setEntity(entity);
         if (BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_FEED_REGISTRATION_PROPERTY)) {
-            ((EntityInternal)entity).getFeedSupport().addFeed(this);
+            ((EntityInternal)entity).feeds().addFeed(this);
         }
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java
index 756d549..7692771 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java
@@ -102,7 +102,7 @@ public class RebindFeedTest extends RebindTestFixtureWithApp {
                 .configure(MyEntityWithHttpFeedImpl.BASE_URL, baseUrl));
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_INT, (Integer)200);
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "{\"foo\":\"myfoo\"}");
-        assertEquals(origEntity.getFeedSupport().getFeeds().size(), 1);
+        assertEquals(origEntity.feeds().getFeeds().size(), 1);
 
         final long taskCountBefore = ((BasicExecutionManager)origManagementContext.getExecutionManager()).getNumIncompleteTasks();
         
@@ -112,7 +112,7 @@ public class RebindFeedTest extends RebindTestFixtureWithApp {
         newApp = rebind(false);
         TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
         
-        Collection<Feed> newFeeds = newEntity.getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = newEntity.feeds().getFeeds();
         assertEquals(newFeeds.size(), 1);
         
         // Expect the feed to still be polling
@@ -151,12 +151,12 @@ public class RebindFeedTest extends RebindTestFixtureWithApp {
     public void testFunctionFeedRegisteredInInitIsPersisted() throws Exception {
         TestEntity origEntity = origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(MyEntityWithFunctionFeedImpl.class));
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_INT, (Integer)1);
-        assertEquals(origEntity.getFeedSupport().getFeeds().size(), 1);
+        assertEquals(origEntity.feeds().getFeeds().size(), 1);
 
         newApp = rebind(false);
         TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
         
-        Collection<Feed> newFeeds = newEntity.getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = newEntity.feeds().getFeeds();
         assertEquals(newFeeds.size(), 1);
         
         // Expect the feed to still be polling
@@ -175,12 +175,12 @@ public class RebindFeedTest extends RebindTestFixtureWithApp {
         origApp.start(ImmutableList.<Location>of());
 
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_INT, (Integer)0);
-        assertEquals(origEntity.getFeedSupport().getFeeds().size(), 1);
+        assertEquals(origEntity.feeds().getFeeds().size(), 1);
 
         newApp = rebind(false);
         TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
         
-        Collection<Feed> newFeeds = newEntity.getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = newEntity.feeds().getFeeds();
         assertEquals(newFeeds.size(), 1);
         
         // Expect the feed to still be polling

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java
index c19f68c..2c9c69b 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java
@@ -90,7 +90,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp {
                 .configure(RebindFeedTest.MyEntityWithHttpFeedImpl.BASE_URL, baseUrl));
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_INT, (Integer)200);
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "{\"foo\":\"myfoo\"}");
-        assertEquals(origEntity.getFeedSupport().getFeeds().size(), 1);
+        assertEquals(origEntity.feeds().getFeeds().size(), 1);
         origManagementContext.getRebindManager().forcePersistNow();
 
         List<Task<?>> tasksBefore = ((BasicExecutionManager)origManagementContext.getExecutionManager()).getAllTasks();
@@ -114,7 +114,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp {
 
         TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
         
-        Collection<Feed> newFeeds = newEntity.getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = newEntity.feeds().getFeeds();
         assertEquals(newFeeds.size(), 1);
         
         // Expect the feed to still be polling

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java
index 3c48c8e..b9e1873 100644
--- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java
+++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java
@@ -101,12 +101,12 @@ public class RebindJmxFeedTest extends RebindTestFixtureWithApp {
         GeneralisedDynamicMBean mbean = jmxService.registerMBean(MutableMap.of(JMX_ATTRIBUTE_NAME, "myval"), OBJECT_NAME);
         
         EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "myval");
-        assertEquals(origEntity.getFeedSupport().getFeeds().size(), 1);
+        assertEquals(origEntity.feeds().getFeeds().size(), 1);
 
         newApp = rebind(false);
         TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
         
-        Collection<Feed> newFeeds = newEntity.getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = newEntity.feeds().getFeeds();
         assertEquals(newFeeds.size(), 1);
         
         // Expect the feed to still be polling

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2e84f3fe/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
index 39bcd2e..6575d0b 100644
--- a/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
@@ -133,7 +133,7 @@ public class NginxRebindWithHaIntegrationTest extends RebindTestFixtureWithApp {
         origApp.start(ImmutableList.of(loc));
         Assert.assertTrue(RecordingSshjTool.connectionCount.get()>0);
 
-        Collection<Feed> origFeeds = ((EntityInternal)origNginx).getFeedSupport().getFeeds();
+        Collection<Feed> origFeeds = ((EntityInternal)origNginx).feeds().getFeeds();
         LOG.info("feeds before rebind are: "+origFeeds);
         Assert.assertTrue(origFeeds.size() >= 1);
 
@@ -163,7 +163,7 @@ public class NginxRebindWithHaIntegrationTest extends RebindTestFixtureWithApp {
 
         NginxController newNginx = Iterables.getOnlyElement(Entities.descendants(newApp, NginxController.class));
         
-        Collection<Feed> newFeeds = ((EntityInternal)newNginx).getFeedSupport().getFeeds();
+        Collection<Feed> newFeeds = ((EntityInternal)newNginx).feeds().getFeeds();
         LOG.info("feeds after rebind are: "+newFeeds);
         Assert.assertTrue(newFeeds.size() >= 1);