Merge pull request #19280 from vespa-engine/bratseth/cleanup-876

No functional changes

3 files changed, 12 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java
index ef7d8756228..7a3fa9fe46c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GetConfigContext.java
@@ -49,4 +49,10 @@ public class GetConfigContext {
     public String logPre() {
         return TenantRepository.logPre(app);
     }
+
+    @Override
+    public String toString() {
+        return "get config context for application " + app + ", having handler " + requestHandler;
+    }
+
 }
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 dd514e0d843..93148c52c3a 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
@@ -205,9 +205,8 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
     @Override
     public ConfigResponse resolveConfig(ApplicationId appId, GetConfigRequest req, Optional<Version> vespaVersion) {
         Application application = getApplication(appId, vespaVersion);
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, TenantRepository.logPre(appId) + "Resolving for tenant '" + tenant + "' with handler for application '" + application + "'");
-        }
+        log.log(Level.FINE, () -> TenantRepository.logPre(appId) + "Resolving for tenant '" + tenant +
+                                  "' with handler for application '" + application + "'");
         return application.resolveConfig(req, responseFactory);
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
index bad03862133..412eafd9882 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
@@ -27,8 +27,8 @@ import java.util.logging.Logger;
 import static com.yahoo.vespa.config.protocol.SlimeConfigResponse.fromConfigPayload;
 
 /**
-* @author hmusum
-*/
+ * @author hmusum
+ */
 class GetConfigProcessor implements Runnable {
 
     private static final Logger log = Logger.getLogger(GetConfigProcessor.class.getName());
@@ -69,7 +69,7 @@ class GetConfigProcessor implements Runnable {
 
     // TODO: Increment statistics (Metrics) failed counters when requests fail
     public Pair<GetConfigContext, Long> getConfig(JRTServerConfigRequest request) {
-        //Request has already been detached
+        // Request has already been detached
         if ( ! request.validateParameters()) {
             // Error code is set in verifyParameters if parameters are not OK.
             log.log(Level.WARNING, "Parameters for request " + request + " did not validate: " + request.errorCode() + " : " + request.errorMessage());
@@ -140,6 +140,7 @@ class GetConfigProcessor implements Runnable {
         }
         return null;
     }
+
     @Override
     public void run() {
         rpcServer.hostLivenessTracker().receivedRequestFrom(request.getClientHostName());