Remove some unused metrics code and dewire it.

2 files changed, 12 insertions, 12 deletions

diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
index 01e0fbf34b6..bc109a6074f 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java
@@ -3,8 +3,15 @@ package com.yahoo.messagebus.network.rpc;
 
 import com.yahoo.component.Version;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
-import com.yahoo.messagebus.metrics.MetricSet;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Protocol;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.Routable;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.routing.RoutingPolicy;
@@ -88,11 +95,6 @@ public class RPCNetworkTestCase {
             return null;
         }
 
-        @Override
-        public MetricSet getMetrics() {
-            return null;
-        }
-
         static MyProtocol newEncodeException(RuntimeException e) {
             return new MyProtocol(e);
         }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
index 898d5a36431..c6b3b09f2ed 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java
@@ -6,7 +6,9 @@ import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Routable;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Simon Thoresen Hult
@@ -21,10 +23,6 @@ public class SimpleProtocolTestCase {
         assertEquals(SimpleProtocol.NAME, PROTOCOL.getName());
     }
 
-    @Test
-    public void requireThatMetricSetIsNull() {
-        assertNull(PROTOCOL.getMetrics());
-    }
 
     @Test
     public void requireThatMessageCanBeEncodedAndDecoded() {