Revert "Revert "GC long gone config""

2 files changed, 9 insertions, 1 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 3bd5d5d4890..19d3b5b3e43 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -470,6 +470,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @return The resender.
      */
+    @Deprecated // Remove on 9
     public Resender getResender() {
         return resender;
     }
@@ -480,6 +481,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @return The pending count.
      */
+    @Deprecated // Package private on 9
     public synchronized int getPendingCount() {
         return pendingCount;
     }
@@ -490,6 +492,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @return The pending size.
      */
+    @Deprecated // Package private on 9
     public synchronized int getPendingSize() {
         return pendingSize;
     }
@@ -500,6 +503,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @param maxCount The max count.
      */
+    @Deprecated // Remove on 9
     public void setMaxPendingCount(int maxCount) {
         maxPendingCount = maxCount;
     }
@@ -508,6 +512,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      * Gets maximum number of messages that can be received without being
      * replied to yet.
      */
+    @Deprecated // Remove on 9
     public int getMaxPendingCount() {
         return maxPendingCount;
     }
@@ -518,6 +523,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      *
      * @param maxSize The max size.
      */
+    @Deprecated // Remove on 9
     public void setMaxPendingSize(int maxSize) {
         maxPendingSize = maxSize;
     }
@@ -526,6 +532,7 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      * Gets maximum combined size of messages that can be received without
      * being replied to yet.
      */
+    @Deprecated // Remove on 9
     public int getMaxPendingSize() {
         return maxPendingSize;
     }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
index 60ec6c400a9..6d50fc769be 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
@@ -14,7 +14,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import static org.junit.Assert.assertEquals;
@@ -55,6 +54,7 @@ public class ChokeTestCase {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testMaxCount() {
         int max = 10;
         dstServer.mb.setMaxPendingCount(max);
@@ -103,6 +103,7 @@ public class ChokeTestCase {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testMaxSize() {
         int size = createMessage("msg").getApproxSize();
         int max = size * 10;