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 5eaaf8b868c8ac9bd1998f146b67f4105dfca852 Merge: 0716b3f14f 27a26ec059 Author: Alex Heneveld <[email protected]> AuthorDate: Fri Dec 2 19:54:02 2022 +0000 Merge branch 'workflow-nested' .../brooklyn/api/mgmt/ManagementContext.java | 5 +- .../java/org/apache/brooklyn/api/mgmt/Task.java | 5 + .../BrooklynCampPlatformLauncherAbstract.java | 7 +- .../camp/brooklyn/AddChildrenEffectorYamlTest.java | 28 +- .../brooklyn/AddChildrenInitializerYamlTest.java | 18 +- .../camp/brooklyn/FunctionSensorYamlTest.java | 8 +- .../brooklyn/WorkflowApplicationModelTest.java | 318 ++++++ .../camp/brooklyn/WorkflowExpressionsYamlTest.java | 3 +- .../camp/brooklyn/WorkflowYamlRebindTest.java | 16 +- .../brooklyn/camp/brooklyn/WorkflowYamlTest.java | 91 +- .../catalog/SpecParameterUnwrappingTest.java | 2 - .../catalog/internal/BasicBrooklynCatalog.java | 3 +- .../brooklyn/core/entity/AbstractEntity.java | 4 + .../org/apache/brooklyn/core/entity/Entities.java | 22 +- .../brooklyn/core/entity/EntityAdjuncts.java | 68 +- .../brooklyn/core/mgmt/BrooklynTaskTags.java | 39 +- .../brooklyn/core/mgmt/EntityManagementUtils.java | 68 +- .../core/mgmt/entitlement/Entitlements.java | 19 +- .../mgmt/internal/EntityManagementSupport.java | 15 +- .../core/mgmt/internal/LocalManagementContext.java | 27 + .../internal/NonDeploymentManagementContext.java | 5 + .../core/resolve/jackson/BeanWithTypeUtils.java | 8 +- .../jackson/BrooklynJacksonSerializationUtils.java | 12 + .../resolve/jackson/CommonTypesSerialization.java | 132 ++- .../jackson/JsonPassThroughDeserializer.java | 16 + .../brooklyn/core/workflow/ShorthandProcessor.java | 4 +- .../core/workflow/WorkflowCommonConfig.java | 22 +- .../brooklyn/core/workflow/WorkflowEffector.java | 3 +- .../core/workflow/WorkflowErrorHandling.java | 165 +++- .../core/workflow/WorkflowExecutionContext.java | 1042 +++++++++++++------- .../workflow/WorkflowExpressionResolution.java | 84 +- .../core/workflow/WorkflowInitializer.java | 132 +++ .../brooklyn/core/workflow/WorkflowPolicy.java | 15 +- .../core/workflow/WorkflowReplayUtils.java | 437 ++++++-- .../brooklyn/core/workflow/WorkflowSensor.java | 6 +- .../core/workflow/WorkflowStepDefinition.java | 113 ++- .../WorkflowStepInstanceExecutionContext.java | 20 +- .../core/workflow/WorkflowStepResolution.java | 46 +- .../core/workflow/steps/CustomWorkflowStep.java | 359 ++++++- .../steps/appmodel/AddEntityWorkflowStep.java | 182 ++++ .../steps/appmodel/AddPolicyWorkflowStep.java | 130 +++ .../appmodel/ApplyInitializerWorkflowStep.java | 108 ++ .../{ => appmodel}/ClearConfigWorkflowStep.java | 4 +- .../{ => appmodel}/ClearSensorWorkflowStep.java | 6 +- .../steps/appmodel/DeleteEntityWorkflowStep.java | 120 +++ .../steps/appmodel/DeletePolicyWorkflowStep.java | 99 ++ .../appmodel/DeployApplicationWorkflowStep.java | 141 +++ .../steps/{ => appmodel}/EntityValueToSet.java | 5 +- .../{ => appmodel}/InvokeEffectorWorkflowStep.java | 45 +- .../steps/appmodel/ReparentEntityWorkflowStep.java | 75 ++ .../{ => appmodel}/SetConfigWorkflowStep.java | 6 +- .../{ => appmodel}/SetSensorWorkflowStep.java | 64 +- .../steps/{ => external}/HttpWorkflowStep.java | 3 +- .../steps/{ => external}/SshWorkflowStep.java | 3 +- .../steps/{ => flow}/FailWorkflowStep.java | 6 +- .../steps/{ => flow}/GotoWorkflowStep.java | 14 +- .../workflow/steps/{ => flow}/LogWorkflowStep.java | 7 +- .../steps/{ => flow}/NoOpWorkflowStep.java | 3 +- .../steps/{ => flow}/RetryWorkflowStep.java | 136 ++- .../steps/{ => flow}/ReturnWorkflowStep.java | 13 +- .../steps/{ => flow}/SleepWorkflowStep.java | 3 +- .../workflow/steps/flow/SwitchWorkflowStep.java | 154 +++ .../{ => variables}/ClearVariableWorkflowStep.java | 4 +- .../steps/{ => variables}/LoadWorkflowStep.java | 31 +- .../{ => variables}/SetVariableWorkflowStep.java | 240 +---- .../workflow/steps/variables/TransformJsonish.java | 155 +++ .../workflow/steps/variables/TransformMerge.java | 150 +++ .../workflow/steps/variables/TransformTrim.java | 46 + .../workflow/steps/variables/TransformType.java | 47 + .../variables/TransformVariableWorkflowStep.java | 213 ++++ .../TransformWait.java} | 21 +- .../steps/{ => variables}/TypedValueToSet.java | 3 +- .../steps/{ => variables}/WaitWorkflowStep.java | 4 +- .../WorkflowTransform.java} | 22 +- .../WorkflowTransformDefault.java} | 25 +- .../WorkflowTransformWithContext.java} | 22 +- .../store/WorkflowRetentionAndExpiration.java | 190 ++++ .../store/WorkflowStateActiveInMemory.java | 115 +++ .../store/WorkflowStatePersistenceViaSensors.java | 175 +++- .../workflow/utils/WorkflowConcurrencyParser.java | 295 ++++++ .../workflow/utils/WorkflowRetentionParser.java | 340 +++++++ .../brooklyn/util/core/flags/TypeCoercions.java | 17 +- .../util/core/predicates/DslPredicates.java | 6 + .../apache/brooklyn/util/core/task/BasicTask.java | 64 +- .../brooklyn/util/core/task/ForwardingTask.java | 5 + .../org/apache/brooklyn/util/core/task/Tasks.java | 8 +- .../brooklyn/util/core/text/TemplateProcessor.java | 84 +- .../mgmt/internal/EntityExecutionManagerTest.java | 7 +- .../rebind/ActivePartialRebindVersionTest.java | 2 +- .../core/mgmt/rebind/RebindTestFixture.java | 6 +- .../brooklyn/core/mgmt/rebind/RebindTestUtils.java | 16 + .../BrooklynMiscJacksonSerializationTest.java | 29 + .../core/workflow/SpecificShorthandTest.java} | 28 +- .../brooklyn/core/workflow/WorkflowBasicTest.java | 66 +- .../core/workflow/WorkflowBeefyStepTest.java | 3 +- .../workflow/WorkflowInputOutputExtensionTest.java | 499 ++++++---- .../WorkflowNestedAndCustomExtensionTest.java | 696 +++++++++++++ .../workflow/WorkflowPersistReplayErrorsTest.java | 451 +++++++-- .../brooklyn/core/workflow/WorkflowRetryTest.java | 22 +- karaf/init/src/main/resources/catalog.bom | 88 +- .../org/apache/brooklyn/rest/api/EntityApi.java | 23 +- .../brooklyn/rest/resources/AdjunctResource.java | 14 +- .../rest/resources/EntityConfigResource.java | 14 +- .../brooklyn/rest/resources/EntityResource.java | 41 +- .../brooklyn/rest/resources/ServerResource.java | 3 + .../rest/resources/EntityWorkflowsRestTest.java | 3 - .../util/json/BrooklynJacksonSerializerTest.java | 22 +- .../tasks/kubectl/ContainerWorkflowStep.java | 4 +- ...sterWithAvailabilityZonesMultiLocationTest.java | 2 +- .../brooklyn/location/winrm/WinrmWorkflowStep.java | 7 +- .../org/apache/brooklyn/test/ClassLogWatcher.java | 2 +- .../apache/brooklyn/util/collections/Jsonya.java | 7 + .../java/org/apache/brooklyn/util/guava/Maybe.java | 7 +- 113 files changed, 7457 insertions(+), 1601 deletions(-)
