This closes #663
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/95d82bc7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/95d82bc7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/95d82bc7 Branch: refs/heads/master Commit: 95d82bc73978c14fa8863dee1522a3122acbd5fd Parents: b7a4d5e dbcc40a Author: Alex Heneveld <[email protected]> Authored: Fri May 29 11:31:43 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri May 29 11:31:43 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/basic/EntityInternal.java | 3 +- .../java/brooklyn/rest/api/ApplicationApi.java | 7 +- usage/rest-client/pom.xml | 37 ++-------- .../java/brooklyn/rest/client/BrooklynApi.java | 58 ++++++++++----- .../util/http/BuiltResponsePreservingError.java | 76 ++++++++++++++++++++ .../ApplicationResourceIntegrationTest.java | 19 ++--- .../rest/client/BrooklynApiRestClientTest.java | 66 ++++++++++++----- .../rest/resources/ApplicationResource.java | 5 -- .../rest/resources/CatalogResource.java | 1 + .../rest/resources/EntityConfigResource.java | 14 ++-- .../rest/resources/PolicyConfigResource.java | 2 +- .../provider/DelegatingSecurityProvider.java | 10 ++- .../rest/transform/LocationTransformer.java | 11 +-- .../rest/util/BrooklynRestResourceUtils.java | 5 +- .../rest/util/json/MultimapSerializer.java | 4 +- .../BrooklynRestApiLauncherTestFixture.java | 1 - .../brooklyn/rest/domain/ApplicationTest.java | 2 +- .../rest/domain/LocationSummaryTest.java | 1 + .../ApplicationResourceIntegrationTest.java | 1 - .../resources/EntityConfigResourceTest.java | 4 +- .../rest/resources/LocationResourceTest.java | 6 +- .../rest/resources/ServerResourceTest.java | 10 ++- .../rest/testing/mocks/EverythingGroupImpl.java | 2 +- .../testing/mocks/NameMatcherGroupImpl.java | 2 +- .../json/BrooklynJacksonSerializerTest.java | 10 +-- 25 files changed, 233 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
