From 0a2a27f808beaa09cbb84c3709466bb700251c45 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Wed, 14 Mar 2018 15:10:50 +0100
Subject: Add @JsonIgnoreProperties where missing

---
 .../com/yahoo/vespa/orchestrator/restapi/wire/BatchOperationResult.java | 2 ++
 .../vespa/orchestrator/restapi/wire/HostStateChangeDenialReason.java    | 2 ++
 .../com/yahoo/vespa/orchestrator/restapi/wire/SlobrokEntryResponse.java | 2 ++
 .../com/yahoo/vespa/orchestrator/restapi/wire/UpdateHostResponse.java   | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'orchestrator-restapi/src')

diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/BatchOperationResult.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/BatchOperationResult.java
index 0e1d0306c4c..0236e51b52f 100644
--- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/BatchOperationResult.java
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/BatchOperationResult.java
@@ -2,10 +2,12 @@
 package com.yahoo.vespa.orchestrator.restapi.wire;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Optional;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class BatchOperationResult {
     private static final String FAILURE_REASON = "failure-reason";
 
diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/HostStateChangeDenialReason.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/HostStateChangeDenialReason.java
index 1df7ca2d16c..1b4269420f8 100644
--- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/HostStateChangeDenialReason.java
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/HostStateChangeDenialReason.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.orchestrator.restapi.wire;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Objects;
@@ -10,6 +11,7 @@ import java.util.Objects;
  * A reason to reject a host state change request
  * @author andreer
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class HostStateChangeDenialReason {
 
     public static final String FIELD_NAME_CONSTRAINT = "constraint";
diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/SlobrokEntryResponse.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/SlobrokEntryResponse.java
index 5efdd2581a9..b7e35c0b69d 100644
--- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/SlobrokEntryResponse.java
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/SlobrokEntryResponse.java
@@ -1,10 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.orchestrator.restapi.wire;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Objects;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class SlobrokEntryResponse {
     @JsonProperty("name")
     public final String name;
diff --git a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/UpdateHostResponse.java b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/UpdateHostResponse.java
index 4302a7d6d62..c773085b8d8 100644
--- a/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/UpdateHostResponse.java
+++ b/orchestrator-restapi/src/main/java/com/yahoo/vespa/orchestrator/restapi/wire/UpdateHostResponse.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.orchestrator.restapi.wire;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.annotation.Nullable;
@@ -10,6 +11,7 @@ import java.util.Objects;
 /*
  * @author andreer
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class UpdateHostResponse {
 
     public static final String FIELD_NAME_HOSTNAME = "hostname";
-- 
cgit v1.2.3