diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-10-11 13:07:02 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-10-25 09:04:38 +0200 |
| commit | d52b10e09dbd4c5b842e22aa6a543f0ce694c209 (patch) | |
| tree | d3c0853b985ea3048cc0a95c1a72ecae138893b0 /controller-server | |
| parent | b8b272cafc0fb59311219b198c8648308c3ad7c4 (diff) | |
Remove unused parameter
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java index 366be35fe15..cd063e8e14b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java @@ -192,7 +192,7 @@ public class Application { /** Returns the global rotation dns name, if present */ public Optional<GlobalDnsName> globalDnsName(SystemName system) { - return rotation.map(rotation -> new GlobalDnsName(id, rotation, system)); + return rotation.map(ignored -> new GlobalDnsName(id, system)); } /** Returns the status of the global rotation assigned to this. Wil be empty if this does not have a global rotation. */ @@ -205,7 +205,6 @@ public class Application { // Rotation status only contains VIP host names, one per zone in the system. The only way to map VIP hostname to // this deployment, and thereby determine rotation status, is to check if VIP hostname contains the // deployment's environment and region. - // TODO: change this map to be indexed by zones, then? return rotationStatus.entrySet().stream() .filter(kv -> kv.getKey().value().contains(deployment.zone().value())) .map(Map.Entry::getValue) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java index 18ec15d35ac..91406bdb941 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/GlobalDnsName.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.application; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.SystemName; -import com.yahoo.vespa.hosted.controller.rotation.RotationId; import java.net.URI; @@ -24,7 +23,7 @@ public class GlobalDnsName { private final URI secureUrl; private final URI oathUrl; - public GlobalDnsName(ApplicationId application, RotationId id, SystemName system) { + public GlobalDnsName(ApplicationId application, SystemName system) { this.url = URI.create(String.format("http://%s%s.%s.%s:%d/", getSystemPart(system, "."), sanitize(application.application().value()), |