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:39 UTC
[brooklyn-server] branch master updated (dcc6a42b54 -> 3c5b56832a)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from dcc6a42b54 Merge pull request #1321 from iuliana/feature/container-components
add 84a1fd3f28 Tests to verify rebind with DynamicMultiGroup, before and after stopping an applicaiton with it
add af8219f807 Merge remote-tracking branch 'algairim/rebind/dynamic-multi-group'
add f00a7a2e66 better warnings for when this race occurs (but not a fix yet)
add 6a896b1f3e fix most cases of the creation/deletion/persistence race
add e7fd590c90 tidy previous, always passing, but added new failing code to test for related adjunct problem
add ec4fe38839 fix the adjuncts change after deletion problem
add 3aabee919f fix last known case of entity creation/deletion/persistence race
add 3c5b179ed9 and remove debug logging
add 28a6c2b678 suppress warning for known case of dynamic sensor creation during persistence
add 2ead562f4d better log messages for concurrent creation/deletion
add 8c155425b5 apply the pre-registration assumptions to deprecated code
add 5cd59cca8a only do 100 iterations in integration run
new 9ebb92de03 Merge branch 'fix-persistence-deletion-race'
add f1d16da133 support serial/deserial for type tokens, and better jackson extensibility
add e35034a09f allow coercion of EntitySpec
add f7771a98ac tidyup of entity spec coercion
add 4e23f4ef55 support de/serialization of EntitySpec, misc tidies to jackson to support that
add d3d94c680b fix longstanding non-deterministic test failure around unicode
add cc1036dc80 fix a few more edge cases esp where we register untransformed items as their raw map
add 0040ba6a60 improve deserialization buffering logic for when inside an object
add 01f21025a2 add default behaviour to fail on trailing tokens
add 752b0cf116 if deserializing without mgmt context, give better error
add 9c9612c204 support compatibility for cases (primarily in tests) where we cast to Brooklyn types but don't support loading them
add 00ec23bb95 improve deserialization of strings into our types
add 5ca68e144b case insensitive enum deserialization
add 7be591d74e support deserialization of entity specs in common camp syntax
add 8b372dd137 add convenience for wrapped value value access when value holder is possibly null
add f7d73e43ef support camp when doing BlueprintTest rebind
add 0c08762792 Merge branch 'master' into deserializing
add a14ed09f4d add new DslPredicates support
add 01d7901f20 bump jackson, adjust code, and fix config key deserialization and more
add 3c523a4ade jackson 2.13 updates - because java.* inner fields now hidden
add 269425cd63 add support for type name and instance of predicate tests
add dad3cc5ac2 WIP comparison of more types
add 308245c692 add date and other Comparable types to comparison types
add 7a1c51bdcb change default for JsonSymbol deserializer for lists to attempt the [type,value]
add 76d2abb94c DslPredicates fields public and some convenience factory methods
add 94a0c46f02 more notes on intermittent error
add 29cae81620 fix some minor bugs in long-standing method coercion code
add acbef53b20 support DSL coercion to Predicate
add 1daf36c86b when deserializing an array containing a type, don't restrict to default type
add 67b03f7996 Merge branch 'master' into deserializing
add 64262e3749 make visibility checker more forgiving
add 7e43adbd53 Merge branch 'master' into deserializing
new 868af631e0 Merge remote-tracking branch 'ahgittin/deserializing'
add b245c1abbb fix intermittent failing test
new 3c5b56832a Merge branch 'fix-effector-test'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/brooklyn/api/entity/EntitySpec.java | 23 +-
.../api/internal/AbstractBrooklynObjectSpec.java | 12 +
.../apache/brooklyn/api/objs/EntityAdjunct.java | 4 +-
.../BrooklynComponentTemplateResolver.java | 27 +-
.../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java | 7 +
.../spi/dsl/methods/BrooklynDslCommon.java | 53 +-
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 5 +
.../brooklyn/DynamicMultiGroupYamlRebindTest.java | 173 +++++++
.../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/AbstractEntity.java | 27 +-
.../org/apache/brooklyn/core/entity/Entities.java | 33 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 25 +-
.../brooklyn/core/entity/EntityPredicates.java | 23 +
.../OsgiBrooklynClassLoadingContext.java | 1 +
.../internal/AsyncCollectionChangeAdapter.java | 21 +-
.../mgmt/internal/CollectionChangeListener.java | 6 +
.../mgmt/internal/EntityManagementSupport.java | 7 +-
.../core/mgmt/internal/LocalEntityManager.java | 179 +++++--
.../BrooklynMementoPersisterToObjectStore.java | 60 ++-
.../mgmt/rebind/PeriodicDeltaChangeListener.java | 30 +-
.../core/objs/proxy/InternalEntityFactory.java | 3 +
.../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/DynamicGroupImpl.java | 10 +-
.../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 | 28 +-
.../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 +-
.../rest/resources/EffectorResourceTest.java | 2 +-
.../util/json/BrooklynJacksonSerializerTest.java | 217 +++++++-
.../apache/brooklyn/util/stream/StreamGobbler.java | 5 +-
.../brooklyn/util/stream/StreamGobblerTest.java | 5 +-
57 files changed, 2475 insertions(+), 238 deletions(-)
create mode 100644 camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DynamicMultiGroupYamlRebindTest.java
create mode 100644 core/src/main/java/org/apache/brooklyn/util/core/predicates/DslPredicates.java
create mode 100644 core/src/test/java/org/apache/brooklyn/util/core/predicates/DslPredicateEntityTest.java
create mode 100644 core/src/test/java/org/apache/brooklyn/util/core/predicates/DslPredicateTest.java
[brooklyn-server] 02/03: Merge remote-tracking branch 'ahgittin/deserializing'
Posted by he...@apache.org.
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(-)
[brooklyn-server] 01/03: Merge branch 'fix-persistence-deletion-race'
Posted by he...@apache.org.
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 9ebb92de0392b98f91bffa8e1fb8610633ca38db
Merge: dcc6a42b54 5cd59cca8a
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:36:02 2022 +0100
Merge branch 'fix-persistence-deletion-race'
.../apache/brooklyn/api/objs/EntityAdjunct.java | 4 +-
.../brooklyn/DynamicMultiGroupYamlRebindTest.java | 173 ++++++++++++++++++++
.../brooklyn/core/entity/AbstractEntity.java | 27 +++-
.../org/apache/brooklyn/core/entity/Entities.java | 33 +++-
.../brooklyn/core/entity/EntityAdjuncts.java | 25 ++-
.../internal/AsyncCollectionChangeAdapter.java | 21 ++-
.../mgmt/internal/CollectionChangeListener.java | 6 +
.../mgmt/internal/EntityManagementSupport.java | 7 +-
.../core/mgmt/internal/LocalEntityManager.java | 179 ++++++++++++++++-----
.../BrooklynMementoPersisterToObjectStore.java | 60 +++++--
.../mgmt/rebind/PeriodicDeltaChangeListener.java | 30 +++-
.../core/objs/proxy/InternalEntityFactory.java | 3 +
.../brooklyn/entity/group/DynamicGroupImpl.java | 10 +-
.../brooklyn/util/core/json/BidiSerialization.java | 27 ++--
14 files changed, 508 insertions(+), 97 deletions(-)
[brooklyn-server] 03/03: Merge branch 'fix-effector-test'
Posted by he...@apache.org.
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 3c5b56832a20d4dd2a332f7a8d2415881e070527
Merge: 868af631e0 b245c1abbb
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:36:28 2022 +0100
Merge branch 'fix-effector-test'
.../java/org/apache/brooklyn/rest/resources/EffectorResourceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)