diff options
author | jonmv <venstad@gmail.com> | 2023-07-14 11:58:14 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-07-14 11:58:14 +0200 |
commit | 37dbcbd0e30d77106d0087e92089a953a4ab6899 (patch) | |
tree | c934f1bbbe883521c95cae5a0131d40168a28d32 /container-messagebus | |
parent | 04c653308e09f05fbc1dc137d3a4290e47a76054 (diff) |
Use config self-subscription also for session-cache which powers docproc
Diffstat (limited to 'container-messagebus')
2 files changed, 6 insertions, 17 deletions
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 16dedd0765d..ab5080b8f3f 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 @@ -1,12 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.jdisc.messagebus; -import com.yahoo.component.annotation.Inject; import com.yahoo.component.AbstractComponent; +import com.yahoo.component.annotation.Inject; import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.document.DocumentTypeManager; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.jdisc.ReferencedResource; import com.yahoo.jdisc.References; import com.yahoo.jdisc.ResourceReference; @@ -25,7 +24,6 @@ import com.yahoo.messagebus.network.NetworkMultiplexer; import com.yahoo.messagebus.shared.SharedIntermediateSession; import com.yahoo.messagebus.shared.SharedMessageBus; import com.yahoo.messagebus.shared.SharedSourceSession; -import com.yahoo.vespa.config.content.DistributionConfig; import com.yahoo.yolean.concurrent.Memoized; import java.util.HashMap; @@ -65,25 +63,18 @@ public final class SessionCache extends AbstractComponent { @Inject public SessionCache(NetworkMultiplexerProvider nets, ContainerMbusConfig containerMbusConfig, DocumentTypeManager documentTypeManager, - MessagebusConfig messagebusConfig, - DocumentProtocolPoliciesConfig policiesConfig, - DistributionConfig distributionConfig) { - this(nets::net, containerMbusConfig, documentTypeManager, - messagebusConfig, policiesConfig, distributionConfig); + MessagebusConfig messagebusConfig) { + this(nets::net, containerMbusConfig, documentTypeManager, messagebusConfig); } public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig, DocumentTypeManager documentTypeManager, - MessagebusConfig messagebusConfig, - DocumentProtocolPoliciesConfig policiesConfig, - DistributionConfig distributionConfig) { + MessagebusConfig messagebusConfig) { this(net, containerMbusConfig, messagebusConfig, - new DocumentProtocol(documentTypeManager, - policiesConfig, - distributionConfig)); + new DocumentProtocol(documentTypeManager)); } public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig, diff --git a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java index e0cd9ca6dde..e41ce539b4a 100644 --- a/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java +++ b/container-messagebus/src/test/java/com/yahoo/container/jdisc/messagebus/MbusClientProviderTest.java @@ -39,9 +39,7 @@ public class MbusClientProviderTest { SessionCache cache = new SessionCache(() -> NetworkMultiplexer.dedicated(new NullNetwork()), new ContainerMbusConfig.Builder().build(), new DocumentTypeManager(new DocumentmanagerConfig.Builder().build()), - new MessagebusConfig.Builder().build(), - new DocumentProtocolPoliciesConfig.Builder().build(), - new DistributionConfig.Builder().build()); + new MessagebusConfig.Builder().build()); MbusClientProvider p = new MbusClientProvider(cache, config); assertNotNull(p.get()); p.deconstruct(); |