fix eclipse-collections#289 Update TextProcessorEC.java -Nutan

fixed issue eclipse-collections#289
nkadhane · Sep 22, 2023 · 95225b1 · 95225b1
1 parent 5960cde
commit 95225b1
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/haiku-kata-solutions/src/main/java/org/eclipse/collections/haikukata/TextProcessorEC.java b/haiku-kata-solutions/src/main/java/org/eclipse/collections/haikukata/TextProcessorEC.java
@@ -76,18 +76,21 @@ public Triple<CharBag, CharBag, CharSet> duplicatesAndUnique()
 
     public CharCharPair topVowelAndConsonant()
     {
-        // TODO: Find all of the alphabetic letters from this.getHaikuAsCharAdapter(), convert them to lowercase,
-        // TODO: put them in a bag and then get the top 26 occurrences
-        // Hint: Look at select, collectChar, toBag, and topOccurrences
-        // Bonus: See if the same solution will work using asLazy
-        MutableList<CharIntPair> charIntPairs = null;
-
-        // TODO: Find the top vowel
-        // Hint: Use the detect method on MutableList with the isVowel method below to find the top vowel char value
-        char topVowel = 'a';
-        // TODO: Find the top consonant
-        // Hint: Use the detect method on MutableList with the isVowel method below to find the top consonant char value
-        char topConsonant = 'b';
+        // Collecting all the alphabetic letters from getHaikuAsCharAdapter(), converting them to lowercase,
+        // putting them in a bag and then getting the top 26 occurrences.
+        MutableList<CharIntPair> charIntPairs = this.getHaikuAsCharAdapter()
+                                                     .select(Character::isAlphabetic)
+                                                     .collectChar(Character::toLowerCase)
+                                                     .toBag()
+                                                     .topOccurrences(26);
+
+        // Finding the top vowel.
+        CharIntPair topVowelPair = charIntPairs.detect(pair -> isVowel(pair.getOne()));
+        char topVowel = topVowelPair == null ? ' ' : topVowelPair.getOne();  // Default to space if no vowel is found.
+
+        // Finding the top consonant.
+        CharIntPair topConsonantPair = charIntPairs.detect(pair -> !isVowel(pair.getOne()));
+        char topConsonant = topConsonantPair == null ? ' ' : topConsonantPair.getOne();  // Default to space if no consonant is found.
 
         return PrimitiveTuples.pair(topVowel, topConsonant);
     }