diff options
author | Bjorn Meland <bjormel@verizonmedia.com> | 2020-11-05 14:05:41 +0100 |
---|---|---|
committer | Bjorn Meland <bjormel@verizonmedia.com> | 2020-11-05 14:05:41 +0100 |
commit | f52db95ab8c851d38dc4fc737bcec337e67ccc01 (patch) | |
tree | 6f06d27fe90253ab033b82230e2c7bd7270ccd14 /controller-api | |
parent | f599b4836a8ef695cb9c6080ea8d719b3f282c2f (diff) |
Return empty map, not null from getReports()
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java index 2e5132fe17d..9bb2e51e575 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.noderepository; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -357,8 +358,9 @@ public class NodeRepositoryNode { this.wantedFirmwareCheck = wantedFirmwareCheck; } + @JsonIgnore public Map<String, JsonNode> getReports() { - return reports; + return reports == null ? Map.of() : reports; } public void setReports(Map<String, JsonNode> reports) { |