Remove getConfigServerUris from ZoneRegistry

2 files changed, 1 insertions, 14 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
index 2945544d668..09e6aa11490 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java
@@ -28,15 +28,7 @@ public interface ZoneRegistry {
     /** Returns the default region for the given environment, if one is configured. */
     Optional<RegionName> getDefaultRegion(Environment environment);
 
-    /** Returns a list with all known config servers in the given zone.
-     *
-     * @deprecated Use {@link #getConfigServerSecureUris(ZoneId)} instead (requires that client trusts Athenz CA)
-     */
-    @Deprecated
-    default List<URI> getConfigServerUris(ZoneId zoneId) {
-        throw new UnsupportedOperationException("Use getConfigServerSecureUris() instead");
-    }
-
+    // TODO Rename to getConfigServerUris once port 4080 is removed from configservers
     /** Returns a list with all known config servers in the given zone, with a secure connection URL. */
     List<URI> getConfigServerSecureUris(ZoneId zoneId);
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
index 21072f0b162..82cac67b599 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java
@@ -79,11 +79,6 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry
     }
 
     @Override
-    public List<URI> getConfigServerUris(ZoneId zoneId) {
-        return Collections.singletonList(URI.create(String.format("http://cfg.%s.test", zoneId.value())));
-    }
-
-    @Override
     public List<URI> getConfigServerSecureUris(ZoneId zoneId) {
         return Collections.singletonList(URI.create(String.format("https://cfg.%s.test:4443", zoneId.value())));
     }