Non-funcitonal changes

3 files changed, 17 insertions, 19 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
index 7e8286d8793..805242665ca 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
@@ -63,13 +63,11 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler,
      * @param routable the routable to forward.
      */
     public void forward(Routable routable) {
-        if (routable instanceof Reply) {
-            Reply reply = (Reply)routable;
-            ReplyHandler handler = reply.popHandler();
-            handler.handleReply(reply);
+        if (routable instanceof Reply reply) {
+            reply.popHandler().handleReply(reply);
         } else {
             routable.pushHandler(this);
-            mbus.handleMessage((Message)routable);
+            mbus.handleMessage((Message) routable);
         }
     }
 
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index eeea999cc14..4a443a9fde5 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -367,7 +367,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      * sessions from receiving data from message bus.</p>
      *
      * @param name          The name of the session to remove.
-     * @param broadcastName Whether or not session name was broadcast.
+     * @param broadcastName Whether session name was broadcast.
      */
     public synchronized void unregisterSession(String name, boolean broadcastName) {
         net.unregisterSession(name, this, broadcastName);
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
index 794ac152c9f..974eb54d779 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
@@ -42,7 +42,7 @@ public class Messenger implements Runnable {
      *
      * @param task The task to add.
      */
-    void addRecurrentTask(final Task task) {
+    void addRecurrentTask(Task task) {
         children.add(task);
     }
 
@@ -64,7 +64,7 @@ public class Messenger implements Runnable {
      * @param msg     The message to send.
      * @param handler The handler to send to.
      */
-    public void deliverMessage(final Message msg, final MessageHandler handler) {
+    public void deliverMessage(Message msg, MessageHandler handler) {
         if (destroyed.get()) {
             msg.discard();
         } else {
@@ -80,7 +80,7 @@ public class Messenger implements Runnable {
      * @param reply   The reply to return.
      * @param handler The handler to return to.
      */
-    public void deliverReply(final Reply reply, final ReplyHandler handler) {
+    public void deliverReply(Reply reply, ReplyHandler handler) {
         if (destroyed.get()) {
             reply.discard();
         } else {
@@ -95,7 +95,7 @@ public class Messenger implements Runnable {
      *
      * @param task The task to enqueue.
      */
-    public void enqueue(final Task task) {
+    public void enqueue(Task task) {
         if (destroyed.get()) {
             task.destroy();
             return;
@@ -116,7 +116,7 @@ public class Messenger implements Runnable {
         if (Thread.currentThread() == thread) {
             return; // no need to wait for self
         }
-        final SyncTask task = new SyncTask();
+        SyncTask task = new SyncTask();
         enqueue(task);
         task.await();
     }
@@ -140,7 +140,7 @@ public class Messenger implements Runnable {
                     }
                 }
                 thread.join();
-            } catch (final InterruptedException e) {
+            } catch (InterruptedException e) {
                 // ignore
             }
             done = true;
@@ -161,7 +161,7 @@ public class Messenger implements Runnable {
                         } else {
                             wait(timeoutMS);
                         }
-                    } catch (final InterruptedException e) {
+                    } catch (InterruptedException e) {
                         continue;
                     }
                 }
@@ -175,26 +175,26 @@ public class Messenger implements Runnable {
             if (task != null) {
                 try {
                     task.run();
-                } catch (final Exception e) {
+                } catch (Exception e) {
                     log.log(Level.SEVERE, "An exception was thrown while running " + task.getClass().getName(), e);
                 }
                 try {
                     task.destroy();
-                } catch (final Exception e) {
+                } catch (Exception e) {
                     log.warning("An exception was thrown while destroying " + task.getClass().getName() + ": " + e);
                     log.warning("Someone, somewhere might have to wait indefinitely for something.");
                 }
             }
-            for (final Task child : children) {
+            for (Task child : children) {
                 child.run();
             }
         }
-        for (final Task child : children) {
+        for (Task child : children) {
             child.destroy();
         }
         synchronized (this) {
             while (!queue.isEmpty()) {
-                final Task task = queue.poll();
+                Task task = queue.poll();
                 task.destroy();
             }
             notify();
@@ -236,7 +236,7 @@ public class Messenger implements Runnable {
         public void await() {
             try {
                 latch.await();
-            } catch (final InterruptedException e) {
+            } catch (InterruptedException e) {
                 // ignore
             }
         }