Change to the Serde interface nullability constraints. These should not affect bytecode compatibility, but only linters using the jspecify annotations.

Author: slinkydeveloper

common/src/main/java/dev/restate/serde/Serde.java

@@ -11,6 +11,7 @@
 import dev.restate.common.Slice;
 import dev.restate.common.function.ThrowingFunction;
 import java.util.Objects;
+import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.*;
 
 /**
@@ -24,12 +25,11 @@
  *
  * @see SerdeFactory
  */
-@NullMarked
-public interface Serde<T extends @Nullable Object> extends TypeTag<T> {
+public interface Serde<T> extends TypeTag<T> {
 
-  Slice serialize(T value);
+  Slice serialize(@Nullable T value);
 
-  T deserialize(Slice value);
+  T deserialize(@NonNull Slice value);
 
   // --- Metadata about the serialized/deserialized content
 
@@ -72,7 +72,7 @@ public Slice serialize(T value) {
       }
 
       @Override
-      public T deserialize(Slice value) {
+      public T deserialize(@NotNull Slice value) {
         return deserializer.asFunction().apply(value.toByteArray());
       }
     };
@@ -93,7 +93,7 @@ public Slice serialize(T value) {
       }
 
       @Override
-      public T deserialize(Slice value) {
+      public T deserialize(@NotNull Slice value) {
         return deserializer.asFunction().apply(value.toByteArray());
       }
 
@@ -112,7 +112,7 @@ public Slice serialize(T value) {
       }
 
       @Override
-      public T deserialize(Slice value) {
+      public T deserialize(@NotNull Slice value) {
         return inner.deserialize(value);
       }
 
@@ -132,7 +132,7 @@ public Slice serialize(Void value) {
         }
 
         @Override
-        public Void deserialize(Slice value) {
+        public Void deserialize(@NotNull Slice value) {
           return null;
         }
 
@@ -151,7 +151,7 @@ public Slice serialize(byte[] value) {
         }
 
         @Override
-        public byte[] deserialize(Slice value) {
+        public byte[] deserialize(@NotNull Slice value) {
           return value.toByteArray();
         }
       };
@@ -165,7 +165,7 @@ public Slice serialize(Slice value) {
         }
 
         @Override
-        public Slice deserialize(Slice value) {
+        public Slice deserialize(@NotNull Slice value) {
           return value;
         }
       };

sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/futures.kt

@@ -51,7 +51,8 @@ internal abstract class BaseDurableFutureImpl<T : Any?> : DurableFuture<T> {
           }
 
           try {
-            @Suppress("UNCHECKED_CAST") return@simpleMap this.asyncResult().poll().getNow(null) as T
+            @Suppress("UNCHECKED_CAST")
+            return@simpleMap this.asyncResult().poll().getNow(null) as T
           } catch (e: ExecutionException) {
             throw e.cause ?: e // unwrap original cause from ExecutionException
           }

sdk-api/src/main/java/dev/restate/sdk/JsonSerdes.java

@@ -20,6 +20,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.NonNull;
 
 /**
@@ -191,7 +192,7 @@ public Slice serialize(T value) {
       }
 
       @Override
-      public T deserialize(Slice value) {
+      public T deserialize(@NotNull Slice value) {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(value.toByteArray());
         try (JsonParser parser = JSON_FACTORY.createParser(inputStream)) {
           return deserializer.asFunction().apply(parser);

sdk-core/src/test/java/dev/restate/sdk/core/TestSerdes.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -124,7 +125,7 @@ public Slice serialize(@Nullable T value) {
       }
 
       @Override
-      public T deserialize(Slice value) {
+      public T deserialize(@NotNull Slice value) {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(value.toByteArray());
         try (JsonParser parser = JSON_FACTORY.createParser(inputStream)) {
           return deserializer.asFunction().apply(parser);

sdk-core/src/test/kotlin/dev/restate/sdk/core/vertx/ThreadTrampoliningTestSuite.kt

@@ -51,7 +51,7 @@ class ThreadTrampoliningTestSuite : TestDefinitions.TestSuite {
 
   private fun checkBlockingComponentTrampolineExecutor(
       ctx: dev.restate.sdk.Context,
-      _unused: Any
+      _unused: Any?
   ): Void? {
     val id = Thread.currentThread().id
     check(Vertx.currentContext() == null)

sdk-serde-kotlinx/src/main/kotlin/dev/restate/serde/kotlinx/KotlinSerializationSerdeFactory.kt

@@ -96,7 +96,6 @@ constructor(
     val UNIT: Serde<Unit> =
         object : Serde<Unit> {
           // This is fine, it's less strict
-          @Suppress("WRONG_NULLABILITY_FOR_JAVA_OVERRIDE")
           override fun serialize(value: Unit?): Slice {
             return Slice.EMPTY
           }
@@ -119,7 +118,6 @@ constructor(
       val schema = jsonSchemaFactory.generateSchema(json, serializer)
 
       return object : Serde<T> {
-        @Suppress("WRONG_NULLABILITY_FOR_JAVA_OVERRIDE")
         override fun serialize(value: T?): Slice {
           if (value == null) {
             return Slice.wrap(json.encodeToString(JsonNull.serializer(), JsonNull))

test-services/src/main/kotlin/dev/restate/sdk/testservices/TestUtilsServiceImpl.kt

@@ -41,7 +41,7 @@ class TestUtilsServiceImpl : TestUtilsService {
   override suspend fun countExecutedSideEffects(context: Context, increments: Int): Int {
     val invokedSideEffects = AtomicInteger(0)
 
-    for (i in 0 ..< increments) {
+    for (i in 0..<increments) {
       context.runBlock { invokedSideEffects.incrementAndGet() }
     }