diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-11 18:12:21 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-04-11 18:12:21 +0200 |
commit | 2d214622088459815467d4e20087f3f4accc839e (patch) | |
tree | a76c9d6f2012deaa79794219c10f7923c65d07e8 /messagebus | |
parent | fe4a3f308f80b294643ff6c7cfc51e88f84e7f27 (diff) |
Avoid universal import
Diffstat (limited to 'messagebus')
-rwxr-xr-x | messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java | 21 | ||||
-rw-r--r-- | messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java | 17 |
2 files changed, 32 insertions, 6 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java index 64b7c4cb12e..e04cccfcbd1 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingNode.java @@ -1,15 +1,28 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.routing; -import com.yahoo.messagebus.*; +import com.yahoo.messagebus.EmptyReply; import com.yahoo.messagebus.Error; +import com.yahoo.messagebus.ErrorCode; +import com.yahoo.messagebus.Message; +import com.yahoo.messagebus.MessageBus; +import com.yahoo.messagebus.Reply; +import com.yahoo.messagebus.ReplyHandler; +import com.yahoo.messagebus.SendProxy; +import com.yahoo.messagebus.Trace; +import com.yahoo.messagebus.TraceLevel; +import com.yahoo.messagebus.TraceNode; import com.yahoo.messagebus.metrics.RouteMetricSet; import com.yahoo.messagebus.network.Network; import com.yahoo.messagebus.network.ServiceAddress; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; +import java.util.Stack; import java.util.concurrent.atomic.AtomicInteger; /** @@ -32,7 +45,7 @@ public class RoutingNode implements ReplyHandler { private final AtomicInteger pending = new AtomicInteger(0); private final Message msg; private Reply reply = null; - private Route route = null; + private Route route; private RoutingPolicy policy = null; private RoutingContext routingContext = null; private ServiceAddress serviceAddress = null; @@ -122,7 +135,7 @@ public class RoutingNode implements ReplyHandler { * * @param msg The error message to assign. */ - public void notifyAbort(String msg) { + private void notifyAbort(String msg) { Stack<RoutingNode> stack = new Stack<>(); stack.push(this); while (!stack.isEmpty()) { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java index 0ac962ad947..2ebe4103713 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java @@ -4,8 +4,17 @@ package com.yahoo.messagebus.routing; import com.yahoo.component.Vtag; import com.yahoo.jrt.ListenFailedException; import com.yahoo.jrt.slobrok.server.Slobrok; -import com.yahoo.messagebus.*; +import com.yahoo.messagebus.DestinationSession; +import com.yahoo.messagebus.DestinationSessionParams; +import com.yahoo.messagebus.EmptyReply; import com.yahoo.messagebus.Error; +import com.yahoo.messagebus.ErrorCode; +import com.yahoo.messagebus.Message; +import com.yahoo.messagebus.MessageBusParams; +import com.yahoo.messagebus.Reply; +import com.yahoo.messagebus.SourceSession; +import com.yahoo.messagebus.SourceSessionParams; +import com.yahoo.messagebus.Trace; import com.yahoo.messagebus.network.Identity; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; import com.yahoo.messagebus.network.rpc.test.TestServer; @@ -23,7 +32,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a> |