Value API: value converter vs bean converter

Author: jknack

jooby/src/main/java/io/jooby/BeanConverter.java

@@ -5,11 +5,22 @@
  */
 package io.jooby;
 
+import javax.annotation.Nonnull;
+
 /**
  * Bean value converter, works like {@link ValueConverter} except that the input value is always
  * a hash/object value, not a simple string like it is required by {@link ValueConverter}.
  *
  * @since 2.1.1
  */
-public interface BeanConverter extends ValueConverter {
+public interface BeanConverter {
+  /**
+   * True if the converter applies for the given type.
+   *
+   * @param type Conversion type.
+   * @return True if the converter applies for the given type.
+   */
+  boolean supports(@Nonnull Class type);
+
+  Object convert(@Nonnull ValueNode node, @Nonnull Class type);
 }

jooby/src/main/java/io/jooby/Jooby.java

@@ -543,7 +543,12 @@ public Jooby errorCode(@Nonnull Class<? extends Throwable> type,
     return this;
   }
 
-  @Nonnull @Override public Jooby converter(ValueConverter converter) {
+  @Nonnull @Override public Jooby converter(@Nonnull ValueConverter converter) {
+    router.converter(converter);
+    return this;
+  }
+
+  @Nonnull @Override public Router converter(@Nonnull BeanConverter converter) {
     router.converter(converter);
     return this;
   }

jooby/src/main/java/io/jooby/Router.java

@@ -682,7 +682,15 @@ default Router error(@Nonnull Predicate<StatusCode> predicate,
    * @param converter Custom value converter.
    * @return This router.
    */
-  @Nonnull Router converter(@Nonnull ValueConverter converter);
+  @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.

jooby/src/main/java/io/jooby/ValueConverter.java

@@ -8,8 +8,8 @@
 import javax.annotation.Nonnull;
 
 /**
- * Value converter for string values that come from query, path, form parameters into more specific
- * type.
+ * Value converter for simple values that come from query, path, form, etc... parameters into more
+ * specific type.
  *
  * It is an extension point for {@link ValueNode#to(Class)} calls.
  */
@@ -29,5 +29,5 @@ public interface ValueConverter {
    * @param type Requested type.
    * @return Converted value.
    */
-  Object convert(@Nonnull ValueNode value, @Nonnull Class type);
+  Object convert(@Nonnull Value value, @Nonnull Class type);
 }

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -314,11 +314,12 @@ public Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder en
   }
 
   @Nonnull @Override public Router converter(ValueConverter converter) {
-    if (converter instanceof BeanConverter) {
-      beanConverters.add((BeanConverter) converter);
-    } else {
-      converters.add(converter);
-    }
+    converters.add(converter);
+    return this;
+  }
+
+  @Nonnull @Override public Router converter(@Nonnull BeanConverter converter) {
+    beanConverters.add(converter);
     return this;
   }
 

jooby/src/main/java/io/jooby/internal/converter/BigDecimalConverter.java

@@ -5,7 +5,7 @@
  */
 package io.jooby.internal.converter;
 
-import io.jooby.ValueNode;
+import io.jooby.Value;
 import io.jooby.ValueConverter;
 
 import java.math.BigDecimal;
@@ -15,7 +15,7 @@ public class BigDecimalConverter implements ValueConverter {
     return type == BigDecimal.class;
   }
 
-  @Override public BigDecimal convert(ValueNode value, Class type) {
+  @Override public Object convert(Value value, Class type) {
     return new BigDecimal(value.value());
   }
 }

jooby/src/main/java/io/jooby/internal/converter/BigIntegerConverter.java

@@ -5,7 +5,7 @@
  */
 package io.jooby.internal.converter;
 
-import io.jooby.ValueNode;
+import io.jooby.Value;
 import io.jooby.ValueConverter;
 
 import java.math.BigInteger;
@@ -15,7 +15,7 @@ public class BigIntegerConverter implements ValueConverter {
     return type == BigInteger.class;
   }
 
-  @Override public BigInteger convert(ValueNode value, Class type) {
+  @Override public Object convert(Value value, Class type) {
     return new BigInteger(value.value());
   }
 }

jooby/src/main/java/io/jooby/internal/converter/CharsetConverter.java

@@ -5,7 +5,7 @@
  */
 package io.jooby.internal.converter;
 
-import io.jooby.ValueNode;
+import io.jooby.Value;
 import io.jooby.ValueConverter;
 
 import java.nio.charset.Charset;
@@ -16,7 +16,7 @@ public class CharsetConverter implements ValueConverter {
     return type == Charset.class;
   }
 
-  @Override public Charset convert(ValueNode value, Class type) {
+  @Override public Object convert(Value value, Class type) {
     String charset = value.value();
     switch (charset.toLowerCase()) {
       case "utf-8":

jooby/src/main/java/io/jooby/internal/converter/DateConverter.java

@@ -5,7 +5,7 @@
  */
 package io.jooby.internal.converter;
 
-import io.jooby.ValueNode;
+import io.jooby.Value;
 import io.jooby.ValueConverter;
 
 import java.time.LocalDate;
@@ -18,7 +18,7 @@ public class DateConverter implements ValueConverter {
     return type == Date.class;
   }
 
-  @Override public Object convert(ValueNode value, Class type) {
+  @Override public Object convert(Value value, Class type) {
     try {
       // must be millis
       return new Date(Long.parseLong(value.value()));

jooby/src/main/java/io/jooby/internal/converter/DurationConverter.java

@@ -5,7 +5,7 @@
  */
 package io.jooby.internal.converter;
 
-import io.jooby.ValueNode;
+import io.jooby.Value;
 import io.jooby.ValueConverter;
 
 import com.typesafe.config.ConfigException;
@@ -21,7 +21,7 @@ public class DurationConverter implements ValueConverter {
     return type == Duration.class;
   }
 
-  @Override public Object convert(ValueNode value, Class type) {
+  @Override public Object convert(Value value, Class type) {
     try {
       return Duration.parse(value.value());
     } catch (DateTimeParseException x) {