diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-11-08 10:59:42 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-11-08 10:59:42 +0100 |
commit | a6c73c4606d49fe3441f8d73a0fba43a27597791 (patch) | |
tree | ef7f5806f6dafcd832ed037a566de2b21c337057 /controller-api | |
parent | aeb44288a43930f740cea49b022377124de75f72 (diff) |
Rename 'ConfigserverFlagsTarget' -> 'ConfigServerFlagsTarget'
Diffstat (limited to 'controller-api')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigServerFlagsTarget.java (renamed from controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigserverFlagsTarget.java) | 6 | ||||
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java | 6 | ||||
-rw-r--r-- | controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigserverFlagsTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigServerFlagsTarget.java index 6863b68ba72..0304d1a5949 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigserverFlagsTarget.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/ConfigServerFlagsTarget.java @@ -18,13 +18,13 @@ import static com.yahoo.vespa.hosted.controller.api.systemflags.v1.FlagsTarget.z /** * @author bjorncs */ -class ConfigserverFlagsTarget implements FlagsTarget { +class ConfigServerFlagsTarget implements FlagsTarget { private final SystemName system; private final ZoneId zone; private final URI endpoint; private final AthenzIdentity identity; - ConfigserverFlagsTarget(SystemName system, ZoneId zone, URI endpoint, AthenzIdentity identity) { + ConfigServerFlagsTarget(SystemName system, ZoneId zone, URI endpoint, AthenzIdentity identity) { this.system = Objects.requireNonNull(system); this.zone = Objects.requireNonNull(zone); this.endpoint = Objects.requireNonNull(endpoint); @@ -39,7 +39,7 @@ class ConfigserverFlagsTarget implements FlagsTarget { @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ConfigserverFlagsTarget that = (ConfigserverFlagsTarget) o; + ConfigServerFlagsTarget that = (ConfigServerFlagsTarget) o; return system == that.system && Objects.equals(zone, that.zone) && Objects.equals(endpoint, that.endpoint) && diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java index 7b63cfbdcf2..1b7f84d1ec7 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/FlagsTarget.java @@ -41,7 +41,7 @@ public interface FlagsTarget { SystemName system = registry.system(); Set<FlagsTarget> targets = new HashSet<>(); for (ZoneApi zone : registry.zones().reachable().zones()) { - targets.add(forConfigserver(registry, zone.getId())); + targets.add(forConfigServer(registry, zone.getId())); } targets.add(forController(system)); return targets; @@ -51,8 +51,8 @@ public interface FlagsTarget { return new ControllerFlagsTarget(systemName); } - static FlagsTarget forConfigserver(ZoneRegistry registry, ZoneId zoneId) { - return new ConfigserverFlagsTarget( + static FlagsTarget forConfigServer(ZoneRegistry registry, ZoneId zoneId) { + return new ConfigServerFlagsTarget( registry.system(), zoneId, registry.getConfigServerVipUri(zoneId), registry.getConfigServerHttpsIdentity(zoneId)); } diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java index eb0e90f8ca1..35fec04e4c5 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java @@ -45,7 +45,7 @@ public class SystemFlagsDataArchiveTest { private static FlagsTarget devUsEast1CfgTarget = createConfigserverTarget(Environment.dev, "us-east-1"); private static FlagsTarget createConfigserverTarget(Environment environment, String region) { - return new ConfigserverFlagsTarget( + return new ConfigServerFlagsTarget( SYSTEM, ZoneId.from(environment, RegionName.from(region)), URI.create("https://cfg-" + region), |