LogLevel.INFO -> Level.INFO

15 files changed, 30 insertions, 30 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index be607907854..583d560994e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -215,7 +215,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         try (ActionTimer timer = timerFor(applicationId, "deployment.prepareMillis")) {
             ConfigChangeActions actions = session.prepare(logger, prepareParams, currentActiveApplicationSet, tenant.getPath(), now);
             logConfigChangeActions(actions, logger);
-            log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " prepared successfully. ");
+            log.log(Level.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " prepared successfully. ");
             return new PrepareResult(sessionId, actions, deployLog);
         }
     }
@@ -380,17 +380,17 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                 remoteSession = getRemoteSession(tenant, sessionId);
                 Transaction deleteTransaction = remoteSession.createDeleteTransaction();
                 deleteTransaction.commit();
-                log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Waiting for session " + sessionId + " to be deleted");
+                log.log(Level.INFO, TenantRepository.logPre(applicationId) + "Waiting for session " + sessionId + " to be deleted");
 
                 if ( ! waitTime.isZero() && localSessionHasBeenDeleted(applicationId, sessionId, waitTime)) {
-                    log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " deleted");
+                    log.log(Level.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " deleted");
                 } else {
                     deleteTransaction.rollbackOrLog();
                     throw new InternalServerException(applicationId + " was not deleted (waited " + waitTime + "), session " + sessionId);
                 }
             } catch (NotFoundException e) {
                 // For the case where waiting timed out in a previous attempt at deleting the application, continue and do the steps below
-                log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Active session exists, but has not been deleted properly. Trying to cleanup");
+                log.log(Level.INFO, TenantRepository.logPre(applicationId) + "Active session exists, but has not been deleted properly. Trying to cleanup");
             }
 
             NestedTransaction transaction = new NestedTransaction();
@@ -400,7 +400,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
             transaction.add(tenantApplications.createDeleteTransaction(applicationId));
 
             hostProvisioner.ifPresent(provisioner -> provisioner.remove(transaction, applicationId));
-            transaction.onCommitted(() -> log.log(LogLevel.INFO, "Deleted " + applicationId));
+            transaction.onCommitted(() -> log.log(Level.INFO, "Deleted " + applicationId));
             transaction.commit();
             return true;
         }
