Revert "accept and store json endpoint cert metadata on deploy"

3 files changed, 5 insertions, 40 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java b/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
deleted file mode 100644
index a1fae9bb148..00000000000
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateMetadata.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.yahoo.config.model.api;
-
-public class EndpointCertificateMetadata {
-
-    private final String keyName;
-    private final String certName;
-    private final int version;
-
-    public EndpointCertificateMetadata(String keyName, String certName, int version) {
-        this.keyName = keyName;
-        this.certName = certName;
-        this.version = version;
-    }
-
-    public String keyName() {
-        return keyName;
-    }
-
-    public String certName() {
-        return certName;
-    }
-
-    public int version() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return "EndpointCertificateMetadata{" +
-                "keyName='" + keyName + '\'' +
-                ", certName='" + certName + '\'' +
-                ", version=" + version +
-                '}';
-    }
-}
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index d45c7ce4137..323aa473580 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -55,7 +55,7 @@ public interface ModelContext {
         default boolean useDedicatedNodeForLogserver() { return true; }
         boolean useAdaptiveDispatch();
         // TODO: Remove temporary default implementation
-        default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); }
+        default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); }
         double defaultTermwiseLimit();
         boolean useBucketSpaceMetric();
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecrets.java b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
index 6fcbac4f422..6a8b5a237ab 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/EndpointCertificateSecrets.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
@@ -1,17 +1,17 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
-public class EndpointCertificateSecrets {
-    public static final EndpointCertificateSecrets MISSING = new EndpointCertificateSecrets();
+public class TlsSecrets {
+    public static final TlsSecrets MISSING = new TlsSecrets();
 
     private final String certificate;
     private final String key;
 
-    private EndpointCertificateSecrets() {
+    private TlsSecrets() {
         this(null, null);
     }
 
-    public EndpointCertificateSecrets(String certificate, String key) {
+    public TlsSecrets(String certificate, String key) {
         this.certificate = certificate;
         this.key = key;
     }