diff options
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java | 14 | ||||
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java | 9 |
2 files changed, 12 insertions, 11 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java index 78bf9fc68c4..83106e75627 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java @@ -52,12 +52,10 @@ public class Endpoint { Target a = targets.get(i); Target b = targets.get(j); if (level == Level.application) { - // - All instance names must be distinct - // - All region names must be equal - if (a.instance().equals(b.instance())) throw new IllegalArgumentException("Instance '" + a.instance + - "' declared multiple times, but allowed at most once"); - if (!a.region().equals(b.region())) throw new IllegalArgumentException("Instance '" + a.instance + "' declares a region different from instance '" + - b.instance() + "': '" + a.region() + "'"); + // - All instance name and region combinations must be distinct + if (a.instance().equals(b.instance()) && a.region.equals(b.region)) + throw new IllegalArgumentException("Instance '" + a.instance + "' declared multiple times " + + "with region '" + a.region + "', but allowed at most once"); } if (level == Level.instance && a.region.equals(b.region)) { // - Instance name is implicit @@ -78,9 +76,9 @@ public class Endpoint { return containerId; } - /** The regions of this points to */ + /** The regions this points to */ public List<RegionName> regions() { - return targets.stream().map(Target::region).collect(Collectors.toUnmodifiableList()); + return targets.stream().map(Target::region).toList(); } /** The level of targets in this */ diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java index 77894a8cf1f..75949d2b6cd 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java @@ -321,12 +321,15 @@ public class DeploymentSpecXmlReader { List<Endpoint.Target> targets = new ArrayList<>(); if (level == Endpoint.Level.application) { - String region = requireStringAttribute("region", endpointElement); + Optional<String> endpointRegion = stringAttribute("region", endpointElement); int weightSum = 0; for (var instanceElement : XML.getChildren(endpointElement, "instance")) { String instanceName = instanceElement.getTextContent(); - String weightFromAttribute = requireStringAttribute("weight", instanceElement); if (instanceName == null || instanceName.isBlank()) illegal(msgPrefix + "empty 'instance' element"); + Optional<String> instanceRegion = stringAttribute("region", instanceElement); + if (endpointRegion.isPresent() == instanceRegion.isPresent()) + illegal(msgPrefix + "'region' attribute must be declared on either <endpoint> or <instance> tag"); + String weightFromAttribute = requireStringAttribute("weight", instanceElement); int weight; try { weight = Integer.parseInt(weightFromAttribute); @@ -334,7 +337,7 @@ public class DeploymentSpecXmlReader { throw new IllegalArgumentException(msgPrefix + "invalid weight value '" + weightFromAttribute + "'"); } weightSum += weight; - targets.add(new Endpoint.Target(RegionName.from(region), + targets.add(new Endpoint.Target(RegionName.from(endpointRegion.orElseGet(instanceRegion::get)), InstanceName.from(instanceName), weight)); } |