Repository: incubator-brooklyn Updated Branches: refs/heads/master c43a619bf -> 4338a8f16
REST api domain objects Serializable - Makes everything in brooklyn.rest.domain.* serialisable - Useful for users of brooklyn.rest.client.BrooklynApi, where they use these Java objects. Serialisable is not necessary, but for subsequent usage (e.g. in a mule flow) then it is useful if they are. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1bb09788 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1bb09788 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1bb09788 Branch: refs/heads/master Commit: 1bb097886c6c72db3ed5310d398d7c1d8068eda1 Parents: 6153b0a Author: Aled Sage <[email protected]> Authored: Sun Apr 12 19:33:28 2015 -0500 Committer: Aled Sage <[email protected]> Committed: Sun Apr 12 19:33:28 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/brooklyn/rest/domain/AccessSummary.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/ApiError.java | 6 +++++- .../src/main/java/brooklyn/rest/domain/ApplicationSpec.java | 5 ++++- .../main/java/brooklyn/rest/domain/ApplicationSummary.java | 5 ++++- .../java/brooklyn/rest/domain/CatalogEntitySummary.java | 2 ++ .../main/java/brooklyn/rest/domain/CatalogItemSummary.java | 5 ++++- .../java/brooklyn/rest/domain/CatalogPolicySummary.java | 2 ++ .../src/main/java/brooklyn/rest/domain/ConfigSummary.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/EffectorSummary.java | 9 +++++++-- .../main/java/brooklyn/rest/domain/EntityConfigSummary.java | 2 ++ .../src/main/java/brooklyn/rest/domain/EntitySpec.java | 7 ++++++- .../src/main/java/brooklyn/rest/domain/EntitySummary.java | 2 ++ .../java/brooklyn/rest/domain/HighAvailabilitySummary.java | 9 +++++++-- .../main/java/brooklyn/rest/domain/LinkWithMetadata.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/LocationSpec.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/LocationSummary.java | 2 ++ .../main/java/brooklyn/rest/domain/PolicyConfigSummary.java | 2 ++ .../src/main/java/brooklyn/rest/domain/PolicySummary.java | 5 ++++- .../java/brooklyn/rest/domain/ScriptExecutionSummary.java | 6 +++++- .../src/main/java/brooklyn/rest/domain/SensorSummary.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/TaskSummary.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/UsageStatistic.java | 6 +++++- .../src/main/java/brooklyn/rest/domain/UsageStatistics.java | 5 ++++- .../src/main/java/brooklyn/rest/domain/VersionSummary.java | 6 +++++- 24 files changed, 96 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/AccessSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/AccessSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/AccessSummary.java index 68cc1b8..9456a23 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/AccessSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/AccessSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -28,8 +29,10 @@ import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @Beta -public class AccessSummary { +public class AccessSummary implements Serializable { + private static final long serialVersionUID = 5097292906225042890L; + private final boolean locationProvisioningAllowed; private final Map<String, URI> links; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/ApiError.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApiError.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApiError.java index 96b9e27..83baa8f 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApiError.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApiError.java @@ -20,6 +20,8 @@ package brooklyn.rest.domain; import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; + import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -34,7 +36,9 @@ import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Throwables; -public class ApiError { +public class ApiError implements Serializable { + + private static final long serialVersionUID = -8244515572813244686L; public static Builder builder() { return new Builder(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSpec.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSpec.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSpec.java index f85468f..761f365 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSpec.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSpec.java @@ -20,6 +20,7 @@ package brooklyn.rest.domain; import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; import java.util.Collection; import java.util.Collections; import java.util.Map; @@ -32,7 +33,9 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -public class ApplicationSpec implements HasName { +public class ApplicationSpec implements HasName, Serializable { + + private static final long serialVersionUID = -7090404504233835343L; public static Builder builder() { return new Builder(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSummary.java index fa06b82..8370fee 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/ApplicationSummary.java @@ -20,6 +20,7 @@ package brooklyn.rest.domain; import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -27,7 +28,9 @@ import org.codehaus.jackson.annotate.JsonProperty; import com.google.common.collect.ImmutableMap; -public class ApplicationSummary implements HasId { +public class ApplicationSummary implements HasId, Serializable { + + private static final long serialVersionUID = -247411021540729088L; private final static Map<Status, Status> validTransitions = ImmutableMap.<Status, Status>builder() http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java index d383365..c08e82a 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogEntitySummary.java @@ -26,6 +26,8 @@ import org.codehaus.jackson.annotate.JsonProperty; public class CatalogEntitySummary extends CatalogItemSummary { + private static final long serialVersionUID = 1063908984191424539L; + private final Set<EntityConfigSummary> config; private final Set<SensorSummary> sensors; private final Set<EffectorSummary> effectors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java index 570043a..db979e2 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogItemSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -31,8 +32,10 @@ import com.google.common.collect.ImmutableMap; /** variant of Catalog*ItemDto objects for JS/JSON serialization; * see also, subclasses */ -public class CatalogItemSummary implements HasId, HasName { +public class CatalogItemSummary implements HasId, HasName, Serializable { + private static final long serialVersionUID = -823483595879417681L; + private final String id; private final String symbolicName; private final String version; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java index daef120..f30006a 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/CatalogPolicySummary.java @@ -28,6 +28,8 @@ import com.google.common.collect.ImmutableSet; public class CatalogPolicySummary extends CatalogItemSummary { + private static final long serialVersionUID = -588856488327394445L; + private final Set<PolicyConfigSummary> config; public CatalogPolicySummary( http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/ConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/ConfigSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/ConfigSummary.java index 2c02c70..676525c 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/ConfigSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/ConfigSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Arrays; import java.util.List; @@ -36,8 +37,10 @@ import com.google.common.base.Function; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; -public abstract class ConfigSummary implements HasName { +public abstract class ConfigSummary implements HasName, Serializable { + private static final long serialVersionUID = -2831796487073496730L; + private final String name; private final String type; @JsonSerialize(include = Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/EffectorSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/EffectorSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/EffectorSummary.java index fcc1d39..d7a9c27 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/EffectorSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/EffectorSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; import java.util.Set; @@ -29,9 +30,13 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; -public class EffectorSummary implements HasName { +public class EffectorSummary implements HasName, Serializable { - public static class ParameterSummary<T> implements HasName { + private static final long serialVersionUID = 8103535211378449509L; + + public static class ParameterSummary<T> implements HasName, Serializable { + private static final long serialVersionUID = -6393686096290306153L; + private final String name; private final String type; @JsonSerialize(include = Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java index 367ff5d..cadbf0a 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntityConfigSummary.java @@ -30,6 +30,8 @@ import java.util.Map; public class EntityConfigSummary extends ConfigSummary { + private static final long serialVersionUID = -1336134336883426030L; + @JsonSerialize(include = Inclusion.NON_NULL) private final Map<String, URI> links; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySpec.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySpec.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySpec.java index f90d896..93c104b 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySpec.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySpec.java @@ -19,14 +19,19 @@ package brooklyn.rest.domain; import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.collect.ImmutableMap; + import org.codehaus.jackson.annotate.JsonProperty; +import java.io.Serializable; import java.util.Collections; import java.util.Map; -public class EntitySpec implements HasName { +public class EntitySpec implements HasName, Serializable { + private static final long serialVersionUID = -3882575609132757188L; + private final String name; private final String type; private final Map<String, String> config; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySummary.java index 5efb03d..2ad5457 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/EntitySummary.java @@ -30,6 +30,8 @@ import java.util.Map; public class EntitySummary implements HasId, HasName, Serializable { + private static final long serialVersionUID = 100490507982229165L; + private final String id; private final String name; private final String type; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/HighAvailabilitySummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/HighAvailabilitySummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/HighAvailabilitySummary.java index 915f80e..3d127c5 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/HighAvailabilitySummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/HighAvailabilitySummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -26,9 +27,13 @@ import org.codehaus.jackson.annotate.JsonProperty; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; -public class HighAvailabilitySummary { +public class HighAvailabilitySummary implements Serializable { - public static class HaNodeSummary { + private static final long serialVersionUID = -317333127094471223L; + + public static class HaNodeSummary implements Serializable { + private static final long serialVersionUID = 9205960988226816539L; + private final String nodeId; private final URI nodeUri; private final String status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/LinkWithMetadata.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/LinkWithMetadata.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/LinkWithMetadata.java index cf828b8..253da9a 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/LinkWithMetadata.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/LinkWithMetadata.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.util.Map; import javax.annotation.Nullable; @@ -28,9 +29,11 @@ import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; @Beta -public class LinkWithMetadata { +public class LinkWithMetadata implements Serializable { // TODO remove 'metadata' and promote its contents to be top-level fields; then unmark as Beta + + private static final long serialVersionUID = 3146368899471495143L; private final String link; private final Map<String,Object> metadata; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSpec.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSpec.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSpec.java index d4a9c1a..862b34d 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSpec.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSpec.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.util.Collections; import java.util.Map; @@ -32,8 +33,10 @@ import com.google.common.collect.ImmutableMap; // FIXME change name, due to confusion with brooklyn.location.LocationSpec <- no need, as we can kill the class instead soon! /** @deprecated since 0.7.0 location spec objects will not be used from the client, instead pass yaml location spec strings */ -public class LocationSpec implements HasName, HasConfig { +public class LocationSpec implements HasName, HasConfig, Serializable { + private static final long serialVersionUID = -1562824224808185255L; + @JsonSerialize(include = Inclusion.NON_NULL) private final String name; @JsonSerialize(include = Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSummary.java index 64300b3..f975211 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/LocationSummary.java @@ -34,6 +34,8 @@ import com.google.common.collect.ImmutableMap; public class LocationSummary extends LocationSpec implements HasName, HasId { + private static final long serialVersionUID = -4559153719273573670L; + private final String id; /** only intended for instantiated Locations, not definitions */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java index fe70a61..b59ebea 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicyConfigSummary.java @@ -29,6 +29,8 @@ import com.google.common.collect.ImmutableMap; public class PolicyConfigSummary extends ConfigSummary { + private static final long serialVersionUID = 4339330833863794513L; + @JsonSerialize(include = Inclusion.NON_NULL) private final Map<String, URI> links; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicySummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicySummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicySummary.java index 97fa7ff..8398a4d 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicySummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/PolicySummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -27,8 +28,10 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import com.google.common.collect.ImmutableMap; -public class PolicySummary implements HasName, HasId { +public class PolicySummary implements HasName, HasId, Serializable { + private static final long serialVersionUID = -5086680835225136768L; + private final String id; private final String name; @JsonSerialize(include = Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java index 01d7c09..d7f0c03 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/ScriptExecutionSummary.java @@ -18,12 +18,16 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; + import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; -public class ScriptExecutionSummary { +public class ScriptExecutionSummary implements Serializable { + private static final long serialVersionUID = -7707936602991185960L; + @JsonSerialize(include = Inclusion.NON_NULL) private final Object result; @JsonSerialize(include = Inclusion.NON_EMPTY) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/SensorSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/SensorSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/SensorSummary.java index 7af9e0b..ad552ad 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/SensorSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/SensorSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -27,8 +28,10 @@ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; import com.google.common.collect.ImmutableMap; -public class SensorSummary implements HasName { +public class SensorSummary implements HasName, Serializable { + private static final long serialVersionUID = 1154308408351165426L; + private final String name; private final String type; @JsonSerialize(include = Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/TaskSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/TaskSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/TaskSummary.java index b83140a..f6ffeaf 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/TaskSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/TaskSummary.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.ArrayList; import java.util.Collection; @@ -35,8 +36,10 @@ import brooklyn.util.collections.Jsonya; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -public class TaskSummary implements HasId { +public class TaskSummary implements HasId, Serializable { + private static final long serialVersionUID = 4637850742127078158L; + private final String id; private final String displayName; private final String entityId; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistic.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistic.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistic.java index 1292f96..08425db 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistic.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistic.java @@ -23,6 +23,7 @@ import org.codehaus.jackson.annotate.JsonProperty; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; +import java.io.Serializable; import java.net.URI; import java.util.Map; @@ -31,7 +32,10 @@ import static com.google.common.base.Preconditions.checkNotNull; /** * @author Adam Lowe */ -public class UsageStatistic implements HasId { +public class UsageStatistic implements HasId, Serializable { + + private static final long serialVersionUID = 5701414937003064442L; + private final Status status; private final String id; private final String applicationId; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistics.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistics.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistics.java index e654165..fe985b1 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistics.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/UsageStatistics.java @@ -18,6 +18,7 @@ */ package brooklyn.rest.domain; +import java.io.Serializable; import java.net.URI; import java.util.List; import java.util.Map; @@ -31,8 +32,10 @@ import com.google.common.collect.ImmutableMap; /** * @author Aled Sage */ -public class UsageStatistics { +public class UsageStatistics implements Serializable { + private static final long serialVersionUID = -1842301852728290967L; + // TODO populate links with /apps endpoint to link to /usage/applications/{id}, to make it more // RESTy http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1bb09788/usage/rest-api/src/main/java/brooklyn/rest/domain/VersionSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/VersionSummary.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/VersionSummary.java index 9bcbaea..7b1d6e0 100644 --- a/usage/rest-api/src/main/java/brooklyn/rest/domain/VersionSummary.java +++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/VersionSummary.java @@ -20,13 +20,17 @@ package brooklyn.rest.domain; import static com.google.common.base.Preconditions.checkNotNull; +import java.io.Serializable; + import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.codehaus.jackson.annotate.JsonProperty; -public class VersionSummary { +public class VersionSummary implements Serializable { + private static final long serialVersionUID = 7275038546963638540L; + private final String version; private final String buildSha1; private final String buildBranch;
