diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-05-12 09:14:04 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-05-12 09:14:04 +0200 |
| commit | 73d1baeac6d54edf6ee33db4ec84cc9a43a43747 (patch) | |
| tree | 92315d596639fbedb439baae3c5f901b0ea426a2 /config-model-api | |
| parent | 47d57ef30bceff2832d14edfd844623a8a6ce1a2 (diff) | |
No fallthrough
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java | 7 |
1 files changed, 3 insertions, 4 deletions
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 23c1adafd56..8166fb33b78 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 @@ -219,10 +219,7 @@ public class DeploymentSpecXmlReader { } - - // Consume the given tag as 0-N steps. 0 if it is not a step, >1 if it contains multiple nested steps that should be flattened - @SuppressWarnings("fallthrough") private List<Step> readNonInstanceSteps(Element stepTag, Map<String, String> prodAttributes, Element parentTag) { Optional<AthenzService> athenzService = mostSpecificAttribute(stepTag, athenzServiceAttribute).map(AthenzService::from); Optional<String> testerFlavor = mostSpecificAttribute(stepTag, testerFlavorAttribute); @@ -238,8 +235,10 @@ public class DeploymentSpecXmlReader { switch (stepTag.getTagName()) { case testTag: if (Stream.iterate(stepTag, Objects::nonNull, Node::getParentNode) - .anyMatch(node -> prodTag.equals(node.getNodeName()))) + .anyMatch(node -> prodTag.equals(node.getNodeName()))) { return List.of(new DeclaredTest(RegionName.from(XML.getValue(stepTag).trim()))); + } + return List.of(new DeclaredZone(Environment.from(stepTag.getTagName()), Optional.empty(), false, athenzService, testerFlavor, Optional.empty())); case stagingTag: return List.of(new DeclaredZone(Environment.from(stepTag.getTagName()), Optional.empty(), false, athenzService, testerFlavor, Optional.empty())); case prodTag: // regions, delay and parallel may be nested within, but we can flatten them |