LogLevel.WARNING -> Level.WARNING

13 files changed, 19 insertions, 19 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
index a1b97dad56a..7e0fec4ba66 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificateManager.java
@@ -251,10 +251,10 @@ public class EndpointCertificateManager {
                 // Normally because the cert is in the process of being provisioned - this will cause a retry in InternalStepRunner
                 throw new EndpointCertificateException(EndpointCertificateException.Type.CERT_NOT_AVAILABLE, "Certificate not found in secret store");
             } catch (EndpointCertificateException e) {
-                log.log(LogLevel.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
+                log.log(Level.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
                 throw e;
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
+                log.log(Level.WARNING, "Certificate validation failure for " + instance.id().serializedForm(), e);
                 throw new EndpointCertificateException(EndpointCertificateException.Type.VERIFICATION_FAILURE, "Certificate validation failure for app " + instance.id().serializedForm(), e);
             }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 56d3b928b8f..e2fb74ec0b4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -69,7 +69,7 @@ public class DeploymentTrigger {
 
     public void notifyOfSubmission(TenantAndApplicationId id, ApplicationVersion version, long projectId) {
         if (applications().getApplication(id).isEmpty()) {
-            log.log(LogLevel.WARNING, "Ignoring submission from project '" + projectId +
+            log.log(Level.WARNING, "Ignoring submission from project '" + projectId +
                                       "': Unknown application '" + id + "'");
             return;
         }
@@ -117,7 +117,7 @@ public class DeploymentTrigger {
      */
     public void notifyOfCompletion(ApplicationId id) {
         if (applications().getInstance(id).isEmpty()) {
-            log.log(LogLevel.WARNING, "Ignoring completion of job of unknown application '" + id + "'");
+            log.log(Level.WARNING, "Ignoring completion of job of unknown application '" + id + "'");
             return;
         }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
index 6f60106c79e..855cbdb5337 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceForwarder.java
@@ -74,7 +74,7 @@ public class NameServiceForwarder {
             NameServiceQueue queue = db.readNameServiceQueue();
             var queued = queue.requests().size();
             if (queued >= maxQueuedRequests) {
-                log.log(LogLevel.WARNING, "Queue is at capacity (size: " + queued + "), dropping older " +
+                log.log(Level.WARNING, "Queue is at capacity (size: " + queued + "), dropping older " +
                                           "requests. This likely means that the name service is not successfully " +
                                           "executing requests");
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
index aebf4a61966..ee5d50414c1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueue.java
@@ -78,7 +78,7 @@ public class NameServiceQueue {
                 request.dispatchTo(nameService);
                 queue.requests.poll();
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to execute " + request + ": " + e.getMessage() +
+                log.log(Level.WARNING, "Failed to execute " + request + ": " + e.getMessage() +
                                           ", request will be retried");
             }
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
index 8346fe7a0f9..12b52d1bf2f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContactInformationMaintainer.java
@@ -55,7 +55,7 @@ public class ContactInformationMaintainer extends Maintainer {
                         throw new IllegalArgumentException("Unexpected tenant type '" + tenant.type() + "'.");
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, "Failed to update contact information for " + tenant + ": " +
+                log.log(Level.WARNING, "Failed to update contact information for " + tenant + ": " +
                                           Exceptions.toMessageString(e) + ". Retrying in " +
                                           maintenanceInterval());
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index 9843d808564..a4078f7e028 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
@@ -80,7 +80,7 @@ public class DeploymentMetricsMaintainer extends Maintainer {
         try {
             pool.awaitTermination(30, TimeUnit.MINUTES);
             if (lastException.get() != null) {
-                log.log(LogLevel.WARNING,
+                log.log(Level.WARNING,
                         String.format("Failed to gather metrics for %d/%d applications. Retrying in %s. Last error: %s",
                                       failures.get(),
                                       attempts.get(),
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
index d78091b5116..e8391b8aded 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java
@@ -86,7 +86,7 @@ public class JobRunner extends Maintainer {
                         .ifPresent(run -> controller().applications().deploymentTrigger().notifyOfCompletion(id.application()));
         }
         catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception finishing " + id, e);
+            log.log(Level.WARNING, "Exception finishing " + id, e);
         }
     }
 
@@ -118,7 +118,7 @@ public class JobRunner extends Maintainer {
             // Something else is already advancing this step, or a prerequisite -- try again later!
         }
         catch (RuntimeException e) {
-            log.log(LogLevel.WARNING, "Exception attempting to advance " + step + " of " + id, e);
+            log.log(Level.WARNING, "Exception attempting to advance " + step + " of " + id, e);
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
index e08ed6a6178..4b4d2c8698d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsVersionStatusUpdater.java
@@ -23,7 +23,7 @@ public class OsVersionStatusUpdater extends Maintainer {
             OsVersionStatus newStatus = OsVersionStatus.compute(controller());
             controller().updateOsVersionStatus(newStatus);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
+            log.log(Level.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
                                       ". Retrying in " + maintenanceInterval());
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
index 0253cdb1e34..68f8e5464a0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java
@@ -68,7 +68,7 @@ public class RotationStatusUpdater extends Maintainer {
         try {
             pool.awaitTermination(30, TimeUnit.SECONDS);
             if (lastException.get() != null) {
-                log.log(LogLevel.WARNING, String.format("Failed to get global routing status of %d/%d applications. Retrying in %s. Last error: ",
+                log.log(Level.WARNING, String.format("Failed to get global routing status of %d/%d applications. Retrying in %s. Last error: ",
                                                         failures.get(),
                                                         attempts.get(),
                                                         maintenanceInterval()),
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
index e678c4bb5ca..22030931944 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdater.java
@@ -27,7 +27,7 @@ public class VersionStatusUpdater extends Maintainer {
             VersionStatus newStatus = VersionStatus.compute(controller());
             controller().updateVersionStatus(newStatus);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
+            log.log(Level.WARNING, "Failed to compute version status: " + Exceptions.toMessageString(e) +
                                       ". Retrying in " + maintenanceInterval());
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
index 757ccbe900e..2b9fe708df6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/ControllerAuthorizationFilter.java
@@ -52,7 +52,7 @@ public class ControllerAuthorizationFilter extends JsonSecurityRequestFilterBase
                 return Optional.empty();
         }
         catch (Exception e) {
-            log.log(LogLevel.WARNING, "Exception evaluating access control: ", e);
+            log.log(Level.WARNING, "Exception evaluating access control: ", e);
         }
         return Optional.of(new ErrorResponse(Response.Status.FORBIDDEN, "Access denied"));
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
index b4fa9d261c1..538ab36374b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
@@ -85,7 +85,7 @@ class SystemFlagsDeployer  {
             currentFlagData = lookupTable(client.listFlagData(target));
             definedFlags = client.listDefinedFlags(target);
         } catch (Exception e) {
-            log.log(LogLevel.WARNING, String.format("Failed to list flag data for target '%s': %s", target, e.getMessage()), e);
+            log.log(Level.WARNING, String.format("Failed to list flag data for target '%s': %s", target, e.getMessage()), e);
             return new SystemFlagsDeployResult(List.of(OperationError.listFailed(e.getMessage(), target)));
         }
 
@@ -119,7 +119,7 @@ class SystemFlagsDeployer  {
                     dryRunFlagDataValidation(data);
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, String.format("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e);
+                log.log(Level.WARNING, String.format("Failed to put flag '%s' for target '%s': %s", data.id(), target, e.getMessage()), e);
                 errors.add(OperationError.createFailed(e.getMessage(), target, data));
                 return;
             }
@@ -145,7 +145,7 @@ class SystemFlagsDeployer  {
                     dryRunFlagDataValidation(wantedData);
                 }
             } catch (Exception e) {
-                log.log(LogLevel.WARNING, String.format("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e);
+                log.log(Level.WARNING, String.format("Failed to update flag '%s' for target '%s': %s", wantedData.id(), target, e.getMessage()), e);
                 errors.add(OperationError.updateFailed(e.getMessage(), target, wantedData));
                 return;
             }
@@ -167,7 +167,7 @@ class SystemFlagsDeployer  {
                 try {
                     client.deleteFlagData(target, id);
                 } catch (Exception e) {
-                    log.log(LogLevel.WARNING, String.format("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e);
+                    log.log(Level.WARNING, String.format("Failed to delete flag '%s' for target '%s': %s", id, target, e.getMessage()), e);
                     errors.add(OperationError.deleteFailed(e.getMessage(), target, id));
                     return;
                 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index 41a3784163d..19b98ae12cc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -151,7 +151,7 @@ public class VersionStatus {
                 if (nodes.isEmpty()) continue;
                 var configConverged = application.configConvergedIn(zone.getId(), controller, Optional.empty());
                 if (!configConverged) {
-                    log.log(LogLevel.WARNING, "Config for " + application.id() + " in " + zone.getId() +
+                    log.log(Level.WARNING, "Config for " + application.id() + " in " + zone.getId() +
                                               " has not converged");
                 }
                 for (var node : nodes) {