value api: reduce API by removing ValueNode

- we don't need it

Author: jknack

jooby/pom.xml

@@ -94,7 +94,6 @@
       <version>3.4.15</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>

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

@@ -29,7 +29,7 @@
  * @author edgar
  * @since 2.0.0
  */
-public interface Body extends ValueNode {
+public interface Body extends Value {
 
   /**
    * HTTP body as string.

jooby/src/main/java/io/jooby/Context.java

@@ -164,7 +164,7 @@ private static Selector single() {
    * @param <T> Generic type.
    * @return Converted value.
    */
-  default @NonNull <T> T convert(@NonNull ValueNode value, @NonNull Class<T> type) {
+  default @NonNull <T> T convert(@NonNull Value value, @NonNull Class<T> type) {
     T result = convertOrNull(value, type);
     if (result == null) {
       throw new TypeMismatchException(value.name(), type);
@@ -180,7 +180,7 @@ private static Selector single() {
    * @param <T> Generic type.
    * @return Converted value or <code>null</code>.
    */
-  @Nullable <T> T convertOrNull(@NonNull ValueNode value, @NonNull Class<T> type);
+  @Nullable <T> T convertOrNull(@NonNull Value value, @NonNull Class<T> type);
 
   /*
    * **********************************************************************************************
@@ -328,11 +328,11 @@ private static Selector single() {
   @NonNull <T> T path(@NonNull Class<T> type);
 
   /**
-   * Convert {@link #pathMap()} to a {@link ValueNode} object.
+   * Convert {@link #pathMap()} to a {@link Value} object.
    *
    * @return A value object.
    */
-  @NonNull ValueNode path();
+  @NonNull Value path();
 
   /**
    * Path map represent all the path keys with their values.
@@ -367,9 +367,9 @@ private static Selector single() {
    */
 
   /**
-   * Query string as {@link ValueNode} object.
+   * Query string as {@link Value} object.
    *
-   * @return Query string as {@link ValueNode} object.
+   * @return Query string as {@link Value} object.
    */
   @NonNull QueryString query();
 
@@ -389,7 +389,7 @@ private static Selector single() {
    * @param name Parameter name.
    * @return A query value.
    */
-  @NonNull ValueNode query(@NonNull String name);
+  @NonNull Value query(@NonNull String name);
 
   /**
    * Query string with the leading <code>?</code> or empty string. This is the raw query string,
@@ -428,11 +428,11 @@ private static Selector single() {
    */
 
   /**
-   * Request headers as {@link ValueNode}.
+   * Request headers as {@link Value}.
    *
-   * @return Request headers as {@link ValueNode}.
+   * @return Request headers as {@link Value}.
    */
-  @NonNull ValueNode header();
+  @NonNull Value header();
 
   /**
    * Get a header that matches the given name.
@@ -764,7 +764,7 @@ default boolean isPreflight() {
    * @param name Field name.
    * @return Multipart value.
    */
-  @NonNull ValueNode form(@NonNull String name);
+  @NonNull Value form(@NonNull String name);
 
   /**
    * Convert form data to the given type.

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

@@ -203,7 +203,7 @@ default FlashMap flashOrNull() {
   }
 
   @Override
-  @NonNull default ValueNode path() {
+  @NonNull default Value path() {
     var path = new HashValue(getValueFactory(), null);
     for (Map.Entry<String, String> entry : pathMap().entrySet()) {
       path.put(entry.getKey(), entry.getValue());
@@ -212,7 +212,7 @@ default FlashMap flashOrNull() {
   }
 
   @Override
-  @NonNull default ValueNode query(@NonNull String name) {
+  @NonNull default Value query(@NonNull String name) {
     return query().get(name);
   }
 
@@ -383,7 +383,7 @@ default boolean isSecure() {
   }
 
   @Override
-  @NonNull default ValueNode form(@NonNull String name) {
+  @NonNull default Value form(@NonNull String name) {
     return form().get(name);
   }
 
@@ -427,7 +427,7 @@ default ValueFactory getValueFactory() {
   }
 
   @Override
-  default @NonNull <T> T convertOrNull(@NonNull ValueNode value, @NonNull Class<T> type) {
+  default @NonNull <T> T convertOrNull(@NonNull Value value, @NonNull Class<T> type) {
     return getValueFactory().convert(type, value, ConversionHint.Nullable);
   }
 

jooby/src/main/java/io/jooby/Formdata.java

@@ -21,7 +21,7 @@
  * @author edgar
  * @since 2.0.0
  */
-public interface Formdata extends ValueNode {
+public interface Formdata extends Value {
 
   /**
    * Add a form field.
@@ -30,7 +30,7 @@ public interface Formdata extends ValueNode {
    * @param value Form value.
    */
   @NonNull
-  void put(@NonNull String path, @NonNull ValueNode value);
+  void put(@NonNull String path, @NonNull Value value);
 
   /**
    * Add a form field.

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -108,12 +108,12 @@ public long getSize() {
     }
 
     @Override
-    @NonNull public ValueNode get(int index) {
+    @NonNull public Value get(int index) {
       return delegate.get(index);
     }
 
     @Override
-    @NonNull public ValueNode get(@NonNull String name) {
+    @NonNull public Value get(@NonNull String name) {
       return delegate.get(name);
     }
 
@@ -123,7 +123,7 @@ public int size() {
     }
 
     @Override
-    @NonNull public Iterator<ValueNode> iterator() {
+    @NonNull public Iterator<Value> iterator() {
       return delegate.iterator();
     }
 
@@ -153,12 +153,12 @@ public int size() {
     }
 
     @Override
-    public void forEach(Consumer<? super ValueNode> action) {
+    public void forEach(Consumer<? super Value> action) {
       delegate.forEach(action);
     }
 
     @Override
-    public Spliterator<ValueNode> spliterator() {
+    public Spliterator<Value> spliterator() {
       return delegate.spliterator();
     }
 
@@ -310,20 +310,20 @@ public boolean isObject() {
     }
   }
 
-  public static class ForwardingValueNode implements ValueNode {
-    protected final ValueNode delegate;
+  public static class ForwardingValue implements Value {
+    protected final Value delegate;
 
-    public ForwardingValueNode(ValueNode delegate) {
+    public ForwardingValue(Value delegate) {
       this.delegate = delegate;
     }
 
     @Override
-    @NonNull public ValueNode get(@NonNull int index) {
+    @NonNull public Value get(@NonNull int index) {
       return delegate.get(index);
     }
 
     @Override
-    @NonNull public ValueNode get(@NonNull String name) {
+    @NonNull public Value get(@NonNull String name) {
       return delegate.get(name);
     }
 
@@ -333,7 +333,7 @@ public int size() {
     }
 
     @Override
-    @NonNull public Iterator<ValueNode> iterator() {
+    @NonNull public Iterator<Value> iterator() {
       return delegate.iterator();
     }
 
@@ -363,12 +363,12 @@ public int size() {
     }
 
     @Override
-    public void forEach(Consumer<? super ValueNode> action) {
+    public void forEach(Consumer<? super Value> action) {
       delegate.forEach(action);
     }
 
     @Override
-    public Spliterator<ValueNode> spliterator() {
+    public Spliterator<Value> spliterator() {
       return delegate.spliterator();
     }
 
@@ -545,7 +545,7 @@ public boolean isObject() {
     }
   }
 
-  public static class ForwardingQueryString extends ForwardingValueNode implements QueryString {
+  public static class ForwardingQueryString extends ForwardingValue implements QueryString {
     public ForwardingQueryString(QueryString queryString) {
       super(queryString);
     }
@@ -556,13 +556,13 @@ public String queryString() {
     }
   }
 
-  public static class ForwardingFormdata extends ForwardingValueNode implements Formdata {
+  public static class ForwardingFormdata extends ForwardingValue implements Formdata {
     public ForwardingFormdata(Formdata delegate) {
       super(delegate);
     }
 
     @Override
-    public void put(@NonNull String path, @NonNull ValueNode value) {
+    public void put(@NonNull String path, @NonNull Value value) {
       ((Formdata) delegate).put(path, value);
     }
 
@@ -751,7 +751,7 @@ public <T> T path(@NonNull Class<T> type) {
   }
 
   @NonNull @Override
-  public ValueNode path() {
+  public Value path() {
     return ctx.path();
   }
 
@@ -772,7 +772,7 @@ public ValueNode path() {
   }
 
   @NonNull @Override
-  public ValueNode query(@NonNull String name) {
+  public Value query(@NonNull String name) {
     return ctx.query(name);
   }
 
@@ -792,7 +792,7 @@ public Map<String, String> queryMap() {
   }
 
   @Override
-  @NonNull public ValueNode header() {
+  @NonNull public Value header() {
     return ctx.header();
   }
 
@@ -916,7 +916,7 @@ public Context setScheme(@NonNull String scheme) {
   }
 
   @NonNull @Override
-  public ValueNode form(@NonNull String name) {
+  public Value form(@NonNull String name) {
     return ctx.form(name);
   }
 
@@ -961,12 +961,12 @@ public <T> T body(@NonNull Type type) {
   }
 
   @NonNull @Override
-  public <T> T convert(@NonNull ValueNode value, @NonNull Class<T> type) {
+  public <T> T convert(@NonNull Value value, @NonNull Class<T> type) {
     return ctx.convert(value, type);
   }
 
   @Nullable @Override
-  public <T> T convertOrNull(@NonNull ValueNode value, @NonNull Class<T> type) {
+  public <T> T convertOrNull(@NonNull Value value, @NonNull Class<T> type) {
     return ctx.convertOrNull(value, type);
   }
 

jooby/src/main/java/io/jooby/ParamLookup.java

@@ -5,8 +5,6 @@
  */
 package io.jooby;
 
-import java.util.Optional;
-
 /**
  * Fluent interface allowing to conveniently search context parameters in multiple sources.
  *
@@ -117,16 +115,5 @@ interface Stage extends ParamLookup {
      *     if none found.
      */
     Value get(String name);
-
-    /**
-     * Wraps the result of {@link #get(String)} in an {@link Optional} if the value is a {@link
-     * ValueNode} or returns an empty {@link Optional} otherwise.
-     *
-     * @param name The name of the parameter.
-     * @return An {@link Optional} wrapping the result of {@link #get(String)}
-     */
-    default Optional<ValueNode> getNode(String name) {
-      return Optional.of(get(name)).map(v -> v instanceof ValueNode ? (ValueNode) v : null);
-    }
   }
 }

jooby/src/main/java/io/jooby/QueryString.java

@@ -16,7 +16,7 @@
  * @author edgar
  * @since 2.0.0
  */
-public interface QueryString extends ValueNode {
+public interface QueryString extends Value {
 
   /**
    * Query string with the leading <code>?</code> or empty string.