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 8bdc96f7327e1f17d114d215b06e7c90cd612ca7 Merge: d27d1720eb 0096fe41a6 Author: Alex Heneveld <[email protected]> AuthorDate: Fri May 26 14:18:57 2023 +0100 Merge branch 'misc-fixes' .../core/resolve/jackson/BeanWithTypeUtils.java | 33 ++++-- .../resolve/jackson/CommonTypesSerialization.java | 16 +-- .../JacksonBetterDelegatingDeserializer.java | 17 +++ .../jackson/JsonSymbolDependentDeserializer.java | 7 +- .../core/workflow/WorkflowExecutionContext.java | 5 +- .../steps/variables/SetVariableWorkflowStep.java | 29 ++++- .../workflow/steps/variables/TransformMerge.java | 2 + .../brooklyn/util/core/flags/TypeCoercions.java | 2 +- .../util/core/predicates/DslPredicates.java | 30 +++-- .../BrooklynMiscJacksonSerializationTest.java | 132 ++++++++++++++++++--- .../util/core/internal/TypeCoercionsTest.java | 100 ++++++++++------ .../util/core/predicates/DslPredicateTest.java | 10 +- .../coerce/CommonAdaptorTypeCoercions.java | 15 ++- .../javalang/coerce/TypeCoercerExtensible.java | 34 +++--- .../util/javalang/coerce/TypeCoercionsTest.java | 35 +----- 15 files changed, 325 insertions(+), 142 deletions(-)
