diff options
3 files changed, 8 insertions, 10 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java index 0d35967ff8a..11f9add6b25 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java @@ -71,16 +71,14 @@ public class ValidationOverrides { /** * Returns a ValidationOverrides instance with the content of the given Reader. - * An empty ValidationOverrides is returned if the argument is empty. * - * @param reader the reader which optionally contains a validation-overrides XML structure + * @param reader the reader containing a validation-overrides XML structure * @return a ValidationOverrides from the argument * @throws IllegalArgumentException if the validation-allows.xml file exists but is invalid */ - public static ValidationOverrides fromXml(Optional<Reader> reader) { + public static ValidationOverrides fromXml(Reader reader) { try { - if ( ! reader.isPresent()) return ValidationOverrides.empty; - return fromXml(IOUtils.readAll(reader.get())); + return fromXml(IOUtils.readAll(reader)); } catch (IOException e) { throw new IllegalArgumentException("Could not read deployment spec", e); } diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java index 75e1fe72e4b..c17b9a6f220 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java @@ -27,7 +27,7 @@ public class ValidationOverrideTest { "</validation-overrides>"; { - ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + ValidationOverrides overrides = ValidationOverrides.fromXml(new StringReader(validationOverrides)); Instant now = ManualClock.at("2000-01-01T23:59:00"); assertOverridden("indexing-change", overrides, now); assertOverridden("indexing-mode-change", overrides, now); @@ -37,7 +37,7 @@ public class ValidationOverrideTest { } { - ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + ValidationOverrides overrides = ValidationOverrides.fromXml(new StringReader(validationOverrides)); Instant now = ManualClock.at("2000-01-02T00:00:00"); assertNotOverridden("indexing-change", overrides, now); assertOverridden("indexing-mode-change", overrides, now); @@ -45,7 +45,7 @@ public class ValidationOverrideTest { } { - ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + ValidationOverrides overrides = ValidationOverrides.fromXml(new StringReader(validationOverrides)); Instant now = ManualClock.at("2000-01-04T00:00:00"); assertNotOverridden("indexing-change", overrides, now); assertNotOverridden("indexing-mode-change", overrides, now); @@ -62,7 +62,7 @@ public class ValidationOverrideTest { "</validation-overrides>"; try { - ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + ValidationOverrides overrides = ValidationOverrides.fromXml(new StringReader(validationOverrides)); Instant now = ManualClock.at("2000-01-01T23:59:00"); overrides.allows("indexing-change", now); Assert.fail("Expected validation interval override validation validation failure"); diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java index 95bce32f802..25d45dee234 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java @@ -99,7 +99,7 @@ public class DeployState implements ConfigDefinitionStore { this.zone = zone; this.queryProfiles = queryProfiles; // TODO: Remove this by seeing how pagetemplates are propagated this.semanticRules = semanticRules; // TODO: Remove this by seeing how pagetemplates are propagated - this.validationOverrides = ValidationOverrides.fromXml(applicationPackage.getValidationOverrides()); + this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty); this.wantedNodeVespaVersion = wantedNodeVespaVersion; this.now = now; } |