diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-12 13:04:09 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2017-12-12 13:04:09 +0100 |
| commit | 62f194fdfc61c6326b98e7fae76657100ca2f029 (patch) | |
| tree | 39b0ae932b33a4597ebc6ee9c2e400c4cae1c04d /controller-api | |
| parent | bfc81fdad037521df6a5e15473d8d40e1ab05d6d (diff) | |
Reintroduced Optional for default region and made mock consistent
Diffstat (limited to 'controller-api')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java index 1cdae46fec1..f1c584c7a3c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/DeploymentId.java @@ -63,5 +63,5 @@ public class DeploymentId { private static String unCapitalize(String str) { return str.toLowerCase().substring(0,1) + str.substring(1); } - + } 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 9211fa97204..b7ffd2c74e3 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 @@ -26,8 +26,8 @@ public interface ZoneRegistry { /** Returns a list containing the id of all zones in this registry. */ List<ZoneId> zones(); - /** Returns the default region for the given environment. */ - RegionName getDefaultRegion(Environment environment); + /** 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. */ List<URI> getConfigServerUris(ZoneId zoneId); |