diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-16 11:08:50 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-16 11:08:50 +0200 |
commit | 95eef9b4bc9e4607ab63f8a5e9bec6bcaaebbc2e (patch) | |
tree | e46e4a17d8474d365faee5cc39b214b6e9eac594 /config-model-api/src/main/java/com/yahoo | |
parent | 1cda0afa21ebc76ee244e748e068e6b90f46357d (diff) |
Improve API
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/ValidationOverrides.java | 8 |
1 files changed, 3 insertions, 5 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); } |