From 0c55dc92a3bf889c67fac1ca855e6e33e1994904 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 9 Oct 2023 09:44:29 +0200 Subject: Update copyright --- .../main/java/com/yahoo/messagebus/jdisc/IgnoredCompletionHandler.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/MbusRequestHandler.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/MbusResponse.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/StatusCodes.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/package-info.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/MessageQueue.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/ReplyQueue.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java | 2 +- .../src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'container-messagebus/src/main/java/com/yahoo/messagebus/jdisc') diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/IgnoredCompletionHandler.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/IgnoredCompletionHandler.java index 4a172fb9f70..7dc0c345448 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/IgnoredCompletionHandler.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/IgnoredCompletionHandler.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.jdisc.handler.CompletionHandler; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java index ac4276d0325..dee4e3dcfbb 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusClient.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.component.annotation.Inject; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java index bfaec7a2876..8bdc9368c9f 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.jdisc.Request; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequestHandler.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequestHandler.java index 86e84beb01b..8d54682be51 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequestHandler.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequestHandler.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.jdisc.Request; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusResponse.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusResponse.java index efc646f57b9..feafe6c3c11 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusResponse.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusResponse.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.jdisc.Response; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java index 3cf3b4bf8b0..3949d713768 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.google.inject.Inject; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/StatusCodes.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/StatusCodes.java index 6ab1fbea9e9..316a2dc0921 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/StatusCodes.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/StatusCodes.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc; import com.yahoo.jdisc.Response; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/package-info.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/package-info.java index 28ec9df04d3..377d9e77f4b 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/package-info.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.messagebus.jdisc; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java index 07ab03a117f..ec06c963396 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.jdisc.References; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/MessageQueue.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/MessageQueue.java index 09f7125c649..e69ad3836d3 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/MessageQueue.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/MessageQueue.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.messagebus.Message; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java index 6cec6c8e3d5..743ea274e60 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.cloud.config.SlobroksConfig; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java index 3481e95befb..c648235003d 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.cloud.config.SlobroksConfig; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ReplyQueue.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ReplyQueue.java index 800a84a4a20..342b814716a 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ReplyQueue.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ReplyQueue.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.messagebus.Reply; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java index 5a5ca6fcd78..5528085c5b8 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.google.inject.Module; diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java index 00ebb61b87d..127eef7353b 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.jdisc.test; import com.yahoo.cloud.config.SlobroksConfig; -- cgit v1.2.3 From ac6c7464aba758270e1aa2674ba8c0d25faed79d Mon Sep 17 00:00:00 2001 From: jonmv Date: Wed, 11 Oct 2023 21:44:23 +0200 Subject: Info log message when MbusServer is finally destroyed --- .../src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java | 4 ++-- .../src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java | 2 +- jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java | 2 +- .../src/main/java/com/yahoo/messagebus/IntermediateSession.java | 3 ++- .../main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'container-messagebus/src/main/java/com/yahoo/messagebus/jdisc') diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java index 3949d713768..4c21489ded2 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java @@ -48,8 +48,8 @@ public final class MbusServer extends AbstractResource implements ServerProvider @Override public void start() { log.log(Level.FINE, "Starting message bus server."); - session.connect(); runState.set(State.RUNNING); + session.connect(); } @Override @@ -66,7 +66,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider @Override protected void destroy() { - log.log(Level.FINE, "Destroying message bus server."); + log.log(Level.INFO, "Destroying message bus server: " + session.name()); runState.set(State.STOPPED); sessionReference.close(); } diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java index 3556fb0a739..8b0cd62df07 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; /** - *

This class implements a Future<Boolean> that is conjunction of zero or more other Future<Boolean>s, + *

This class implements a Future<Boolean> that is a conjunction of zero or more other Future<Boolean>s, * i.e. it evaluates to true if, and only if, all its operands evaluate to true. To use this class, * simply create an instance of it and add operands to it using the {@link #addOperand(CompletableFuture)} method.

* diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java index 28037ce6fb4..b60b62e3f86 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java @@ -119,7 +119,7 @@ public abstract class RequestDispatch implements Future, ResponseHandl try { return futureResponse.get(); } catch (InterruptedException | ExecutionException e) { - throw new IllegalStateException(e); // Should not happens since both futures are complete + throw new IllegalStateException(e); // Should not happen since both futures are complete } }); } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java index cbaeb25af58..7e8286d8793 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java @@ -119,6 +119,7 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler, mbus.connect(name, broadcastName); } - @Override public void disconnect() { close(); } + @Override + public void disconnect() { close(); } } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java b/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java index 0759a5661be..85389c8b21f 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java @@ -6,6 +6,7 @@ import com.yahoo.messagebus.Protocol; import com.yahoo.text.Utf8Array; import java.util.Deque; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedDeque; @@ -68,7 +69,7 @@ public class NetworkMultiplexer implements NetworkOwner { public void unregisterSession(String session, NetworkOwner owner, boolean broadcast) { sessions.computeIfPresent(session, (name, owners) -> { - if (owners.size() == 1 && owners.contains(owner)) { + if (owners.equals(List.of(owner))) { if (broadcast) net.unregisterSession(session); return null; -- cgit v1.2.3