Closes #173 BROOKLYN-286: merge config keys map values
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2edf7168 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2edf7168 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2edf7168 Branch: refs/heads/master Commit: 2edf7168d6204c4b724eea95e2f6999232303f52 Parents: 2276de0 6dad5de Author: Svetoslav Neykov <[email protected]> Authored: Mon Jun 6 17:45:44 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Mon Jun 6 17:45:44 2016 +0300 ---------------------------------------------------------------------- .../internal/AbstractBrooklynObjectSpec.java | 5 + .../camp/brooklyn/BrooklynCampConstants.java | 4 +- .../BrooklynComponentTemplateResolver.java | 105 +++- .../camp/brooklyn/AbstractYamlTest.java | 11 +- .../brooklyn/ConfigInheritanceYamlTest.java | 507 ++++++++++++++++++- .../ConfigLocationInheritanceYamlTest.java | 369 ++++++++++++++ .../camp/brooklyn/ConfigParametersYamlTest.java | 2 +- .../brooklyn/core/config/BasicConfigKey.java | 169 +++++-- .../apache/brooklyn/core/config/ConfigKeys.java | 8 +- .../brooklyn/core/config/MapConfigKey.java | 77 ++- .../internal/AbstractStructuredConfigKey.java | 2 +- .../core/entity/BrooklynConfigKeys.java | 11 +- .../core/entity/internal/EntityConfigMap.java | 129 +++-- .../entity/lifecycle/ServiceStateLogic.java | 4 +- .../core/location/AbstractLocation.java | 4 +- .../brooklyn/core/objs/BasicSpecParameter.java | 15 +- .../sensor/AttributeSensorAndConfigKey.java | 2 +- .../sensor/PortAttributeSensorAndConfigKey.java | 2 +- .../brooklyn/util/core/flags/FlagUtils.java | 31 +- .../brooklyn/core/config/ConfigKeysTest.java | 4 +- .../entity/ConfigEntityInheritanceTest.java | 4 +- .../util/core/internal/FlagUtilsTest.java | 96 +++- .../location/jclouds/JcloudsLocation.java | 31 +- .../location/jclouds/JcloudsLocationConfig.java | 6 + .../entity/software/base/SoftwareProcess.java | 54 +- .../brooklyn/config/ConfigInheritance.java | 43 +- .../org/apache/brooklyn/config/ConfigKey.java | 12 + .../util/collections/CollectionMerger.java | 236 +++++++++ .../util/collections/CollectionMergerTest.java | 409 +++++++++++++++ 29 files changed, 2186 insertions(+), 166 deletions(-) ----------------------------------------------------------------------
