This is an automated email from the ASF dual-hosted git repository.
duncangrant pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from 9de3ed9 Merge pull request #1108 from ahgittin/unwrap-entity-spec-dsl
new 9fd4867 refactor how deep resolution works, and test elaboration in
prep for deep conversion semantics change
new 3fc9f3e disallow legacy-style deep resolution
new 149e4e0 add a "bean" transformer that allows us to deserialize
registered types
new 75325c1 minor value resolver tidy-up
new ad64517 allow config values to use bean-with-type syntax to resolve
from camp
new d0facd3 allow initializers to come from registered types with fields
new 5913655 tidy recent changes
new d7fb32e more tidy - ignoreGenericsAndReuseThisType
new 347546d do coercion when config keys resolve also, and fix weirdness
where keys/lists as values were allowed even if their type didn't allow them
new 1202455 clean up BrooklynEntityDecorationResolver, consistent
handling of policies and enrichers
new 4758115 update EntityInitializer instances to support bean specs,
where fields or brooklyn.config can be passed
new 2bd2534 standardize and extend the supported types for parameters and
config
new d199c0c use registered types more (config, params, sensors); allow
wrapped values from yaml
new 738260c tidy up and support deserialization calling string
type-coercion
new 3fdab4f add support for bean and format in catalog, bit of a catalog
clean-up too
new 1fa0670 try java and container-bundle classloading when
auto-detecting types
new 3c7d523 Merge pull request #1109 from
ahgittin/registered-types-allow-references-in-camp
The 12587 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:
.../brooklyn/api/catalog/BrooklynCatalog.java | 65 +--
.../apache/brooklyn/api/catalog/CatalogItem.java | 10 +-
.../brooklyn/api/entity/EntityInitializer.java | 8 +-
.../brooklyn/api/objs/BrooklynObjectType.java | 2 +-
.../brooklyn/api/typereg/BrooklynTypeRegistry.java | 6 +-
.../BrooklynComponentTemplateResolver.java | 10 +-
.../creation/BrooklynEntityDecorationResolver.java | 178 ++++----
.../spi/creation/BrooklynYamlTypeInstantiator.java | 5 +
.../brooklyn/spi/dsl/DslDeferredFunctionCall.java | 2 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 4 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 6 +-
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 5 +-
.../camp/brooklyn/AddChildrenEffectorYamlTest.java | 133 ++++--
.../camp/brooklyn/ApplicationsYamlTest.java | 5 +-
.../camp/brooklyn/ConfigParametersYamlTest.java | 93 +++-
.../camp/brooklyn/CustomTypeConfigYamlTest.java | 187 ++++++++
.../brooklyn/CustomTypeInitializerYamlTest.java | 354 +++++++++++++++
.../brooklyn/camp/brooklyn/EntitiesYamlTest.java | 91 +++-
...a => TestSensorAndEffectorInitializerBase.java} | 73 +++-
.../brooklyn/ValidationMissingTypeYamlTest.java | 9 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 1 +
.../catalog/CatalogYamlVersioningTest.java | 8 +-
.../brooklyn/catalog/GetFileContentsEffector.java | 12 +-
.../test/policy/failover/ElectPrimaryTest.java | 15 +-
.../brooklyn/core/catalog/CatalogPredicates.java | 4 +-
.../catalog/internal/BasicBrooklynCatalog.java | 486 ++++++++++++---------
.../core/catalog/internal/CatalogItemBuilder.java | 1 +
.../brooklyn/core/config/BasicConfigKey.java | 33 +-
.../config/internal/AbstractConfigMapImpl.java | 39 +-
.../config/internal/LazyContainerAndKeyValue.java | 19 +-
.../core/effector/AddChildrenEffector.java | 17 +-
.../apache/brooklyn/core/effector/AddEffector.java | 94 ++--
.../effector/AddEffectorInitializerAbstract.java | 71 +++
...va => AddEffectorInitializerAbstractProto.java} | 86 ++--
.../apache/brooklyn/core/effector/AddSensor.java | 87 +---
.../core/effector/AddSensorInitializer.java | 112 +++++
.../AddSensorInitializerAbstractProto.java | 51 +++
.../brooklyn/core/effector/CompositeEffector.java | 18 +-
.../brooklyn/core/effector/ProxyEffector.java | 12 +-
.../core/effector/http/HttpCommandEffector.java | 17 +-
.../core/effector/ssh/SshCommandEffector.java | 20 +-
.../brooklyn/core/entity/EntityInitializers.java | 159 ++++++-
.../OsgiBrooklynClassLoadingContext.java | 22 +-
.../objs/AbstractConfigurationSupportInternal.java | 2 +-
.../brooklyn/core/objs/BasicSpecParameter.java | 64 +--
.../resolve/jackson/AsPropertyIfAmbiguous.java | 162 +++++++
.../jackson/BeanWithTypePlanTransformer.java | 89 ++++
.../core/resolve/jackson/BeanWithTypeUtils.java | 119 +++++
.../jackson/BrooklynJacksonSerializationUtils.java | 168 +++++++
...BrooklynRegisteredTypeJacksonSerialization.java | 238 ++++++++++
.../core/resolve/jackson/WrappedValue.java | 83 ++++
.../jackson/WrappedValuesSerialization.java | 217 +++++++++
.../core/sensor/AbstractAddSensorFeed.java | 4 +-
.../brooklyn/core/sensor/DurationSinceSensor.java | 35 +-
.../brooklyn/core/sensor/MaxConcurrencySensor.java | 19 +-
.../apache/brooklyn/core/sensor/StaticSensor.java | 22 +-
.../core/sensor/function/FunctionSensor.java | 10 +-
.../core/sensor/http/HttpRequestSensor.java | 12 +-
.../core/sensor/password/CreatePasswordSensor.java | 28 +-
.../brooklyn/core/sensor/ssh/SshCommandSensor.java | 49 ++-
.../core/typereg/BasicBrooklynTypeRegistry.java | 34 +-
.../typereg/JavaClassNameTypePlanTransformer.java | 11 +-
.../brooklyn/enricher/stock/Transformer.java | 2 +-
.../group/SshCommandMembershipTrackingPolicy.java | 2 +-
.../brooklyn/util/core/config/ConfigBag.java | 42 +-
.../util/core/config/ResolvingConfigBag.java | 4 +-
.../core/flags/BrooklynTypeNameResolution.java | 266 +++++++++++
.../org/apache/brooklyn/util/core/task/Tasks.java | 188 +++++---
.../brooklyn/util/core/task/ValueResolver.java | 236 +++++-----
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 1 +
.../core/config/ConfigKeyDeprecationTest.java | 13 +-
.../MapListAndOtherStructuredConfigKeyTest.java | 28 +-
.../core/effector/CompositeEffectorTest.java | 9 +-
.../brooklyn/core/effector/ProxyEffectorTest.java | 6 +-
.../core/effector/SampleManyTasksEffector.java | 14 +-
.../effector/http/HttpCommandEffectorTest.java | 8 +-
.../brooklyn/core/entity/DynamicEntityTest.java | 14 +-
.../brooklyn/core/entity/EntityConfigTest.java | 102 ++++-
.../rebind/RebindHistoricSshCommandSensorTest.java | 14 +-
.../rebind/RebindManagerExceptionHandlerTest.java | 16 +-
.../BrooklynMiscJacksonSerializationTest.java | 56 +++
...klynRegisteredTypeJacksonSerializationTest.java | 95 ++++
.../resolve/jackson/LoggingSerializationTest.java | 56 +++
.../core/resolve/jackson/MapperTestFixture.java | 45 +-
.../resolve/jackson/PerverseSerializationTest.java | 147 +++++++
.../jackson/WrappedValuesSerializationTest.java | 121 +++++
.../core/test/BrooklynMgmtUnitTestSupport.java | 2 +
.../brooklyn/feed/ssh/SshFeedIntegrationTest.java | 7 +-
.../location/ssh/SshMachineLocationTest.java | 6 +-
.../core/flags/BrooklynTypeNameResolutionTest.java | 55 +++
.../jclouds/DefaultConnectivityResolver.java | 11 +-
.../templates/customize/TemplateOptionsOption.java | 2 +-
.../policy/failover/ElectPrimaryEffector.java | 19 +-
.../java/org/apache/brooklyn/cli/ItemLister.java | 4 +
.../brooklyn/entity/java/JmxAttributeSensor.java | 29 +-
.../core/sensor/windows/WinRmCommandSensor.java | 51 ++-
.../windows/WindowsPerformanceCounterSensors.java | 23 +-
.../brooklyn/feed/windows/WinRmFeedLiveTest.java | 7 +-
.../java/org/apache/brooklyn/test/Asserts.java | 9 +-
.../java/org/apache/brooklyn/util/guava/Maybe.java | 28 +-
.../org/apache/brooklyn/util/guava/TypeTokens.java | 2 +-
.../apache/brooklyn/util/javalang/Reflections.java | 3 +-
.../javalang/coerce/TypeCoercerExtensible.java | 10 +-
.../org/apache/brooklyn/util/text/Strings.java | 16 +-
104 files changed, 4561 insertions(+), 1204 deletions(-)
create mode 100644
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CustomTypeConfigYamlTest.java
create mode 100644
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CustomTypeInitializerYamlTest.java
rename
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/{TestSensorAndEffectorInitializer.java
=> TestSensorAndEffectorInitializerBase.java} (51%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/effector/AddEffectorInitializerAbstract.java
copy core/src/main/java/org/apache/brooklyn/core/effector/{AddEffector.java =>
AddEffectorInitializerAbstractProto.java} (73%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/effector/AddSensorInitializer.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/effector/AddSensorInitializerAbstractProto.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/AsPropertyIfAmbiguous.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/BeanWithTypePlanTransformer.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/BeanWithTypeUtils.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/BrooklynJacksonSerializationUtils.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/BrooklynRegisteredTypeJacksonSerialization.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/WrappedValue.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/resolve/jackson/WrappedValuesSerialization.java
create mode 100644
core/src/main/java/org/apache/brooklyn/util/core/flags/BrooklynTypeNameResolution.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/BrooklynMiscJacksonSerializationTest.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/BrooklynRegisteredTypeJacksonSerializationTest.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/LoggingSerializationTest.java
copy
rest/rest-api/src/test/java/org/apache/brooklyn/rest/util/RestApiTestUtils.java
=>
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/MapperTestFixture.java
(53%)
create mode 100644
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/PerverseSerializationTest.java
create mode 100644
core/src/test/java/org/apache/brooklyn/core/resolve/jackson/WrappedValuesSerializationTest.java
create mode 100644
core/src/test/java/org/apache/brooklyn/util/core/flags/BrooklynTypeNameResolutionTest.java
