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 2016/11/27 19:31:23 UTC
[1/3] brooklyn-server git commit: Add `GroupSupportInternal
EntityInternal.groups()`
Repository: brooklyn-server
Updated Branches:
refs/heads/master 870986bd9 -> 7d39417eb
Add `GroupSupportInternal EntityInternal.groups()`
Remove use of deprecated entity.addGroup/removeGroup()
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/717ceb78
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/717ceb78
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/717ceb78
Branch: refs/heads/master
Commit: 717ceb786c8f8e26c9fefbdfadd19931fdfde92f
Parents: 7690982
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 22 20:21:38 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Nov 25 23:01:01 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/core/entity/EntityInternal.java | 3 +++
.../apache/brooklyn/core/mgmt/internal/LocalEntityManager.java | 2 +-
.../org/apache/brooklyn/entity/group/AbstractGroupImpl.java | 5 +++--
.../test/java/org/apache/brooklyn/entity/group/GroupTest.java | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/717ceb78/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
index bd0fcce..23f6b69 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
@@ -163,6 +163,9 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
@Override
EnricherSupportInternal enrichers();
+ @Override
+ GroupSupportInternal groups();
+
@Beta
public interface EntitySubscriptionSupportInternal extends BrooklynObjectInternal.SubscriptionSupportInternal {
public SubscriptionContext getSubscriptionContext();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/717ceb78/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
index e51fa40..d0168d1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
@@ -742,7 +742,7 @@ public class LocalEntityManager implements EntityManagerInternal {
if (e instanceof Group) {
Collection<Entity> members = ((Group)e).getMembers();
for (Entity member : members) {
- if (!Entities.isNoLongerManaged(member)) member.removeGroup((Group)e);
+ if (!Entities.isNoLongerManaged(member)) ((EntityInternal)member).groups().remove((Group)e);
}
}
} else {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/717ceb78/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
index 672f646..7490246 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
@@ -31,6 +31,7 @@ import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.entity.Entities;
+import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
import org.apache.brooklyn.entity.stock.DelegateEntity;
@@ -143,7 +144,7 @@ public abstract class AbstractGroupImpl extends AbstractEntity implements Abstra
}
}
- member.addGroup((Group)getProxyIfAvailable());
+ ((EntityInternal)member).groups().add((Group)getProxyIfAvailable());
boolean changed = addMemberInternal(member);
if (changed) {
log.debug("Group {} got new member {}", this, member);
@@ -216,7 +217,7 @@ public abstract class AbstractGroupImpl extends AbstractEntity implements Abstra
Exception errorRemoving = null;
// suppress errors if member is being unmanaged in parallel
try {
- member.removeGroup((Group)getProxyIfAvailable());
+ ((EntityInternal)member).groups().remove((Group)getProxyIfAvailable());
} catch (Exception e) {
Exceptions.propagateIfFatal(e);
errorRemoving = e;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/717ceb78/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java
index 40c6693..efecee5 100644
--- a/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java
+++ b/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java
@@ -104,7 +104,7 @@ public class GroupTest extends BrooklynAppUnitTestSupport {
@Test
public void testAddingUnmanagedGroupDoesNotFailBadly() throws Exception {
Entities.unmanage(group);
- entity1.addGroup(group);
+ entity1.groups().add(group);
Entities.unmanage(entity1);
}
[3/3] brooklyn-server git commit: This closes #454
Posted by al...@apache.org.
This closes #454
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7d39417e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7d39417e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7d39417e
Branch: refs/heads/master
Commit: 7d39417ebfa82e724482a980f24a0e5c328e2bea
Parents: 870986b 717ceb7
Author: Aled Sage <al...@gmail.com>
Authored: Sun Nov 27 19:31:09 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Sun Nov 27 19:31:09 2016 +0000
----------------------------------------------------------------------
.../apache/brooklyn/core/entity/EntityInternal.java | 3 +++
.../core/mgmt/internal/LocalEntityManager.java | 16 ++++++++--------
.../brooklyn/entity/group/AbstractGroupImpl.java | 5 +++--
.../org/apache/brooklyn/entity/group/GroupTest.java | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: LocalEntityManager: make fields
private
Posted by al...@apache.org.
LocalEntityManager: make fields private
Making these fields non-private is asking for trouble - it makes it
harder to reason about what the class does and whether it\u2019s safe,
particularly around thread safety etc.
It is also exposing more implementation detail than is required, making
refactoring harder in the future.
If there is a compelling reason to provide access to the fields,
we can consider adding accessor(s).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/76909821
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/76909821
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/76909821
Branch: refs/heads/master
Commit: 76909821d20944b40a689caac95aabe58e4dfbb8
Parents: 870986b
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 22 20:18:19 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Nov 25 23:01:01 2016 +0000
----------------------------------------------------------------------
.../core/mgmt/internal/LocalEntityManager.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/76909821/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
index 3a9d756..e51fa40 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java
@@ -91,25 +91,25 @@ public class LocalEntityManager implements EntityManagerInternal {
private final InternalPolicyFactory policyFactory;
/** Entities that have been created, but have not yet begun to be managed */
- protected final Map<String,Entity> preRegisteredEntitiesById = Collections.synchronizedMap(new WeakHashMap<String, Entity>());
+ private final Map<String,Entity> preRegisteredEntitiesById = Collections.synchronizedMap(new WeakHashMap<String, Entity>());
/** Entities that are in the process of being managed, but where management is not yet complete */
- protected final Map<String,Entity> preManagedEntitiesById = Collections.synchronizedMap(new WeakHashMap<String, Entity>());
+ private final Map<String,Entity> preManagedEntitiesById = Collections.synchronizedMap(new WeakHashMap<String, Entity>());
/** Proxies of the managed entities */
- protected final ConcurrentMap<String,Entity> entityProxiesById = Maps.newConcurrentMap();
+ private final ConcurrentMap<String,Entity> entityProxiesById = Maps.newConcurrentMap();
/** Real managed entities */
- protected final Map<String,Entity> entitiesById = Maps.newLinkedHashMap();
+ private final Map<String,Entity> entitiesById = Maps.newLinkedHashMap();
/** Management mode for each entity */
- protected final Map<String,ManagementTransitionMode> entityModesById = Collections.synchronizedMap(Maps.<String,ManagementTransitionMode>newLinkedHashMap());
+ private final Map<String,ManagementTransitionMode> entityModesById = Collections.synchronizedMap(Maps.<String,ManagementTransitionMode>newLinkedHashMap());
/** Proxies of the managed entities */
- protected final ObservableList entities = new ObservableList();
+ private final ObservableList entities = new ObservableList();
/** Proxies of the managed entities that are applications */
- protected final Set<Application> applications = Sets.newConcurrentHashSet();
+ private final Set<Application> applications = Sets.newConcurrentHashSet();
private final BrooklynStorage storage;
private final Map<String,String> entityTypes;