Value API: normalize data parsing

- remove odd/harcoded edge cases
- value converter now make a difference between simple and bean values

Author: jknack

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

@@ -0,0 +1,4 @@
+package io.jooby;
+
+public interface BeanConverter extends ValueConverter {
+}

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -303,7 +303,7 @@ public interface DefaultContext extends Context {
   }
 
   @Override default @Nullable <T> T convert(Value value, Class<T> type) {
-    T result = ValueConverters.convert(value, type, getRouter().getConverters());
+    T result = ValueConverters.convert(value, type, getRouter());
     if (result == null) {
       throw new TypeMismatchException(value.name(), type);
     }
@@ -313,7 +313,7 @@ public interface DefaultContext extends Context {
   @Override default @Nonnull <T> T decode(@Nonnull Type type, @Nonnull MediaType contentType) {
     try {
       if (MediaType.text.equals(contentType)) {
-        T result = ValueConverters.convert(body(), type, getRouter().getConverters());
+        T result = ValueConverters.convert(body(), type, getRouter());
         if (result != null) {
           return result;
         }

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

@@ -552,6 +552,10 @@ public Jooby errorCode(@Nonnull Class<? extends Throwable> type,
     return router.getConverters();
   }
 
+  @Nonnull @Override public List<BeanConverter> getBeanConverters() {
+    return router.getBeanConverters();
+  }
+
   /**
    * Start application, find a web server, deploy application, start router, extension modules,
    * etc..

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

@@ -680,6 +680,8 @@ default Router error(@Nonnull Predicate<StatusCode> predicate,
 
   @Nonnull List<ValueConverter> getConverters();
 
+  @Nonnull List<BeanConverter> getBeanConverters();
+
   /**
    * Normalize a path by removing consecutives <code>/</code>(slashes), make it lower case and
    * removing trailing slash.

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

@@ -133,6 +133,9 @@ private void put(String path, BiConsumer<String, Map<String, Value>> consumer) {
   }
 
   private void useIndexes() {
+    if (hash instanceof TreeMap) {
+      return;
+    }
     TreeMap<String, Value> ordered = new TreeMap<>();
     ordered.putAll(hash);
     hash.clear();
@@ -199,21 +202,31 @@ public int size() {
   }
 
   @Nonnull @Override public <T> List<T> toList(@Nonnull Class<T> type) {
-    Collection<Value> values = hash.values();
-    List<T> result = new ArrayList<>(values.size());
-    for (Value value : values) {
-      result.add(value.to(type));
+    if (hash instanceof TreeMap) {
+      // indexes access, treat like a list
+      Collection<Value> values = hash.values();
+      List<T> result = new ArrayList<>(values.size());
+      for (Value value : values) {
+        result.add(value.to(type));
+      }
+      return result;
+    } else {
+      return Collections.singletonList(to(type));
     }
-    return result;
   }
 
   @Nonnull @Override public <T> Set<T> toSet(@Nonnull Class<T> type) {
-    Collection<Value> values = hash.values();
-    Set<T> result = new LinkedHashSet<>(values.size());
-    for (Value value : values) {
-      result.add(value.to(type));
+    if (hash instanceof TreeMap) {
+      // indexes access, treat like a list
+      Collection<Value> values = hash.values();
+      Set<T> result = new LinkedHashSet<>(values.size());
+      for (Value value : values) {
+        result.add(value.to(type));
+      }
+      return result;
+    } else {
+      return Collections.singleton(to(type));
     }
-    return result;
   }
 
   @Nonnull @Override public <T> Optional<T> toOptional(@Nonnull Class<T> type) {

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

@@ -5,6 +5,7 @@
  */
 package io.jooby.internal;
 
+import io.jooby.BeanConverter;
 import io.jooby.Context;
 import io.jooby.RegistryException;
 import io.jooby.ServiceKey;
@@ -139,12 +140,15 @@ public Stack executor(Executor executor) {
 
   private List<ValueConverter> converters;
 
+  private List<BeanConverter> beanConverters;
+
   public RouterImpl(ClassLoader loader) {
     this.source = new ClassSource(loader);
     this.analyzer = new RouteAnalyzer(source, false);
     stack.addLast(new Stack(""));
 
     converters = ValueConverters.defaultConverters();
+    beanConverters = new ArrayList<>(3);
   }
 
   @Nonnull @Override public Map<String, Object> getAttributes() {
@@ -310,14 +314,22 @@ public Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder en
   }
 
   @Nonnull @Override public Router converter(ValueConverter converter) {
-    converters.add(converter);
+    if (converter instanceof BeanConverter) {
+      beanConverters.add((BeanConverter) converter);
+    } else {
+      converters.add(converter);
+    }
     return this;
   }
 
   @Nonnull @Override public List<ValueConverter> getConverters() {
     return converters;
   }
 
+  @Nonnull @Override public List<BeanConverter> getBeanConverters() {
+    return beanConverters;
+  }
+
   @Override
   public Route route(@Nonnull String method, @Nonnull String pattern,
       @Nonnull Route.Handler handler) {
@@ -394,6 +406,7 @@ private Route defineRoute(@Nonnull String method, @Nonnull String pattern,
 
     // Must be last, as fallback
     ValueConverters.addFallbackConverters(converters);
+    ValueConverters.addFallbackBeanConverters(beanConverters);
 
     ExecutionMode mode = owner.getExecutionMode();
     for (Route route : routes) {

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

@@ -1,6 +1,8 @@
 package io.jooby.internal;
 
+import io.jooby.BeanConverter;
 import io.jooby.FileUpload;
+import io.jooby.Router;
 import io.jooby.TypeMismatchException;
 import io.jooby.Value;
 import io.jooby.internal.converter.BigDecimalConverter;
@@ -35,7 +37,6 @@ public class ValueConverters {
 
   static List<ValueConverter> defaultConverters() {
     List<ValueConverter> result = new ArrayList<>();
-//    result.add(new EnumConverter());
     result.add(new UUIDConverter());
 
     result.add(new InstantConverter());
@@ -63,25 +64,28 @@ static List<ValueConverter> defaultConverters() {
 
   static void addFallbackConverters(List<ValueConverter> converters) {
     converters.add(new ValueOfConverter());
+  }
+
+  static void addFallbackBeanConverters(List<BeanConverter> converters) {
     converters.add(new ReflectiveBeanConverter());
   }
 
-  public static <T> T convert(Value value, Type type, List<ValueConverter> converters) {
+  public static <T> T convert(Value value, Type type, Router router) {
     Class rawType = $Types.getRawType(type);
     if (List.class.isAssignableFrom(rawType)) {
       return (T) Collections
-          .singletonList(convert(value, $Types.parameterizedType0(type), converters));
+          .singletonList(convert(value, $Types.parameterizedType0(type), router));
     }
     if (Set.class.isAssignableFrom(rawType)) {
-      return (T) Collections.singleton(convert(value, $Types.parameterizedType0(type), converters));
+      return (T) Collections.singleton(convert(value, $Types.parameterizedType0(type), router));
     }
     if (Optional.class.isAssignableFrom(rawType)) {
-      return (T) Optional.ofNullable(convert(value, $Types.parameterizedType0(type), converters));
+      return (T) Optional.ofNullable(convert(value, $Types.parameterizedType0(type), router));
     }
-    return convert(value, rawType, converters);
+    return convert(value, rawType, router);
   }
 
-  public static <T> T convert(Value value, Class type, List<ValueConverter> converters) {
+  public static <T> T convert(Value value, Class type, Router router) {
     if (type == String.class) {
       return (T) first(value).valueOrNull();
     }
@@ -123,23 +127,28 @@ public static <T> T convert(Value value, Class type, List<ValueConverter> conver
       return (T) (value.isMissing() ? null : Byte.valueOf(first(value).byteValue()));
     }
     /** File Upload: */
-    if (Path.class == type) {
-      if (value.isUpload()) {
+    if (value.isUpload()) {
+      if (Path.class == type) {
+
         FileUpload upload = (FileUpload) value;
         return (T) upload.path();
-      }
-      throw new TypeMismatchException(value.name(), Path.class);
-    }
-    if (FileUpload.class == type) {
-      if (value.isUpload()) {
+      } else if (FileUpload.class == type) {
         return (T) value;
       }
       throw new TypeMismatchException(value.name(), FileUpload.class);
     }
 
-    for (ValueConverter converter : converters) {
-      if (converter.supports(type)) {
-        return (T) converter.convert(value, type);
+    if (value.isSingle()) {
+      for (ValueConverter converter : router.getConverters()) {
+        if (converter.supports(type)) {
+          return (T) converter.convert(value, type);
+        }
+      }
+    } else if (value.isObject()) {
+      for (BeanConverter converter : router.getBeanConverters()) {
+        if (converter.supports(type)) {
+          return (T) converter.convert(value, type);
+        }
       }
     }
     return null;
@@ -162,15 +171,15 @@ private static Object enumValue(Value value, Class type) {
   }
 
   private static Value first(Value source) {
-    if (source.isSingle()) {
-      return source;
-    }
-    if (source.isArray()) {
-      return source.get(0);
-    }
-    if (source.isObject() && source.size() > 0) {
-      return source.iterator().next();
-    }
+    //    if (source.isSingle()) {
+    //      return source;
+    //    }
+    //    if (source.isArray()) {
+    //      return source.get(0);
+    //    }
+    //    if (source.isObject() && source.size() > 0) {
+    //      return source.iterator().next();
+    //    }
     return source;
   }
 }

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

@@ -1,10 +1,10 @@
 package io.jooby.internal.converter;
 
 import io.jooby.BadRequestException;
+import io.jooby.BeanConverter;
 import io.jooby.MissingValueException;
 import io.jooby.ProvisioningException;
 import io.jooby.Value;
-import io.jooby.ValueConverter;
 import io.jooby.internal.reflect.$Types;
 
 import javax.annotation.Nonnull;
@@ -26,7 +26,7 @@
 
 import static io.jooby.SneakyThrows.propagate;
 
-public class ReflectiveBeanConverter implements ValueConverter {
+public class ReflectiveBeanConverter implements BeanConverter {
   private static final String AMBIGUOUS_CONSTRUCTOR =
       "Ambiguous constructor found. Expecting a single constructor or only one annotated with "
           + Inject.class.getName();

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

@@ -428,7 +428,7 @@ public void valueOf() {
     });
 
     queryString("id=userId", queryString -> {
-      assertEquals("valueOf:userId", queryString.to(UserId.class).toString());
+      assertEquals("userId", queryString.to(UserId.class).toString());
     });
     queryString("id=userId", queryString -> {
       assertEquals("valueOf:userId", queryString.get("id").to(UserId.class).toString());