CODEC-299 - Improve control flow (#83)

Author: arturobernalg

src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java

@@ -182,7 +182,7 @@ public String[] getReplacements(final String context, final boolean atStart) {
             }
 
             final int nextIndex = getPatternLength();
-            final boolean nextCharIsVowel = nextIndex < context.length() ? isVowel(context.charAt(nextIndex)) : false;
+            final boolean nextCharIsVowel = nextIndex < context.length() && isVowel(context.charAt(nextIndex));
             if (nextCharIsVowel) {
                 return replacementBeforeVowel;
             }

src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java

@@ -802,10 +802,7 @@ private boolean conditionCH0(final String value, final int index) {
                    !contains(value, index + 1, 3, "HOR", "HYM", "HIA", "HEM")) {
             return false;
         }
-        if (contains(value, 0, 5, "CHORE")) {
-            return false;
-        }
-        return true;
+        return !contains(value, 0, 5, "CHORE");
     }
 
     /**
@@ -827,12 +824,9 @@ private boolean conditionL0(final String value, final int index) {
             contains(value, index - 1, 4, "ILLO", "ILLA", "ALLE")) {
             return true;
         }
-        if ((contains(value, value.length() - 2, 2, "AS", "OS") ||
-                    contains(value, value.length() - 1, 1, "A", "O")) &&
-                   contains(value, index - 1, 4, "ALLE")) {
-            return true;
-        }
-        return false;
+        return (contains(value, value.length() - 2, 2, "AS", "OS") ||
+                contains(value, value.length() - 1, 1, "A", "O")) &&
+                contains(value, index - 1, 4, "ALLE");
     }
 
     /**

src/main/java/org/apache/commons/codec/language/Metaphone.java

@@ -224,12 +224,8 @@ public String metaphone(final String txt) {
                           regionMatch(local, n, "GNED") ) ) {
                         break; // silent G
                     }
-                    if (isPreviousChar(local, n, 'G')) {
-                        // NOTE: Given that duplicated chars are removed, I don't see how this can ever be true
-                        hard = true;
-                    } else {
-                        hard = false;
-                    }
+                    // NOTE: Given that duplicated chars are removed, I don't see how this can ever be true
+                    hard = isPreviousChar(local, n, 'G');
                     if (!isLastChar(wdsz, n) &&
                         FRONTV.indexOf(local.charAt(n + 1)) >= 0 &&
                         !hard) {