Skip to content

Commit 4b40983

Browse files
grumgrum
committed
Style/import stuff.
1 parent a1f4543 commit 4b40983

Some content is hidden

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

62 files changed

+121
-138
lines changed

‎src/main/java/com/mojang/datafixers/DataFix.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
package com.mojang.datafixers;
44

55
import com.mojang.datafixers.schemas.Schema;
6+
import com.mojang.datafixers.types.Type;
67
import com.mojang.datafixers.util.Pair;
7-
import com.mojang.serialization.DataResult;
88
import com.mojang.serialization.Dynamic;
99
import com.mojang.serialization.DynamicOps;
10-
import com.mojang.datafixers.types.Type;
1110
import org.apache.logging.log4j.LogManager;
1211
import org.apache.logging.log4j.Logger;
1312

‎src/main/java/com/mojang/datafixers/DataFixerUpper.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44

55
import com.google.common.collect.ImmutableList;
66
import com.google.common.collect.Lists;
7+
import com.mojang.datafixers.functions.PointFreeRule;
8+
import com.mojang.datafixers.schemas.Schema;
9+
import com.mojang.datafixers.types.Type;
710
import com.mojang.serialization.DataResult;
811
import com.mojang.serialization.Dynamic;
912
import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap;
1013
import it.unimi.dsi.fastutil.ints.IntSortedSet;
1114
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
1215
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
1316
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
14-
import com.mojang.datafixers.functions.PointFreeRule;
15-
import com.mojang.datafixers.schemas.Schema;
16-
import com.mojang.datafixers.types.Type;
1717
import org.apache.logging.log4j.LogManager;
1818
import org.apache.logging.log4j.Logger;
1919

2020
import java.util.List;
21-
import java.util.Optional;
2221

