Refactor to improve readability

opentripplanner · Jan 25, 2019 · d1a8ecc · d1a8ecc
1 parent b794a89
commit d1a8ecc
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/org/opentripplanner/util/TranslatedString.java b/src/main/java/org/opentripplanner/util/TranslatedString.java
@@ -55,13 +55,14 @@ public static I18NString getI18NString(Map<String, String> translations) {
         else {
             I18NString ret;
             // Check if we only have one name, even under multiple languages
-            if (new HashSet<>(translations.values()).size() < 2) {
-                Iterator it = translations.values().iterator();
-                if (!it.hasNext()) {
-                    throw new IllegalArgumentException("Map of languages and translations is empty.");
-                }
+            long numberOfUniqValues = translations.values().stream().distinct().count();
+            if(numberOfUniqValues == 0) {
+                throw new IllegalArgumentException("Map of languages and translations is empty.");
+            }
+            else if(numberOfUniqValues == 1) {
                 ret = new NonLocalizedString(translations.values().iterator().next());
-            } else {
+            }
+            else {
                 ret = new TranslatedString(translations);
             }
             intern.put(translations, ret);