Deprecate legacy SecretStore interface

2 files changed, 5 insertions, 5 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
index 9e35619cc84..28169524c90 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStoreProvider.java
@@ -2,7 +2,6 @@
 package com.yahoo.container.jdisc;
 
 import com.yahoo.container.di.componentgraph.Provider;
-import com.yahoo.jdisc.http.SecretStore;
 
 /**
  * An secret store provider which provides a factory which throws exception on
@@ -12,17 +11,18 @@ import com.yahoo.jdisc.http.SecretStore;
  *
  * @author bratseth
  */
-public class SecretStoreProvider implements Provider<SecretStore> {
+@SuppressWarnings("deprecation")
+public class SecretStoreProvider implements Provider<com.yahoo.jdisc.http.SecretStore> {
 
     private static final ThrowingSecretStore instance = new ThrowingSecretStore();
 
     @Override
-    public SecretStore get() { return instance; }
+    public com.yahoo.jdisc.http.SecretStore get() { return instance; }
 
     @Override
     public void deconstruct() { }
 
-    private static final class ThrowingSecretStore implements SecretStore {
+    private static final class ThrowingSecretStore implements com.yahoo.jdisc.http.SecretStore {
 
         @Override
         public String getSecret(String key) {
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStore.java b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java
index 5e18f608777..902d924c431 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/SecretStore.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/secretstore/SecretStore.java
@@ -1,6 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-package com.yahoo.container.jdisc;
+package com.yahoo.container.jdisc.secretstore;
 
 /**
  * @author mortent