diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-08-19 16:36:14 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-08-19 16:36:14 +0200 |
| commit | 290dc43262a9f55589d982e066d1f5b701584925 (patch) | |
| tree | b9a2d352c05d019558f5e710a3dd33286e4607bd /config-model-api | |
| parent | fa9cb345a17bcedfae450022d50cef687e4482c4 (diff) | |
Split assignment and if-condition
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java | 14 |
1 files changed, 10 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 88c366e5d96..14b72f79525 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 @@ -399,11 +399,14 @@ public class DeploymentSpecXmlReader { } private DeploymentSpec.UpgradePolicy readUpgradePolicy(Element parent, Element fallbackParent) { - String policy; Element upgradeElement = XML.getChild(parent, upgradeTag); if (upgradeElement == null) upgradeElement = XML.getChild(fallbackParent, upgradeTag); - if (upgradeElement == null || (policy = upgradeElement.getAttribute("policy")).isEmpty()) + if (upgradeElement == null) + return DeploymentSpec.UpgradePolicy.defaultPolicy; + + String policy = upgradeElement.getAttribute("policy"); + if (policy.isEmpty()) return DeploymentSpec.UpgradePolicy.defaultPolicy; switch (policy) { @@ -416,11 +419,14 @@ public class DeploymentSpecXmlReader { } private DeploymentSpec.UpgradeRollout readUpgradeRollout(Element parent, Element fallbackParent) { - String rollout; Element upgradeElement = XML.getChild(parent, upgradeTag); if (upgradeElement == null) upgradeElement = XML.getChild(fallbackParent, upgradeTag); - if (upgradeElement == null || (rollout = upgradeElement.getAttribute("rollout")).isEmpty()) + if (upgradeElement == null) + return DeploymentSpec.UpgradeRollout.separate; + + String rollout = upgradeElement.getAttribute("rollout"); + if (rollout.isEmpty()) return DeploymentSpec.UpgradeRollout.separate; switch (rollout) { |