diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-03-07 08:32:47 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-03-07 08:32:47 +0100 |
commit | 08c4e99ea0b874ea7f668ca4aa06867a14ab9f90 (patch) | |
tree | c64975bcf714f23a389d8062d8b08755cdf0f80d | |
parent | 1b9936ac1ff12d2ec7c15b6b970513198156abe9 (diff) |
Ignore unknown properties
3 files changed, 6 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetAclResponse.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetAclResponse.java index b7762cf6aa9..7000170ca4c 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetAclResponse.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetAclResponse.java @@ -29,6 +29,7 @@ public class GetAclResponse { this.trustedNetworks = trustedNetworks == null ? Collections.emptyList() : trustedNetworks; } + @JsonIgnoreProperties(ignoreUnknown = true) public static class Node { @JsonProperty("hostname") @@ -49,6 +50,7 @@ public class GetAclResponse { } } + @JsonIgnoreProperties(ignoreUnknown = true) public static class Network { @JsonProperty("network") diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetNodesResponse.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetNodesResponse.java index 783ce89ad5c..d1eda3c2d45 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetNodesResponse.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/GetNodesResponse.java @@ -119,7 +119,7 @@ public class GetNodesResponse { + " }"; } - + @JsonIgnoreProperties(ignoreUnknown = true) public static class Owner { public final String tenant; public final String application; @@ -143,6 +143,7 @@ public class GetNodesResponse { } } + @JsonIgnoreProperties(ignoreUnknown = true) public static class Membership { public final String clusterType; public final String clusterId; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/UpdateNodeAttributesRequestBody.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/UpdateNodeAttributesRequestBody.java index 28605bc3a8d..305d7d386de 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/UpdateNodeAttributesRequestBody.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/UpdateNodeAttributesRequestBody.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAttributes; @@ -16,6 +17,7 @@ import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAttributes; * @author bakksjo */ @JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) public class UpdateNodeAttributesRequestBody { public Long currentRestartGeneration; public Long currentRebootGeneration; |