diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-14 11:48:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-14 11:48:51 +0100 |
commit | cc37ff856d269aa2ac11c59db3d8435a4ed3fd3c (patch) | |
tree | de1ff13d21c23efa82b868fa5ec2a2a439e06b9b /config-model | |
parent | 830549997e15a0af070d630a0bf2b5eced5b57c2 (diff) | |
parent | 10cafb96566bc3080d71c72a7c894a9f70f09e8b (diff) |
Merge pull request #29652 from vespa-engine/hmusum/dont-handle-optional-presence-explicitly
equals() for Optional handles empty/non-empty comparison itself
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidator.java | 5 |
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(); } |