Reduce library bloat

Author: SimonBaars

adventofcode2019.iml

@@ -25,13 +25,6 @@
     <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.8" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-configuration2:2.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.htmlcleaner:htmlcleaner:2.25" level="project" />
     <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.5" level="project" />
   </component>

pom.xml

@@ -41,21 +41,6 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.12.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-collections4</artifactId>
-			<version>4.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math3</artifactId>
-			<version>3.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.9</version>
-		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.htmlcleaner</groupId>
 			<artifactId>htmlcleaner</artifactId>

src/main/java/com/sbaars/adventofcode/year20/days/Day14.java

@@ -1,19 +1,15 @@
 package com.sbaars.adventofcode.year20.days;
 
+import com.sbaars.adventofcode.year20.Day2020;
+
+import java.util.*;
+
 import static com.sbaars.adventofcode.common.ReadsFormattedString.readString;
 import static java.lang.Long.parseLong;
 import static java.lang.Long.toBinaryString;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
 
-import com.sbaars.adventofcode.year20.Day2020;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.apache.commons.text.TextStringBuilder;
-
 public class Day14 extends Day2020 {
   public Day14() {
     super(14);
@@ -27,10 +23,9 @@ public static void main(String[] args) {
   public Object part1() {
     Instruction[] input = getInput();
     Map<Long, Long> memory = new HashMap<>();
-    final TextStringBuilder currentMask = new TextStringBuilder();
+    StringBuilder currentMask = new StringBuilder();
     for (Instruction i : input) {
-      i.getMem().ifPresentOrElse(m -> memory.put(m.index, m.value | parseLong(currentMask.toString(), 2)),
-          () -> currentMask.set(i.value).replaceAll("X", "0"));
+      i.getMem().ifPresentOrElse(m -> memory.put(m.index, m.value | parseLong(currentMask.toString(), 2)), () -> currentMask.replace(0, currentMask.length(), i.value.replaceAll("X", "0")));
     }
     return memory.values().stream().mapToLong(e -> e).sum();
   }
@@ -85,13 +80,12 @@ private StringBuilder binWithLength(long val, int s) {
     return bin;
   }
 
-  public static record Instruction(String mem, String value) {
-
+  public record Instruction(String mem, String value) {
     public Optional<Mem> getMem() {
       return mem.startsWith("mem") ? of(readString(mem + value, "mem[%n]%n", Mem.class)) : empty();
     }
   }
 
-  public static record Mem(long index, long value) {
+  public record Mem(long index, long value) {
   }
 }

src/main/java/com/sbaars/adventofcode/year21/days/Day21.java

@@ -3,7 +3,7 @@
 import com.google.common.base.Objects;
 import com.sbaars.adventofcode.common.HasRecursion;
 import com.sbaars.adventofcode.year21.Day2021;
-import org.apache.commons.math3.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -52,15 +52,15 @@ public Object part1() {
   @Override
   public Object part2() {
     Pair<Long, Long> universes = universes(new HashMap<>(), new State(7, 2, 0, 0, true));
-    return Math.max(universes.getFirst(), universes.getSecond());
+    return Math.max(universes.getLeft(), universes.getRight());
   }
 
   private Pair<Long, Long> universes(Map<State, Pair<Long, Long>> m, State s) {
-    Pair<Long, Long> wins = new Pair<>(0L, 0L);
+    Pair<Long, Long> wins = Pair.of(0L, 0L);
     if(m.containsKey(s)) {
       return m.get(s);
     } else if(Math.max(s.score[0], s.score[1]) >= 21){
-      return new Pair<>(s.move ? 0L : 1L, s.move ? 1L : 0L);
+      return Pair.of(s.move ? 0L : 1L, s.move ? 1L : 0L);
     }
     for(int i = 1; i<=3; i++){
       for(int j = 1; j<=3; j++){
@@ -69,7 +69,7 @@ private Pair<Long, Long> universes(Map<State, Pair<Long, Long>> m, State s) {
           while(newTurn>10) newTurn-=10;
           int newScore = s.score[s.move ? 0 : 1] + newTurn;
           Pair<Long, Long> newWins = universes(m, new State(s.move ? newTurn : s.turn[0], s.move ? s.turn[1] : newTurn, s.move ? newScore : s.score[0], s.move ? s.score[1] : newScore, !s.move));
-          wins = new Pair<>(wins.getFirst() + newWins.getFirst(), wins.getSecond() + newWins.getSecond());
+          wins = Pair.of(wins.getLeft() + newWins.getLeft(), wins.getRight() + newWins.getRight());
         }
       }
     }