tmp

Signed-off-by: David Kral <[email protected]>

Author: Verdent

builder/codegen/src/main/java/io/helidon/builder/codegen/TypeHandlerOptional.java

@@ -188,7 +188,11 @@ void setters(InnerClass.Builder classBuilder,
                             it.addContent("<");
                             Iterator<TypeName> iterator = finalBuilderType.typeArguments().iterator();
                             while (iterator.hasNext()) {
-                                it.addContent(iterator.next());
+                                TypeName next = iterator.next();
+                                if (next.wildcard()) {
+                                    next = TypeNames.OBJECT;
+                                }
+                                it.addContent(next);
                                 if (iterator.hasNext()) {
                                     it.addContent(", ");
                                 }

common/common/src/main/java/io/helidon/common/GenericType.java

@@ -117,7 +117,7 @@ public static <N> GenericType<N> create(N object) {
         return GenericType.<N>create(object.getClass());
     }
 
-    public static <N> Builder<N> builder1() {
+    public static <N> Builder<N> builder() {
         return new Builder<>();
     }
 
@@ -217,8 +217,7 @@ public String toString() {
         return type.toString();
     }
 
-//    public static final class Builder<T> implements io.helidon.common.Builder<Builder<T>, GenericType<T>> {
-    public static final class Builder<T> {
+    public static final class Builder<T> implements io.helidon.common.Builder<Builder<T>, GenericType<T>> {
 
         private Class<? extends T> baseType;
         private List<GenericType<?>> genericParameters = new ArrayList<>();

json/binding/src/main/java/io/helidon/json/binding/JsonBindingFactory.java

@@ -4,6 +4,9 @@
 
 public interface JsonBindingFactory<T> {
 
+//    ConfigurableJsonDeserializer<T>  createDeserializer(JsonBinding jsonBinding, Type type);
+//    ConfigurableJsonSerializer<T>  createSerializer(JsonBinding jsonBinding, Type type);
+
     JsonDeserializer<T>  createDeserializer(JsonBinding jsonBinding, Type type);
     JsonSerializer<T>  createSerializer(JsonBinding jsonBinding, Type type);
 

json/binding/src/main/java/io/helidon/json/binding/TypedJsonConverter.java

@@ -1,8 +1,23 @@
 package io.helidon.json.binding;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import io.helidon.common.GenericType;
+
 /**
  * TODO javadoc
  */
 public interface TypedJsonConverter<T> extends TypedJsonSerializer<T>, TypedJsonDeserializer<T> {
 
+    default GenericType<T> type() {
+        for (Type type : getClass().getGenericInterfaces()) {
+            if (type instanceof ParameterizedType parameterizedType
+                    && parameterizedType.getRawType().equals(TypedJsonConverter.class)) {
+                return GenericType.create(parameterizedType.getActualTypeArguments()[0]);
+            }
+        }
+        throw new IllegalStateException("This should never be reached.");
+    }
+
 }

json/binding/src/main/java/io/helidon/json/binding/converters/IntegerConverter.java

@@ -15,10 +15,10 @@ final class IntegerConverter implements TypedJsonConverter<Integer> {
 
     private static final GenericType<Integer> TYPE = GenericType.create(Integer.class);
 
-    @Override
-    public GenericType<Integer> type() {
-        return TYPE;
-    }
+//    @Override
+//    public GenericType<Integer> type() {
+//        return TYPE;
+//    }
 
     @Override
     public void toJson(Generator generator, Integer instance) {

json/binding/src/main/java/module-info.java

@@ -3,6 +3,7 @@
     requires helidon.json.parser;
     requires io.helidon.common.config;
     requires io.helidon.service.registry;
+    requires jdk.jdi;
 
     exports io.helidon.json.binding;
     exports io.helidon.json.binding.converters;

json/codegen/src/main/java/io/helidon/json/codegen/JsonConverterGenerator.java

@@ -197,10 +197,9 @@ private static Consumer<Constructor.Builder> constructComplexGenericType(Constru
                 }
             }
             String variableName = "genericType" + counter.count++;
-            constructor.addContent(TypeNames.GENERIC_TYPE)
-                    .addContent("<?> " + variableName + " = ")
+            constructor.addContent("var " + variableName + " = ")
                     .addContent(TypeNames.GENERIC_TYPE)
-                    .addContentLine(".builder1()")
+                    .addContent(".<").addContent(TypeNames.OBJECT).addContentLine(">builder()")
                     .increaseContentPadding()
                     .increaseContentPadding()
                     .addContent(".baseType(").addContent(typeName.genericTypeName()).addContentLine(".class)");

json/tests/src/main/java/io/helidon/json/tests/ClassWithGenerics.java

@@ -11,7 +11,7 @@ public class ClassWithGenerics<T> {
     private T field;
     private List<T> collection = new ArrayList<>();
     private List<List<T>> collection2 = new ArrayList<>();
-    public ClassWithGenerics<T> test;
+//    public ClassWithGenerics<T> test;
     private List<? extends SimpleClass> collection23 = new ArrayList<>();
     //widlcard
     //upper/lower bounds

json/tests/src/main/java/io/helidon/json/tests/Main.java

@@ -9,8 +9,9 @@ public class Main {
 
     public static void main(String[] args) {
 
-//        GenericType<List<String>> genericType = new GenericType<>() { };
-////        SimpleClass deserialize = JsonBinding.deserialize("{\"name\":\"value\"}", SimpleClass.class);
+        GenericType<List<String>> genericType = new GenericType<>() { };
+        GenericType<List<String>> genericType2 = new GenericType<>() { };
+//        SimpleClass deserialize = JsonBinding.deserialize("{\"name\":\"value\"}", SimpleClass.class);
 //        SimpleRecord record = JsonBinding.deserialize("{\"ints\":[1,2,3]}", SimpleRecord.class);
 //        System.out.println();