From c2f74605f1d51ec994c8e913b9cb68c24af384ec Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahooinc.com>
Date: Tue, 7 Jun 2022 13:08:10 +0000
Subject: cleanup

---
 .../main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java    | 4 ----
 .../java/com/yahoo/vespa/hosted/routing/RoutingGeneratorTest.java     | 1 -
 .../src/test/java/com/yahoo/vespa/hosted/routing/TestUtil.java        | 1 -
 3 files changed, 6 deletions(-)

(limited to 'routing-generator/src')

diff --git a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
index e4e739c89c7..ba14bc83137 100644
--- a/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
+++ b/routing-generator/src/main/java/com/yahoo/vespa/hosted/routing/RoutingGenerator.java
@@ -60,7 +60,6 @@ public class RoutingGenerator extends AbstractComponent {
     private volatile RoutingTable routingTable = null;
 
     @Inject
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public RoutingGenerator(ZoneConfig zoneConfig, RoutingStatus routingStatus, Metric metric) {
         this(new ConfigSourceSet(zoneConfig.configserver()), new Nginx(FileSystems.getDefault(),
                                                                        new ProcessExecuter(),
@@ -71,7 +70,6 @@ public class RoutingGenerator extends AbstractComponent {
              Clock.systemUTC());
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     RoutingGenerator(ConfigSource configSource, Router router, Clock clock) {
         this.router = Objects.requireNonNull(router);
         this.clock = Objects.requireNonNull(clock);
@@ -107,7 +105,6 @@ public class RoutingGenerator extends AbstractComponent {
         load(RoutingTable.from(lbServicesConfig, generation));
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private <T extends ConfigInstance> void subscribeOn(Class<T> clazz, BiConsumer<T, Long> action, ConfigSource configSource,
                                                         ExecutorService executor) {
         ConfigHandle<T> configHandle = null;
@@ -141,7 +138,6 @@ public class RoutingGenerator extends AbstractComponent {
     }
 
     @Override
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public void deconstruct() {
         configSubscriber.close();
         // shutdownNow because ConfigSubscriber#nextGeneration blocks until next config, and we don't want to wait for
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingGeneratorTest.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingGeneratorTest.java
index 3e8b9be572f..7c526eae4ed 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingGeneratorTest.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/RoutingGeneratorTest.java
@@ -55,7 +55,6 @@ public class RoutingGeneratorTest {
 
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private static class ConfigSetMock extends ConfigSet {
 
         private int attempt = 0;
diff --git a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/TestUtil.java b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/TestUtil.java
index 09440cfaac7..ac2db906825 100644
--- a/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/TestUtil.java
+++ b/routing-generator/src/test/java/com/yahoo/vespa/hosted/routing/TestUtil.java
@@ -18,7 +18,6 @@ public class TestUtil {
 
     private static final Path testData = Paths.get("src/test/resources/");
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public static RoutingTable readRoutingTable(String filename) {
         List<String> lines = Exceptions.uncheck(() -> Files.readAllLines(testFile(filename),
                                                                          StandardCharsets.UTF_8));
-- 
cgit v1.2.3