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 32e909c5004920cb926f660a185188cb9fe5d4a4 Merge: e124a5bb90 2c2e905bee Author: Alex Heneveld <[email protected]> AuthorDate: Mon Mar 20 13:07:17 2023 +0000 Merge branch 'type-fields-misleading' .../camp/brooklyn/CustomTypeConfigYamlTest.java | 9 ++- .../brooklyn/camp/brooklyn/WorkflowYamlTest.java | 31 ++++++++ .../resolve/jackson/AsPropertyIfAmbiguous.java | 87 +++++++++++++++++----- .../jackson/BeanWithTypePlanTransformer.java | 24 +++++- .../core/resolve/jackson/BeanWithTypeUtils.java | 22 ++++-- .../jackson/BrooklynJacksonSerializationUtils.java | 12 +++ .../core/flags/BrooklynTypeNameResolution.java | 19 ++--- .../brooklyn/util/core/flags/TypeCoercions.java | 23 ++++++ ...klynRegisteredTypeJacksonSerializationTest.java | 34 +++++++++ 9 files changed, 216 insertions(+), 45 deletions(-)
