Value API: code clean up

Author: jknack

TODO

@@ -1,6 +1,5 @@
 * Session set null context to Value API
-* review toString on Value API
-* Value vs ValueNode API
+* review toString on Value API (removal of QueryStringValue?)
 * tests and coverage
 * server options from application.conf MUST override hardcoded settings
 * make reset headers on error configurable

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

@@ -8,10 +8,10 @@
 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}.
+ * Value converter for complex values that come from query, path, form, etc... parameters into more
+ * specific type.
  *
- * @since 2.1.1
+ * It is an extension point for {@link ValueNode#to(Class)} calls.
  */
 public interface BeanConverter {
   /**
@@ -22,5 +22,12 @@ public interface BeanConverter {
    */
   boolean supports(@Nonnull Class type);
 
+  /**
+   * Convert a node value into more specific type.
+   *
+   * @param node Value value.
+   * @param type Requested type.
+   * @return Converted value.
+   */
   Object convert(@Nonnull ValueNode node, @Nonnull Class type);
 }

jooby/src/main/java/io/jooby/Body.java

@@ -15,7 +15,9 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /**
  * HTTP body value. Allows to access HTTP body as string, byte[], stream, etc..
@@ -78,6 +80,14 @@ public interface Body extends ValueNode {
     return to(Reified.list(type).getType());
   }
 
+  default @Nonnull @Override List<String> toList() {
+    return Collections.singletonList(value());
+  }
+
+  default @Nonnull @Override Set<String> toSet() {
+    return Collections.singleton(value());
+  }
+
   @Override default @Nonnull <T> T to(@Nonnull Class<T> type) {
     return to((Type) type);
   }

jooby/src/main/java/io/jooby/FileUpload.java

@@ -18,6 +18,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * File upload class, file upload are available when request body is encoded as
@@ -93,6 +94,14 @@ public interface FileUpload extends ValueNode {
     throw new TypeMismatchException(name(), type);
   }
 
+  default @Nonnull @Override List<String> toList() {
+    return Collections.singletonList(value());
+  }
+
+  default @Nonnull @Override Set<String> toSet() {
+    return Collections.singleton(value());
+  }
+
   /**
    * Multi-value map with field name as key and file name as values.
    *

jooby/src/main/java/io/jooby/Value.java

@@ -253,18 +253,14 @@ default boolean booleanValue(boolean defaultValue) {
    *
    * @return List of values.
    */
-  @Nonnull default List<String> toList() {
-    return Collections.emptyList();
-  }
+  @Nonnull List<String> toList();
 
   /**
    * Get set of values.
    *
    * @return set of values.
    */
-  @Nonnull default Set<String> toSet() {
-    return Collections.emptySet();
-  }
+  @Nonnull Set<String> toSet();
 
   /**
    * Convert this value to an Enum.

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

@@ -11,7 +11,7 @@
  * 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.
+ * It is an extension point for {@link Value#to(Class)} calls.
  */
 public interface ValueConverter {
   /**
@@ -23,7 +23,7 @@ public interface ValueConverter {
   boolean supports(@Nonnull Class type);
 
   /**
-   * Convert string to specific type.
+   * Convert simple to specific type.
    *
    * @param value Value value.
    * @param type Requested type.

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

@@ -26,7 +26,7 @@ public class ArrayValue implements ValueNode {
 
   private final String name;
 
-  private final List<ValueNode> value = new ArrayList<>(5);
+  private final List<ValueNode> list = new ArrayList<>(5);
 
   public ArrayValue(Context ctx, String name) {
     this.ctx = ctx;
@@ -38,7 +38,7 @@ public ArrayValue(Context ctx, String name) {
   }
 
   public ArrayValue add(ValueNode value) {
-    this.value.add(value);
+    this.list.add(value);
     return this;
   }
 
@@ -55,7 +55,7 @@ public ArrayValue add(String value) {
 
   @Override public ValueNode get(@Nonnull int index) {
     try {
-      return value.get(index);
+      return list.get(index);
     } catch (IndexOutOfBoundsException x) {
       return new MissingValue(name + "[" + index + "]");
     }
@@ -66,33 +66,28 @@ public ArrayValue add(String value) {
   }
 
   @Override public int size() {
-    return value.size();
+    return list.size();
   }
 
   @Override public String value() {
     String name = name();
-
     throw new TypeMismatchException(name == null ? getClass().getSimpleName() : name, String.class);
   }
 
   @Override public String toString() {
-    return value.toString();
+    return list.toString();
   }
 
   @Override public Iterator<ValueNode> iterator() {
-    return value.iterator();
+    return list.iterator();
   }
 
   @Nonnull @Override public <T> T to(@Nonnull Class<T> type) {
-    return ctx.convert(value.get(0), type);
+    return ctx.convert(list.get(0), type);
   }
 
   @Nonnull @Override public <T> List<T> toList(@Nonnull Class<T> type) {
-    List<T> list = new ArrayList<>(value.size());
-    for (ValueNode it : value) {
-      list.add(it.to(type));
-    }
-    return list;
+    return collect(new ArrayList<>(this.list.size()), type);
   }
 
   @Nonnull @Override public <T> Optional<T> toOptional(@Nonnull Class<T> type) {
@@ -104,29 +99,27 @@ public ArrayValue add(String value) {
   }
 
   @Nonnull @Override public <T> Set<T> toSet(@Nonnull Class<T> type) {
-    Set<T> list = new LinkedHashSet<>(value.size());
-    for (ValueNode it : value) {
-      list.add(it.to(type));
-    }
-    return list;
+    return collect(new LinkedHashSet<>(this.list.size()), type);
   }
 
   @Override public Map<String, List<String>> toMultimap() {
     List<String> values = new ArrayList<>();
-    value.stream().forEach(it -> it.toMultimap().values().forEach(values::addAll));
+    list.stream().forEach(it -> it.toMultimap().values().forEach(values::addAll));
     return Collections.singletonMap(name, values);
   }
 
   @Override public List<String> toList() {
-    return fill(new ArrayList<>());
+    return collect(new ArrayList<>(), String.class);
   }
 
   @Override public Set<String> toSet() {
-    return fill(new LinkedHashSet<>());
+    return collect(new LinkedHashSet<>(), String.class);
   }
 
-  private <C extends Collection<String>> C fill(C values) {
-    value.forEach(v -> values.addAll(v.toList()));
-    return values;
+  private <T, C extends Collection<T>> C collect(C collection, Class<T> type) {
+    for (ValueNode node : list) {
+      collection.add(node.to(type));
+    }
+    return collection;
   }
 }

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

@@ -57,6 +57,10 @@ public ByteArrayBody(Context ctx, byte[] bytes) {
     return value(StandardCharsets.UTF_8);
   }
 
+  @Nonnull @Override public List<String> toList() {
+    return Collections.singletonList(value());
+  }
+
   @Nonnull @Override public ValueNode get(@Nonnull int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }

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

@@ -72,6 +72,10 @@ public FileBody(Context ctx, Path file) {
     return value(StandardCharsets.UTF_8);
   }
 
+  @Nonnull @Override public List<String> toList() {
+    return Collections.singletonList(value());
+  }
+
   @Nonnull @Override public ValueNode get(@Nonnull int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }

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

@@ -200,6 +200,14 @@ public int size() {
     return hash.values().iterator();
   }
 
+  @Nonnull @Override public List<String> toList() {
+    return toList(String.class);
+  }
+
+  @Nonnull @Override public Set<String> toSet() {
+    return toSet(String.class);
+  }
+
   @Nonnull @Override public <T> List<T> toList(@Nonnull Class<T> type) {
     return toCollection(type, new ArrayList<>());
   }