From 70e852985d784c8398b95acd475cd0e1ef2e570c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 7 Jun 2021 11:13:07 +0200
Subject: Minor cleanup

---
 .../com/yahoo/config/application/api/ApplicationPackage.java   | 10 +++++-----
 .../com/yahoo/config/application/api/ValidationOverrides.java  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'config-model-api')

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index bc7dbbe2069..2aefc985f4b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
 import com.yahoo.component.Version;
@@ -87,14 +87,14 @@ public interface ApplicationPackage {
     /**
      * Contents of services.xml. Caller must close reader after use.
      *
-     * @return a Reader, or null if no services.xml/vespa-services.xml present
+     * @return a Reader, or null if no services.xml present
      */
     Reader getServices();
 
     /**
      * Contents of hosts.xml. Caller must close reader after use.
      *
-     * @return a Reader, or null if no hosts.xml/vespa-hosts.xml present
+     * @return a Reader, or null if no hosts.xml present
      */
     Reader getHosts();
 
@@ -146,10 +146,11 @@ public interface ApplicationPackage {
 
     /** Returns the major version this application is valid for, or empty if it is valid for all versions */
     default Optional<Integer> getMajorVersion() {
-        if ( ! getDeployment().isPresent()) return Optional.empty();
+        if (getDeployment().isEmpty()) return Optional.empty();
 
         Element deployElement = XML.getDocument(getDeployment().get()).getDocumentElement();
         if (deployElement == null) return Optional.empty();
+
         String majorVersionString = deployElement.getAttribute("major-version");
         if (majorVersionString == null || majorVersionString.isEmpty())
             return Optional.empty();
@@ -181,7 +182,6 @@ public interface ApplicationPackage {
     /** Returns handle for the file containing client certificate authorities */
     default ApplicationFile getClientSecurityFile() { return getFile(SECURITY_DIR.append("clients.pem")); }
 
-    //For generating error messages
     String getHostSource();
     String getServicesSource();
 
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 8845431c71b..ea27b7f70d8 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
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
 import com.google.common.collect.ImmutableList;
@@ -67,7 +67,7 @@ public class ValidationOverrides {
 
     public boolean allows(String validationIdString, Instant now) {
         Optional<ValidationId> validationId = ValidationId.from(validationIdString);
-        if ( ! validationId.isPresent()) return false; // unknown id -> not allowed
+        if (validationId.isEmpty()) return false; // unknown id -> not allowed
         return allows(validationId.get(), now);
     }
 
@@ -125,8 +125,8 @@ public class ValidationOverrides {
                         .atStartOfDay().atZone(ZoneOffset.UTC).toInstant()
                         .plus(Duration.ofDays(1)); // Make the override valid *on* the "until" date
                 Optional<ValidationId> validationId = ValidationId.from(XML.getValue(allow));
-                if (validationId.isPresent()) // skip unknown ids as they may be valid for other model versions
-                    overrides.add(new ValidationOverrides.Allow(validationId.get(), until));
+                // skip unknown ids as they may be valid for other model versions
+                validationId.ifPresent(id -> overrides.add(new Allow(id, until)));
             }
             return new ValidationOverrides(overrides, xmlForm);
         }
-- 
cgit v1.2.3