Skip to content

Commit ae567d4

Browse files
committed
switch to fishflakes lazy
1 parent 82ce38c commit ae567d4

6 files changed

Lines changed: 10 additions & 37 deletions

File tree

src/main/java/fish/cichlidmc/tinycodecs/api/codec/Codec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package fish.cichlidmc.tinycodecs.api.codec;
22

33
import fish.cichlidmc.fishflakes.api.value.Either;
4+
import fish.cichlidmc.fishflakes.api.value.Lazy;
45
import fish.cichlidmc.fishflakes.api.value.Result;
56
import fish.cichlidmc.tinycodecs.api.codec.dual.DualCodec;
67
import fish.cichlidmc.tinycodecs.api.codec.map.MapCodec;
7-
import fish.cichlidmc.tinycodecs.impl.Lazy;
88
import fish.cichlidmc.tinycodecs.impl.codec.ByNameCodec;
99
import fish.cichlidmc.tinycodecs.impl.codec.DispatchCodec;
1010
import fish.cichlidmc.tinycodecs.impl.codec.EitherCodec;
@@ -144,7 +144,7 @@ static <T> Codec<T> throwing(Function<? super T, ? extends JsonValue> encoder, F
144144
}
145145

146146
static <T> Codec<T> lazy(Supplier<? extends Codec<T>> factory) {
147-
Lazy<Codec<T>> lazy = new Lazy<>(factory);
147+
Lazy<? extends Codec<T>> lazy = Lazy.of(factory);
148148

149149
return of(
150150
value -> lazy.get().encode(value),

src/main/java/fish/cichlidmc/tinycodecs/api/codec/dual/DualCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package fish.cichlidmc.tinycodecs.api.codec.dual;
22

3+
import fish.cichlidmc.fishflakes.api.value.Lazy;
34
import fish.cichlidmc.fishflakes.api.value.Result;
45
import fish.cichlidmc.tinycodecs.api.codec.Codec;
56
import fish.cichlidmc.tinycodecs.api.codec.CompositeCodec;
67
import fish.cichlidmc.tinycodecs.api.codec.map.MapCodec;
7-
import fish.cichlidmc.tinycodecs.impl.Lazy;
88

99
import java.util.function.Function;
1010
import java.util.function.Supplier;
@@ -39,7 +39,7 @@ public static <T> DualCodec<T> unit(T unit) {
3939
}
4040

4141
public static <T> DualCodec<T> lazy(Supplier<DualCodec<T>> factory) {
42-
Lazy<DualCodec<T>> lazy = new Lazy<>(factory);
42+
Lazy<DualCodec<T>> lazy = Lazy.of(factory);
4343
return new DualCodec<>(Codec.lazy(() -> lazy.get().codec()), MapCodec.lazy(() -> lazy.get().mapCodec()));
4444
}
4545
}

src/main/java/fish/cichlidmc/tinycodecs/api/codec/map/MapCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fish.cichlidmc.tinycodecs.api.codec.map;
22

3+
import fish.cichlidmc.fishflakes.api.value.Lazy;
34
import fish.cichlidmc.fishflakes.api.value.Result;
45
import fish.cichlidmc.tinycodecs.api.codec.Codec;
5-
import fish.cichlidmc.tinycodecs.impl.Lazy;
66
import fish.cichlidmc.tinycodecs.impl.codec.map.MapCodecAsCodec;
77
import fish.cichlidmc.tinycodecs.impl.codec.map.MapMapCodec;
88
import fish.cichlidmc.tinycodecs.impl.codec.map.RecursiveMapCodec;
@@ -66,7 +66,7 @@ static <T> MapCodec<T> unit(T unit) {
6666
}
6767

6868
static <T> MapCodec<T> lazy(Supplier<? extends MapCodec<T>> factory) {
69-
Lazy<MapCodec<T>> lazy = new Lazy<>(factory);
69+
Lazy<? extends MapCodec<T>> lazy = Lazy.of(factory);
7070

7171
return of(
7272
(json, value) -> lazy.get().encode(json, value),

src/main/java/fish/cichlidmc/tinycodecs/impl/Lazy.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/java/fish/cichlidmc/tinycodecs/impl/codec/RecursiveCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fish.cichlidmc.tinycodecs.impl.codec;
22

3+
import fish.cichlidmc.fishflakes.api.value.Lazy;
34
import fish.cichlidmc.fishflakes.api.value.Result;
45
import fish.cichlidmc.tinycodecs.api.codec.Codec;
5-
import fish.cichlidmc.tinycodecs.impl.Lazy;
66
import fish.cichlidmc.tinyjson.value.JsonValue;
77

88
import java.util.function.UnaryOperator;
@@ -11,7 +11,7 @@ public final class RecursiveCodec<T> implements Codec<T> {
1111
private final Lazy<Codec<T>> lazy;
1212

1313
public RecursiveCodec(UnaryOperator<Codec<T>> factory) {
14-
this.lazy = new Lazy<>(() -> factory.apply(this));
14+
this.lazy = Lazy.of(() -> factory.apply(this));
1515
}
1616

1717
@Override

src/main/java/fish/cichlidmc/tinycodecs/impl/codec/map/RecursiveMapCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fish.cichlidmc.tinycodecs.impl.codec.map;
22

3+
import fish.cichlidmc.fishflakes.api.value.Lazy;
34
import fish.cichlidmc.fishflakes.api.value.Result;
45
import fish.cichlidmc.tinycodecs.api.codec.map.MapCodec;
5-
import fish.cichlidmc.tinycodecs.impl.Lazy;
66
import fish.cichlidmc.tinyjson.value.composite.JsonObject;
77

88
import java.util.Optional;
@@ -12,7 +12,7 @@ public final class RecursiveMapCodec<T> implements MapCodec<T> {
1212
private final Lazy<MapCodec<T>> lazy;
1313

1414
public RecursiveMapCodec(UnaryOperator<MapCodec<T>> factory) {
15-
this.lazy = new Lazy<>(() -> factory.apply(this));
15+
this.lazy = Lazy.of(() -> factory.apply(this));
1616
}
1717

1818
@Override

0 commit comments

Comments
 (0)