Value API: favor Value for simple attributes

Author: jknack

TODO

@@ -1,5 +1,3 @@
-* review ValueNode return type on Context, some must be Value not ValueNode.
-* Make Session.toMap() read-only
 * review toString on Value API (removal of QueryStringValue?)
 * tests and coverage
 * server options from application.conf MUST override hardcoded settings
@@ -9,3 +7,4 @@
 * doc Session
 * doc WebSocket
 * doc FileUpload change
+* doc ContextParam/SessionParam

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

@@ -118,7 +118,7 @@ public interface Context extends Registry {
    * @param name Attribute's name.
    * @return Flash attribute.
    */
-  @Nonnull ValueNode flash(@Nonnull String name);
+  @Nonnull Value flash(@Nonnull String name);
 
   /**
    * Find a session or creates a new session.
@@ -149,7 +149,7 @@ public interface Context extends Registry {
    * @param name Cookie's name.
    * @return Cookie value.
    */
-  @Nonnull ValueNode cookie(@Nonnull String name);
+  @Nonnull Value cookie(@Nonnull String name);
 
   /**
    * Request cookies.
@@ -202,7 +202,7 @@ public interface Context extends Registry {
    * @param name Path key.
    * @return Associated value or a missing value, but never a <code>null</code> reference.
    */
-  @Nonnull ValueNode path(@Nonnull String name);
+  @Nonnull Value path(@Nonnull String name);
 
   /**
    * Convert the {@link #pathMap()} to the given type.
@@ -336,7 +336,7 @@ public interface Context extends Registry {
    * @param name Header name. Case insensitive.
    * @return A header value or missing value, never a <code>null</code> reference.
    */
-  @Nonnull ValueNode header(@Nonnull String name);
+  @Nonnull Value header(@Nonnull String name);
 
   /**
    * Header as single-value map.

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

@@ -82,7 +82,7 @@ public interface DefaultContext extends Context {
    * @param name Attribute's name.
    * @return Flash attribute.
    */
-  @Override default @Nonnull ValueNode flash(@Nonnull String name) {
+  @Override default @Nonnull Value flash(@Nonnull String name) {
     return Value.create(this, name, flash().get(name));
   }
 
@@ -114,12 +114,12 @@ public interface DefaultContext extends Context {
     return session;
   }
 
-  @Override default @Nonnull ValueNode cookie(@Nonnull String name) {
+  @Override default @Nonnull Value cookie(@Nonnull String name) {
     String value = cookieMap().get(name);
     return value == null ? Value.missing(name) : Value.value(this, name, value);
   }
 
-  @Override @Nonnull default ValueNode path(@Nonnull String name) {
+  @Override @Nonnull default Value path(@Nonnull String name) {
     String value = pathMap().get(name);
     return value == null
         ? new MissingValue(name)
@@ -158,7 +158,7 @@ public interface DefaultContext extends Context {
     return query().toMultimap();
   }
 
-  @Override @Nonnull default ValueNode header(@Nonnull String name) {
+  @Override @Nonnull default Value header(@Nonnull String name) {
     return header().get(name);
   }
 
@@ -171,7 +171,7 @@ public interface DefaultContext extends Context {
   }
 
   @Override default boolean accept(@Nonnull MediaType contentType) {
-    ValueNode accept = header(ACCEPT);
+    Value accept = header(ACCEPT);
     return accept.isMissing() ? true : contentType.matches(accept.value());
   }
 
@@ -196,17 +196,17 @@ public interface DefaultContext extends Context {
   }
 
   @Override @Nullable default MediaType getRequestType() {
-    ValueNode contentType = header("Content-Type");
+    Value contentType = header("Content-Type");
     return contentType.isMissing() ? null : MediaType.valueOf(contentType.value());
   }
 
   @Override @Nonnull default MediaType getRequestType(MediaType defaults) {
-    ValueNode contentType = header("Content-Type");
+    Value contentType = header("Content-Type");
     return contentType.isMissing() ? defaults : MediaType.valueOf(contentType.value());
   }
 
   @Override default long getRequestLength() {
-    ValueNode contentLength = header("Content-Length");
+    Value contentLength = header("Content-Length");
     return contentLength.isMissing() ? -1 : contentLength.longValue();
   }
 

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

@@ -61,7 +61,7 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.flash();
   }
 
-  @Nonnull @Override public ValueNode flash(@Nonnull String name) {
+  @Nonnull @Override public Value flash(@Nonnull String name) {
     return ctx.flash(name);
   }
 
@@ -77,7 +77,7 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.sessionOrNull();
   }
 
-  @Nonnull @Override public ValueNode cookie(@Nonnull String name) {
+  @Nonnull @Override public Value cookie(@Nonnull String name) {
     return ctx.cookie(name);
   }
 
@@ -101,7 +101,7 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.pathString();
   }
 
-  @Nonnull @Override public ValueNode path(@Nonnull String name) {
+  @Nonnull @Override public Value path(@Nonnull String name) {
     return ctx.path(name);
   }
 
@@ -150,7 +150,7 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.header();
   }
 
-  @Nonnull @Override public ValueNode header(@Nonnull String name) {
+  @Nonnull @Override public Value header(@Nonnull String name) {
     return ctx.header(name);
   }
 

jooby/src/main/java/io/jooby/Session.java

@@ -34,7 +34,7 @@ public interface Session {
    * @param name Attribute's name.
    * @return An attribute value or missing value.
    */
-  @Nonnull ValueNode get(@Nonnull String name);
+  @Nonnull Value get(@Nonnull String name);
 
   /**
    * Put a session attribute.
@@ -128,7 +128,7 @@ public interface Session {
    * @param name Attribute's name.
    * @return Session attribute or missing value.
    */
-  @Nonnull ValueNode remove(@Nonnull String name);
+  @Nonnull Value remove(@Nonnull String name);
 
   /**
    * Read-only copy of session attributes.

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

@@ -8,7 +8,7 @@
 import io.jooby.Context;
 import io.jooby.Cookie;
 import io.jooby.FlashMap;
-import io.jooby.ValueNode;
+import io.jooby.Value;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +29,7 @@ public class FlashMapImpl extends HashMap<String, String> implements FlashMap {
   private Map<String, String> initialScope;
 
   public FlashMapImpl(Context ctx, Cookie template) {
-    ValueNode cookie = ctx.cookie(template.getName());
+    Value cookie = ctx.cookie(template.getName());
     Map<String, String> seed = cookie.isMissing() ? emptyMap() : decode(cookie.value());
     super.putAll(seed);
     this.ctx = ctx;

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

@@ -64,7 +64,7 @@ public SessionImpl(Context ctx, String id, Map<String, String> attributes) {
     return id;
   }
 
-  @Override public @Nonnull ValueNode get(@Nonnull String name) {
+  @Override public @Nonnull Value get(@Nonnull String name) {
     return Value.create(ctx, name, attributes.get(name));
   }
 

jooby/src/test/java/io/jooby/internal/ReturnTypeTest.java

@@ -3,6 +3,7 @@
 import io.jooby.Context;
 import io.jooby.Reified;
 import io.jooby.Route;
+import io.jooby.Value;
 import io.jooby.ValueNode;
 import io.jooby.internal.asm.ClassSource;
 import org.junit.jupiter.api.Test;
@@ -140,7 +141,7 @@ public void localVariable() {
     });
 
     assertType(Double.class, ctx -> {
-      ValueNode value = ctx.path("f");
+      Value value = ctx.path("f");
 
       Double to = value.to(Double.class);
 

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java

@@ -211,7 +211,7 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S
     return multipart;
   }
 
-  @Nonnull @Override public ValueNode header(@Nonnull String name) {
+  @Nonnull @Override public Value header(@Nonnull String name) {
     return Value.create(this, name, req.headers().getAll(name));
   }
 

modules/jooby-test/src/main/java/io/jooby/MockSession.java

@@ -48,7 +48,7 @@ public MockSession(@Nonnull MockContext ctx) {
     return sessionId;
   }
 
-  @Nonnull @Override public ValueNode get(@Nonnull String name) {
+  @Nonnull @Override public Value get(@Nonnull String name) {
     return Optional.ofNullable(data.get(name))
         .map(value -> Value.create(ctx, name, value))
         .orElse(Value.missing(name));
@@ -59,8 +59,8 @@ public MockSession(@Nonnull MockContext ctx) {
     return this;
   }
 
-  @Nonnull @Override public ValueNode remove(@Nonnull String name) {
-    ValueNode value = get(name);
+  @Nonnull @Override public Value remove(@Nonnull String name) {
+    Value value = get(name);
     data.remove(name);
     return value;
   }