tmp

Signed-off-by: David Kral <[email protected]>
Verdent · Jan 10, 2025 · 7025192 · 7025192
1 parent 4bfe71d
commit 7025192
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 17 deletions.
diff --git a/common/common/src/main/java/io/helidon/common/GenericType.java b/common/common/src/main/java/io/helidon/common/GenericType.java
@@ -91,7 +91,8 @@ public class GenericType<T> implements Type {
     public static <N> GenericType<N> create(Type genericType) throws IllegalArgumentException {
         Objects.requireNonNull(genericType);
 
-        return new GenericType<>(genericType, GenericTypeUtil.rawClass(genericType));
+        Type type = genericType instanceof GenericType<?> genType ? genType.type : genericType;
+        return new GenericType<>(type, GenericTypeUtil.rawClass(type));
     }
 
     /**
@@ -116,8 +117,8 @@ public static <N> GenericType<N> create(N object) {
         return GenericType.<N>create(object.getClass());
     }
 
-    public static Builder builder() {
-        return new Builder();
+    public static <N> Builder<N> builder1() {
+        return new Builder<>();
     }
 
     private GenericType(Type type, Class<?> rawType) {
@@ -216,13 +217,13 @@ public String toString() {
         return type.toString();
     }
 
-    public static final class Builder implements io.helidon.common.Builder<Builder, GenericType<?>> {
+//    public static final class Builder<T> implements io.helidon.common.Builder<Builder<T>, GenericType<T>> {
+    public static final class Builder<T> {
 
-        private Class<?> baseType;
+        private Class<? extends T> baseType;
         private List<GenericType<?>> genericParameters = new ArrayList<>();
 
-        @Override
-        public GenericType<?> build() {
+        public GenericType<T> build() {
             if (baseType == null) {
                 throw new IllegalStateException("Base type has to be set");
             }
@@ -234,23 +235,23 @@ public GenericType<?> build() {
             return new GenericType<>(parameterizedType, baseType);
         }
 
-        public Builder baseType(Class<?> baseType) {
+        public Builder<T> baseType(Class<? extends T> baseType) {
             this.baseType = baseType;
             return this;
         }
 
-        public Builder genericParameters(List<GenericType<?>> genericParameters) {
+        public Builder<T> genericParameters(List<GenericType<?>> genericParameters) {
             this.genericParameters = genericParameters;
             return this;
         }
 
-        public Builder addGenericParameter(GenericType<?> genericParameter) {
+        public Builder<T> addGenericParameter(GenericType<?> genericParameter) {
             this.genericParameters.add(genericParameter);
             return this;
         }
 
-        public Builder addGenericParameter(Consumer<Builder> consumer) {
-            Builder builder = new Builder();
+        public Builder<T> addGenericParameter(Consumer<Builder<T>> consumer) {
+            Builder<T> builder = new Builder<T>();
             consumer.accept(builder);
             this.genericParameters.add(builder.build());
             return this;

diff --git a/json/codegen/src/main/java/io/helidon/json/codegen/JsonConverterGenerator.java b/json/codegen/src/main/java/io/helidon/json/codegen/JsonConverterGenerator.java
@@ -200,7 +200,7 @@ private static Consumer<Constructor.Builder> constructComplexGenericType(Constru
             constructor.addContent(TypeNames.GENERIC_TYPE)
                     .addContent("<?> " + variableName + " = ")
                     .addContent(TypeNames.GENERIC_TYPE)
-                    .addContentLine(".builder()")
+                    .addContentLine(".builder1()")
                     .increaseContentPadding()
                     .increaseContentPadding()
                     .addContent(".baseType(").addContent(typeName.genericTypeName()).addContentLine(".class)");

diff --git a/json/tests/src/main/java/io/helidon/json/tests/ClassUsingClassWithGenerics.java b/json/tests/src/main/java/io/helidon/json/tests/ClassUsingClassWithGenerics.java
@@ -0,0 +1,10 @@
+package io.helidon.json.tests;
+
+import io.helidon.json.binding.Json;
+
+@Json.AsJson
+public class ClassUsingClassWithGenerics {
+
+    public ClassWithGenerics<Integer> test;
+
+}
diff --git a/json/tests/src/main/java/io/helidon/json/tests/ClassWithGenerics.java b/json/tests/src/main/java/io/helidon/json/tests/ClassWithGenerics.java
@@ -11,6 +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;
     private List<? extends SimpleClass> collection23 = new ArrayList<>();
     //widlcard
     //upper/lower bounds

diff --git a/json/tests/src/main/java/io/helidon/json/tests/Main.java b/json/tests/src/main/java/io/helidon/json/tests/Main.java
@@ -9,12 +9,18 @@ public class Main {
 
     public static void main(String[] args) {
 
-        GenericType<List<String>> genericType = new GenericType<>() { };
-//        SimpleClass deserialize = JsonBinding.deserialize("{\"name\":\"value\"}", SimpleClass.class);
-        SimpleRecord record = JsonBinding.deserialize("{\"ints\":[1,2,3]}", SimpleRecord.class);
-        System.out.println();
+//        GenericType<List<String>> genericType = new GenericType<>() { };
+////        SimpleClass deserialize = JsonBinding.deserialize("{\"name\":\"value\"}", SimpleClass.class);
+//        SimpleRecord record = JsonBinding.deserialize("{\"ints\":[1,2,3]}", SimpleRecord.class);
+//        System.out.println();
 
         //        SimpleRecord record = new SimpleRecord("testValue", List.of(1, 2, 3), 1);
+
+        ClassUsingClassWithGenerics deserialize = JsonBinding.deserialize("{\"test\":{\"collection\":[1,2,3]}}",
+                                                                          ClassUsingClassWithGenerics.class);
+
+        System.out.println();
+
     }
 
 }