Value API: move more methods to Value base class

Author: jknack

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

@@ -20,6 +20,28 @@
 import java.util.Set;
 import java.util.function.Function;
 
+/**
+ * Unified API for HTTP value. This API plays two role:
+ *
+ * - unify access to HTTP values, like query, path, form and header parameter
+ * - works as validation API, because it is able to check for required and type-safe values
+ *
+ * The value API is composed by three types:
+ *
+ * - Single value
+ * - Object value
+ * - Sequence of values (array)
+ *
+ * Single value are can be converted to string, int, boolean, enum like values.
+ * Object value is a key:value structure (like a hash).
+ * Sequence of values are index based structure.
+ *
+ * All these 3 types are modeled into a single Value class. At any time you can treat a value as
+ * 1) single, 2) hash or 3) array of them.
+ *
+ * @since 2.0.0
+ * @author edgar
+ */
 public interface Value {
   /**
    * Convert this value to long (if possible).
@@ -299,13 +321,87 @@ default boolean isMissing() {
     return this instanceof MissingValue;
   }
 
+  /**
+   * True if this value is an array/sequence (not single or hash).
+   *
+   * @return True if this value is an array/sequence.
+   */
+  default boolean isArray() {
+    return this instanceof ArrayValue;
+  }
+
+  /**
+   * True if this is a hash/object value (not single or array).
+   *
+   * @return True if this is a hash/object value (not single or array).
+   */
+  default boolean isObject() {
+    return this instanceof HashValue;
+  }
+
+  /**
+   * True if this is a file upload (not single, not array, not hash).
+   *
+   * @return True for file upload.
+   */
+  default boolean isUpload() {
+    return this instanceof FileUpload;
+  }
+
   /**
    * Name of this value or <code>null</code>.
    *
    * @return Name of this value or <code>null</code>.
    */
   @Nullable String name();
 
+  /**
+   * Get a value or empty optional.
+   *
+   * @param type Item type.
+   * @param <T> Item type.
+   * @return Value or empty optional.
+   */
+  @Nonnull default <T> Optional<T> toOptional(@Nonnull Class<T> type) {
+    try {
+      return Optional.ofNullable(to(type));
+    } catch (MissingValueException x) {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * Get list of the given type.
+   *
+   * @param type Type to convert.
+   * @param <T> Item type.
+   * @return List of items.
+   */
+  @Nonnull default <T> List<T> toList(@Nonnull Class<T> type) {
+    return Collections.singletonList(to(type));
+  }
+
+  /**
+   * Get set of the given type.
+   *
+   * @param type Type to convert.
+   * @param <T> Item type.
+   * @return Set of items.
+   */
+  @Nonnull default <T> Set<T> toSet(@Nonnull Class<T> type) {
+    return Collections.singleton(to(type));
+  }
+
+  /**
+   * Convert this value to the given type. Support values are single-value, array-value and
+   * object-value. Object-value can be converted to a JavaBean type.
+   *
+   * @param type Type to convert.
+   * @param <T> Element type.
+   * @return Instance of the type.
+   */
+  @Nonnull <T> T to(@Nonnull Class<T> type);
+
   /**
    * Value as multi-value map.
    *
@@ -416,5 +512,4 @@ default boolean isMissing() {
   static @Nonnull ValueNode hash(Context ctx, @Nonnull Map<String, Collection<String>> values) {
     return new HashValue(ctx, null).put(values);
   }
-
 }

jooby/src/main/java/io/jooby/ValueNode.java

@@ -5,28 +5,11 @@
  */
 package io.jooby;
 
-import io.jooby.internal.ArrayValue;
-import io.jooby.internal.HashValue;
-import io.jooby.internal.MissingValue;
-import io.jooby.internal.SingleValue;
-
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeParseException;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 
 /**
  * Unified API for HTTP value. This API plays two role:
@@ -52,38 +35,6 @@
  */
 public interface ValueNode extends Iterable<ValueNode>, Value {
 
-  /**
-   * True if this value is an array/sequence (not single or hash).
-   *
-   * @return True if this value is an array/sequence.
-   */
-  default boolean isArray() {
-    return this instanceof ArrayValue;
-  }
-
-  /**
-   * True if this is a hash/object value (not single or array).
-   *
-   * @return True if this is a hash/object value (not single or array).
-   */
-  default boolean isObject() {
-    return this instanceof HashValue;
-  }
-
-  /**
-   * True if this is a file upload (not single, not array, not hash).
-   *
-   * @return True for file upload.
-   */
-  default boolean isUpload() {
-    return this instanceof FileUpload;
-  }
-
-  /* ***********************************************************************************************
-   * Node methods
-   * ***********************************************************************************************
-   */
-
   /**
    * Get a value at the given position.
    *
@@ -109,53 +60,6 @@ default int size() {
     return 0;
   }
 
-  /**
-   * Get a value or empty optional.
-   *
-   * @param type Item type.
-   * @param <T> Item type.
-   * @return Value or empty optional.
-   */
-  @Nonnull default <T> Optional<T> toOptional(@Nonnull Class<T> type) {
-    try {
-      return Optional.ofNullable(to(type));
-    } catch (MissingValueException x) {
-      return Optional.empty();
-    }
-  }
-
-  /**
-   * Get list of the given type.
-   *
-   * @param type Type to convert.
-   * @param <T> Item type.
-   * @return List of items.
-   */
-  @Nonnull default <T> List<T> toList(@Nonnull Class<T> type) {
-    return Collections.singletonList(to(type));
-  }
-
-  /**
-   * Get set of the given type.
-   *
-   * @param type Type to convert.
-   * @param <T> Item type.
-   * @return Set of items.
-   */
-  @Nonnull default <T> Set<T> toSet(@Nonnull Class<T> type) {
-    return Collections.singleton(to(type));
-  }
-
-  /**
-   * Convert this value to the given type. Support values are single-value, array-value and
-   * object-value. Object-value can be converted to a JavaBean type.
-   *
-   * @param type Type to convert.
-   * @param <T> Element type.
-   * @return Instance of the type.
-   */
-  @Nonnull <T> T to(@Nonnull Class<T> type);
-
   /**
    * Value iterator.
    *
@@ -165,31 +69,6 @@ default int size() {
     return Collections.emptyIterator();
   }
 
-  /**
-   * Name of this value or <code>null</code>.
-   *
-   * @return Name of this value or <code>null</code>.
-   */
-  @Nullable String name();
-
-  /**
-   * Value as multi-value map.
-   *
-   * @return Value as multi-value map.
-   */
-  @Nullable Map<String, List<String>> toMultimap();
-
-  /**
-   * Value as single-value map.
-   *
-   * @return Value as single-value map.
-   */
-  default @Nonnull Map<String, String> toMap() {
-    Map<String, String> map = new LinkedHashMap<>();
-    toMultimap().forEach((k, v) -> map.put(k, v.get(0)));
-    return map;
-  }
-
   /**
    * Process the given expression and resolve value references.
    *