API changes and cleanup 2

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

Author: Verdent

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

@@ -222,8 +222,8 @@ public String toString() {
 
     public static final class Builder<T> implements io.helidon.common.Builder<Builder<T>, GenericType<T>> {
 
-        private Class<? extends T> baseType;
-        private List<Type> genericParameters = new ArrayList<>();
+        private Class<?> baseType;
+        private final List<Type> genericParameters = new ArrayList<>();
 
         public GenericType<T> build() {
             if (baseType == null) {
@@ -237,7 +237,7 @@ public GenericType<T> build() {
             return new GenericType<>(parameterizedType, baseType);
         }
 
-        public Builder<T> baseType(Class<? extends T> baseType) {
+        public Builder<T> baseType(Class<?> baseType) {
             this.baseType = baseType;
             return this;
         }

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

@@ -22,18 +22,14 @@ static JsonBindingConfig.Builder builder() {
 
     static JsonBinding create(JsonBindingConfig config) {
         JsonBindingImpl jsonBinding = new JsonBindingImpl(config);
-        Set<JsonConfigurable> processed = new HashSet<>();
         for (TypedJsonSerializer<?> serializer : config.serializers()) {
-            if (serializer instanceof JsonConfigurable configurable) {
-                configurable.configure(jsonBinding);
-                processed.add(configurable);
-            }
+            serializer.configure(jsonBinding);
         }
         for (TypedJsonDeserializer<?> deserializer : config.deserializers()) {
-            if (deserializer instanceof JsonConfigurable configurable
-                    && !processed.contains(deserializer)) {
-                configurable.configure(jsonBinding);
+            if (config.serializers().contains(deserializer)) {
+                continue;
             }
+            deserializer.configure(jsonBinding);
         }
         return jsonBinding;
     }

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

@@ -4,7 +4,7 @@
 
 public interface JsonBindingFactory<T> {
 
-    BindingFactoryDeserializer<T>  createDeserializer(Type type);
-    BindingFactorySerializer<T>  createSerializer(Type type);
+    BindingFactoryDeserializer<T> createDeserializer(Type type);
+    BindingFactorySerializer<T> createSerializer(Type type);
 
 }

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

@@ -242,7 +242,7 @@ public <T> JsonDeserializer<T> getDeserializer(Type type) {
     public <T> JsonDeserializer<T> getDeserializer(Type type, JsonContext jsonContext) {
         return switch (type) {
             case Class<?> clazz -> (JsonDeserializer<T>) getDeserializer(clazz, jsonContext);
-            case GenericType<?> genericType -> getDeserializer(genericType, jsonContext);
+            case GenericType<?> genericType -> (JsonDeserializer<T>) getDeserializer(genericType, jsonContext);
             case null, default -> getDeserializer(GenericType.create(type), jsonContext);
         };
     }
@@ -347,7 +347,7 @@ public <T> JsonSerializer<T> getSerializer(Type type) {
     public <T> JsonSerializer<T> getSerializer(Type type, JsonContext jsonContext) {
         return switch (type) {
             case Class<?> clazz -> (JsonSerializer<T>) getSerializer(clazz);
-            case GenericType<?> genericType -> getSerializer(genericType);
+            case GenericType<?> genericType -> (JsonSerializer<T>) getSerializer(genericType);
             case null, default -> getSerializer(GenericType.create(type));
         };
     }

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

@@ -5,4 +5,7 @@
  */
 public interface JsonConverter<T> extends JsonDeserializer<T>, JsonSerializer<T> {
 
+    default void configure(JsonBindingConfigurator jsonBindingConfigurator) {
+    }
+
 }

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

@@ -10,4 +10,7 @@ default T deserializeNull() {
         return null;
     }
 
+    default void configure(JsonBindingConfigurator jsonBindingConfigurator) {
+    }
+
 }

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

@@ -10,4 +10,7 @@ default void serializeNull(Generator generator) {
         generator.writeNull();
     }
 
+    default void configure(JsonBindingConfigurator jsonBindingConfigurator) {
+    }
+
 }

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

@@ -1,23 +1,11 @@
 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.");
+    default void configure(JsonBindingConfigurator jsonBindingConfigurator) {
     }
 
 }

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

@@ -1,10 +1,10 @@
 package io.helidon.json.binding.converters;
 
+import io.helidon.common.GenericType;
 import io.helidon.common.Weight;
 import io.helidon.common.Weighted;
 import io.helidon.json.binding.Deserializers;
 import io.helidon.json.binding.JsonBindingConfigurator;
-import io.helidon.json.binding.JsonConfigurable;
 import io.helidon.json.binding.JsonDeserializer;
 import io.helidon.json.binding.JsonSerializer;
 import io.helidon.json.binding.TypedJsonConverter;
@@ -15,7 +15,9 @@
 
 @Service.PerLookup
 @Weight(Weighted.DEFAULT_WEIGHT - 10)
-class BooleanArrayConverter implements TypedJsonConverter<boolean[]>, JsonConfigurable {
+class BooleanArrayConverter implements TypedJsonConverter<boolean[]> {
+
+    private static final GenericType<boolean[]> TYPE = GenericType.create(boolean[].class);
 
     private final boolean[] emptyArray = new boolean[0];
     private JsonDeserializer<Boolean> deserializer;
@@ -77,4 +79,9 @@ public void configure(JsonBindingConfigurator jsonBindingConfigurator) {
         deserializer = jsonBindingConfigurator.getDeserializer(boolean.class);
         serializer = jsonBindingConfigurator.getSerializer(boolean.class);
     }
+
+    @Override
+    public GenericType<boolean[]> type() {
+        return TYPE;
+    }
 }