Fully remove OOS stuff from java too.

8 files changed, 21 insertions, 21 deletions

diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
index cc968e0c843..89c641808f5 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java
@@ -38,9 +38,9 @@ public class ErrorTestCase {
         table.addRoute("test", Arrays.asList("itr", "dst"));
 
         Slobrok slobrok = new Slobrok();
-        TestServer src = new TestServer("test/src", table, slobrok, null, null);
-        TestServer itr = new TestServer("test/itr", table, slobrok, null, null);
-        TestServer dst = new TestServer("test/dst", table, slobrok, null, null);
+        TestServer src = new TestServer("test/src", table, slobrok, null);
+        TestServer itr = new TestServer("test/itr", table, slobrok, null);
+        TestServer dst = new TestServer("test/dst", table, slobrok, null);
 
         Receptor ss_rr = new Receptor();
         SourceSession ss = src.mb.createSourceSession(ss_rr);
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java
index 96ca309a429..ed765a146c6 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java
@@ -56,18 +56,18 @@ public class MessageBusTestCase {
         Slobrok slobrok = new Slobrok();
         List<TestServer> servers = new ArrayList<>();
 
-        TestServer srcServer = new TestServer("feeder", null, slobrok, null, null);
+        TestServer srcServer = new TestServer("feeder", null, slobrok, null);
         servers.add(srcServer);
         SourceSession src = servers.get(0).mb.createSourceSession(new Receptor());
 
         List<IntermediateSession> sessions = new ArrayList<>();
         for (int i = 0; i < 10; ++i) {
-            TestServer server = new TestServer("intermediate/" + i, null, slobrok, null, null);
+            TestServer server = new TestServer("intermediate/" + i, null, slobrok, null);
             servers.add(server);
             sessions.add(server.mb.createIntermediateSession("session", true, new Receptor(), new Receptor()));
         }
 
-        TestServer dstServer = new TestServer("destination", null, slobrok, null, null);
+        TestServer dstServer = new TestServer("destination", null, slobrok, null);
         DestinationSession dst = dstServer.mb.createDestinationSession("session", true, new Receptor());
 
         assertTrue(srcServer.waitSlobrok("intermediate/*/session", sessions.size()));
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
index 23410a70842..b760ee6d13f 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
@@ -15,8 +15,8 @@ public class RoutableTestCase extends junit.framework.TestCase {
 
     public void testMessageContext() throws ListenFailedException, UnknownHostException {
         Slobrok slobrok = new Slobrok();
-        TestServer srcServer = new TestServer("src", null, slobrok, null, null);
-        TestServer dstServer = new TestServer("dst", null, slobrok, null, null);
+        TestServer srcServer = new TestServer("src", null, slobrok, null);
+        TestServer dstServer = new TestServer("dst", null, slobrok, null);
         SourceSession srcSession = srcServer.mb.createSourceSession(
                 new Receptor(),
                 new SourceSessionParams().setTimeout(600.0));
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
index 5b0f142c224..6c298f5f3b5 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
@@ -29,8 +29,8 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"));
         table.addRoute("test", Arrays.asList("dst"));
         slobrok = new Slobrok();
-        src = new TestServer("test/src", table, slobrok, null, null);
-        dst = new TestServer("test/dst", table, slobrok, null, null);
+        src = new TestServer("test/src", table, slobrok, null);
+        dst = new TestServer("test/dst", table, slobrok, null);
     }
 
     public void tearDown() {
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
index a88da4c2e42..007f7a70d14 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
@@ -33,9 +33,9 @@ public class TraceTripTestCase extends junit.framework.TestCase {
                                  .addRoute("test", Arrays.asList("pxy", "dst"));
 
         slobrok = new Slobrok();
-        src = new TestServer("test/src", table, slobrok, null, null);
-        pxy = new TestServer("test/pxy", table, slobrok, null, null);
-        dst = new TestServer("test/dst", table, slobrok, null, null);
+        src = new TestServer("test/src", table, slobrok, null);
+        pxy = new TestServer("test/pxy", table, slobrok, null);
+        dst = new TestServer("test/dst", table, slobrok, null);
     }
 
     public void tearDown() {
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
index f9db12a77ee..603d8433524 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
@@ -34,9 +34,9 @@ public class BasicNetworkTestCase extends junit.framework.TestCase {
         table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"));
         table.addRoute("test", Arrays.asList("pxy", "dst"));
         slobrok = new Slobrok();
-        src = new TestServer("test/src", table, slobrok, null, null);
-        pxy = new TestServer("test/pxy", table, slobrok, null, null);
-        dst = new TestServer("test/dst", table, slobrok, null, null);
+        src = new TestServer("test/src", table, slobrok, null);
+        pxy = new TestServer("test/pxy", table, slobrok, null);
+        dst = new TestServer("test/dst", table, slobrok, null);
     }
 
     public void tearDown() {
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
index a985de2ee08..c9a4c38a682 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
@@ -19,10 +19,10 @@ public class LoadBalanceTestCase extends junit.framework.TestCase {
 
     public void testLoadBalance() throws ListenFailedException, UnknownHostException {
         Slobrok slobrok = new Slobrok();
-        TestServer src = new TestServer("src", null, slobrok, null, null);
-        TestServer dst1 = new TestServer("dst/1", null, slobrok, null, null);
-        TestServer dst2 = new TestServer("dst/2", null, slobrok, null, null);
-        TestServer dst3 = new TestServer("dst/3", null, slobrok, null, null);
+        TestServer src = new TestServer("src", null, slobrok, null);
+        TestServer dst1 = new TestServer("dst/1", null, slobrok, null);
+        TestServer dst2 = new TestServer("dst/2", null, slobrok, null);
+        TestServer dst3 = new TestServer("dst/3", null, slobrok, null);
 
         // set up handlers
         final QueueAdapter sq = new QueueAdapter();
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
index 020611b695d..26b32eeb418 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
@@ -97,7 +97,7 @@ public class TargetPoolTestCase extends junit.framework.TestCase {
     }
 
     private RPCServiceAddress registerServer() throws ListenFailedException, UnknownHostException {
-        servers.add(new TestServer("srv" + servers.size(), null, slobrok, null, null));
+        servers.add(new TestServer("srv" + servers.size(), null, slobrok, null));
         return new RPCServiceAddress("foo/bar", servers.get(servers.size() - 1).mb.getConnectionSpec());
     }