refactor: value converter

jknack · jknack · commit b34b99132fb6 · 2023-06-10T13:51:33.000-03:00
- make bean converter extends value converter (will be a single-value converter)
- cleanup and remove some static methods
diff --git a/jooby/src/main/java/io/jooby/BeanConverter.java b/jooby/src/main/java/io/jooby/BeanConverter.java
@@ -13,7 +13,7 @@
  *
  * <p>It is an extension point for {@link ValueNode#to(Class)} calls.
  */
-public interface BeanConverter {
+public interface BeanConverter extends ValueConverter<ValueNode> {
 
   /**
    * True if the converter applies for the given type.
diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -805,12 +805,6 @@ public Jooby converter(@NonNull ValueConverter converter) {
     return this;
   }
 
-  @NonNull @Override
-  public Jooby converter(@NonNull BeanConverter converter) {
-    router.converter(converter);
-    return this;
-  }
-
   @NonNull @Override
   public List<ValueConverter> getConverters() {
     return router.getConverters();
diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java
@@ -930,14 +930,6 @@ default Object execute(@NonNull Context context) {
    */
   @NonNull Router converter(@NonNull ValueConverter converter);
 
-  /**
-   * Add a custom bean value converter.
-   *
-   * @param converter Custom value converter.
-   * @return This router.
-   */
-  @NonNull Router converter(@NonNull BeanConverter converter);
-
   /**
    * Get all simple/string value converters.
    *
diff --git a/jooby/src/main/java/io/jooby/ValueConverter.java b/jooby/src/main/java/io/jooby/ValueConverter.java
@@ -9,16 +9,14 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.internal.ValueConverters;
-import io.jooby.internal.converter.StringConstructorConverter;
-import io.jooby.internal.converter.ValueOfConverter;
 
 /**
  * Value converter for simple values that come from query, path, form, etc... parameters into more
  * specific type.
  *
  * <p>It is an extension point for {@link Value#to(Class)} calls.
  */
-public interface ValueConverter {
+public interface ValueConverter<V extends Value> {
   /**
    * True if the converter applies for the given type.
    *
@@ -34,14 +32,14 @@ public interface ValueConverter {
    * @param type Requested type.
    * @return Converted value.
    */
-  Object convert(@NonNull Value value, @NonNull Class type);
+  Object convert(@NonNull V value, @NonNull Class type);
 
+  /**
+   * Immutable list of defaults/built-in {@link ValueConverter}.
+   *
+   * @return Immutable list of defaults/built-in {@link ValueConverter}.
+   */
   static List<ValueConverter> defaults() {
     return ValueConverters.defaultConverters();
   }
-
-  static void addFallbackConverters(List<ValueConverter> input) {
-    input.add(new ValueOfConverter());
-    input.add(new StringConstructorConverter());
-  }
 }
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -174,7 +174,7 @@ public Stack executor(Executor executor) {
 
   private Cookie flashCookie = new Cookie("jooby.flash").setHttpOnly(true);
 
-  private List<ValueConverter> converters;
+  private LinkedList<ValueConverter> converters;
 
   private List<BeanConverter> beanConverters;
 
@@ -195,7 +195,7 @@ public Stack executor(Executor executor) {
   public RouterImpl() {
     stack.addLast(new Stack(chi, null));
 
-    converters = ValueConverters.defaultConverters();
+    converters = new LinkedList<>(ValueConverters.defaultConverters());
     beanConverters = new ArrayList<>(3);
   }
 
@@ -449,13 +449,11 @@ public Router setSessionStore(SessionStore sessionStore) {
 
   @NonNull @Override
   public Router converter(ValueConverter converter) {
-    converters.add(converter);
-    return this;
-  }
-
-  @NonNull @Override
-  public Router converter(@NonNull BeanConverter converter) {
-    beanConverters.add(converter);
+    if (converter instanceof BeanConverter) {
+      beanConverters.add((BeanConverter) converter);
+    } else {
+      converters.addFirst(converter);
+    }
     return this;
   }
 
@@ -562,9 +560,6 @@ private Route newRoute(
       err = err.then(ErrorHandler.create());
     }
 
-    // Must be last, as fallback
-    ValueConverter.addFallbackConverters(converters);
-
     ExecutionMode mode = app.getExecutionMode();
     for (Route route : routes) {
       String executorKey = route.getExecutorKey();
diff --git a/jooby/src/main/java/io/jooby/internal/ValueConverters.java b/jooby/src/main/java/io/jooby/internal/ValueConverters.java
@@ -6,7 +6,6 @@
 package io.jooby.internal;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
@@ -28,39 +27,34 @@
 import io.jooby.internal.converter.PeriodConverter;
 import io.jooby.internal.converter.ReflectiveBeanConverter;
 import io.jooby.internal.converter.StatusCodeConverter;
+import io.jooby.internal.converter.StringConstructorConverter;
 import io.jooby.internal.converter.TimeZoneConverter;
 import io.jooby.internal.converter.URIConverter;
 import io.jooby.internal.converter.UUIDConverter;
+import io.jooby.internal.converter.ValueOfConverter;
 import io.jooby.internal.converter.ZoneIdConverter;
 import io.jooby.internal.reflect.$Types;
 
 public class ValueConverters {
 
   public static List<ValueConverter> defaultConverters() {
-    List<ValueConverter> result = new ArrayList<>();
-    result.add(new UUIDConverter());
-
-    result.add(new InstantConverter());
-    result.add(new DateConverter());
-    result.add(new LocalDateConverter());
-    result.add(new LocalDateTimeConverter());
-
-    result.add(new BigDecimalConverter());
-    result.add(new BigIntegerConverter());
-
-    result.add(new DurationConverter());
-    result.add(new PeriodConverter());
-
-    result.add(new CharsetConverter());
-
-    result.add(new StatusCodeConverter());
-
-    result.add(new TimeZoneConverter());
-    result.add(new ZoneIdConverter());
-
-    result.add(new URIConverter());
-
-    return result;
+    return List.of(
+        new UUIDConverter(),
+        new InstantConverter(),
+        new DateConverter(),
+        new LocalDateConverter(),
+        new LocalDateTimeConverter(),
+        new BigDecimalConverter(),
+        new BigIntegerConverter(),
+        new DurationConverter(),
+        new PeriodConverter(),
+        new CharsetConverter(),
+        new StatusCodeConverter(),
+        new TimeZoneConverter(),
+        new ZoneIdConverter(),
+        new URIConverter(),
+        new ValueOfConverter(),
+        new StringConstructorConverter());
   }
 
   public static <T> T convert(ValueNode value, Type type, Router router) {
diff --git a/jooby/src/test/java/io/jooby/internal/ValueConverterHelper.java b/jooby/src/test/java/io/jooby/internal/ValueConverterHelper.java
@@ -26,12 +26,11 @@ public class ValueConverterHelper {
 
   public static Context testContext(ValueConverter... converters) {
     List<BeanConverter> beans = new ArrayList<>();
-    List<ValueConverter> simple = ValueConverters.defaultConverters();
+    List<ValueConverter> simple = new ArrayList<>(ValueConverters.defaultConverters());
     Stream.of(converters).filter(it -> (!(it instanceof BeanConverter))).forEach(simple::add);
     Stream.of(converters)
         .filter(it -> (it instanceof BeanConverter))
         .forEach(it -> beans.add((BeanConverter) it));
-    ValueConverter.addFallbackConverters(simple);
 
     Context ctx = mock(Context.class);
     Router router = mock(Router.class);
diff --git a/modules/jooby-apt/src/test/java/io/jooby/internal/apt/MockContextHelper.java b/modules/jooby-apt/src/test/java/io/jooby/internal/apt/MockContextHelper.java
@@ -21,12 +21,11 @@ public class MockContextHelper {
 
   public static MockContext mockContext(ValueConverter... converters) {
     List<BeanConverter> beans = new ArrayList<>();
-    List<ValueConverter> simple = ValueConverter.defaults();
+    List<ValueConverter> simple = new ArrayList<>(ValueConverter.defaults());
     Stream.of(converters).filter(it -> (!(it instanceof BeanConverter))).forEach(simple::add);
     Stream.of(converters)
         .filter(it -> (it instanceof BeanConverter))
         .forEach(it -> beans.add((BeanConverter) it));
-    ValueConverter.addFallbackConverters(simple);
 
     Router router = mock(Router.class);
     when(router.getConverters()).thenReturn(simple);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* <p>It is an extension point for {@link ValueNode#to(Class)} calls.`
`15`	`15`	`*/`
`16`		`-public interface BeanConverter {`
	`16`	`+public interface BeanConverter extends ValueConverter<ValueNode> {`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* True if the converter applies for the given type.`