[brooklyn-server] branch master updated: Makes WorkflowSensor public and extensible

[duncangrant]

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

duncangrant 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 b719f22958 Makes WorkflowSensor public and extensible
     new 9550789cf7 Merge pull request #1379 from 
nakomis/workflow-sensor-visibility
b719f22958 is described below

commit b719f229586ecd7ce556368d0e3445227cdf135d
Author: Martin Harris <git...@nakomis.com>
AuthorDate: Wed Feb 15 13:41:57 2023 +0000

    Makes WorkflowSensor public and extensible
---
 .../java/org/apache/brooklyn/core/workflow/WorkflowSensor.java    | 8 ++++++--
 .../org/apache/brooklyn/util/core/xstream/XmlSerializerTest.java  | 2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java 
b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
index 4f07479c34..c24195fa70 100644
--- a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
+++ b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
@@ -55,7 +55,7 @@ import java.util.concurrent.Callable;
  * Configurable {@link EntityInitializer} which adds a sensor feed running a 
given workflow.
  */
 @Beta
-public final class WorkflowSensor<T> extends AbstractAddTriggerableSensor<T> 
implements WorkflowCommonConfig {
+public class WorkflowSensor<T> extends AbstractAddTriggerableSensor<T> 
implements WorkflowCommonConfig {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(WorkflowSensor.class);
 
@@ -142,7 +142,7 @@ public final class WorkflowSensor<T> extends 
AbstractAddTriggerableSensor<T> imp
         return s;
     }
 
-    static class WorkflowPollCallable implements Callable<Object> {
+    public static class WorkflowPollCallable implements Callable<Object> {
         private final String workflowCallableName;
         private BrooklynObject entityOrAdjunct;
         private final Map<String,Object> params;
@@ -194,6 +194,10 @@ public final class WorkflowSensor<T> extends 
AbstractAddTriggerableSensor<T> imp
             }
         }
 
+        public Map<String,Object> getParams() {
+            return params;
+        }
+
         @Override
         public String toString() {
             return "WorkflowPollCallable{" +
diff --git 
a/core/src/test/java/org/apache/brooklyn/util/core/xstream/XmlSerializerTest.java
 
b/core/src/test/java/org/apache/brooklyn/util/core/xstream/XmlSerializerTest.java
index df62549c60..e2c5b950e9 100644
--- 
a/core/src/test/java/org/apache/brooklyn/util/core/xstream/XmlSerializerTest.java
+++ 
b/core/src/test/java/org/apache/brooklyn/util/core/xstream/XmlSerializerTest.java
@@ -32,8 +32,6 @@ import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.collections.MutableSet;
 import org.apache.brooklyn.util.core.config.ConfigBag;
 import 
org.apache.brooklyn.util.core.xstream.LambdaPreventionMapper.LambdaPersistenceMode;
-import org.omg.CORBA.ObjectHolder;
-import org.omg.CORBA.StringHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import static org.testng.Assert.assertEquals;