diff options
author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-05-16 13:20:56 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:22 +0200 |
commit | 4639be4f03d58a0b8df7b1ecb573e7d344a53ed5 (patch) | |
tree | 236d8b271e2e51c5e15df08bc19c4c97860ca16a /container-messagebus/src/main/java | |
parent | 1e03a00cd6f69cf63d942885e97ff7582778c7f5 (diff) |
Remove top-level <clients> element and LoadType concept
Load types have not been properly supported for some time, so remove
the remaining API surfaces exposing them. Since load type config was
the last remaining use of <clients> in services.xml, remove that one
as well.
Diffstat (limited to 'container-messagebus/src/main/java')
-rw-r--r-- | container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java | 10 |
1 files changed, 2 insertions, 8 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 b092f4fce10..baff0437b5d 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 @@ -6,7 +6,6 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentUtil; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.jdisc.ReferencedResource; @@ -28,7 +27,6 @@ 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.vespa.config.content.LoadTypeConfig; import com.yahoo.yolean.concurrent.Memoized; import java.util.HashMap; @@ -72,17 +70,13 @@ public final class SessionCache extends AbstractComponent { DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { this(nets::net, containerMbusConfig, documentTypeManager, - null/*TODO: Remove on Vespa 8*/, messagebusConfig, policiesConfig, distributionConfig); + messagebusConfig, policiesConfig, distributionConfig); } - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 public SessionCache(Supplier<NetworkMultiplexer> net, ContainerMbusConfig containerMbusConfig, DocumentTypeManager documentTypeManager, - LoadTypeConfig loadTypeConfig, MessagebusConfig messagebusConfig, + MessagebusConfig messagebusConfig, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { this(net, |