Add a module-info & replace JSR305 annotations with JSpecify

build.gradle

@@ -29,7 +29,7 @@ dependencies {
     api 'com.google.guava:guava:32.1.2-jre' // TypeToken primarily exposed
     api 'it.unimi.dsi:fastutil:8.5.12' // various collection types are used in public API
 
-    compileOnlyApi 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnlyApi 'org.jspecify:jspecify:1.0.0'
     implementation 'org.slf4j:slf4j-api:2.0.9'
 
     testImplementation 'junit:junit-dep:4.11'

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

@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.BitSet;
 import java.util.Objects;
 import java.util.Optional;

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

@@ -13,7 +13,7 @@
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Objects;
 
 public final class FieldFinder<FT> implements OpticFinder<FT> {

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

@@ -20,7 +20,7 @@
 import com.mojang.datafixers.util.Either;
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nonnull;
+import org.jspecify.annotations.NonNull;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -42,8 +42,8 @@ static <A, B> Function<A, B> unbox(final App<ReaderMu<A>, B> box) {
     }
 
     @Override
-    @Nonnull
-    B apply(@Nonnull A a);
+    @NonNull
+    B apply(@NonNull A a);
 
     final class ReaderInstance<R> implements Representable<ReaderMu<R>, R, ReaderInstance.Mu<R>> {
         public static final class Mu<A> implements Representable.Mu {}

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

@@ -5,7 +5,7 @@
 import com.mojang.datafixers.types.Type;
 import com.mojang.datafixers.util.Either;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public interface OpticFinder<FT> {
     Type<FT> type();

src/main/java/com/mojang/datafixers/functions/PointFree.java

@@ -5,7 +5,7 @@
 import com.mojang.datafixers.types.Type;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.Function;
 

src/main/java/com/mojang/datafixers/types/Type.java

@@ -26,7 +26,7 @@
 import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;

src/main/java/com/mojang/datafixers/types/families/RecursiveTypeFamily.java

@@ -22,7 +22,7 @@
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.BitSet;
 import java.util.List;
 import java.util.Objects;

src/main/java/com/mojang/datafixers/types/templates/Check.java

@@ -17,7 +17,7 @@
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.IntFunction;
 

src/main/java/com/mojang/datafixers/types/templates/CompoundList.java

@@ -20,7 +20,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.IntFunction;

src/main/java/com/mojang/datafixers/types/templates/Const.java

@@ -15,7 +15,7 @@
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Objects;
 import java.util.function.IntFunction;
 

src/main/java/com/mojang/datafixers/types/templates/Hook.java

@@ -17,7 +17,7 @@
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.Lifecycle;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.IntFunction;

src/main/java/com/mojang/datafixers/types/templates/List.java

@@ -17,7 +17,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.IntFunction;
 

src/main/java/com/mojang/datafixers/types/templates/Named.java

@@ -19,7 +19,7 @@
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.Lifecycle;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.IntFunction;

src/main/java/com/mojang/datafixers/types/templates/Product.java

@@ -26,7 +26,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.IntFunction;
 

src/main/java/com/mojang/datafixers/types/templates/RecursivePoint.java

@@ -20,7 +20,7 @@
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.Lifecycle;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.BitSet;
 import java.util.Objects;
 import java.util.Optional;

src/main/java/com/mojang/datafixers/types/templates/Sum.java

@@ -23,7 +23,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Optional;
 import java.util.function.IntFunction;
 

src/main/java/com/mojang/datafixers/types/templates/Tag.java

@@ -16,7 +16,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DynamicOps;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.IntFunction;

src/main/java/com/mojang/datafixers/types/templates/TaggedChoice.java

@@ -39,7 +39,7 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Map;

src/main/java/com/mojang/datafixers/types/templates/TypeTemplate.java

@@ -9,7 +9,7 @@
 import com.mojang.datafixers.types.families.TypeFamily;
 import com.mojang.datafixers.util.Either;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.function.IntFunction;
 
 public interface TypeTemplate {

src/main/java/com/mojang/serialization/Dynamic.java

@@ -6,7 +6,7 @@
 import com.mojang.datafixers.DataFixUtils;
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Objects;

src/main/java/com/mojang/serialization/JavaOps.java

@@ -10,7 +10,7 @@
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.longs.LongList;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.nio.ByteBuffer;
 import java.util.LinkedHashMap;
 import java.util.List;

src/main/java/com/mojang/serialization/JsonOps.java

@@ -10,7 +10,7 @@
 import com.google.gson.JsonPrimitive;
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;

src/main/java/com/mojang/serialization/MapDecoder.java

@@ -4,7 +4,7 @@
 
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

src/main/java/com/mojang/serialization/MapLike.java

@@ -4,7 +4,7 @@
 
 import com.mojang.datafixers.util.Pair;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.Map;
 import java.util.stream.Stream;
 

src/main/java/module-info.java

@@ -0,0 +1,11 @@
+module com.mojang.datafixerupper {
+
+    requires com.google.common;
+    requires it.unimi.dsi.fastutil;
+    requires org.jspecify;
+    requires org.slf4j;
+    requires com.google.gson;
+
+    exports com.mojang.datafixers;
+    exports com.mojang.serialization;
+}

src/test/java/com/mojang/serialization/CodecTests.java

@@ -6,7 +6,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import org.junit.Test;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;