diff options
| author | Andreas Eriksen <andreer@yahoo-inc.com> | 2017-10-19 08:45:20 +0200 |
|---|---|---|
| committer | Andreas Eriksen <andreer@yahoo-inc.com> | 2017-10-19 08:45:20 +0200 |
| commit | bc58143d369d7d75a3454d9bf748f0c3622c210e (patch) | |
| tree | 3d11f9e1c2b938bd2f599ff48c179ea632e24ad1 /node-repository | |
| parent | 684e34c171252820e84c4cc23de0e4b4944c4f6a (diff) | |
simplify
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index 7cef8f824d8..dc26303d804 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -241,7 +241,7 @@ public class NodeSerializer { // Remove when we no longer have "null" strings for this field in the node repo private Optional<String> removeQuotedNulls(Optional<String> value) { - return value.isPresent() && value.get().equals("null") ? Optional.empty() : value; + return value.filter(v -> !v.equals("null")); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java index 916d889fec5..62bfea21eff 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodePatcher.java @@ -172,7 +172,7 @@ public class NodePatcher { // Remove when we no longer have "null" strings for this field in the node repo private Optional<String> removeQuotedNulls(Optional<String> value) { - return value.isPresent() && value.get().equals("null") ? Optional.empty() : value; + return value.filter(v -> !v.equals("null")); } private boolean asBoolean(Inspector field) { |