You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/06/27 14:36:41 UTC
[brooklyn-server] 02/03: Merge remote-tracking branch 'ahgittin/deserializing'
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 868af631e040552839815313f30e3fb083092fc1
Merge: 9ebb92de03 7e43adbd53
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:36:21 2022 +0100
Merge remote-tracking branch 'ahgittin/deserializing'
.../org/apache/brooklyn/api/entity/EntitySpec.java | 23 +-
.../api/internal/AbstractBrooklynObjectSpec.java | 12 +
.../BrooklynComponentTemplateResolver.java | 27 +-
.../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java | 7 +
.../spi/dsl/methods/BrooklynDslCommon.java | 53 +-
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 5 +
.../brooklyn/camp/brooklyn/EntitiesYamlTest.java | 21 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 20 +
.../catalog/internal/BasicBrooklynCatalog.java | 14 +-
.../brooklyn/core/config/BasicConfigKey.java | 6 +-
.../AddSensorInitializerAbstractProto.java | 5 +-
.../brooklyn/core/entity/EntityPredicates.java | 23 +
.../OsgiBrooklynClassLoadingContext.java | 1 +
.../resolve/jackson/AsPropertyIfAmbiguous.java | 106 ++--
.../core/resolve/jackson/BeanWithTypeUtils.java | 14 +-
.../jackson/BrooklynJacksonSerializationUtils.java | 89 +++-
...BrooklynRegisteredTypeJacksonSerialization.java | 57 ++-
.../resolve/jackson/CommonTypesSerialization.java | 199 +++++++-
.../JacksonBetterDelegatingDeserializer.java | 43 +-
.../jackson/JsonSymbolDependentDeserializer.java | 50 +-
.../core/resolve/jackson/WrappedValue.java | 6 +
.../jackson/WrappedValuesSerialization.java | 17 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 5 +
.../brooklyn/entity/group/GroupsChangePolicy.java | 9 +-
.../core/flags/BrooklynTypeNameResolution.java | 43 +-
.../brooklyn/util/core/flags/MethodCoercions.java | 7 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 8 +
.../brooklyn/util/core/json/BidiSerialization.java | 1 +
.../util/core/json/BrooklynObjectsJsonMapper.java | 6 +-
...blyStrictPreferringFieldsVisibilityChecker.java | 8 +-
.../util/core/predicates/DslPredicates.java | 550 +++++++++++++++++++++
.../org/apache/brooklyn/util/core/units/Range.java | 8 +
.../BrooklynMiscJacksonSerializationTest.java | 24 +
...klynRegisteredTypeJacksonSerializationTest.java | 11 +
.../resolve/jackson/PerverseSerializationTest.java | 4 +-
.../core/predicates/DslPredicateEntityTest.java | 117 +++++
.../util/core/predicates/DslPredicateTest.java | 223 +++++++++
.../launcher/blueprints/AbstractBlueprintTest.java | 16 +-
pom.xml | 2 +-
.../brooklyn/rest/resources/ActivityRestTest.java | 39 +-
.../util/json/BrooklynJacksonSerializerTest.java | 217 +++++++-
.../apache/brooklyn/util/stream/StreamGobbler.java | 5 +-
.../brooklyn/util/stream/StreamGobblerTest.java | 5 +-
43 files changed, 1966 insertions(+), 140 deletions(-)