aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2023-12-14 11:24:30 +0100
committerHarald Musum <musum@yahooinc.com>2023-12-14 11:24:30 +0100
commit10cafb96566bc3080d71c72a7c894a9f70f09e8b (patch)
tree6fcf3132bb41c77fbe643e5767a0d90c557d08d9
parent1ad5ec5fa814a92fdbf98db14121197023f434f0 (diff)
equals() for Optional handles empty/non-empty comparison itself
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
index 15e9e526db2..7db11b24dd0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java
@@ -92,10 +92,7 @@ public class RestartOnDeployForOnnxModelChangesValidator implements ChangeValida
log.log(FINE, "Checking if model has changed (%s) -> (%s)".formatted(a, b));
if (a.estimatedCost() != b.estimatedCost()) return Optional.of("estimated cost");
if (a.hash() != b.hash()) return Optional.of("model hash");
- if (a.onnxModelOptions().isPresent() && b.onnxModelOptions().isEmpty()) return Optional.of("model option(s)");
- if (a.onnxModelOptions().isEmpty() && b.onnxModelOptions().isPresent()) return Optional.of("model option(s)");
- if (a.onnxModelOptions().isPresent() && ! a.onnxModelOptions().get().equals(b.onnxModelOptions().get()))
- return Optional.of("model option(s)");
+ if (! a.onnxModelOptions().equals(b.onnxModelOptions())) return Optional.of("model option(s)");
return Optional.empty();
}