Add missing checks

Author: freya022

api/src/main/java/dev/freya02/discord/zstd/api/DiscordZstdNativesLoader.java

@@ -1,5 +1,6 @@
 package dev.freya02.discord.zstd.api;
 
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 
 import java.io.IOException;
@@ -38,9 +39,7 @@ public static synchronized boolean isLoaded() {
     public static synchronized boolean load(Path path) {
         if (init)
             return false;
-        //noinspection ConstantValue
-        if (path == null)
-            throw new IllegalArgumentException("path is null");
+        Checks.notNull(path, "Path");
         if (!path.isAbsolute())
             throw new IllegalArgumentException("path is not absolute: " + path);
 
@@ -71,12 +70,8 @@ public static synchronized boolean load(Path path) {
     public static synchronized boolean loadFromJar(String resourcePath, Class<?> clazz) throws IOException {
         if (init)
             return false;
-        //noinspection ConstantValue
-        if (resourcePath == null)
-            throw new IllegalArgumentException("resourcePath is null");
-        //noinspection ConstantValue
-        if (clazz == null)
-            throw new IllegalArgumentException("clazz is null");
+        Checks.notNull(resourcePath, "Resource path");
+        Checks.notNull(clazz, "Class");
 
         Path nativePath = IOUtil.copyNativeFromJar(resourcePath, clazz);
         load(nativePath);

api/src/main/java/dev/freya02/discord/zstd/internal/Checks.java

@@ -0,0 +1,13 @@
+package dev.freya02.discord.zstd.internal;
+
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public class Checks {
+    public static void notNull(@Nullable Object object, String name) {
+        if (object == null) {
+            throw new IllegalArgumentException(name + " cannot be null");
+        }
+    }
+}

ffm-impl/src/main/java/dev/freya02/discord/zstd/ffm/DiscordZstdFFMContext.java

@@ -2,6 +2,7 @@
 
 import dev.freya02.discord.zstd.api.DiscordZstdContext;
 import dev.freya02.discord.zstd.api.DiscordZstdException;
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 
 import java.io.InputStream;
@@ -38,14 +39,13 @@ public void reset() {
 
     @Override
     public InputStream createInputStream(byte[] input) {
+        checkValid();
+        Checks.notNull(input, "Input");
         return new DiscordZstdFFMInputStream(this, input);
     }
 
     public void decompress(MemorySegment dst, long dstCapacity, MemorySegment dstPos, MemorySegment src, long srcSize, MemorySegment srcPos) {
-        if (closed)
-            throw new IllegalStateException("Context is closed");
-        if (invalidated)
-            throw new IllegalStateException("Context is in an errored state and needs to be reset");
+        checkValid();
 
         long result = Zstd.ZSTD_decompressStream_simpleArgs(stream, dst, dstCapacity, dstPos, src, srcSize, srcPos);
 
@@ -58,4 +58,11 @@ public DiscordZstdException createException(String message) {
         invalidated = true;
         return new DiscordZstdException(message);
     }
+
+    private void checkValid() {
+        if (closed)
+            throw new IllegalStateException("Context is closed");
+        if (invalidated)
+            throw new IllegalStateException("Context is in an errored state and needs to be reset");
+    }
 }

ffm-impl/src/main/java/dev/freya02/discord/zstd/ffm/DiscordZstdFFMDecompressor.java

@@ -2,6 +2,7 @@
 
 import dev.freya02.discord.zstd.api.DiscordZstdException;
 import dev.freya02.discord.zstd.internal.AbstractZstdDecompressor;
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,9 +77,7 @@ public byte[] decompress(byte[] data)
             throw new IllegalStateException("Decompressor is closed");
         if (invalidated)
             throw new IllegalStateException("Decompressor is in an errored state and needs to be reset");
-        //noinspection ConstantValue
-        if (data == null)
-            throw new IllegalArgumentException("data is null");
+        Checks.notNull(data, "Data");
 
         if (LOG.isTraceEnabled())
             LOG.trace("Decompressing data {}", Arrays.toString(data));

jna-impl/src/main/java/dev/freya02/discord/zstd/jna/ZstdJNADecompressor.java

@@ -3,6 +3,7 @@
 import com.sun.jna.Pointer;
 import dev.freya02.discord.zstd.api.DiscordZstdException;
 import dev.freya02.discord.zstd.internal.AbstractZstdDecompressor;
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,9 +69,7 @@ public byte[] decompress(byte[] data)
             throw new IllegalStateException("Decompressor is closed");
         if (invalidated)
             throw new IllegalStateException("Decompressor is in an errored state and needs to be reset");
-        //noinspection ConstantValue
-        if (data == null)
-            throw new IllegalArgumentException("data is null");
+        Checks.notNull(data, "Data");
 
         if (LOG.isTraceEnabled())
             LOG.trace("Decompressing data {}", Arrays.toString(data));

jni-impl/src/main/java/dev/freya02/discord/zstd/jni/DiscordZstdJNIContext.java

@@ -1,6 +1,7 @@
 package dev.freya02.discord.zstd.jni;
 
 import dev.freya02.discord.zstd.api.DiscordZstdContext;
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 
 import java.io.InputStream;
@@ -47,6 +48,8 @@ public void reset() {
 
     @Override
     public InputStream createInputStream(byte[] input) {
+        checkValid();
+        Checks.notNull(input, "Input");
         return new DiscordZstdJNIInputStream(this, zds, input);
     }
 

jni-impl/src/main/java/dev/freya02/discord/zstd/jni/DiscordZstdJNIDecompressor.java

@@ -2,6 +2,7 @@
 
 import dev.freya02.discord.zstd.api.DiscordZstdException;
 import dev.freya02.discord.zstd.internal.AbstractZstdDecompressor;
+import dev.freya02.discord.zstd.internal.Checks;
 import org.jspecify.annotations.NullMarked;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,9 +60,7 @@ public byte[] decompress(byte[] data)
             throw new IllegalStateException("Decompressor is closed");
         if (invalidated)
             throw new IllegalStateException("Decompressor is in an errored state and needs to be reset");
-        //noinspection ConstantValue
-        if (data == null)
-            throw new IllegalArgumentException("data is null");
+        Checks.notNull(data, "Data");
 
         if (LOG.isTraceEnabled())
             LOG.trace("Decompressing data {}", Arrays.toString(data));