Skip to content

Commit 7683581

Browse files
committed
Optimize imports
1 parent 9cddcee commit 7683581

File tree

197 files changed

+1555
-1637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+1555
-1637
lines changed

src/main/java/com/sbaars/adventofcode/common/CircularList.java

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.List;
55

66
import static java.lang.Math.abs;
7-
import static java.lang.Math.toIntExact;
87

98
/**
109
* A circular list of fixed length where all operations are O(1)

src/main/java/com/sbaars/adventofcode/common/Either.java

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.util.Objects;
44
import java.util.Optional;
55

6-
import static com.sbaars.adventofcode.util.AOCUtils.verify;
7-
86
public record Either<A, B> (Optional<A> a, Optional<B> b) {
97
public Either(A a, B b){
108
this(Optional.ofNullable(a), Optional.ofNullable(b));

src/main/java/com/sbaars/adventofcode/common/Graph.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
import java.util.Collection;
77
import java.util.List;
88
import java.util.Map;
9-
import java.util.function.*;
9+
import java.util.function.BiConsumer;
10+
import java.util.function.BinaryOperator;
11+
import java.util.function.Function;
12+
import java.util.function.Supplier;
1013
import java.util.stream.Collector;
1114
import java.util.stream.Collectors;
1215
import java.util.stream.Stream;

src/main/java/com/sbaars/adventofcode/common/SmartArray.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.sbaars.adventofcode.common;
22

3-
import java.lang.reflect.Array;
43
import java.util.HashMap;
54
import java.util.Map;
6-
import java.util.stream.LongStream;
75
import java.util.stream.Stream;
86

97
/**

src/main/java/com/sbaars/adventofcode/common/grid/Coordinates.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.sbaars.adventofcode.common.grid;
22

3-
import static com.sbaars.adventofcode.common.Day.DEFAULT_DELIMITER;
4-
import static java.lang.Math.abs;
5-
63
import java.awt.*;
74
import java.util.Arrays;
85
import java.util.HashSet;
@@ -11,6 +8,9 @@
118
import java.util.stream.Collectors;
129
import java.util.stream.Stream;
1310

11+
import static com.sbaars.adventofcode.common.Day.DEFAULT_DELIMITER;
12+
import static java.lang.Math.abs;
13+
1414
public class Coordinates {
1515
public final Set<Point> coords;
1616

src/main/java/com/sbaars/adventofcode/common/map/ListCountMap.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.sbaars.adventofcode.common.map;
22

3-
import java.util.*;
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
import java.util.Objects;
46

57
public class ListCountMap<K, V> extends HashMap<K, CountMap<V>> {
68
public ListCountMap() {

src/main/java/com/sbaars/adventofcode/common/map/ListMap.java

-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
package com.sbaars.adventofcode.common.map;
22

3-
import com.sbaars.adventofcode.common.Pair;
4-
import com.sbaars.adventofcode.common.grid.InfiniteGrid;
5-
import com.sbaars.adventofcode.common.location.Loc;
6-
73
import java.util.*;
84
import java.util.function.BiConsumer;
95
import java.util.function.BinaryOperator;
106
import java.util.function.Function;
117
import java.util.function.Supplier;
128
import java.util.stream.Collector;
13-
import java.util.stream.Collectors;
149
import java.util.stream.Stream;
1510

1611
public class ListMap<K, V> extends HashMap<K, List<V>> {

src/main/java/com/sbaars/adventofcode/haskell/year20/HaskellDay2020.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.sbaars.adventofcode.haskell.year20;
22

3-
import static java.util.Arrays.stream;
4-
import static java.util.stream.Collectors.joining;
5-
63
import com.sbaars.adventofcode.year20.Day2020;
4+
75
import java.util.List;
86
import java.util.stream.Collector;
97

8+
import static java.util.Arrays.stream;
9+
import static java.util.stream.Collectors.joining;
10+
1011
public abstract class HaskellDay2020 extends Day2020 {
1112
protected HaskellDay2020(int day) {
1213
super(day);

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day11.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

33
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
4+
45
import java.util.Arrays;
56

67
public class Day11 extends HaskellDay2020 {

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day3.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

33
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
4+
45
import java.util.Arrays;
56

67
public class Day3 extends HaskellDay2020 {

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day4.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

33
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
4+
45
import java.util.Arrays;
56

67
public class Day4 extends HaskellDay2020 {

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day6.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

33
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
4+
45
import java.util.Arrays;
56

67
public class Day6 extends HaskellDay2020 {

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day7.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

3-
import static java.util.Arrays.stream;
4-
53
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
64
import com.sbaars.adventofcode.year20.days.Day7.Item;
75
import com.sbaars.adventofcode.year20.days.Day7.Trade;
86

7+
import static java.util.Arrays.stream;
8+
99
public class Day7 extends HaskellDay2020 {
1010
public Day7() {
1111
super(7);

src/main/java/com/sbaars/adventofcode/haskell/year20/days/Day8.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.sbaars.adventofcode.haskell.year20.days;
22

3-
import static java.util.Arrays.stream;
4-
53
import com.sbaars.adventofcode.haskell.year20.HaskellDay2020;
64
import com.sbaars.adventofcode.year20.gamepad.Gamepad;
75

6+
import static java.util.Arrays.stream;
7+
88
public class Day8 extends HaskellDay2020 {
99
public Day8() {
1010
super(8);

src/main/java/com/sbaars/adventofcode/haskell/year21/HaskellDay2021.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.sbaars.adventofcode.haskell.year21;
22

3-
import static java.util.Arrays.stream;
4-
import static java.util.stream.Collectors.joining;
5-
63
import com.sbaars.adventofcode.year21.Day2021;
4+
75
import java.util.List;
86
import java.util.stream.Collector;
97

8+
import static java.util.Arrays.stream;
9+
import static java.util.stream.Collectors.joining;
10+
1011
public abstract class HaskellDay2021 extends Day2021 {
1112
protected HaskellDay2021(int day) {
1213
super(day);

src/main/java/com/sbaars/adventofcode/network/WebClient.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package com.sbaars.adventofcode.network;
22

3-
import static com.sbaars.adventofcode.common.Day.getResourceAsString;
4-
5-
import java.net.CookieHandler;
6-
import java.net.CookieManager;
7-
import java.net.HttpCookie;
8-
import java.net.URI;
9-
import java.net.URISyntaxException;
3+
import java.net.*;
104
import java.net.http.HttpClient;
115
import java.time.Duration;
126

7+
import static com.sbaars.adventofcode.common.Day.getResourceAsString;
8+
139
public class WebClient {
1410
public static HttpClient getClient() {
1511
String session = getResourceAsString("APIKEY").trim();

src/main/java/com/sbaars/adventofcode/template/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.template;
22

33
import com.sbaars.adventofcode.common.Day;
4+
45
import java.io.IOException;
56
import java.lang.reflect.InvocationTargetException;
67

src/main/java/com/sbaars/adventofcode/util/AOCUtils.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import com.sbaars.adventofcode.common.*;
44

55
import java.util.*;
6-
import java.util.function.*;
6+
import java.util.function.BiFunction;
7+
import java.util.function.Function;
8+
import java.util.function.Predicate;
9+
import java.util.function.ToLongFunction;
710
import java.util.stream.Stream;
811
import java.util.stream.StreamSupport;
912

src/main/java/com/sbaars/adventofcode/year15/days/Day1.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import com.sbaars.adventofcode.year15.Day2015;
44

5-
import static com.sbaars.adventofcode.util.AOCUtils.*;
5+
import static com.sbaars.adventofcode.util.AOCUtils.findReduce;
6+
import static com.sbaars.adventofcode.util.AOCUtils.zipWithIndex;
67

78
public class Day1 extends Day2015 {
89
public Day1() {

src/main/java/com/sbaars/adventofcode/year15/days/Day4.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.sbaars.adventofcode.year15.days;
22

3+
import com.sbaars.adventofcode.common.Pair;
34
import com.sbaars.adventofcode.year15.Day2015;
45

56
import java.security.MessageDigest;
67
import java.security.NoSuchAlgorithmException;
7-
import com.sbaars.adventofcode.common.Pair;
88

99
import static com.sbaars.adventofcode.common.Pair.pair;
1010
import static java.lang.Integer.MAX_VALUE;

src/main/java/com/sbaars/adventofcode/year18/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year18;
22

33
import com.sbaars.adventofcode.common.Day;
4+
45
import java.io.IOException;
56
import java.lang.reflect.InvocationTargetException;
67

src/main/java/com/sbaars/adventofcode/year18/days/Day1.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year18.days;
22

33
import com.sbaars.adventofcode.year18.Day2018;
4+
45
import java.util.HashSet;
56
import java.util.Set;
67

src/main/java/com/sbaars/adventofcode/year18/days/Day3.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.sbaars.adventofcode.year18.days;
22

3-
import static com.sbaars.adventofcode.util.DataMapper.readString;
4-
53
import com.sbaars.adventofcode.common.location.Loc;
64
import com.sbaars.adventofcode.common.location.Range;
75
import com.sbaars.adventofcode.year18.Day2018;
6+
87
import java.util.HashSet;
98
import java.util.List;
109
import java.util.Set;
1110

11+
import static com.sbaars.adventofcode.util.DataMapper.readString;
12+
1213
public class Day3 extends Day2018 {
1314
public Day3() {
1415
super(3);

src/main/java/com/sbaars/adventofcode/year18/days/Day9.java

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.sbaars.adventofcode.common.map.LongCountMap;
66
import com.sbaars.adventofcode.year18.Day2018;
77

8-
import java.util.Arrays;
9-
108
import static com.sbaars.adventofcode.util.DataMapper.readString;
119
import static java.lang.Math.toIntExact;
1210

src/main/java/com/sbaars/adventofcode/year19/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year19;
22

33
import com.sbaars.adventofcode.common.Day;
4+
45
import java.io.IOException;
56
import java.lang.reflect.InvocationTargetException;
67

src/main/java/com/sbaars/adventofcode/year19/days/Day11.java

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.sbaars.adventofcode.common.ProcessesImages;
55
import com.sbaars.adventofcode.year19.Day2019;
66
import com.sbaars.adventofcode.year19.intcode.IntcodeComputer;
7+
78
import java.awt.*;
89
import java.util.HashSet;
910
import java.util.Set;

src/main/java/com/sbaars/adventofcode/year19/days/Day12.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year19.days;
22

33
import com.sbaars.adventofcode.year19.Day2019;
4+
45
import java.util.Arrays;
56
import java.util.Collections;
67
import java.util.HashSet;

src/main/java/com/sbaars/adventofcode/year19/days/Day13.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.sbaars.adventofcode.year19.Day2019;
44
import com.sbaars.adventofcode.year19.intcode.IntcodeComputer;
5+
56
import java.awt.*;
67
import java.util.HashSet;
78
import java.util.Set;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.sbaars.adventofcode.year19.days;
22

33
import com.sbaars.adventofcode.common.HasRecursion;
4-
import com.sbaars.adventofcode.year19.Day2019;
54
import com.sbaars.adventofcode.common.map.LongCountMap;
5+
import com.sbaars.adventofcode.year19.Day2019;
66

77
import java.util.Arrays;
88

src/main/java/com/sbaars/adventofcode/year19/days/Day16.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year19.days;
22

33
import com.sbaars.adventofcode.year19.Day2019;
4+
45
import java.util.Arrays;
56
import java.util.stream.Collectors;
67

src/main/java/com/sbaars/adventofcode/year19/days/Day17.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.sbaars.adventofcode.common.Direction;
44
import com.sbaars.adventofcode.year19.Day2019;
55
import com.sbaars.adventofcode.year19.intcode.IntcodeComputer;
6+
67
import java.awt.*;
78
import java.util.ArrayList;
89
import java.util.List;

src/main/java/com/sbaars/adventofcode/year19/days/Day18.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22

33
import com.sbaars.adventofcode.year19.Day2019;
44
import com.sbaars.adventofcode.year19.pathfinding.CharGrid2d;
5+
56
import java.awt.*;
6-
import java.util.ArrayList;
7-
import java.util.HashMap;
87
import java.util.List;
9-
import java.util.Map;
10-
import java.util.Objects;
11-
import java.util.TreeSet;
8+
import java.util.*;
129
import java.util.stream.Collectors;
1310

1411
public class Day18 extends Day2019 {

src/main/java/com/sbaars/adventofcode/year19/days/Day20.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
import com.sbaars.adventofcode.common.map.ListMap;
44
import com.sbaars.adventofcode.year19.Day2019;
55
import com.sbaars.adventofcode.year19.pathfinding.CharGrid2d;
6+
67
import java.awt.*;
7-
import java.util.ArrayDeque;
8-
import java.util.ArrayList;
9-
import java.util.HashMap;
10-
import java.util.HashSet;
118
import java.util.List;
12-
import java.util.Map;
139
import java.util.Queue;
14-
import java.util.Set;
10+
import java.util.*;
1511

1612
public class Day20 extends Day2019 {
1713
private final Map<String, Portal[]> portals = new HashMap<>();

src/main/java/com/sbaars/adventofcode/year19/days/Day22.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sbaars.adventofcode.year19.days;
22

33
import com.sbaars.adventofcode.year19.Day2019;
4+
45
import java.math.BigInteger;
56
import java.util.ArrayList;
67
import java.util.Arrays;

src/main/java/com/sbaars/adventofcode/year19/days/Day23.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.sbaars.adventofcode.year19.Day2019;
44
import com.sbaars.adventofcode.year19.intcode.IntcodeComputer;
55
import com.sbaars.adventofcode.year19.intcode.RetentionPolicy;
6+
67
import java.util.stream.IntStream;
78

89
public class Day23 extends Day2019 {

0 commit comments

Comments
 (0)