2322
/*
2423
* Optimizing functions

‎src/main/java/com/mojang/datafixers/FieldFinder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT license.
33
package com.mojang.datafixers;
44

5-
import com.mojang.datafixers.util.Either;
6-
import com.mojang.datafixers.util.Pair;
75
import com.mojang.datafixers.optics.Adapter;
86
import com.mojang.datafixers.optics.Optics;
97
import com.mojang.datafixers.optics.Proj1;
@@ -12,6 +10,8 @@
1210
import com.mojang.datafixers.types.Type;
1311
import com.mojang.datafixers.types.templates.Tag;
1412
import com.mojang.datafixers.types.templates.TaggedChoice;
13+
import com.mojang.datafixers.util.Either;
14+
import com.mojang.datafixers.util.Pair;
1515

1616
import javax.annotation.Nullable;
1717
import java.util.Objects;

‎src/main/java/com/mojang/datafixers/FunctionType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.mojang.datafixers.kinds.K1;
1111
import com.mojang.datafixers.kinds.K2;
1212
import com.mojang.datafixers.kinds.Representable;
13-
import com.mojang.datafixers.optics.Optic;
1413
import com.mojang.datafixers.optics.Optics;
1514
import com.mojang.datafixers.optics.Procompose;
1615
import com.mojang.datafixers.optics.Wander;
@@ -69,7 +68,7 @@ enum Instance implements TraversalP<Mu, Instance.Mu>, MonoidProfunctor<Mu, Insta
6968
INSTANCE;
7069

7170
public static final class Mu implements TraversalP.Mu, MonoidProfunctor.Mu, Mapping.Mu, Monoidal.Mu {
72-
public static final TypeToken<Instance.Mu> TYPE_TOKEN = new TypeToken<Instance.Mu>() {};
71+
public static final TypeToken<Mu> TYPE_TOKEN = new TypeToken<Mu>() {};
7372
}
7473

7574
@Override

‎src/main/java/com/mojang/datafixers/NamedChoiceFinder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Licensed under the MIT license.
33
package com.mojang.datafixers;
44

5-
import com.mojang.datafixers.util.Either;
65
import com.mojang.datafixers.types.Type;
76
import com.mojang.datafixers.types.templates.Tag;
87
import com.mojang.datafixers.types.templates.TaggedChoice;
8+
import com.mojang.datafixers.util.Either;
99

1010
import java.util.Objects;
1111

‎src/main/java/com/mojang/datafixers/OpticFinder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the MIT license.
33
package com.mojang.datafixers;
44

5-
import com.mojang.datafixers.util.Either;
65
import com.mojang.datafixers.types.Type;
6+
import com.mojang.datafixers.util.Either;
77

88
import javax.annotation.Nullable;
99

‎src/main/java/com/mojang/datafixers/Typed.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import com.google.common.collect.ImmutableList;
66
import com.google.common.reflect.TypeToken;
7-
import com.mojang.datafixers.util.Either;
8-
import com.mojang.datafixers.util.Pair;
97
import com.mojang.datafixers.kinds.Const;
108
import com.mojang.datafixers.kinds.IdF;
119
import com.mojang.datafixers.kinds.Monoid;
@@ -17,11 +15,13 @@
1715
import com.mojang.datafixers.optics.ReForgetC;
1816
import com.mojang.datafixers.optics.Traversal;
1917
import com.mojang.datafixers.optics.profunctors.TraversalP;
18+
import com.mojang.datafixers.types.Type;
19+
import com.mojang.datafixers.types.templates.RecursivePoint;
20+
import com.mojang.datafixers.util.Either;
21+
import com.mojang.datafixers.util.Pair;
2022
import com.mojang.serialization.DataResult;
2123
import com.mojang.serialization.Dynamic;
2224
import com.mojang.serialization.DynamicOps;
23-
import com.mojang.datafixers.types.Type;
24-
import com.mojang.datafixers.types.templates.RecursivePoint;
2525

2626
import java.util.List;
2727
import java.util.Optional;
@@ -167,7 +167,7 @@ private <B, FT, FR> Typed<B> updateCap(final TypedOptic<A, B, FT, FR> field, fin
167167

168168
public <FT> List<Typed<FT>> getAllTyped(final OpticFinder<FT> optic) {
169169
final TypedOptic<A, ?, FT, ?> field = optic.findType(type, optic.type(), false).orThrow();
170-
return getAll(field).stream().map(ft -> new Typed<FT>(optic.type(), ops, ft)).collect(Collectors.toList());
170+
return getAll(field).stream().map(ft -> new Typed<>(optic.type(), ops, ft)).collect(Collectors.toList());
171171
}
172172

173173
public <FT> List<FT> getAll(final TypedOptic<A, ?, FT, ?> field) {

‎src/main/java/com/mojang/datafixers/TypedOptic.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.google.common.collect.ImmutableSet;
66
import com.google.common.collect.Maps;
77
import com.google.common.reflect.TypeToken;
8-
import com.mojang.datafixers.util.Either;
9-
import com.mojang.datafixers.util.Pair;
108
import com.mojang.datafixers.kinds.App;
119
import com.mojang.datafixers.kinds.App2;
1210
import com.mojang.datafixers.kinds.K1;
@@ -25,8 +23,11 @@
2523
import com.mojang.datafixers.optics.profunctors.TraversalP;
2624
import com.mojang.datafixers.types.Type;
2725
import com.mojang.datafixers.types.templates.TaggedChoice;
26+
import com.mojang.datafixers.util.Either;
27+
import com.mojang.datafixers.util.Pair;
2828

2929
import java.util.Collection;
30+
import java.util.List;
3031
import java.util.Map;
3132
import java.util.Objects;
3233
import java.util.Optional;
@@ -167,7 +168,7 @@ public static <F, G, G2> TypedOptic<Either<F, G>, Either<F, G2>, G, G2> inj2(fin
167168
);
168169
}
169170

170-
public static <K, V, K2> TypedOptic<java.util.List<Pair<K, V>>, java.util.List<Pair<K2, V>>, K, K2> compoundListKeys(final Type<K> aType, final Type<K2> bType, final Type<V> valueType) {
171+
public static <K, V, K2> TypedOptic<List<Pair<K, V>>, List<Pair<K2, V>>, K, K2> compoundListKeys(final Type<K> aType, final Type<K2> bType, final Type<V> valueType) {
171172
return new TypedOptic<>(
172173
TraversalP.Mu.TYPE_TOKEN,
173174
DSL.compoundList(aType, valueType),
@@ -178,7 +179,7 @@ public static <K, V, K2> TypedOptic<java.util.List<Pair<K, V>>, java.util.List<P
178179
);
179180
}
180181

181-
public static <K, V, V2> TypedOptic<java.util.List<Pair<K, V>>, java.util.List<Pair<K, V2>>, V, V2> compoundListElements(final Type<K> keyType, final Type<V> aType, final Type<V2> bType) {
182+
public static <K, V, V2> TypedOptic<List<Pair<K, V>>, List<Pair<K, V2>>, V, V2> compoundListElements(final Type<K> keyType, final Type<V> aType, final Type<V2> bType) {
182183
return new TypedOptic<>(
183184
TraversalP.Mu.TYPE_TOKEN,
184185
DSL.compoundList(keyType, aType),
@@ -189,7 +190,7 @@ public static <K, V, V2> TypedOptic<java.util.List<Pair<K, V>>, java.util.List<P
189190
);
190191
}
191192

192-
public static <A, B> TypedOptic<java.util.List<A>, java.util.List<B>, A, B> list(final Type<A> aType, final Type<B> bType) {
193+
public static <A, B> TypedOptic<List<A>, List<B>, A, B> list(final Type<A> aType, final Type<B> bType) {
193194
return new TypedOptic<>(
194195
TraversalP.Mu.TYPE_TOKEN,
195196
DSL.list(aType),

‎src/main/java/com/mojang/datafixers/View.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import com.mojang.datafixers.functions.PointFreeRule;
88
import com.mojang.datafixers.kinds.App2;
99
import com.mojang.datafixers.kinds.K2;
10-
import com.mojang.serialization.DynamicOps;
1110
import com.mojang.datafixers.types.Type;
11+
import com.mojang.serialization.DynamicOps;
1212

1313
import java.util.Objects;
1414
import java.util.Optional;

‎src/main/java/com/mojang/datafixers/functions/Apply.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
package com.mojang.datafixers.functions;
44

55
import com.mojang.datafixers.DSL;
6-
import com.mojang.serialization.DynamicOps;
76
import com.mojang.datafixers.types.Type;
7+
import com.mojang.serialization.DynamicOps;
88

99
import java.util.Objects;
1010
import java.util.Optional;

0 commit comments

Comments
 (0)