From 7bc757ef1e1aa47042c8f58f9fc9ad38126388c4 Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@yahooinc.com>
Date: Mon, 4 Apr 2022 17:12:45 +0200
Subject: Deprecate load types from Java APIs

Load types have not been used in practice for years, and supporting
them in backend metrics etc. has long since been lacking. Prepare for
removing these on Vespa 8.

Most callsites are unchanged, aside from presumed safe changes such
as constructors used by dependency injection. Have added new overloads
without load types where these did not already exist to allow for
an orderly transition.
---
 .../java/com/yahoo/container/jdisc/messagebus/SessionCache.java  | 9 ++++++---
 .../yahoo/container/jdisc/messagebus/MbusClientProviderTest.java | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'container-messagebus/src')

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 46dcaf17abc..91a3181cb68 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
@@ -69,14 +69,18 @@ public final class SessionCache extends AbstractComponent {
     @Inject
     public SessionCache(NetworkMultiplexerProvider nets, ContainerMbusConfig containerMbusConfig,
                         DocumentTypeManager documentTypeManager,
-                        LoadTypeConfig loadTypeConfig, MessagebusConfig messagebusConfig,
+                        MessagebusConfig messagebusConfig,
                         DocumentProtocolPoliciesConfig policiesConfig,
                         DistributionConfig distributionConfig) {
         this(nets::net, containerMbusConfig, documentTypeManager,
-             loadTypeConfig, messagebusConfig, policiesConfig, distributionConfig);
+             null/*TODO: Remove on Vespa 8*/, 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,
@@ -86,7 +90,6 @@ public final class SessionCache extends AbstractComponent {
              containerMbusConfig,
              messagebusConfig,
              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 c509fb917fa..b9f33506894 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
@@ -36,6 +36,7 @@ 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(),
-- 
cgit v1.2.3