diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-09-07 12:51:58 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-09-12 09:27:12 +0200 |
commit | 939eb860022dde6689c1dabae11ff640d529e9a1 (patch) | |
tree | f19a1ddc412926b35cb02a3eb6664c81525d6872 | |
parent | dda637d7693328ad2f246e88d13d1d2293c59ae8 (diff) |
Use switch expression
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java | 54 |
1 files changed, 27 insertions, 27 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 09d61835ae3..d08b6c46943 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 @@ -483,42 +483,42 @@ public class DeploymentSpecXmlReader { } private DeploymentSpec.UpgradePolicy readUpgradePolicy(String policy) { - switch (policy) { - case "canary": return DeploymentSpec.UpgradePolicy.canary; - case "default": return DeploymentSpec.UpgradePolicy.defaultPolicy; - case "conservative": return DeploymentSpec.UpgradePolicy.conservative; - default: throw new IllegalArgumentException("Illegal upgrade policy '" + policy + "': " + - "Must be one of 'canary', 'default', 'conservative'"); - } + return switch (policy) { + case "canary" -> UpgradePolicy.canary; + case "default" -> UpgradePolicy.defaultPolicy; + case "conservative" -> UpgradePolicy.conservative; + default -> throw new IllegalArgumentException("Illegal upgrade policy '" + policy + "': " + + "Must be one of 'canary', 'default', 'conservative'"); + }; } private DeploymentSpec.RevisionChange readRevisionChange(String revision) { - switch (revision) { - case "when-clear": return DeploymentSpec.RevisionChange.whenClear; - case "when-failing": return DeploymentSpec.RevisionChange.whenFailing; - case "always": return DeploymentSpec.RevisionChange.always; - default: throw new IllegalArgumentException("Illegal upgrade revision change policy '" + revision + "': " + - "Must be one of 'always', 'when-failing', 'when-clear'"); - } + return switch (revision) { + case "when-clear" -> RevisionChange.whenClear; + case "when-failing" -> RevisionChange.whenFailing; + case "always" -> RevisionChange.always; + default -> throw new IllegalArgumentException("Illegal upgrade revision change policy '" + revision + "': " + + "Must be one of 'always', 'when-failing', 'when-clear'"); + }; } private DeploymentSpec.RevisionTarget readRevisionTarget(String revision) { - switch (revision) { - case "next": return DeploymentSpec.RevisionTarget.next; - case "latest": return DeploymentSpec.RevisionTarget.latest; - default: throw new IllegalArgumentException("Illegal upgrade revision target '" + revision + "': " + - "Must be one of 'next', 'latest'"); - } + return switch (revision) { + case "next" -> RevisionTarget.next; + case "latest" -> RevisionTarget.latest; + default -> throw new IllegalArgumentException("Illegal upgrade revision target '" + revision + "': " + + "Must be one of 'next', 'latest'"); + }; } private DeploymentSpec.UpgradeRollout readUpgradeRollout(String rollout) { - switch (rollout) { - case "separate": return DeploymentSpec.UpgradeRollout.separate; - case "leading": return DeploymentSpec.UpgradeRollout.leading; - case "simultaneous": return DeploymentSpec.UpgradeRollout.simultaneous; - default: throw new IllegalArgumentException("Illegal upgrade rollout '" + rollout + "': " + - "Must be one of 'separate', 'leading', 'simultaneous'"); - } + return switch (rollout) { + case "separate" -> UpgradeRollout.separate; + case "leading" -> UpgradeRollout.leading; + case "simultaneous" -> UpgradeRollout.simultaneous; + default -> throw new IllegalArgumentException("Illegal upgrade rollout '" + rollout + "': " + + "Must be one of 'separate', 'leading', 'simultaneous'"); + }; } private boolean readActive(Element regionTag) { |