diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-03-06 20:28:03 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-03-06 20:28:03 +0100 |
| commit | 3662f6203003cf5cdef8ec6932cd0ffb6e6f2516 (patch) | |
| tree | d5ae20e102e424a41136d9f7740dd5acacb9c8b3 /container-messagebus | |
| parent | 8419cba0870998b45506d54039bece445ef7bef5 (diff) | |
Inject DocumentTypeManager to SessionCache
Diffstat (limited to 'container-messagebus')
2 files changed, 6 insertions, 5 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 1db288d59dd..74b6f07a23d 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 @@ -70,24 +70,24 @@ public final class SessionCache extends AbstractComponent { @Inject public SessionCache(NetworkMultiplexerProvider nets, ContainerMbusConfig containerMbusConfig, - DocumentmanagerConfig documentmanagerConfig, + DocumentTypeManager documentTypeManager, LoadTypeConfig loadTypeConfig, MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this(nets::net, containerMbusConfig, documentmanagerConfig, + this(nets::net, containerMbusConfig, documentTypeManager, loadTypeConfig, messagebusConfig, policiesConfig, distributionConfig); } public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig, - DocumentmanagerConfig documentmanagerConfig, + DocumentTypeManager documentTypeManager, LoadTypeConfig loadTypeConfig, MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { this(net, containerMbusConfig, messagebusConfig, - new DocumentProtocol(new DocumentTypeManager(documentmanagerConfig), + new DocumentProtocol(documentTypeManager, new LoadTypeSet(loadTypeConfig), policiesConfig, distributionConfig)); 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 8d8010c72dc..c509fb917fa 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 @@ -3,6 +3,7 @@ package com.yahoo.container.jdisc.messagebus; import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.container.jdisc.config.SessionConfig; +import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.MessagebusConfig; @@ -38,7 +39,7 @@ public class MbusClientProviderTest { private void testClient(SessionConfig config) { SessionCache cache = new SessionCache(() -> NetworkMultiplexer.dedicated(new NullNetwork()), new ContainerMbusConfig.Builder().build(), - new DocumentmanagerConfig.Builder().build(), + new DocumentTypeManager(new DocumentmanagerConfig.Builder().build()), new LoadTypeConfig.Builder().build(), new MessagebusConfig.Builder().build(), new DocumentProtocolPoliciesConfig.Builder().build(), |