Error in running the zerocode tests in JDK23/21 authorjapps#704

Author: rkampani

core/pom.xml

@@ -120,7 +120,24 @@
             <groupId>org.jukito</groupId>
             <artifactId>jukito</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

core/src/main/java/org/jsmart/zerocode/core/di/module/OptionalTypeAdapter.java

@@ -0,0 +1,38 @@
+package org.jsmart.zerocode.core.di.module;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.Optional;
+
+public class OptionalTypeAdapter<T> extends TypeAdapter<Optional<T>> {
+    private final TypeAdapter<T> delegate;
+
+    public OptionalTypeAdapter(TypeAdapter<T> delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void write(JsonWriter out, Optional<T> value) throws IOException {
+        if (value == null || !value.isPresent()) {
+            out.nullValue();
+        } else {
+            delegate.write(out, value.get());
+        }
+    }
+
+    @Override
+    public Optional<T> read(JsonReader in) throws IOException {
+        if (in.peek() == com.google.gson.stream.JsonToken.NULL) {
+            in.nextNull();
+            return Optional.empty();
+        } else {
+            return Optional.ofNullable(delegate.read(in));
+        }
+    }
+
+    public static <T> TypeAdapter<Optional<T>> factory(TypeAdapter<T> delegate) {
+        return new OptionalTypeAdapter<>(delegate);
+    }
+}

core/src/main/java/org/jsmart/zerocode/core/di/module/OptionalTypeAdapterFactory.java

@@ -0,0 +1,29 @@
+package org.jsmart.zerocode.core.di.module;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Optional;
+
+public class OptionalTypeAdapterFactory implements TypeAdapterFactory {
+
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        if (!Optional.class.isAssignableFrom(typeToken.getRawType())) {
+            return null;
+        }
+
+        Type type = typeToken.getType();
+        if (type instanceof ParameterizedType) {
+            Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0];
+            TypeAdapter<?> elementAdapter = gson.getAdapter(TypeToken.get(elementType));
+            return (TypeAdapter<T>) OptionalTypeAdapter.factory(elementAdapter);
+        }
+
+        return null;
+    }
+}

core/src/main/java/org/jsmart/zerocode/core/di/provider/GsonSerDeProvider.java

@@ -11,17 +11,20 @@
 import jakarta.inject.Provider;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.jsmart.zerocode.core.di.module.OptionalTypeAdapterFactory;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public class GsonSerDeProvider implements Provider<Gson> {
 
     @Override
     public Gson get() {
         return new GsonBuilder()
                 .registerTypeAdapterFactory(KafkaHeadersAdapter.FACTORY)
+                .registerTypeAdapterFactory(new OptionalTypeAdapterFactory())
                 .create();
     }
 
@@ -61,6 +64,7 @@ public Headers read(JsonReader reader) throws IOException {
             JsonToken peek = reader.peek();
             if (JsonToken.NULL.equals(peek)) {
                 reader.nextNull();
+
             } else {
                 Map<String, String> map = gson.getAdapter(Map.class).read(reader);
 

pom.xml

@@ -70,6 +70,7 @@
         <jsonassert.version>1.5.1</jsonassert.version>
         <classpath-explorer.version>1.0</classpath-explorer.version>
         <jukito.version>1.5</jukito.version>
+        <mockito.version>5.15.2</mockito.version>
         <guice.version>7.0.0</guice.version>
         <jayway-version>2.9.0</jayway-version>
         <json-smart.version>2.5.0</json-smart.version>
@@ -216,6 +217,22 @@
                 <groupId>org.jukito</groupId>
                 <artifactId>jukito</artifactId>
                 <version>${jukito.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>${mockito.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.inject</groupId>