Merge pull request #21013 from vespa-engine/deprecate-config.subscription

Deprecate config.subscription

2 files changed, 5 insertions, 3 deletions

diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
index 04a577db554..b6455a7703c 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java
@@ -39,6 +39,7 @@ public class Distribution {
         private final boolean distributorAutoOwnershipTransferOnWholeGroupDown;
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private ConfigSubscriber configSub;
     private final AtomicReference<Config> config = new AtomicReference<>(new Config(null, 1, false));
 
@@ -60,6 +61,7 @@ public class Distribution {
         return p;
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     // NOTE: keep in sync with the below
     private ConfigSubscriber.SingleSubscriber<StorDistributionConfig> configSubscriber = config -> {
         try {
@@ -146,6 +148,7 @@ public class Distribution {
         }
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public Distribution(String configId) {
         try {
             configSub = new ConfigSubscriber();
diff --git a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
index 225bc17c552..084d0e9185d 100644
--- a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
+++ b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
@@ -4,8 +4,6 @@ package com.yahoo.vdslib.distribution;
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.document.BucketId;
 import com.yahoo.vdslib.state.ClusterState;
-import com.yahoo.vdslib.state.Node;
-import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vespa.config.content.StorDistributionConfig;
 import org.codehaus.jettison.json.JSONArray;
@@ -16,8 +14,9 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
+
+// TODO: Use config builder instead of ConfigGetter to create test config.
 public class DistributionTestFactory extends CrossPlatformTestFactory {
 
     private static final String testDirectory = "src/tests/distribution/testdata";