diff options
21 files changed, 86 insertions, 145 deletions
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java index 9e76f1bf651..89d4aa05200 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java @@ -20,9 +20,7 @@ public class MbusClientProvider implements Provider<MbusClient> { private final MbusClient client; - private static MbusClient createSourceClient( - SessionCache sessionCache, - boolean setAllPassThrottlePolicy) { + private static MbusClient createSourceClient(SessionCache sessionCache, boolean setAllPassThrottlePolicy) { final SourceSessionParams sourceSessionParams = new SourceSessionParams(); if (setAllPassThrottlePolicy) { sourceSessionParams.setThrottlePolicy(new AllPassThrottlePolicy()); diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java index 1e60050375e..113d99f77f9 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java @@ -14,7 +14,6 @@ import com.yahoo.jdisc.ResourceReference; import com.yahoo.jdisc.SharedResource; import com.yahoo.log.LogLevel; import com.yahoo.messagebus.ConfigAgent; -import com.yahoo.messagebus.DestinationSessionParams; import com.yahoo.messagebus.DynamicThrottlePolicy; import com.yahoo.messagebus.IntermediateSessionParams; import com.yahoo.messagebus.MessageBusParams; @@ -24,7 +23,6 @@ import com.yahoo.messagebus.StaticThrottlePolicy; import com.yahoo.messagebus.ThrottlePolicy; import com.yahoo.messagebus.network.Identity; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; -import com.yahoo.messagebus.shared.SharedDestinationSession; import com.yahoo.messagebus.shared.SharedIntermediateSession; import com.yahoo.messagebus.shared.SharedMessageBus; import com.yahoo.messagebus.shared.SharedSourceSession; @@ -60,10 +58,6 @@ public final class SessionCache extends AbstractComponent { private final Map<String, SharedIntermediateSession> intermediates = new HashMap<>(); private final IntermediateSessionCreator intermediatesCreator = new IntermediateSessionCreator(); - private final Object destinationLock = new Object(); - private final Map<String, SharedDestinationSession> destinations = new HashMap<>(); - private final DestinationSessionCreator destinationsCreator = new DestinationSessionCreator(); - private final Object sourceLock = new Object(); private final Map<SourceSessionKey, SharedSourceSession> sources = new HashMap<>(); private final SourceSessionCreator sourcesCreator = new SourceSessionCreator(); @@ -85,6 +79,13 @@ public final class SessionCache extends AbstractComponent { this(identity, identity, identity, identity, identity, identity, new DocumentTypeManager()); } + public void deconstruct() { + if (configAgent != null) { + configAgent.shutdown(); + } + } + + private void start() { ContainerMbusConfig mbusConfig = ConfigGetter.getConfig(ContainerMbusConfig.class, containerMbusConfigId); if (documentManagerConfigId != null) { @@ -98,6 +99,7 @@ public final class SessionCache extends AbstractComponent { configAgent.subscribe(); } + private boolean isStarted() { return messageBus != null; } @@ -136,7 +138,7 @@ public final class SessionCache extends AbstractComponent { (((double) (maxPendingSize / 1024L)) / 1024.0d) + " pending megabytes.")); } - public ReferencedResource<SharedIntermediateSession> retainIntermediate(final IntermediateSessionParams p) { + ReferencedResource<SharedIntermediateSession> retainIntermediate(final IntermediateSessionParams p) { synchronized (this) { if (!isStarted()) { start(); @@ -145,15 +147,6 @@ public final class SessionCache extends AbstractComponent { return intermediatesCreator.retain(intermediateLock, intermediates, p); } - public ReferencedResource<SharedDestinationSession> retainDestination(final DestinationSessionParams p) { - synchronized (this) { - if (!isStarted()) { - start(); - } - } - return destinationsCreator.retain(destinationLock, destinations, p); - } - public ReferencedResource<SharedSourceSession> retainSource(final SourceSessionParams p) { synchronized (this) { if (!isStarted()) { @@ -203,27 +196,6 @@ public final class SessionCache extends AbstractComponent { } - private class DestinationSessionCreator - extends SessionCreator<DestinationSessionParams, String, SharedDestinationSession> { - - @Override - SharedDestinationSession create(DestinationSessionParams p) { - log.log(LogLevel.DEBUG, "Creating new destination session " + p.getName() + ""); - return messageBus.newDestinationSession(p); - } - - @Override - String buildKey(DestinationSessionParams p) { - return p.getName(); - } - - @Override - void logReuse(SharedDestinationSession session) { - log.log(LogLevel.DEBUG, "Reusing destination session " + session.name() + ""); - } - - } - private class SourceSessionCreator extends SessionCreator<SourceSessionParams, SourceSessionKey, SharedSourceSession> { @@ -377,7 +349,6 @@ public final class SessionCache extends AbstractComponent { } static class UnknownThrottlePolicySignature extends ThrottlePolicySignature { - private final ThrottlePolicy policy; UnknownThrottlePolicySignature(final ThrottlePolicy policy) { @@ -419,10 +390,7 @@ public final class SessionCache extends AbstractComponent { @Override public String toString() { - return "SourceSessionKey{" + - "timeout=" + timeout + - ", policy=" + policy + - '}'; + return "SourceSessionKey{" + "timeout=" + timeout + ", policy=" + policy + '}'; } @Override diff --git a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java index 1b814208d26..89bc5b9cecd 100644 --- a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java +++ b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusSessionKeyTestCase.java @@ -25,22 +25,16 @@ public class MbusSessionKeyTestCase { public final void staticThrottlePolicySignature() { final StaticThrottlePolicy base = new StaticThrottlePolicy(); final StaticThrottlePolicy other = new StaticThrottlePolicy(); - other.setMaxPendingCount(500); - other.setMaxPendingSize(500 * 1000 * 1000); - base.setMaxPendingCount(1); - base.setMaxPendingSize(1000); - final StaticThrottlePolicySignature sigBase = new StaticThrottlePolicySignature( - base); - final StaticThrottlePolicySignature sigOther = new StaticThrottlePolicySignature( - other); - assertFalse("The policies are different, but signatures are equal.", - sigBase.equals(sigOther)); + other.setMaxPendingCount(500).setMaxPendingSize(500 * 1000 * 1000); + base.setMaxPendingCount(1).setMaxPendingSize(1000); + final StaticThrottlePolicySignature sigBase = new StaticThrottlePolicySignature(base); + final StaticThrottlePolicySignature sigOther = new StaticThrottlePolicySignature(other); + assertFalse("The policies are different, but signatures are equal.", sigBase.equals(sigOther)); assertTrue("Sigs created from same policy evaluated as different.", sigBase.equals(new StaticThrottlePolicySignature(base))); other.setMaxPendingCount(1); other.setMaxPendingSize(1000); - assertTrue( - "Sigs created from different policies with same settings evaluated as different.", + assertTrue("Sigs created from different policies with same settings evaluated as different.", sigBase.equals(new StaticThrottlePolicySignature(other))); } @@ -49,52 +43,46 @@ public class MbusSessionKeyTestCase { public final void dynamicThrottlePolicySignature() { final DynamicThrottlePolicy base = new DynamicThrottlePolicy(); final DynamicThrottlePolicy other = new DynamicThrottlePolicy(); - base.setEfficiencyThreshold(5); - base.setMaxPendingCount(3); - base.setMaxPendingSize(3 * 100); - base.setMaxThroughput(1e6); - base.setMaxWindowSize(1e9); - base.setMinWindowSize(1e5); - base.setWeight(1.0); - base.setWindowSizeBackOff(.6); - base.setWindowSizeIncrement(500); - other.setEfficiencyThreshold(5 + 1); - other.setMaxPendingCount(3 + 1); - other.setMaxPendingSize(3 * 100 + 1); - other.setMaxThroughput(1e6 + 1); - other.setMaxWindowSize(1e9 + 1); - other.setMinWindowSize(1e5 + 1); - other.setWeight(1.0 + 1); - other.setWindowSizeBackOff(.6 + 1); - other.setWindowSizeIncrement(500 + 1); - final DynamicThrottlePolicySignature sigBase = new DynamicThrottlePolicySignature( - base); - final DynamicThrottlePolicySignature sigOther = new DynamicThrottlePolicySignature( - other); - assertFalse("The policies are different, but signatures are equal.", - sigBase.equals(sigOther)); + base.setEfficiencyThreshold(5) + .setMaxPendingCount(3) + .setMaxWindowSize(1e9) + .setMinWindowSize(1e5) + .setWeight(1.0) + .setWindowSizeBackOff(.6) + .setWindowSizeIncrement(500) + .setMaxThroughput(1e6) + .setMaxPendingSize(3 * 100); + other.setEfficiencyThreshold(5 + 1) + .setMaxPendingCount(3 + 1) + .setMaxThroughput(1e6 + 1) + .setMaxWindowSize(1e9 + 1) + .setMinWindowSize(1e5 + 1) + .setWeight(1.0 + 1) + .setWindowSizeBackOff(.6 + 1) + .setWindowSizeIncrement(500 + 1) + .setMaxPendingSize(3 * 100 + 1); + final DynamicThrottlePolicySignature sigBase = new DynamicThrottlePolicySignature(base); + final DynamicThrottlePolicySignature sigOther = new DynamicThrottlePolicySignature(other); + assertFalse("The policies are different, but signatures are equal.", sigBase.equals(sigOther)); assertTrue("Sigs created from same policy evaluated as different.", sigBase.equals(new DynamicThrottlePolicySignature(base))); - other.setEfficiencyThreshold(5); - other.setMaxPendingCount(3); - other.setMaxPendingSize(3 * 100); - other.setMaxThroughput(1e6); - other.setMaxWindowSize(1e9); - other.setMinWindowSize(1e5); - other.setWeight(1.0); - other.setWindowSizeBackOff(.6); - other.setWindowSizeIncrement(500); - assertTrue( - "Sigs created from different policies with same settings evaluated as different.", + other.setEfficiencyThreshold(5) + .setMaxPendingCount(3) + .setMaxThroughput(1e6) + .setMaxWindowSize(1e9) + .setMinWindowSize(1e5) + .setWeight(1.0) + .setWindowSizeBackOff(.6) + .setWindowSizeIncrement(500) + .setMaxPendingSize(3 * 100); + assertTrue("Sigs created from different policies with same settings evaluated as different.", sigBase.equals(new DynamicThrottlePolicySignature(other))); } @Test public final void unknownThrottlePolicySignature() { - final UnknownThrottlePolicySignature baseSig = new UnknownThrottlePolicySignature( - new StaticThrottlePolicy()); - final UnknownThrottlePolicySignature otherSig = new UnknownThrottlePolicySignature( - new StaticThrottlePolicy()); + final UnknownThrottlePolicySignature baseSig = new UnknownThrottlePolicySignature(new StaticThrottlePolicy()); + final UnknownThrottlePolicySignature otherSig = new UnknownThrottlePolicySignature(new StaticThrottlePolicy()); assertEquals(baseSig, baseSig); assertFalse(otherSig.equals(baseSig)); } @@ -107,7 +95,6 @@ public class MbusSessionKeyTestCase { final SourceSessionParams other = new SourceSessionParams(); assertEquals(new SourceSessionKey(base), new SourceSessionKey(other)); other.setTimeout(other.getTimeout() + 1); - assertFalse(new SourceSessionKey(base).equals(new SourceSessionKey( - other))); + assertFalse(new SourceSessionKey(base).equals(new SourceSessionKey(other))); } } diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java index 752be1bdde7..fd377aaa7d1 100644 --- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java +++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java @@ -4,8 +4,14 @@ package com.yahoo.messagebus.shared; import com.yahoo.jdisc.AbstractResource; import com.yahoo.jdisc.ResourceReference; import com.yahoo.log.LogLevel; -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.MessageHandler; +import com.yahoo.messagebus.Reply; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Logger; @@ -17,12 +23,10 @@ public class SharedDestinationSession extends AbstractResource implements Messag private static final Logger log = Logger.getLogger(SharedDestinationSession.class.getName()); private final AtomicReference<MessageHandler> msgHandler = new AtomicReference<>(); - private final SharedMessageBus mbus; private final DestinationSession session; private final ResourceReference mbusReference; - public SharedDestinationSession(SharedMessageBus mbus, DestinationSessionParams params) { - this.mbus = mbus; + SharedDestinationSession(SharedMessageBus mbus, DestinationSessionParams params) { this.msgHandler.set(params.getMessageHandler()); this.session = mbus.messageBus().createDestinationSession(params.setMessageHandler(this)); this.mbusReference = mbus.refer(); diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java index 6fed667992c..d49a5ea67b8 100644 --- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java +++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java @@ -19,7 +19,6 @@ import java.util.logging.Logger; public class SharedSourceSession extends AbstractResource implements ClientSession, ReplyHandler { private static final Logger log = Logger.getLogger(SharedSourceSession.class.getName()); - private final SharedMessageBus mbus; private final SourceSession session; private final ResourceReference mbusReference; @@ -27,7 +26,6 @@ public class SharedSourceSession extends AbstractResource implements ClientSessi if (params.getReplyHandler() != null) { throw new IllegalArgumentException("Reply handler must be null."); } - this.mbus = mbus; this.session = mbus.messageBus().createSourceSession(params.setReplyHandler(this)); this.mbusReference = mbus.refer(); } diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json index e8e752127b1..876bf4a6960 100644 --- a/messagebus/abi-spec.json +++ b/messagebus/abi-spec.json @@ -114,7 +114,7 @@ "public void <init>(com.yahoo.concurrent.Timer)", "public double getWindowSizeIncrement()", "public double getWindowSizeBackOff()", - "public void setMaxThroughput(double)", + "public com.yahoo.messagebus.DynamicThrottlePolicy setMaxThroughput(double)", "public boolean canSend(com.yahoo.messagebus.Message, int)", "public void processMessage(com.yahoo.messagebus.Message)", "public void processReply(com.yahoo.messagebus.Reply)", diff --git a/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java b/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java index 4a280317692..717d2a97fe2 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/CallStack.java @@ -3,7 +3,6 @@ package com.yahoo.messagebus; import java.util.ArrayDeque; import java.util.Deque; -import java.util.Stack; /** * An wrapper around a stack of frame objects that is aware of the message that owns it. It contains functionality to @@ -75,7 +74,7 @@ public class CallStack { private final ReplyHandler handler; private final Object context; - public StackFrame(ReplyHandler handler, Object context) { + StackFrame(ReplyHandler handler, Object context) { this.handler = handler; this.context = context; } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java b/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java index c88d3f1308d..f0c7d712f8d 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java @@ -3,7 +3,6 @@ package com.yahoo.messagebus; import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.config.subscription.ConfigURI; -import com.yahoo.messagebus.MessagebusConfig; import com.yahoo.messagebus.routing.HopSpec; import com.yahoo.messagebus.routing.RouteSpec; import com.yahoo.messagebus.routing.RoutingSpec; diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java b/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java index c0b1ee179c6..1f5d60a630a 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java @@ -1,10 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus; -import com.yahoo.log.LogLevel; - import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Logger; /** * A session supporting receiving and replying to messages. A destination is expected to reply to every message @@ -14,7 +11,6 @@ import java.util.logging.Logger; */ public final class DestinationSession implements MessageHandler { - private static Logger log = Logger.getLogger(DestinationSession.class.getName()); private final AtomicBoolean destroyed = new AtomicBoolean(false); private final String name; private final boolean broadcastName; diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java index dae20543b34..525d7ae8867 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java @@ -59,8 +59,9 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy { return windowSizeBackOff; } - public void setMaxThroughput(double maxThroughput) { + public DynamicThrottlePolicy setMaxThroughput(double maxThroughput) { this.maxThroughput = maxThroughput; + return this; } @Override @@ -112,7 +113,6 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy { } double efficiency = throughput*period/windowSize; if (efficiency < efficiencyThreshold) { - double newSize = Math.min(windowSize,throughput * period); windowSize = Math.min(windowSize * windowSizeBackOff, windowSize - 2* windowSizeIncrement); localMaxThroughput = 0; } else { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java index 75534605153..8286404aa23 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java @@ -2,7 +2,6 @@ package com.yahoo.messagebus; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Logger; /** * A session which supports receiving, forwarding and acknowledgement of messages. An intermediate session is expacted @@ -12,7 +11,6 @@ import java.util.logging.Logger; */ public final class IntermediateSession implements MessageHandler, ReplyHandler { - private static final Logger log = Logger.getLogger(IntermediateSession.class.getName()); private final AtomicBoolean destroyed = new AtomicBoolean(false); private final String name; private final boolean broadcastName; diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBusParams.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBusParams.java index 06b2af7ea92..7f55401cf43 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBusParams.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBusParams.java @@ -15,7 +15,7 @@ import java.util.List; */ public class MessageBusParams { - private final List<Protocol> protocols = new ArrayList<Protocol>(); + private final List<Protocol> protocols = new ArrayList<>(); private RetryPolicy retryPolicy; private int maxPendingCount; private int maxPendingSize; diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageHandler.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageHandler.java index 3f18e36b076..5f90a220605 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/MessageHandler.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageHandler.java @@ -15,5 +15,5 @@ public interface MessageHandler { * * @param message The message that arrived. */ - public void handleMessage(Message message); + void handleMessage(Message message); } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java b/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java index df60fc5bdbf..ddddaf23299 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/SendProxy.java @@ -24,7 +24,7 @@ public class SendProxy implements MessageHandler, ReplyHandler { private final Resender resender; private Message msg = null; private boolean logTrace = false; - private long sendTime = 0; + private final long sendTime; /** * Constructs a new instance of this class to maintain sending of a single message. diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Trace.java b/messagebus/src/main/java/com/yahoo/messagebus/Trace.java index 85b066318ff..87f58f6ce05 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/Trace.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Trace.java @@ -1,8 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus; -import java.util.Date; - /** * A Trace object contains ad-hoc string notes organized in a strict-loose tree. A Trace object consists of a trace * level indicating which trace notes should be included and a TraceTree object containing the tree structure and diff --git a/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java b/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java index 7b40b683227..38963645d54 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/TraceNode.java @@ -25,7 +25,7 @@ public class TraceNode implements Comparable<TraceNode> { private TraceNode parent = null; private boolean strict = true; private String note = null; - private List<TraceNode> children = new ArrayList<TraceNode>(); + private List<TraceNode> children = new ArrayList<>(); /** * Create an empty trace tree. @@ -48,7 +48,7 @@ public class TraceNode implements Comparable<TraceNode> { * * @param rhs The tree to copy. */ - TraceNode(TraceNode rhs) { + private TraceNode(TraceNode rhs) { strict = rhs.strict; note = rhs.note; addChildren(rhs.children); @@ -148,7 +148,7 @@ public class TraceNode implements Comparable<TraceNode> { return this; } List<TraceNode> tmp = this.children; - this.children = new ArrayList<TraceNode>(); + this.children = new ArrayList<>(); for (TraceNode child : tmp) { child.compact(); if (child.isEmpty()) { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java index daa31ae2701..1cc45eeb2d8 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSend.java @@ -113,7 +113,7 @@ public abstract class RPCSend implements MethodHandler, ReplyHandler, RequestWai private void doRequestDone(Request req) { SendContext ctx = (SendContext)req.getContext(); String serviceName = ((RPCServiceAddress)ctx.recipient.getServiceAddress()).getServiceName(); - Reply reply = null; + Reply reply; Error error = null; if (!req.checkReturnTypes(getReturnSpec())) { // Map all known JRT errors to the appropriate message bus error. @@ -269,7 +269,7 @@ public abstract class RPCSend implements MethodHandler, ReplyHandler, RequestWai final Request request; final Version version; - public ReplyContext(Request request, Version version) { + ReplyContext(Request request, Version version) { this.request = request; this.version = version; } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java index 6179097e5d9..07a33a646d9 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java @@ -43,7 +43,7 @@ public class RPCTarget implements RequestWaiter { * * @return The target. */ - public Target getJRTTarget() { + Target getJRTTarget() { return target; } @@ -54,7 +54,7 @@ public class RPCTarget implements RequestWaiter { * * @see #subRef() */ - public void addRef() { + void addRef() { ref.incrementAndGet(); } @@ -65,7 +65,7 @@ public class RPCTarget implements RequestWaiter { * * @see #addRef() */ - public void subRef() { + void subRef() { if (ref.decrementAndGet() == 0) { target.close(); } @@ -77,7 +77,7 @@ public class RPCTarget implements RequestWaiter { * * @return The number of references in use. */ - public int getRefCount() { + int getRefCount() { return ref.get(); } @@ -90,7 +90,7 @@ public class RPCTarget implements RequestWaiter { * @param timeout The timeout for the request in seconds. * @param handler The handler to be called once the version is available. */ - public void resolveVersion(double timeout, VersionHandler handler) { + void resolveVersion(double timeout, VersionHandler handler) { boolean hasVersion = false; boolean shouldInvoke = false; boolean shouldLog = log.isLoggable(LogLevel.DEBUG); @@ -168,6 +168,6 @@ public class RPCTarget implements RequestWaiter { * * @param ver The version of corresponding target, or null. */ - public void handleVersion(Version ver); + void handleVersion(Version ver); } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java index 432524ea2a9..f6185f1d410 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java @@ -133,8 +133,8 @@ public class ThrottlerTestCase { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); - policy.setWindowSizeIncrement(5); - policy.setResizeRate(1); + policy.setWindowSizeIncrement(5) + .setResizeRate(1); double windowSize = getWindowSize(policy, timer, 100); assertTrue(windowSize >= 90 && windowSize <= 110); @@ -157,8 +157,8 @@ public class ThrottlerTestCase { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); - policy.setWindowSizeIncrement(5); - policy.setResizeRate(1); + policy.setWindowSizeIncrement(5) + .setResizeRate(1); double windowSize = getWindowSize(policy, timer, 100); assertTrue(windowSize >= 90 && windowSize <= 110); @@ -183,9 +183,9 @@ public class ThrottlerTestCase { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); - policy.setWindowSizeIncrement(5); - policy.setResizeRate(1); - policy.setMinWindowSize(150); + policy.setWindowSizeIncrement(5) + .setResizeRate(1) + .setMinWindowSize(150); double windowSize = getWindowSize(policy, timer, 200); assertTrue(windowSize >= 150 && windowSize <= 210); diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index 5f49dd5ddf8..ac2c9515d71 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -6,7 +6,6 @@ import com.yahoo.container.jdisc.HttpResponse; import com.yahoo.document.DocumentTypeManager; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.documentapi.metrics.DocumentOperationType; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.ReferencedResource; import com.yahoo.log.LogLevel; @@ -23,7 +22,6 @@ import com.yahoo.yolean.Exceptions; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.time.Duration; import java.time.Instant; import java.util.Optional; @@ -297,7 +295,7 @@ class ClientFeederV3 { } private void setMessageParameters(DocumentOperationMessageV3 msg, FeederSettings settings) { - msg.getMessage().setContext(new ReplyContext(msg.getOperationId(), feedReplies, DocumentOperationType.fromMessage(msg.getMessage()))); + msg.getMessage().setContext(new ReplyContext(msg.getOperationId(), feedReplies)); if (settings.traceLevel != null) { msg.getMessage().getTrace().setLevel(settings.traceLevel); } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java index bf18616053b..b8cabe5cc48 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ReplyContext.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.http.server; -import com.yahoo.documentapi.metrics.DocumentOperationType; import com.yahoo.vespa.http.client.core.OperationStatus; import java.util.concurrent.BlockingQueue; @@ -14,11 +13,10 @@ import java.util.concurrent.BlockingQueue; public class ReplyContext { public final String docId; - public DocumentOperationType documentOperationType; public final BlockingQueue<OperationStatus> feedReplies; public final long creationTime; - public ReplyContext(String docId, BlockingQueue<OperationStatus> feedReplies, DocumentOperationType documentOperationType) { + public ReplyContext(String docId, BlockingQueue<OperationStatus> feedReplies) { this.docId = docId; this.feedReplies = feedReplies; this.creationTime = System.currentTimeMillis(); |