Repository: brooklyn-server Updated Branches: refs/heads/master 55df98536 -> 34016b66b
Revert @JsonInclude annotations to what it was in 0.12.0 for backward compatibility Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/81e609b0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/81e609b0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/81e609b0 Branch: refs/heads/master Commit: 81e609b061af6237740e01de3823a6b127700c1b Parents: 62fe7df Author: Thomas Bouron <[email protected]> Authored: Thu Nov 9 14:30:33 2017 +0000 Committer: Thomas Bouron <[email protected]> Committed: Thu Nov 9 14:30:33 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/rest/domain/ApplicationSpec.java | 1 - .../java/org/apache/brooklyn/rest/domain/ConfigSummary.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81e609b0/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApplicationSpec.java ---------------------------------------------------------------------- diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApplicationSpec.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApplicationSpec.java index 172f66f..2e9268b 100644 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApplicationSpec.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApplicationSpec.java @@ -90,7 +90,6 @@ public class ApplicationSpec implements HasName, Serializable { private final String type; @JsonInclude(Include.NON_NULL) private final Set<EntitySpec> entities; - @JsonInclude(Include.NON_NULL) private final Set<String> locations; @JsonInclude(Include.NON_EMPTY) private final Map<String, String> config; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/81e609b0/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java ---------------------------------------------------------------------- diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java index 77bf5fd..a252c54 100644 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java @@ -57,14 +57,14 @@ public class ConfigSummary implements HasName, Serializable { private final String label; @JsonInclude(Include.NON_NULL) private final Double priority; - @JsonInclude(Include.NON_EMPTY) + @JsonInclude(Include.NON_NULL) private final List<Map<String, String>> possibleValues; @JsonInclude(Include.NON_NULL) private final Boolean pinned; - @JsonInclude(Include.NON_EMPTY) + @JsonInclude(Include.NON_NULL) private final List<String> constraints; - @JsonInclude(Include.NON_EMPTY) + @JsonInclude(Include.NON_NULL) private final Map<String, URI> links; // json deserialization
