Move to jspecify

dump/pom.xml

@@ -14,10 +14,11 @@
 
    <dependencies>
       <dependency>
-         <groupId>com.google.code.findbugs</groupId>
-         <artifactId>jsr305</artifactId>
-         <version>3.0.2</version>
+         <groupId>org.jspecify</groupId>
+         <artifactId>jspecify</artifactId>
+         <version>1.0.0</version>
       </dependency>
+
       <dependency>
          <groupId>net.sf.trove4j</groupId>
          <artifactId>trove4j</artifactId>
@@ -37,10 +38,8 @@
       <dependency>
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
-         <version>33.2.1-jre</version>
+         <version>33.5.0-jre</version>
       </dependency>
-
    </dependencies>
-
 </project>
 

dump/src/util/dump/Dump.java

@@ -40,9 +40,8 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -612,7 +611,7 @@ public File getDumpFile() {
       return _dumpFile;
    }
 
-   @Nonnull
+   @NonNull
    public DumpReader<E> getDumpReader() {
       assertOpen();
       try {
@@ -659,7 +658,7 @@ public boolean isClosed() {
     */
    @SuppressWarnings("resource")
    @Override
-   @Nonnull
+   @NonNull
    public DumpIterator<E> iterator() {
       assertOpen();
       try {
@@ -1100,21 +1099,6 @@ private void appendNextItemPos( byte[] bytes, byte[] nextItemPos ) {
       }
    }
 
-   private int getVersionFromDump() {
-      String dumpVersionString = _metaData.get("externalizationVersion");
-      return dumpVersionString == null ? 0 : Integer.parseInt(dumpVersionString);
-   }
-
-   private int getVersionFromCode() {
-      externalizationVersion version = _beanClass.getAnnotation(externalizationVersion.class);
-      return version == null ? 0 : version.version();
-   }
-
-   private ExternalizableBean.OnIncompatibleVersion getOnIncompatibleVersion() {
-      externalizationVersion version = _beanClass.getAnnotation(externalizationVersion.class);
-      return version == null ? ExternalizableBean.OnIncompatibleVersion.RenameDump : version.onIncompatibleVersion();
-   }
-
    private void checkVersion() throws IOException {
       int codeVersion = getVersionFromCode();
       int dumpVersion = getVersionFromDump();
@@ -1199,6 +1183,21 @@ private long getNextItemPos( byte[] bytes ) {
       return l;
    }
 
+   private ExternalizableBean.OnIncompatibleVersion getOnIncompatibleVersion() {
+      externalizationVersion version = _beanClass.getAnnotation(externalizationVersion.class);
+      return version == null ? ExternalizableBean.OnIncompatibleVersion.RenameDump : version.onIncompatibleVersion();
+   }
+
+   private int getVersionFromCode() {
+      externalizationVersion version = _beanClass.getAnnotation(externalizationVersion.class);
+      return version == null ? 0 : version.version();
+   }
+
+   private int getVersionFromDump() {
+      String dumpVersionString = _metaData.get("externalizationVersion");
+      return dumpVersionString == null ? 0 : Integer.parseInt(dumpVersionString);
+   }
+
    private void initInstantiationData() {
       StringWriter sw = new StringWriter();
       PrintWriter pw = new PrintWriter(sw);
@@ -1290,7 +1289,7 @@ public ElementAndPosition( D element, long position ) {
       }
 
       @Override
-      public int compareTo( @Nonnull ElementAndPosition<D> o ) {
+      public int compareTo( @NonNull ElementAndPosition<D> o ) {
          return Long.compare(_position, o._position);
       }
 
@@ -1332,13 +1331,13 @@ public void flush() throws IOException {
       }
 
       @Override
-      public void write( @Nonnull byte[] b ) throws IOException {
+      public void write( @NonNull byte[] b ) throws IOException {
          _out.write(b);
          _n += b.length;
       }
 
       @Override
-      public void write( @Nonnull byte[] b, int off, int len ) throws IOException {
+      public void write( @NonNull byte[] b, int off, int len ) throws IOException {
          _out.write(b, off, len);
          _n += len;
       }
@@ -1553,7 +1552,7 @@ public boolean markSupported() {
        *              or an I/O error occurs.
        */
       @Override
-      public/*synchronized*/int read( @Nonnull byte[] b, int off, int len ) throws IOException {
+      public/*synchronized*/int read( @NonNull byte[] b, int off, int len ) throws IOException {
          // we don't share instances of this class or synchronize access on a different level, so this method is not synchronized
          getBufIfOpen(); // Check for closed stream
          if ( (off | len | (off + len) | (b.length - (off + len))) < 0 ) {
@@ -1773,7 +1772,7 @@ public boolean hasNext() {
       }
 
       @Override
-      @Nonnull
+      @NonNull
       public DumpIterator<E> iterator() {
          return this;
       }

dump/src/util/dump/DumpReader.java

@@ -10,9 +10,8 @@
 import java.io.OptionalDataException;
 import java.util.Iterator;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import util.dump.stream.ExternalizableObjectStreamProvider;
 import util.dump.stream.ObjectStreamProvider;
 
@@ -169,7 +168,7 @@ public boolean hasNext() {
    }
 
    @Override
-   public @Nonnull Iterator<E> iterator() {
+   public @NonNull Iterator<E> iterator() {
       return this;
    }
 

dump/src/util/dump/DumpWriter.java

@@ -8,8 +8,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 
-import javax.annotation.Nullable;
-
+import org.jspecify.annotations.Nullable;
 import util.dump.stream.ExternalizableObjectStreamProvider;
 import util.dump.stream.ObjectStreamProvider;
 

dump/src/util/dump/ExternalizationHelper.java

@@ -30,8 +30,7 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.Nonnull;
-
+import org.jspecify.annotations.NonNull;
 import org.slf4j.LoggerFactory;
 
 import util.dump.ExternalizableBean.externalizationPadding;
@@ -853,7 +852,7 @@ static void writeUUID( ObjectOutput out, UUID uuid ) throws IOException {
       }
    }
 
-   @Nonnull
+   @NonNull
    private static ThrowingSupplier<Object> getGenericReader( ObjectInput in, Class genericType, ClassConfig config, Class[] lastNonDefaultClass ) {
       if ( Externalizable.class.isAssignableFrom(genericType) ) {
          return () -> readExternalizable(in, genericType, lastNonDefaultClass, config);
@@ -1099,7 +1098,7 @@ public int size() {
       }
 
       @Override
-      public void write( @Nonnull byte[] bytes, int start, int length ) {
+      public void write( @NonNull byte[] bytes, int start, int length ) {
          if ( (start < 0) || (start > bytes.length) || (length < 0) || (start + length > bytes.length) || (start + length < 0) ) {
             throw new IndexOutOfBoundsException();
          }
@@ -1462,7 +1461,7 @@ static class FieldInfo implements Comparable<FieldInfo> {
       Class         _defaultGenericType1;
 
       @Override
-      public int compareTo( @Nonnull FieldInfo o ) {
+      public int compareTo( @NonNull FieldInfo o ) {
          int fieldIndex = _fieldIndex & 0xFF;
          int otherFieldIndex = o._fieldIndex & 0xFF;
          return Integer.compare(fieldIndex, otherFieldIndex);

dump/src/util/dump/sort/InfiniteSorter.java

@@ -7,9 +7,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import util.dump.Dump;
 import util.dump.DumpInput;
 import util.dump.DumpReader;
@@ -81,7 +80,7 @@ public InfiniteSorter() {
       init(DEFAULT_MAX_ELEMENTS_IN_MEMORY, -1, null, TempFileProvider.DEFAULT_PROVIDER);
    }
 
-   public InfiniteSorter( @Nonnull File tempDir ) {
+   public InfiniteSorter( @NonNull File tempDir ) {
       init(DEFAULT_MAX_ELEMENTS_IN_MEMORY, -1, null, new TempFileProvider(tempDir));
    }
 
@@ -93,11 +92,11 @@ public InfiniteSorter( int maxElementsInMemory, int bufferSize ) {
       init(maxElementsInMemory, bufferSize, null, TempFileProvider.DEFAULT_PROVIDER);
    }
 
-   public InfiniteSorter( int maxElementsInMemory, int bufferSize, @Nonnull File tempDir ) {
+   public InfiniteSorter( int maxElementsInMemory, int bufferSize, @NonNull File tempDir ) {
       init(maxElementsInMemory, -1, null, new TempFileProvider(tempDir));
    }
 
-   public InfiniteSorter( int maxElementsInMemory, int bufferSize, @Nonnull File tempDir, @Nullable ObjectStreamProvider objectStreamProvider,
+   public InfiniteSorter( int maxElementsInMemory, int bufferSize, @NonNull File tempDir, @Nullable ObjectStreamProvider objectStreamProvider,
          @Nullable Comparator<E> comparator ) {
       init(maxElementsInMemory, bufferSize, comparator, new TempFileProvider(tempDir));
       this._objectStreamProvider = objectStreamProvider;
@@ -198,7 +197,7 @@ public TempFileProvider getTempFileProvider() {
       return _tempFileProvider;
    }
 
-   public @Nonnull Iterator<E> iterator() {
+   public @NonNull Iterator<E> iterator() {
       try {
          return getSortedElements().iterator();
       }

dump/src/util/dump/sort/SortedInputMerger.java

@@ -7,9 +7,8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import util.dump.DumpInput;
 import util.dump.DumpReader;
 
@@ -146,7 +145,7 @@ public boolean hasNext() {
    }
 
    @Override
-   public @Nonnull Iterator<E> iterator() {
+   public @NonNull Iterator<E> iterator() {
       return this;
    }
 

dump/src/util/dump/stream/AesCrypter.java

@@ -7,13 +7,14 @@
 import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 
-import javax.annotation.Nullable;
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import org.jspecify.annotations.Nullable;
+
 
 public class AesCrypter implements ByteArrayPacker {
 

dump/src/util/dump/stream/ByteArrayPacker.java

@@ -3,7 +3,7 @@
 import java.io.Externalizable;
 import java.io.IOException;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 
 public interface ByteArrayPacker {

dump/src/util/dump/stream/Compression.java

@@ -11,8 +11,6 @@
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
 
-import javax.annotation.Nullable;
-
 import com.github.luben.zstd.Zstd;
 import com.github.luben.zstd.ZstdDictCompress;
 import com.github.luben.zstd.ZstdDictDecompress;
@@ -21,6 +19,7 @@
 import net.jpountz.lz4.LZ4Compressor;
 import net.jpountz.lz4.LZ4Factory;
 import net.jpountz.lz4.LZ4FastDecompressor;
+import org.jspecify.annotations.Nullable;
 import util.dump.cache.LRUCache;
 import util.dump.io.IOUtils;
 

dump/test/util/dump/InfiniteSorterTest.java

@@ -1,11 +1,10 @@
 package util.dump;
 
-import javax.annotation.Nonnull;
-
 import java.io.File;
 import java.io.IOException;
 
 import junit.framework.Assert;
+import org.jspecify.annotations.NonNull;
 
 import org.junit.Test;
 
@@ -91,7 +90,7 @@ public Bean( long id ) {
       }
 
       @Override
-      public int compareTo( @Nonnull Bean o ) {
+      public int compareTo( @NonNull Bean o ) {
          return (Long.compare(_id, o._id));
       }
    }

dumpsearch/pom.xml

@@ -13,6 +13,12 @@
    </parent>
 
    <dependencies>
+      <dependency>
+         <groupId>org.jspecify</groupId>
+         <artifactId>jspecify</artifactId>
+         <version>1.0.0</version>
+      </dependency>
+
       <dependency>
          <groupId>mkr</groupId>
          <artifactId>util-dump</artifactId>
@@ -44,6 +50,5 @@
          <version>8.4.0</version>
       </dependency>
    </dependencies>
-
 </project>