You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/12/01 12:44:41 UTC

[3/3] brooklyn-server git commit: Closes #472

Closes #472

Revert 5377839: Replace MultimapSerializer with jackson-datatype-guava

Reverts https://github.com/apache/brooklyn-server/pull/339/commits/53778394ac9eee9d62fca9535f3c49b8f54f8adf in order to preserve the output format of `/v1/applications/{applicationId}/descendants/sensor/{sensor}`
The new library uses toString() rather than object representation used for this call.

Added simple test for retrieving map sensor.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/50826cbc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/50826cbc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/50826cbc

Branch: refs/heads/master
Commit: 50826cbc2081fbbb5d511bb922cfefd70f0f2aae
Parents: d1ef42a 6d710b7
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Dec 1 14:44:26 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Dec 1 14:44:26 2016 +0200

----------------------------------------------------------------------
 core/pom.xml                                    |  4 --
 .../core/json/BrooklynObjectsJsonMapper.java    |  6 +-
 .../util/core/json/MultimapSerializer.java      | 64 ++++++++++++++++++++
 karaf/features/src/main/feature/feature.xml     |  1 -
 parent/pom.xml                                  |  5 --
 .../json/BrooklynJacksonSerializerTest.java     |  9 +++
 .../BrooklynRestApiLauncherTestFixture.java     | 42 ++++++++++++-
 .../AbstractRestApiEntitlementsTest.java        | 25 --------
 .../brooklyn/rest/entity/SensorsApiTest.java    | 64 ++++++++++++++++++++
 9 files changed, 181 insertions(+), 39 deletions(-)
----------------------------------------------------------------------