Refactor day 1 code

Flashky · Dec 2, 2023 · cfee857 · cfee857
1 parent d281d42
commit cfee857
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/src/main/java/com/adventofcode/flashk/day01/Trebuchet.java b/src/main/java/com/adventofcode/flashk/day01/Trebuchet.java
@@ -1,5 +1,7 @@
 package com.adventofcode.flashk.day01;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.List;
 
 public class Trebuchet {
@@ -26,25 +28,13 @@ public int solveB() {
     }
 
     private int lineValue(String line) {
-        List<String> result = line.chars()
-                .filter(Character::isDigit)
-                .mapToObj(c -> (char) c)
-                .map(Object::toString)
-                .toList();
-
-        String first = result.get(0);
-        String last = result.get(result.size()-1);
+        String digits = StringUtils.getDigits(line);
+        String number = String.valueOf(digits.charAt(0)) + digits.charAt(digits.length() - 1);
 
-        String number = first + last;
         return Integer.parseInt(number);
     }
-    private String replaceWordsWithNumber(String line){
-
-        String replaceLine = line;
-        for(int i = 0; i < numberWords.length; i++) {
-            replaceLine = replaceLine.replace(numberWords[i], numberDigits[i]);
-        }
-        return replaceLine;
 
+    private String replaceWordsWithNumber(String line){
+        return StringUtils.replaceEachRepeatedly(line, numberWords, numberDigits);
     }
-}
+}