@@ -466,7 +466,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
                 .filter(fileReference -> isFileLastModifiedBefore(new File(fileReferencesPath, fileReference), instant))
                 .collect(Collectors.toSet());
         if (fileReferencesToDelete.size() > 0) {
-            log.log(LogLevel.INFO, "Will delete file references not in use: " + fileReferencesToDelete);
+            log.log(Level.INFO, "Will delete file references not in use: " + fileReferencesToDelete);
             fileReferencesToDelete.forEach(fileReference -> {
                 File file = new File(fileReferencesPath, fileReference);
                 if ( ! IOUtils.recursiveDeleteDir(file))
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index 98c751dcee5..35cbd0c4303 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -118,7 +118,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
 
     @Override
     public void deconstruct() {
-        log.log(LogLevel.INFO, "Stopping config server");
+        log.log(Level.INFO, "Stopping config server");
         down();
         server.stop();
         log.log(Level.FINE, "RPC server stopped");
@@ -148,7 +148,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
 
     public void start() {
         if (versionState.isUpgraded()) {
-            log.log(LogLevel.INFO, "Config server upgrading from " + versionState.storedVersion() + " to "
+            log.log(Level.INFO, "Config server upgrading from " + versionState.storedVersion() + " to "
                     + versionState.currentVersion() + ". Redeploying all applications");
             try {
                 if ( ! redeployAllApplications()) {
@@ -156,7 +156,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
                     return; // Status will not be set to 'up' since we return here
                 }
                 versionState.saveNewVersion();
-                log.log(LogLevel.INFO, "All applications redeployed successfully");
+                log.log(Level.INFO, "All applications redeployed successfully");
             } catch (Exception e) {
                 log.log(LogLevel.ERROR, "Redeployment of applications failed", e);
                 redeployingApplicationsFailed();
@@ -211,7 +211,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
         do {
             applicationsNotRedeployed = redeployApplications(applicationsNotRedeployed);
             if ( ! applicationsNotRedeployed.isEmpty()) {
-                log.log(LogLevel.INFO, "Redeployment of " + applicationsNotRedeployed +
+                log.log(Level.INFO, "Redeployment of " + applicationsNotRedeployed +
                         " failed, will retry in " + sleepTimeWhenRedeployingFails);
                 Thread.sleep(sleepTimeWhenRedeployingFails.toMillis());
             }
@@ -243,7 +243,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
             } catch (ExecutionException e) {
                 ApplicationId app = f.getKey();
                 if (e.getCause() instanceof TransientException) {
-                    log.log(LogLevel.INFO, "Redeploying " + app +
+                    log.log(Level.INFO, "Redeploying " + app +
                             " failed with transient error, will retry after bootstrap: " + Exceptions.toMessageString(e));
                 } else {
                     log.log(LogLevel.WARNING, "Redeploying " + app + " failed, will retry", e);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
index bc022a3342c..db10d9dcc73 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelManager.java
@@ -127,7 +127,7 @@ public class SuperModelManager implements SuperModelProvider {
     public void markAsComplete() {
         // Invoked on component graph bootstrap (even before ConfigServerBootstrap),
         // there is no need to bump generation counter.
-        logger.log(LogLevel.INFO, "Super model is complete");
+        logger.log(Level.INFO, "Super model is complete");
         SuperModel newSuperModel = getSuperModel().cloneAsComplete();
         superModelConfigProvider = new SuperModelConfigProvider(newSuperModel, zone, flagSource);
         listeners.forEach(listener -> listener.notifyOfCompleteness(newSuperModel));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 318cd367e30..4f04724a0a8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -171,7 +171,7 @@ public class TenantApplications {
 
     private void applicationRemoved(ApplicationId applicationId) {
         reloadHandler.removeApplication(applicationId);
-        log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Application removed: " + applicationId);
+        log.log(Level.INFO, TenantRepository.logPre(applicationId) + "Application removed: " + applicationId);
     }
 
     private void applicationAdded(ApplicationId applicationId) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 37dd0502ee8..ede777265b7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -149,7 +149,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
 
             session.waitUntilActivated(timeoutBudget);
 
-            log.log(LogLevel.INFO, session.logPre() + "Session " + session.getSessionId() +
+            log.log(Level.INFO, session.logPre() + "Session " + session.getSessionId() +
                                    " activated successfully using " +
                                    (hostProvisioner.isPresent() ? hostProvisioner.get().getClass().getSimpleName() : "no host provisioner") +
                                    ". Config generation " + session.getMetaData().getGeneration() +
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
index 52fe57a7923..7dc6b5185a6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpErrorResponse.java
@@ -33,7 +33,7 @@ public class HttpErrorResponse extends HttpResponse {
         root.setString("error-code", errorType);
         root.setString("message", msg);
         if (code != 200) {
-            log.log(LogLevel.INFO, "Returning response with response code " + code + ", error-code:" + errorType + ", message=" + msg);
+            log.log(Level.INFO, "Returning response with response code " + code + ", error-code:" + errorType + ", message=" + msg);
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 361153d2817..1aaa090d145 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -118,7 +118,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
             }
             catch (RuntimeException e) {
                 if (shouldSkipCreatingMajorVersionOnError(majorVersions, majorVersion)) {
-                    log.log(LogLevel.INFO, applicationId + ": Skipping major version " + majorVersion, e);
+                    log.log(Level.INFO, applicationId + ": Skipping major version " + majorVersion, e);
                 } else  {
                     if (e instanceof NullPointerException || e instanceof NoSuchElementException | e instanceof UncheckedTimeoutException) {
                         log.log(LogLevel.WARNING, "Unexpected error when building model ", e);
@@ -197,7 +197,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                 // allow failure to create old config models if there is a validation override that allow skipping old
                 // config models (which is always true for manually deployed zones)
                 if (allApplicationVersions.size() > 0 && allApplicationVersions.get(0).getModel().skipOldConfigModels(now))
-                    log.log(LogLevel.INFO, applicationId + ": Skipping old version (due to validation override)");
+                    log.log(Level.INFO, applicationId + ": Skipping old version (due to validation override)");
                 else {
                     log.log(LogLevel.ERROR, applicationId + ": Failed to build version " + version);
                     throw e;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index e5918d19bc0..977e1f8cc28 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -182,7 +182,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
 
     @Override
     public void run() {
-        log.log(LogLevel.INFO, "Rpc server will listen on port " + spec.port());
+        log.log(Level.INFO, "Rpc server will listen on port " + spec.port());
         try {
             Acceptor acceptor = supervisor.listen(spec);
             isRunning = true;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
index 4484fa55057..3dbb3fd11e3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
@@ -156,7 +156,7 @@ public class MultiTenantRpcAuthorizer implements RpcAuthorizer {
         boolean isAuthorizationException = throwable instanceof AuthorizationException;
         String errorMessage = String.format("For request '%s' from '%s': %s", request.methodName(), request.target().toString(), throwable.getMessage());
         if (!isAuthorizationException || ((AuthorizationException) throwable).type() != Type.SILENT) {
-            log.log(LogLevel.INFO, errorMessage);
+            log.log(Level.INFO, errorMessage);
         }
         log.log(Level.FINE, throwable, throwable::getMessage);
         JrtErrorCode error = isAuthorizationException ? JrtErrorCode.UNAUTHORIZED : JrtErrorCode.AUTHORIZATION_FAILED;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index 0f96d70a3b1..9da3ad2fd7a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -94,7 +94,7 @@ public class RemoteSession extends Session {
         reloadHandler.reloadConfig(app);
         log.log(Level.FINE, () -> logPre() + "Notifying " + waiter);
         notifyCompletion(waiter);
-        log.log(LogLevel.INFO, logPre() + "Session activated: " + getSessionId());
+        log.log(Level.INFO, logPre() + "Session activated: " + getSessionId());
     }
     
     @Override
@@ -124,7 +124,7 @@ public class RemoteSession extends Session {
             if (e.getCause().getClass() != KeeperException.NoNodeException.class) {
                 throw e;
             } else {
-                log.log(LogLevel.INFO, "Not able to notify completion for session: " + getSessionId() + ", node has been deleted");
+                log.log(Level.INFO, "Not able to notify completion for session: " + getSessionId() + ", node has been deleted");
             }
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
index e4e097cf448..d66525326a2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
@@ -88,7 +88,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
             if (session == null) continue; // Internal sessions not in synch with zk, continue
             Instant created = Instant.ofEpochSecond(session.getCreateTime());
             if (sessionHasExpired(created, expiryTime)) {
-                log.log(LogLevel.INFO, "Remote session " + sessionId + " for " + tenantName + " has expired, deleting it");
+                log.log(Level.INFO, "Remote session " + sessionId + " for " + tenantName + " has expired, deleting it");
                 session.delete();
                 deleted++;
             }
@@ -166,7 +166,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
             if (applicationRepo.requireActiveSessionOf(applicationId) == session.getSessionId()) {
                 log.log(Level.FINE, () -> "Found active application for session " + session.getSessionId() + " , loading it");
                 reloadHandler.reloadConfig(session.ensureApplicationLoaded());
-                log.log(LogLevel.INFO, session.logPre() + "Application activated successfully: " + applicationId + " (generation " + session.getSessionId() + ")");
+                log.log(Level.INFO, session.logPre() + "Application activated successfully: " + applicationId + " (generation " + session.getSessionId() + ")");
                 return;
             }
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index fd32cb020d6..1a366063bae 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -82,7 +82,7 @@ public class SessionZooKeeperClient {
             String data = configCurator.getData(sessionStatusPath.getAbsolute());
             return Session.Status.parse(data);
         } catch (Exception e) {
-            log.log(LogLevel.INFO, "Unable to read session status, assuming it was deleted");
+            log.log(Level.INFO, "Unable to read session status, assuming it was deleted");
             return Session.Status.NONE;
         }
     }
@@ -134,7 +134,7 @@ public class SessionZooKeeperClient {
             transaction.add(curatorTransaction);
             transaction.commit();
         } catch (RuntimeException e) {
-            log.log(LogLevel.INFO, "Error deleting session (" + sessionPath.getAbsolute() + ") from zookeeper", e);
+            log.log(Level.INFO, "Error deleting session (" + sessionPath.getAbsolute() + ") from zookeeper", e);
         }
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java
index a1de394f61a..b249211081f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantDebugger.java
@@ -32,7 +32,7 @@ public class TenantDebugger implements TreeCacheListener {
             case NODE_ADDED:
             case NODE_REMOVED:
             case NODE_UPDATED:
-                log.log(LogLevel.INFO, event.toString());
+                log.log(Level.INFO, event.toString());
                 break;
         }
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 45b22ae156c..49bfc20233e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -203,7 +203,7 @@ public class TenantRepository {
         TenantName tenantName = builder.getTenantName();
         if (tenants.containsKey(tenantName)) return;
 
-        log.log(LogLevel.INFO, "Creating tenant '" + tenantName + "'");
+        log.log(Level.INFO, "Creating tenant '" + tenantName + "'");
         Tenant tenant = builder.build();
         notifyNewTenant(tenant);
         tenants.putIfAbsent(tenantName, tenant);
@@ -280,7 +280,7 @@ public class TenantRepository {
         if ( ! tenants.containsKey(name))
             throw new IllegalArgumentException("Deleting '" + name + "' failed, tenant does not exist");
 
-        log.log(LogLevel.INFO, "Deleting tenant '" + name + "'");
+        log.log(Level.INFO, "Deleting tenant '" + name + "'");
         tenants.get(name).delete();
     }
 
@@ -289,7 +289,7 @@ public class TenantRepository {
         if (tenant == null)
             throw new IllegalArgumentException("Closing '" + name + "' failed, tenant does not exist");
 
-        log.log(LogLevel.INFO, "Closing tenant '" + name + "'");
+        log.log(Level.INFO, "Closing tenant '" + name + "'");
         notifyRemovedTenant(name);
         tenant.close();
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index b3d783633a5..fbfbe11cdc6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -138,7 +138,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
     public void removeApplicationsExcept(Set<ApplicationId> applications) {
         for (ApplicationId activeApplication : applicationMapper.listApplicationIds()) {
             if ( ! applications.contains(activeApplication)) {
-                log.log(LogLevel.INFO, "Will remove deleted application " + activeApplication.toShortString());
+                log.log(Level.INFO, "Will remove deleted application " + activeApplication.toShortString());
                 removeApplication(activeApplication);
             }
         }