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/08/07 23:55:37 UTC

[3/9] git commit: Push managementContext up to AbstractBrooklynObject

Push managementContext up to AbstractBrooklynObject


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

Branch: refs/heads/master
Commit: 5c5ed962397958c763b2b0fbc2146f713a286d27
Parents: fed8ee6
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 6 21:38:48 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Aug 6 23:17:46 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/basic/AbstractBrooklynObject.java  | 12 ++++++++
 .../brooklyn/entity/basic/AbstractEntity.java   |  1 +
 .../location/basic/AbstractLocation.java        | 29 ++++++++------------
 .../policy/basic/AbstractEntityAdjunct.java     | 10 -------
 4 files changed, 24 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c5ed962/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 7cc1ffd..e11e4b9 100644
--- a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
+++ b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
@@ -20,6 +20,8 @@ package brooklyn.basic;
 
 import java.util.Set;
 
+import brooklyn.management.ManagementContext;
+import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.text.Identifiers;
 
@@ -33,8 +35,18 @@ public abstract class AbstractBrooklynObject implements BrooklynObjectInternal {
     
     private final Set<Object> tags = Sets.newLinkedHashSet();
 
+    private volatile ManagementContext managementContext;
+
     protected abstract void requestPersist();
 
+    public void setManagementContext(ManagementContextInternal managementContext) {
+        this.managementContext = managementContext;
+    }
+    
+    public ManagementContext getManagementContext() {
+        return managementContext;
+    }
+
     @Override
     public String getId() {
         return id;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c5ed962/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 e2c84fa..8cf279c 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -409,6 +409,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
     }
 
     public void setManagementContext(ManagementContextInternal managementContext) {
+        super.setManagementContext(managementContext);
         getManagementSupport().setManagementContext(managementContext);
         entityType.setName(getEntityTypeName());
         if (displayNameAutoGenerated) displayName.set(getEntityType().getSimpleName()+":"+Strings.maxlen(getId(), 4));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c5ed962/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
index 9c0317e..f6657c8 100644
--- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
@@ -49,7 +49,6 @@ import brooklyn.location.Location;
 import brooklyn.location.LocationSpec;
 import brooklyn.location.geo.HasHostGeoInfo;
 import brooklyn.location.geo.HostGeoInfo;
-import brooklyn.management.ManagementContext;
 import brooklyn.management.internal.LocalLocationManager;
 import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.mementos.LocationMemento;
@@ -101,7 +100,6 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
 
     private ConfigBag configBag = new ConfigBag();
 
-    private volatile ManagementContext managementContext;
     private volatile boolean managed;
 
     private boolean _legacyConstruction;
@@ -169,14 +167,14 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
     }
 
     protected void assertNotYetManaged() {
-        if (!inConstruction && (managementContext != null && managementContext.getLocationManager().isManaged(this))) {
+        if (!inConstruction && Locations.isManaged(this)) {
             LOG.warn("Configuration being made to {} after deployment; may not be supported in future versions", this);
         }
         //throw new IllegalStateException("Cannot set configuration "+key+" on active location "+this)
     }
 
     public void setManagementContext(ManagementContextInternal managementContext) {
-        this.managementContext = managementContext;
+        super.setManagementContext(managementContext);
         if (displayNameAutoGenerated && getId() != null) name.set(getClass().getSimpleName()+":"+getId().substring(0, Math.min(getId().length(),4)));
 
         Location oldParent = parent.get();
@@ -214,11 +212,6 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
         }
     }
 
-    @Override
-    public ManagementContext getManagementContext() {
-        return managementContext;
-    }
-    
     /**
      * Will set fields from flags. The unused configuration can be found via the 
      * {@linkplain ConfigBag#getUnusedConfig()}.
@@ -320,7 +313,7 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
     }
     
     public boolean isManaged() {
-        return managementContext != null && managed;
+        return getManagementContext() != null && managed;
     }
 
     public void onManagementStarted() {
@@ -330,8 +323,8 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
     
     public void onManagementStopped() {
         this.managed = false;
-        if (managementContext.isRunning()) {
-            BrooklynStorage storage = ((ManagementContextInternal)managementContext).getStorage();
+        if (getManagementContext().isRunning()) {
+            BrooklynStorage storage = ((ManagementContextInternal)getManagementContext()).getStorage();
             storage.remove(getId()+"-parent");
             storage.remove(getId()+"-children");
             storage.remove(getId()+"-creationTime");
@@ -482,7 +475,7 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
     }
 
     protected <T extends Location> T addChild(LocationSpec<T> spec) {
-        T child = managementContext.getLocationManager().createLocation(spec);
+        T child = getManagementContext().getLocationManager().createLocation(spec);
         addChild(child);
         return child;
     }
@@ -508,10 +501,10 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
         }
         
         if (isManaged()) {
-            Locations.manage(child, managementContext);
-        } else if (managementContext != null) {
-            if (((LocalLocationManager)managementContext.getLocationManager()).getLocationEvenIfPreManaged(child.getId()) == null) {
-                ((ManagementContextInternal)managementContext).prePreManage(child);
+            Locations.manage(child, getManagementContext());
+        } else if (getManagementContext() != null) {
+            if (((LocalLocationManager)getManagementContext().getLocationManager()).getLocationEvenIfPreManaged(child.getId()) == null) {
+                ((ManagementContextInternal)getManagementContext()).prePreManage(child);
             }
         }
 
@@ -531,7 +524,7 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
             child.setParent(null);
             
             if (isManaged()) {
-                managementContext.getLocationManager().unmanage(child);
+                getManagementContext().getLocationManager().unmanage(child);
             }
         }
         return removed;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5c5ed962/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 39524f8..fed1fd2 100644
--- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
+++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
@@ -68,8 +68,6 @@ import com.google.common.collect.Maps;
 public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject implements BrooklynObjectInternal, EntityAdjunct, Configurable {
     private static final Logger log = LoggerFactory.getLogger(AbstractEntityAdjunct.class);
 
-    private volatile ManagementContext managementContext;
-
     protected Map<String,Object> leftoverProperties = Maps.newLinkedHashMap();
 
     private boolean _legacyConstruction;
@@ -180,14 +178,6 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
         return _legacyConstruction;
     }
 
-    public void setManagementContext(ManagementContext managementContext) {
-        this.managementContext = managementContext;
-    }
-    
-    protected ManagementContext getManagementContext() {
-        return managementContext;
-    }
-
     /**
      * Used for legacy-style policies/enrichers on rebind, to indicate that init() should not be called.
      * Will likely be deleted in a future release; should not be called apart from by framework code.