Remove on Vespa 8

4 files changed, 0 insertions, 72 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index bfa19cfe90c..2b6efab3389 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -108,7 +108,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         addSimpleComponent("com.yahoo.language.provider.DefaultLinguisticsProvider");
         addSimpleComponent("com.yahoo.language.provider.DefaultEmbedderProvider");
         addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider");
-        addSimpleComponent("com.yahoo.container.jdisc.DeprecatedSecretStoreProvider");
         addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider");
         addSimpleComponent("com.yahoo.container.jdisc.AthenzIdentityProviderProvider");
         addSimpleComponent(com.yahoo.container.core.documentapi.DocumentAccessProvider.class.getName());
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index 881c22cb482..35dd216eb0a 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -1751,20 +1751,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.jdisc.http.SecretStore": {
-    "superClass": "java.lang.Object",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "interface",
-      "abstract"
-    ],
-    "methods": [
-      "public abstract java.lang.String getSecret(java.lang.String)",
-      "public java.lang.String getSecret(java.lang.String, int)"
-    ],
-    "fields": []
-  },
   "com.yahoo.jdisc.http.ServerConfig$AccessLog$Builder": {
     "superClass": "java.lang.Object",
     "interfaces": [
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/SecretStore.java b/container-core/src/main/java/com/yahoo/jdisc/http/SecretStore.java
deleted file mode 100644
index 30e3e770a00..00000000000
--- a/container-core/src/main/java/com/yahoo/jdisc/http/SecretStore.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http;
-
-/**
- * An abstraction of a secret store for e.g passwords.
- * Implementations can be plugged in to provide passwords for various keys.
- *
- * @author bratseth
- * @author bjorncs
- * @deprecated Use com.yahoo.container.jdisc.secretstore.SecretStore
- */
-@Deprecated // Vespa 8
-public interface SecretStore {
-
-    /** Returns the secret for this key */
-    String getSecret(String key);
-
-    /** Returns the secret for this key and version */
-    default String getSecret(String key, int version) {
-        throw new UnsupportedOperationException("SecretStore implementation does not support versioned secrets");
-    }
-
-}
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/DeprecatedSecretStoreProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/DeprecatedSecretStoreProvider.java
deleted file mode 100644
index 3292030784b..00000000000
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/DeprecatedSecretStoreProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.jdisc;
-
-import com.yahoo.container.di.componentgraph.Provider;
-
-/**
- * An secret store provider which provides a factory which throws exception on
- * invocation - as no secret store is currently provided by default.
- * The purpose of this is to provide a secret store for injection in the case where
- * no secret store component is provided.
- *
- * @author bratseth
- */
-@SuppressWarnings({"deprecation", "unused"})
-public class DeprecatedSecretStoreProvider implements Provider<com.yahoo.jdisc.http.SecretStore> {
-
-    private static final ThrowingSecretStore instance = new ThrowingSecretStore();
-
-    @Override
-    public com.yahoo.jdisc.http.SecretStore get() { return instance; }
-
-    @Override
-    public void deconstruct() { }
-
-    private static final class ThrowingSecretStore implements com.yahoo.jdisc.http.SecretStore {
-
-        @Override
-        public String getSecret(String key) {
-            throw new UnsupportedOperationException("A secret store is not available");
-        }
-
-    }
-
-}