From d3f1296005f7b39ca08e4410c60de9c98eaf1160 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Mon, 22 Oct 2018 10:49:08 +0200
Subject: Remove redundant code.

---
 .../main/java/com/yahoo/messagebus/MessageBus.java   | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'messagebus')

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 26e61e8917b..54680976650 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -58,13 +58,13 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
     private static Logger log = Logger.getLogger(MessageBus.class.getName());
     private final AtomicBoolean destroyed = new AtomicBoolean(false);
     private final ProtocolRepository protocolRepository = new ProtocolRepository();
-    private final AtomicReference<Map<String, RoutingTable>> tablesRef = new AtomicReference<Map<String, RoutingTable>>(null);
-    private final CopyOnWriteHashMap<String, MessageHandler> sessions = new CopyOnWriteHashMap<String, MessageHandler>();
+    private final AtomicReference<Map<String, RoutingTable>> tablesRef = new AtomicReference<>(null);
+    private final CopyOnWriteHashMap<String, MessageHandler> sessions = new CopyOnWriteHashMap<>();
     private final Network net;
     private final Messenger msn;
     private final Resender resender;
-    private int maxPendingCount = 0;
-    private int maxPendingSize = 0;
+    private int maxPendingCount;
+    private int maxPendingSize;
     private int pendingCount = 0;
     private int pendingSize = 0;
     private final Thread careTaker = new Thread(this::sendBlockedMessages);
@@ -440,7 +440,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
 
     @Override
     public void setupRouting(RoutingSpec spec) {
-        Map<String, RoutingTable> tables = new HashMap<String, RoutingTable>();
+        Map<String, RoutingTable> tables = new HashMap<>();
         for (int i = 0, len = spec.getNumTables(); i < len; ++i) {
             RoutingTableSpec table = spec.getTable(i);
             String name = table.getProtocol();
@@ -479,7 +479,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @return The pending size.
      */
-    public synchronized int getPendingSize() {
+    synchronized int getPendingSize() {
         return pendingSize;
     }
 
@@ -511,14 +511,6 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
         maxPendingSize = maxSize;
     }
 
-    /**
-     * Gets maximum combined size of messages that can be received without
-     * being replied to yet.
-     */
-    public int getMaxPendingSize() {
-        return maxPendingSize;
-    }
-
     /**
      * <p>Returns a named routing table, may return null.</p>
      *
-- 
cgit v1.2.3