From 8f54030347e31e0b1492fe874a1f1b67b89b836a Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <britter@apache.org>
Date: Mon, 17 Apr 2017 12:31:34 +0200
Subject: [PATCH] Replace switch statement with if-else block

---
 .../org/apache/commons/lang3/LocaleUtils.java | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index 58eb21b62..515443db6 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -137,31 +137,23 @@ private static Locale parseLocale(final String str) {
         final String[] segments = str.split("_", -1);
         final int segmentCount = segments.length -1;
         final String language = segments[0];
-        switch (segmentCount) {
-            case 0:
-                if (isISO639LanguageCode(str)) {
-                    return new Locale(str);
-                }
-                throw new IllegalArgumentException("Invalid locale format: " + str);
-
-            case 1:
-                if (isISO639LanguageCode(language) && isISO3166CountryCode(segments[1]) ||
-                      isNumericAreaCode(segments[1])) {
-                    return new Locale(language, segments[1]);
-                }
-                throw new IllegalArgumentException("Invalid locale format: " + str);
-
-            case 2:
-                if (isISO639LanguageCode(language) &&
+        if (segmentCount == 0) {
+            if (isISO639LanguageCode(str)) {
+                return new Locale(str);
+            }
+        } else if (segmentCount == 1) {
+            if (isISO639LanguageCode(language) && isISO3166CountryCode(segments[1]) ||
+                    isNumericAreaCode(segments[1])) {
+                return new Locale(language, segments[1]);
+            }
+        } else if (segmentCount == 2) {
+            if (isISO639LanguageCode(language) &&
                     (segments[1].length() == 0 || isISO3166CountryCode(segments[1])) &&
-                     segments[2].length() > 0) {
-                    return new Locale(language, segments[1], segments[2]);
-                }
-
-            //$FALL-THROUGH$
-            default:
-                throw new IllegalArgumentException("Invalid locale format: " + str);
+                    segments[2].length() > 0) {
+                return new Locale(language, segments[1], segments[2]);
+            }
         }
+        throw new IllegalArgumentException("Invalid locale format: " + str);
     }
 
     /**