diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2019-06-21 14:39:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-21 14:39:17 +0200 |
commit | d41f4bf4765936db480ed7246834382bac0d48f3 (patch) | |
tree | 1d0a03b8544dc89cb67f930bb7d2b05ce0e10f0d /config-model-api | |
parent | 79efda4ec2def085aa8f9768b0d7c7e98053a73a (diff) |
Revert "mortent/tls config from deploy params"
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 1 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java | 30 |
2 files changed, 0 insertions, 31 deletions
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 136f30d437f..b5db9f5eddd 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 @@ -59,7 +59,6 @@ public interface ModelContext { boolean useAdaptiveDispatch(); // TODO: Remove when 7.61 is the oldest model in use default boolean enableMetricsProxyContainer() { return false; } - Optional<TlsSecrets> tlsSecrets(); } } diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java deleted file mode 100644 index a066152aa0b..00000000000 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java +++ /dev/null @@ -1,30 +0,0 @@ -// 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 TlsSecrets { - public static final TlsSecrets MISSING = new TlsSecrets(); - - private final String certificate; - private final String key; - - private TlsSecrets() { - this(null,null); - } - - public TlsSecrets(String certificate, String key) { - this.certificate = certificate; - this.key = key; - } - - public String certificate() { - return certificate; - } - - public String key() { - return key; - } - - public boolean isMissing() { - return this == MISSING; - } -} |