This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit f3153691f6a77231ef0f831590024f0a3e3d503d Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 9 14:26:04 2022 +0000 tidy name of workflow effector task --- .../java/org/apache/brooklyn/camp/brooklyn/WorkflowYamlTest.java | 2 +- .../java/org/apache/brooklyn/core/workflow/WorkflowEffector.java | 2 +- .../java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java | 2 +- .../brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WorkflowYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WorkflowYamlTest.java index 8ef25ca69e..6de56af90c 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WorkflowYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/WorkflowYamlTest.java @@ -334,7 +334,7 @@ public class WorkflowYamlTest extends AbstractYamlTest { assertLogStepMessages( "test message 1", - "test message 2, step 'Second Step' id second in workflow 'Workflow for effector myWorkflow'"); + "test message 2, step 'Second Step' id second in workflow 'myWorkflow (workflow effector)'"); } @Test diff --git a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowEffector.java b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowEffector.java index 4d438d03a4..72a139caee 100644 --- a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowEffector.java +++ b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowEffector.java @@ -96,7 +96,7 @@ public class WorkflowEffector extends AddEffectorInitializerAbstract implements } public Task<Object> newSubWorkflowTask(Entity entity, Effector<?> effector, ConfigBag invocationParams, WorkflowExecutionContext parentWorkflow, Consumer<BrooklynTaskTags.WorkflowTaskTag> parentInitializer) { - WorkflowExecutionContext w = WorkflowExecutionContext.newInstanceUnpersistedWithParent(entity, parentWorkflow, "Workflow for effector " + effector.getName(), ConfigBag.newInstance(this.definitionParams), + WorkflowExecutionContext w = WorkflowExecutionContext.newInstanceUnpersistedWithParent(entity, parentWorkflow, effector.getName() + " (workflow effector)", ConfigBag.newInstance(this.definitionParams), effector.getParameters().stream().map(Effectors::asConfigKey).collect(Collectors.toSet()), invocationParams, getFlagsForTaskInvocationAt(entity, effector, invocationParams)); diff --git a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java index 9788b088b4..bf4dab543c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowBasicTest.java @@ -323,7 +323,7 @@ public class WorkflowBasicTest extends BrooklynMgmtUnitTestSupport { List tasksIds = (List) ids.get("tasks"); Asserts.assertEquals(logWatcher.getMessages(), MutableList.of( - "Starting workflow 'Workflow for effector myWorkflow', moving to first step "+workflowId+"-1", + "Starting workflow 'myWorkflow (workflow effector)', moving to first step "+workflowId+"-1", "Starting step "+workflowId+"-1 in task "+tasksIds.get(0), "one", "Completed step "+workflowId+"-1; moving to sequential next step "+workflowId+"-2-ii", diff --git a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java index b415511ab2..634bc7fad8 100644 --- a/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/workflow/WorkflowPersistReplayErrorsTest.java @@ -545,7 +545,7 @@ public class WorkflowPersistReplayErrorsTest extends RebindTestFixture<BasicAppl List<String> msgs = logWatcher.getMessages(); log.info("Error handler output:\n"+msgs.stream().collect(Collectors.joining("\n"))); Asserts.assertEntriesSatisfy(msgs, MutableList.of( - m -> m.matches("Starting workflow 'Workflow for effector myWorkflow', moving to first step .*-1"), + m -> m.matches("Starting workflow 'myWorkflow .workflow effector.', moving to first step .*-1"), m -> m.matches("Starting step .*-1 in task .*"), m -> m.matches("Encountered error in step .*-1 '1 - invoke-effector does-not-exist' .handler present.: No effector matching 'does-not-exist'"), m -> m.matches("Creating step .*-1 error handler .*-1-error-handler in task .*"), @@ -576,11 +576,11 @@ public class WorkflowPersistReplayErrorsTest extends RebindTestFixture<BasicAppl List<String> msgs = logWatcher.getMessages(); log.info("Error handler output:\n"+msgs.stream().collect(Collectors.joining("\n"))); Asserts.assertEntriesSatisfy(msgs, MutableList.of( - m -> m.matches("Starting workflow 'Workflow for effector myWorkflow', moving to first step .*-1"), + m -> m.matches("Starting workflow 'myWorkflow .workflow effector.', moving to first step .*-1"), m -> m.matches("Starting step .*-1 in task .*"), m -> m.matches("Error in step '1 - invoke-effector does-not-exist', no error handler so rethrowing: No effector matching 'does-not-exist'"), - m -> m.matches("Error in workflow 'Workflow for effector myWorkflow' around step .*-1, running error handler"), - m -> m.matches("Encountered error in workflow .*/.* 'Workflow for effector myWorkflow' .handler present.: No effector matching 'does-not-exist'"), + m -> m.matches("Error in workflow 'myWorkflow .workflow effector.' around step .*-1, running error handler"), + m -> m.matches("Encountered error in workflow .*/.* 'myWorkflow .workflow effector.' .handler present.: No effector matching 'does-not-exist'"), m -> m.matches("Creating workflow .* error handler .*-error-handler in task .*"), m -> m.matches("Starting .*-error-handler with 1 handler in task .*"), m -> m.matches("Creating handler .*-error-handler-1 'no-op' in task .*"),
