Merge pull request #13619 from vespa-engine/bratseth/spare-capacity-maintainer

Bratseth/spare capacity maintainer

2 files changed, 18 insertions, 29 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
index 2da494e19cf..a9bd63d96c3 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
@@ -75,9 +75,8 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
 
     @Override
     public void skip() {
-        if (deserialized.get()) {
-            throw new IllegalStateException("Can not skip processing after deserialization.");
-        }
+        if (deserialized.get())
+            throw new IllegalStateException("Can not skip processing after deserialization");
         dispatchRequest(requestMsg, request.getUri().getPath(), responseHandler);
     }
 
@@ -91,10 +90,7 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
                 }
             }
         }
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "Forwarding " + messages.size() + " messages from " + processings.size() +
-                                    " processings.");
-        }
+        log.log(Level.FINE, () ->"Forwarding " + messages.size() + " messages from " + processings.size() + " processings.");
         if (messages.isEmpty()) {
             dispatchResponse(Response.Status.OK);
             return;
@@ -102,10 +98,10 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
         long inputSequenceId = requestMsg.getSequenceId();
         ResponseMerger responseHandler = new ResponseMerger(requestMsg, messages.size(), this);
         for (Message message : messages) {
-            // See comment for internalNoThrottledSource.
-            dispatchRequest(message, (inputSequenceId == message.getSequenceId())
-                            ? getUri().getPath()
-                            : "/" + internalNoThrottledSource,
+            // See comment for internalNoThrottledSource
+            dispatchRequest(message,
+                            message.getSequenceId() == inputSequenceId ? getUri().getPath()
+                                                                       : "/" + internalNoThrottledSource,
                             responseHandler);
         }
     }
@@ -177,7 +173,7 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
         ResponseDispatch.newInstance(new MbusResponse(status, requestMsg.createReply())).dispatch(this);
     }
 
-    private void dispatchRequest(final Message msg, final String uriPath, final ResponseHandler handler) {
+    private void dispatchRequest(Message msg, String uriPath, ResponseHandler handler) {
         try {
             new RequestDispatch() {
 
@@ -197,15 +193,10 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
         }
     }
 
-    private static MessageFactory newMessageFactory(final DocumentMessage msg) {
-        if (msg == null) {
-            return null;
-        }
-        final Route route = msg.getRoute();
-        if (route == null || !route.hasHops()) {
-            return null;
-        }
-        return new MessageFactory(msg);
+    private static MessageFactory newMessageFactory(DocumentMessage message) {
+        if (message == null) return null;
+        if (message.getRoute() == null || ! message.getRoute().hasHops()) return null;
+        return new MessageFactory(message);
     }
 
     private static URI resolveUri(String path) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
index 92f4952b5b5..1365ed955fc 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
@@ -42,14 +42,12 @@ class MessageFactory {
         message.setTimeReceivedNow();
         message.setTimeRemaining(requestMsg.getTimeRemainingNow());
         message.getTrace().setLevel(requestMsg.getTrace().getLevel());
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "Created '" + message.getClass().getName() +
-                                    "', route = '" + message.getRoute() +
-                                    "', priority = '" + message.getPriority().name() +
-                                    "', load type = '" + message.getLoadType() +
-                                    "', trace level = '" + message.getTrace().getLevel() +
-                                    "', time remaining = '" + message.getTimeRemaining() + "'.");
-        }
+        log.log(Level.FINE, () -> "Created '" + message.getClass().getName() +
+                                  "', route = '" + message.getRoute() +
+                                  "', priority = '" + message.getPriority().name() +
+                                  "', load type = '" + message.getLoadType() +
+                                  "', trace level = '" + message.getTrace().getLevel() +
+                                  "', time remaining = '" + message.getTimeRemaining() + "'.");
         return message;
     }