summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-02-02 00:30:53 +0100
committergjoranv <gv@verizonmedia.com>2022-02-02 00:30:53 +0100
commitf11550dbab6e9b213ab141a8183935746ad6cc7f (patch)
tree342c36a572df969c65e667b53022a784cd81d608 /container-core
parentf25710e1a9fd18e63b2124e4e7a2367c8807a77d (diff)
Add SuppressWarnings for removal of config.subscription types.
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java1
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java1
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java1
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/Container.java1
-rw-r--r--container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java1
5 files changed, 5 insertions, 0 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 5178b864e8e..729e1ca1f2e 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -39,6 +39,7 @@ import java.util.concurrent.Executors;
*/
public class HandlersConfigurerTestWrapper {
+ @SuppressWarnings("removal") // TODO Vespa 8: remove
private final ConfigSourceSet configSources =
new ConfigSourceSet(this.getClass().getSimpleName() + ": " + new Random().nextLong());
private final HandlersConfigurerDi configurer;
diff --git a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
index 0247cda8bbd..2acbec2e388 100644
--- a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
+++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java
@@ -21,6 +21,7 @@ import static java.util.logging.Level.FINE;
* @author Tony Vaagenes
* @author ollivir
*/
+@SuppressWarnings("removal") // TODO Vespa 8: remove
public class CloudSubscriber implements Subscriber {
private static final Logger log = Logger.getLogger(CloudSubscriber.class.getName());
diff --git a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
index a6327b01e21..a58baa5b2bd 100644
--- a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java
@@ -20,6 +20,7 @@ import java.util.WeakHashMap;
* @author Tony Vaagenes
* @author ollivir
*/
+@SuppressWarnings("removal") // TODO Vespa 8: remove
public class CloudSubscriberFactory implements SubscriberFactory {
private final ConfigSource configSource;
diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java
index b37a7b9f69f..d7c94af2a97 100644
--- a/container-core/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Container.java
@@ -217,6 +217,7 @@ public class Container {
}
}
+ @SuppressWarnings("removal") // TODO Vespa 8: remove
private void invalidateGeneration(long generation, Throwable cause) {
leastGeneration = Math.max(retriever.getComponentsGeneration(), retriever.getBootstrapGeneration()) + 1;
if (!(cause instanceof InterruptedException) && !(cause instanceof ConfigInterruptedException)) {
diff --git a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java
index d459070e2bd..34119163d2f 100644
--- a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java
+++ b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java
@@ -16,6 +16,7 @@ import java.util.Random;
* @author gjoranv
* @author ollivir
*/
+@SuppressWarnings("removal") // TODO Vespa 8: remove
public class DirConfigSource {
private final TemporaryFolder tempFolder = createTemporaryFolder();
public final ConfigSource configSource;