Make EndpointCertificateSecretStore an interface

2 files changed, 10 insertions, 8 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 42e7e23dfcc..e493840ef82 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1178,11 +1178,11 @@
     "interfaces" : [ ],
     "attributes" : [
       "public",
+      "interface",
       "abstract"
     ],
     "methods" : [
-      "public void <init>()",
-      "public final com.yahoo.config.model.api.EndpointCertificateSecrets getSecret(com.yahoo.config.model.api.EndpointCertificateMetadata)",
+      "public com.yahoo.config.model.api.EndpointCertificateSecrets getSecret(com.yahoo.config.model.api.EndpointCertificateMetadata)",
       "public abstract java.util.Optional getPrivateKey(com.yahoo.config.model.api.EndpointCertificateMetadata)",
       "public abstract java.util.Optional getCertificate(com.yahoo.config.model.api.EndpointCertificateMetadata)",
       "public abstract boolean supports(com.yahoo.config.model.api.EndpointCertificateMetadata$Provider)"
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecretStore.java b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecretStore.java
index 78be1942db7..21ed3206ae3 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecretStore.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecretStore.java
@@ -2,12 +2,14 @@
 
 package com.yahoo.config.model.api;
 
-import java.util.List;
 import java.util.Optional;
 
-public abstract class EndpointCertificateSecretStore {
+/**
+ * @author tokle
+ */
+public interface EndpointCertificateSecretStore {
 
-    public final EndpointCertificateSecrets getSecret(EndpointCertificateMetadata metadata) {
+    default EndpointCertificateSecrets getSecret(EndpointCertificateMetadata metadata) {
         Optional<String> certificate = getCertificate(metadata);
         Optional<String> key = getPrivateKey(metadata);
         if (certificate.isPresent() && key.isPresent()) {
@@ -17,9 +19,9 @@ public abstract class EndpointCertificateSecretStore {
         }
     }
 
-    public abstract Optional<String> getPrivateKey(EndpointCertificateMetadata metadata);
-    public abstract Optional<String> getCertificate(EndpointCertificateMetadata metadata);
+    Optional<String> getPrivateKey(EndpointCertificateMetadata metadata);
+    Optional<String> getCertificate(EndpointCertificateMetadata metadata);
 
-    public abstract boolean supports(EndpointCertificateMetadata.Provider provider);
+    boolean supports(EndpointCertificateMetadata.Provider provider);
 
 }