Removed two pointless Optional<> and replaced more (Env, Reg) with ZoneId

1 files changed, 3 insertions, 3 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 41541d9fcbe..18739e5133b 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
@@ -23,9 +23,9 @@ public interface ZoneRegistry {
     List<ZoneId> zones();
     boolean hasZone(ZoneId zoneId);
     List<URI> getConfigServerUris(ZoneId zoneId);
-    Optional<URI> getLogServerUri(Environment environment, RegionName region);
-    Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region);
-    Optional<RegionName> getDefaultRegion(Environment environment);
+    Optional<URI> getLogServerUri(ZoneId zoneId);
+    Duration getDeploymentTimeToLive(ZoneId zoneId);
+    RegionName getDefaultRegion(Environment environment);
     URI getMonitoringSystemUri(Environment environment, RegionName name, ApplicationId application);
     URI getDashboardUri();