This closes #821
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c177a7c1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c177a7c1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c177a7c1 Branch: refs/heads/master Commit: c177a7c1b4a45fae773d85ebf1e8af60d71e3cbd Parents: ff5ba37 d5d72cb Author: Alex Heneveld <[email protected]> Authored: Tue Oct 3 15:17:12 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Oct 3 15:17:12 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Entity.java | 3 + .../org/apache/brooklyn/api/sensor/Feed.java | 2 +- .../brooklyn/core/entity/AbstractEntity.java | 34 ++- .../brooklyn/core/entity/EntityAdjuncts.java | 28 +- .../brooklyn/core/entity/EntityInternal.java | 16 +- .../apache/brooklyn/core/feed/AbstractFeed.java | 2 +- .../apache/brooklyn/core/policy/Policies.java | 66 +---- .../core/entity/EntityConcurrencyTest.java | 2 +- .../launcher/CleanOrphanedAdjunctsTest.java | 6 +- .../apache/brooklyn/rest/api/AdjunctApi.java | 237 ++++++++++++++++ .../apache/brooklyn/rest/api/CatalogApi.java | 34 +-- .../brooklyn/rest/api/EntityConfigApi.java | 10 +- .../org/apache/brooklyn/rest/api/PolicyApi.java | 16 +- .../brooklyn/rest/api/PolicyConfigApi.java | 35 ++- .../brooklyn/rest/domain/AdjunctDetail.java | 72 +++++ .../brooklyn/rest/domain/AdjunctSummary.java | 148 ++++++++++ .../brooklyn/rest/domain/ApplicationSpec.java | 12 +- .../rest/domain/CatalogEnricherSummary.java | 4 + .../rest/domain/CatalogEntitySummary.java | 4 + .../rest/domain/CatalogItemSummary.java | 4 + .../rest/domain/CatalogLocationSummary.java | 4 + .../rest/domain/CatalogPolicySummary.java | 4 + .../brooklyn/rest/domain/EffectorSummary.java | 9 +- .../brooklyn/rest/domain/EntityDetail.java | 14 +- .../brooklyn/rest/domain/EntitySummary.java | 11 +- .../rest/domain/PolicyConfigSummary.java | 2 +- .../brooklyn/rest/domain/PolicySummary.java | 83 +----- .../rest/domain/ScriptExecutionSummary.java | 11 +- .../brooklyn/rest/domain/SensorSummary.java | 7 +- .../org/apache/brooklyn/rest/domain/Status.java | 7 +- .../apache/brooklyn/rest/BrooklynRestApi.java | 2 + .../rest/resources/AdjunctResource.java | 273 +++++++++++++++++++ .../rest/resources/CatalogResource.java | 21 +- .../rest/resources/EntityConfigResource.java | 10 +- .../rest/resources/PolicyConfigResource.java | 1 + .../brooklyn/rest/resources/PolicyResource.java | 2 +- .../rest/transform/AdjunctTransformer.java | 96 +++++++ .../rest/transform/CatalogTransformer.java | 30 +- .../rest/transform/ConfigTransformer.java | 175 ++++++++++++ .../rest/transform/EntityTransformer.java | 107 ++++---- .../rest/transform/PolicyTransformer.java | 3 + .../rest/transform/SensorTransformer.java | 21 +- .../rest/transform/TypeTransformer.java | 10 +- .../rest/util/BrooklynRestResourceUtils.java | 44 +++ .../rest/resources/AdjunctResourceTest.java | 198 ++++++++++++++ .../rest/testing/BrooklynRestResourceTest.java | 2 +- .../brooklyn/cli/lister/ItemDescriptors.java | 26 +- 47 files changed, 1566 insertions(+), 342 deletions(-) ----------------------------------------------------------------------
