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.

2 files changed, 2 insertions, 11 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,
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 b9f33506894..e0cd9ca6dde 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
@@ -10,7 +10,6 @@ import com.yahoo.messagebus.MessagebusConfig;
 import com.yahoo.messagebus.network.NetworkMultiplexer;
 import com.yahoo.messagebus.shared.NullNetwork;
 import com.yahoo.vespa.config.content.DistributionConfig;
-import com.yahoo.vespa.config.content.LoadTypeConfig;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
@@ -36,12 +35,10 @@ public class MbusClientProviderTest {
         testClient(new SessionConfig(builder));
     }
 
-    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
     private void testClient(SessionConfig config) {
         SessionCache cache = new SessionCache(() -> NetworkMultiplexer.dedicated(new NullNetwork()),
                                               new ContainerMbusConfig.Builder().build(),
                                               new DocumentTypeManager(new DocumentmanagerConfig.Builder().build()),
-                                              new LoadTypeConfig.Builder().build(),
                                               new MessagebusConfig.Builder().build(),
                                               new DocumentProtocolPoliciesConfig.Builder().build(),
                                               new DistributionConfig.Builder().build());