This closes #424 BROOKLYN-383: fix json serialisation of tasks
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5b65fadc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5b65fadc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5b65fadc Branch: refs/heads/master Commit: 5b65fadc9dc2b4e8ca3e524e540872527af4fb1b Parents: 8735a0a a36ecc8 Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Wed Nov 16 12:29:53 2016 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Wed Nov 16 12:29:53 2016 +0000 ---------------------------------------------------------------------- .../apache/brooklyn/core/feed/AbstractFeed.java | 1 + .../core/objs/AbstractEntityAdjunct.java | 4 + .../util/core/json/BidiSerialization.java | 152 +++++++++++++++++-- .../core/json/BrooklynObjectsJsonMapper.java | 5 + .../mgmt/persist/XmlMementoSerializerTest.java | 36 ++++- .../brooklyn/core/test/entity/TestEntity.java | 5 + .../core/test/entity/TestEntityImpl.java | 9 ++ .../rest/resources/SensorResourceTest.java | 116 +++++++++++++- .../system_service/SystemServiceEnricher.java | 5 - .../base/ShellEnvironmentSerializerTest.java | 6 +- .../org/apache/brooklyn/test/LogWatcher.java | 4 + 11 files changed, 316 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b65fadc/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5b65fadc/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java ---------------------------------------------------------------------- diff --cc core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java index a17bce3,50d14a8..33f2114 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java @@@ -32,8 -32,9 +32,10 @@@ import org.apache.brooklyn.api.location import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.feed.ConfigToAttributes; import org.apache.brooklyn.util.collections.MutableMap; + import org.apache.brooklyn.util.time.Duration; + import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
