Getting rid of lombok

SimonBaars · SimonBaars · commit 3608e5578dc4 · 2021-11-07T13:05:14.000+01:00
diff --git a/adventofcode2019.iml b/adventofcode2019.iml
@@ -17,7 +17,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
diff --git a/pom.xml b/pom.xml
@@ -31,12 +31,6 @@
 			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day1.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day1.java
@@ -1,6 +1,7 @@
 package com.sbaars.adventofcode.year20.days;
 
 import com.sbaars.adventofcode.year20.Day2020;
+import java.util.stream.LongStream;
 
 public class Day1 extends Day2020 {
     public static void main(String[] args) {
@@ -13,8 +14,9 @@ public Day1() {
 
     @Override
     public Object part1() {
-        return dayNumberStream().flatMap(a ->
-                dayNumberStream().filter(b -> a + b == 2020L).map(b -> a * b)
+        LongStream nums = dayNumberStream();
+        return nums.flatMap(a ->
+                nums.filter(b -> a + b == 2020L).map(b -> a * b)
         ).findAny().getAsLong();
     }
 
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day15.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day15.java
@@ -1,19 +1,11 @@
 package com.sbaars.adventofcode.year20.days;
 
-import com.sbaars.adventofcode.year20.Day2020;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.*;
-
-import static com.google.common.primitives.Longs.asList;
-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 static java.util.stream.IntStream.range;
 
+import com.sbaars.adventofcode.year20.Day2020;
+import java.util.HashMap;
+import java.util.Map;
+
 public class Day15 extends Day2020 {
     public static void main(String[] args) {
         new Day15().printParts();
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day16.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day16.java
@@ -15,8 +15,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import lombok.Data;
-import lombok.Value;
 
 public class Day16 extends Day2020 {
     public static void main(String[] args) {
@@ -41,15 +39,7 @@ public Object part1() {
         return tickets.stream().flatMapToLong(t -> t.stream().filter(n -> stream(rules).noneMatch(r -> r.check(n))).mapToLong(e -> e)).sum();
     }
 
-    @Data
-    @Value
-    public static class Rule {
-        String name;
-        long lower1;
-        long upper1;
-        long lower2;
-        long upper2;
-
+    record Rule (String name, long lower1, long upper1, long lower2, long upper2) {
         public boolean check(long val) {
             return (val >= lower1 && val <= upper1) || (val >= lower2 && val <= upper2);
         }
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day17.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day17.java
@@ -1,16 +1,9 @@
 package com.sbaars.adventofcode.year20.days;
 
 import com.sbaars.adventofcode.year20.Day2020;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
-import static java.util.Arrays.stream;
-
 public class Day17 extends Day2020 {
     public static void main(String[] args) {
         new Day17().printParts();
@@ -65,23 +58,9 @@ public void addNeighbors(Set<Pos> pos, Set<Pos> newPos, Set<Pos> checkedPos, Pos
         }
     }
 
-    @Data
-    @Value
-    public static class Pos {
-        long x;
-        long y;
-        long z;
-    }
+    public static record Pos (long x, long y, long z) {}
 
-
-    @Data
-    @Value
-    public static class Pos4 {
-        long x;
-        long y;
-        long z;
-        long w;
-    }
+    public static record Pos4 (long x, long y, long z, long w) {}
 
     @Override
     public Object part2() {
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day18.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day18.java
@@ -1,11 +1,8 @@
 package com.sbaars.adventofcode.year20.days;
 
 import static java.util.Arrays.stream;
-import static java.util.stream.IntStream.range;
 
 import com.sbaars.adventofcode.year20.Day2020;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import org.apache.commons.lang3.tuple.Pair;
 
 public class Day18 extends Day2020 {
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day19.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day19.java
@@ -1,18 +1,19 @@
 package com.sbaars.adventofcode.year20.days;
 
-import com.sbaars.adventofcode.year20.Day2020;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import static java.lang.Long.parseLong;
-import static java.util.Arrays.asList;
 import static java.util.Arrays.stream;
 import static java.util.Collections.singletonList;
 
+import com.sbaars.adventofcode.year20.Day2020;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 public class Day19 extends Day2020 {
     public static void main(String[] args) {
         new Day19().printParts();
@@ -41,37 +42,29 @@ private long getSolution(String inputFile) {
                 .count();
     }
 
-    @Data
-    @Value
-    public static class Rule{
-        long id;
-        Optional<String> letter;
-        long[] rule1;
-        long[] rule2;
+    private static Optional<String> getLetter(String rule){
+        return rule.startsWith("\"") ? Optional.of(rule.charAt(1)+"") : Optional.empty();
+    }
 
+    private static long[] getRule(String rule, boolean num){
+        if(rule.startsWith("\"")){
+            return new long[]{};
+        }
+        String[] r = rule.split(" \\| ");
+        if (!num || r.length > 1) {
+            return Arrays.stream(r[num ? 1 : 0].split(" ")).mapToLong(Long::parseLong).toArray();
+        } else {
+            return new long[]{};
+        }
+    }
+
+    public static record Rule (long id, Optional<String> letter, long[] rule1, long[] rule2) {
         public Rule(long id, String rule){
-            this.id = id;
-            if(rule.startsWith("\"")){
-                letter = Optional.of(rule.charAt(1)+"");
-                rule2 = new long[]{};
-                rule1 = new long[]{};
-            } else {
-                letter = Optional.empty();
-                String[] r = rule.split(" \\| ");
-                rule1 = Arrays.stream(r[0].split(" ")).mapToLong(Long::parseLong).toArray();
-                if (r.length > 1) {
-                    rule2 = Arrays.stream(r[1].split(" ")).mapToLong(Long::parseLong).toArray();
-                } else {
-                    rule2 = new long[]{};
-                }
-            }
+            this(id, getLetter(rule), getRule(rule, false), getRule(rule, true));
         }
 
         public Set<String> getPossibilities(Map<Long, Rule> m, Map<Long, Set<String>> sol){
             if(sol.containsKey(id)) return sol.get(id);
-//            if(id == 8){
-//                System.out.println("hi");
-//            }
             if(letter.isEmpty()){
                 Rule[] r = stream(rule1).mapToObj(m::get).toArray(Rule[]::new);
                 Rule[] orRule = stream(rule2).mapToObj(m::get).toArray(Rule[]::new);
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day2.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day2.java
@@ -4,11 +4,7 @@
 import static java.lang.Math.toIntExact;
 
 import com.sbaars.adventofcode.year20.Day2020;
-import java.util.List;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.Value;
 
 public class Day2 extends Day2020 {
     public static void main(String[] args) {
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day20.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day20.java
@@ -14,17 +14,13 @@
 import com.sbaars.adventofcode.year20.Day2020;
 import java.awt.*;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.Value;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 
 public class Day20 extends Day2020 {
     public static void main(String[] args) {
@@ -51,15 +47,9 @@ public Object part1() {
         return answer.stream().mapToLong(e -> e).reduce((a,b) -> a * b).getAsLong();
     }
 
-    @Data
-    @Value
-    public static class Grid{
-        long id;
-        char[][] grid;
-
+    public static record Grid (long id, char[][] grid) {
         public Grid(String s){
-            this.id = parseLong(s.substring(5,9));
-            this.grid = stream(s.substring(11).split("\n")).map(String::toCharArray).toArray(char[][]::new);
+            this(parseLong(s.substring(5,9)), stream(s.substring(11).split("\n")).map(String::toCharArray).toArray(char[][]::new));
         }
 
         public Multimap<String, Metadata> getSides(Multimap<String, Metadata> map){
@@ -113,13 +103,7 @@ public long countWithoutSides(){
         }
     }
 
-    @Data
-    @Value
-    public static class Metadata{
-        long id;
-        Direction dir;
-        boolean flipped;
-
+    public static record Metadata (long id, Direction dir, boolean flipped) {
         public boolean validMetadata(List<Metadata> l){
             Map<Direction, Boolean> map = new EnumMap<Direction, Boolean>(Direction.class);
             for(Metadata m : l){
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day21.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day21.java
@@ -1,22 +1,16 @@
 package com.sbaars.adventofcode.year20.days;
 
-import static com.sbaars.adventofcode.common.ReadsFormattedString.readString;
 import static java.util.Arrays.asList;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.sbaars.adventofcode.year20.Day2020;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.Value;
 
 public class Day21 extends Day2020 {
     public static void main(String[] args) {
@@ -63,19 +57,16 @@ private Multimap<String, String> getAllergens(Rule[] input) {
         return allergens;
     }
 
-    @Data
-    @Value
-    public static class Rule {
-        String[] ingredients;
-        String[] allergens;
-
+    public static record Rule (String[] ingredients, String[] allergens) {
         public Rule (String s){
-            String[] split = s.substring(0, s.length()-1).split(" \\(contains ");
-            this.ingredients = split[0].split(" ");
-            this.allergens = split[1].split(", ");
+            this(getSplit(s)[0].split(" "), getSplit(s)[1].split(", "));
         }
     }
 
+    private static String[] getSplit(String s) {
+        return s.substring(0, s.length()-1).split(" \\(contains ");
+    }
+
     @Override
     public Object part2() {
         Rule[] input = Arrays.stream(day().split("\n")).map(Rule::new).toArray(Rule[]::new);
diff --git a/src/main/java/com/sbaars/adventofcode/year20/days/Day8.java b/src/main/java/com/sbaars/adventofcode/year20/days/Day8.java
@@ -1,13 +1,9 @@
 package com.sbaars.adventofcode.year20.days;
 
-import static java.util.Arrays.stream;
-
 import com.sbaars.adventofcode.year20.Day2020;
 import com.sbaars.adventofcode.year20.gamepad.Gamepad;
 import java.util.HashSet;
 import java.util.Set;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 
 public class Day8 extends Day2020 {
 
