context: move default method to defaultcontext

Author: jknack

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

@@ -18,7 +18,6 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -30,12 +29,11 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutput;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.internal.LocaleUtils;
-import io.jooby.internal.ParamLookupImpl;
 import io.jooby.internal.ReadOnlyContext;
 import io.jooby.internal.WebSocketSender;
-import io.jooby.output.BufferedOutput;
-import io.jooby.output.BufferedOutputFactory;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -822,17 +820,7 @@ default Value lookup(String name) {
    *     none found.
    * @throws IllegalArgumentException If no {@link ParamSource}s are specified.
    */
-  default Value lookup(@NonNull String name, ParamSource... sources) {
-    if (sources.length == 0) {
-      throw new IllegalArgumentException("No parameter sources were specified.");
-    }
-
-    return Arrays.stream(sources)
-        .map(source -> source.provider.apply(this, name))
-        .filter(value -> !value.isMissing())
-        .findFirst()
-        .orElseGet(() -> Value.missing(name));
-  }
+  Value lookup(@NonNull String name, ParamSource... sources);
 
   /**
    * Returns a {@link ParamLookup} instance which is a fluent interface covering the functionality
@@ -849,9 +837,7 @@ default Value lookup(@NonNull String name, ParamSource... sources) {
    * @see ParamLookup
    * @see #lookup(String, ParamSource...)
    */
-  default ParamLookup lookup() {
-    return new ParamLookupImpl(this);
-  }
+  ParamLookup lookup();
 
   /* **********************************************************************************************
    * Request Body

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

@@ -20,22 +20,15 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.Instant;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 import org.slf4j.Logger;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
-import io.jooby.internal.HashValue;
-import io.jooby.internal.MissingValue;
-import io.jooby.internal.SingleValue;
-import io.jooby.internal.UrlParser;
-import io.jooby.output.BufferedOutputFactory;
+import io.jooby.internal.*;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -189,6 +182,49 @@ default Value cookie(@NonNull String name) {
     return value == null ? Value.missing(name) : Value.value(getValueFactory(), name, value);
   }
 
+  /**
+   * Returns a {@link ParamLookup} instance which is a fluent interface covering the functionality
+   * of the {@link #lookup(String, ParamSource...)} method.
+   *
+   * <pre>{@code
+   * Value foo = ctx.lookup()
+   *   .inQuery()
+   *   .inPath()
+   *   .get("foo");
+   * }</pre>
+   *
+   * @return A {@link ParamLookup} instance.
+   * @see ParamLookup
+   * @see #lookup(String, ParamSource...)
+   */
+  default ParamLookup lookup() {
+    return new ParamLookupImpl(this);
+  }
+
+  /**
+   * Searches for a parameter in the specified sources, in the specified order, returning the first
+   * non-missing {@link Value}, or a 'missing' {@link Value} if none found.
+   *
+   * <p>At least one {@link ParamSource} must be specified.
+   *
+   * @param name The name of the parameter.
+   * @param sources Sources to search in.
+   * @return The first non-missing {@link Value} or a {@link Value} representing a missing value if
+   *     none found.
+   * @throws IllegalArgumentException If no {@link ParamSource}s are specified.
+   */
+  default Value lookup(@NonNull String name, ParamSource... sources) {
+    if (sources.length == 0) {
+      throw new IllegalArgumentException("No parameter sources were specified.");
+    }
+
+    return Arrays.stream(sources)
+        .map(source -> source.provider.apply(this, name))
+        .filter(value -> !value.isMissing())
+        .findFirst()
+        .orElseGet(() -> Value.missing(name));
+  }
+
   @Override
   default Value path(@NonNull String name) {
     String value = pathMap().get(name);

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

@@ -23,9 +23,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutput;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
-import io.jooby.output.BufferedOutput;
-import io.jooby.output.BufferedOutputFactory;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -747,6 +747,16 @@ public Context setRequestPath(@NonNull String path) {
     return this;
   }
 
+  @Override
+  public ParamLookup lookup() {
+    return ctx.lookup();
+  }
+
+  @Override
+  public Value lookup(@NonNull String name, ParamSource... sources) {
+    return ctx.lookup(name, sources);
+  }
+
   @Override
   public Value path(@NonNull String name) {
     return ctx.path(name);

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

@@ -42,13 +42,13 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.LocaleUtils;
 import io.jooby.internal.MutedServer;
 import io.jooby.internal.RegistryRef;
 import io.jooby.internal.RouterImpl;
-import io.jooby.output.BufferedOutputFactory;
 import io.jooby.problem.ProblemDetailsHandler;
 import io.jooby.value.ValueFactory;
 

jooby/src/main/java/io/jooby/MessageEncoder.java

@@ -7,8 +7,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutput;
 import io.jooby.exception.NotAcceptableException;
-import io.jooby.output.BufferedOutput;
 
 /**
  * Render a route output as a byte array.

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

@@ -33,10 +33,10 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.MissingValueException;
 import io.jooby.handler.AssetHandler;
 import io.jooby.handler.AssetSource;
-import io.jooby.output.BufferedOutputFactory;
 import io.jooby.value.ValueFactory;
 
 /**

jooby/src/main/java/io/jooby/Sender.java

@@ -10,7 +10,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.output.BufferedOutput;
+import io.jooby.buffer.BufferedOutput;
 
 /**
  * Non-blocking sender. Reactive responses use this class to send partial data in a non-blocking

jooby/src/main/java/io/jooby/ServerOptions.java

@@ -25,8 +25,8 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferOptions;
 import io.jooby.internal.SslContextProvider;
-import io.jooby.output.BufferOptions;
 
 /**
  * Available server options. To load server options from configuration files, just do:

jooby/src/main/java/io/jooby/ServerSentMessage.java

@@ -14,7 +14,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.output.*;
+import io.jooby.buffer.*;
 
 /**
  * Server-Sent message.

jooby/src/main/java/io/jooby/TemplateEngine.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.output.BufferedOutput;
+import io.jooby.buffer.BufferedOutput;
 
 /**
  * Template engine renderer. This class renderer instances of {@link ModelAndView} objects. Template