[brooklyn-server] branch master updated: add a few entity/app methods to interfaces

[iu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 8bc3747  add a few entity/app methods to interfaces
     new a473f63  Merge pull request #1135 from ahgittin/increase-entity-method-visibility-for-mixin-configuration
8bc3747 is described below

commit 8bc37476bc7e36e18924c91400bc9fb84fb72f94
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Dec 14 14:53:44 2020 +0000

    add a few entity/app methods to interfaces
    
    useful when adding/changing lifecycle operations in initializers, without subclassing:
    * logApplicationLifecycle
    * setExpectedStateAndRecordLifecycleEvent
    * setDefaultDisplayName
---
 .../java/org/apache/brooklyn/core/entity/AbstractApplication.java   | 6 ++++--
 .../main/java/org/apache/brooklyn/core/entity/AbstractEntity.java   | 4 ++--
 .../main/java/org/apache/brooklyn/core/entity/EntityInternal.java   | 3 +++
 .../java/org/apache/brooklyn/core/entity/StartableApplication.java  | 4 ++++
 .../org/apache/brooklyn/core/test/entity/TestApplicationImpl.java   | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
index 3a36c75..b05837c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
@@ -196,7 +196,8 @@ public abstract class AbstractApplication extends AbstractEntity implements Star
         logApplicationLifecycle("Started");
     }
 
-    protected void logApplicationLifecycle(String message) {
+    @Override
+    public void logApplicationLifecycle(String message) {
         log.info(message+" application " + this);
     }
     
@@ -285,7 +286,8 @@ public abstract class AbstractApplication extends AbstractEntity implements Star
         }
     }
 
-    protected void setExpectedStateAndRecordLifecycleEvent(Lifecycle state) {
+    @Override
+    public void setExpectedStateAndRecordLifecycleEvent(Lifecycle state) {
         ServiceStateLogic.setExpectedState(this, state);
         recordApplicationEvent(state);
     }
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
index 0329ff9..4c02ad1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
@@ -522,8 +522,8 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
         getManagementSupport().getEntityChangeListener().onChanged();
     }
     
-    /** allows subclasses to set the default display name to use if none is provided */
-    protected void setDefaultDisplayName(String displayNameIfDefault) {
+    @Override
+    public void setDefaultDisplayName(String displayNameIfDefault) {
         if (displayNameAutoGenerated) {
             displayName.set(displayNameIfDefault);
         }
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 415745d..42c48fc 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
@@ -139,6 +139,9 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
     @Override
     EnricherSupportInternal enrichers();
 
+    /** allows subclasses or mixing to set the default display name to use if none is provided */
+    void setDefaultDisplayName(String displayNameIfDefault);
+
     @Override
     GroupSupportInternal groups();
 
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/StartableApplication.java b/core/src/main/java/org/apache/brooklyn/core/entity/StartableApplication.java
index 3bcde3c..a51301a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/StartableApplication.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/StartableApplication.java
@@ -22,6 +22,7 @@ import org.apache.brooklyn.api.entity.Application;
 import org.apache.brooklyn.config.ConfigKey;
 import org.apache.brooklyn.core.config.BasicConfigInheritance;
 import org.apache.brooklyn.core.config.ConfigKeys;
+import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
 import org.apache.brooklyn.core.entity.trait.Startable;
 import org.apache.brooklyn.util.collections.QuorumCheck;
 import org.apache.brooklyn.util.core.flags.SetFromFlag;
@@ -47,4 +48,7 @@ public interface StartableApplication extends Application, Startable {
     @SetFromFlag("startLatch")
     ConfigKey<Boolean> START_LATCH = BrooklynConfigKeys.START_LATCH;
 
+    public void logApplicationLifecycle(String message);
+    public void setExpectedStateAndRecordLifecycleEvent(Lifecycle state);
+
 }
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
index 030f5d2..409824b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
@@ -79,7 +79,7 @@ public class TestApplicationImpl extends AbstractApplication implements TestAppl
     }
 
     @Override
-    protected void logApplicationLifecycle(String message) {
+    public void logApplicationLifecycle(String message) {
         // for tests, log this at debug so we see test info more
         LOG.debug(message+" application "+this);
     }