Value API: integrate value APu into master

Author: jknack

docs/asciidoc/index.adoc

@@ -70,7 +70,6 @@ fun main(args: Array<String>) {
 * <<responses, Reactive responses>> (Completable Futures, RxJava and Reactor types and Kotlin Coroutines)
 * <<server, Multi-server>> including https://https://www.eclipse.org/jetty[Jetty], https://netty.io[Netty] and http://undertow.io[Undertow]
 * Simple <<extensions-and-services, extension/plugin mechanism>> with a variety of <<modules, modules>>
-* <<support-plans, Commercial Support>>
 
 === Script API
 

docs/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

etc/release.sh

@@ -2,6 +2,4 @@
 
 DIR=$(cd "$(dirname "$0")"; pwd)
 
-if sh $DIR/javadoc.sh; then
-  sh $DIR/maven.sh -pl '!docs,!tests,!examples' clean deploy -P bom,central
-fi
+sh $DIR/maven.sh -pl '!docs,!tests,!examples' clean deploy -P bom,central

examples/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

jooby/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.0.7-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

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

@@ -751,6 +751,13 @@ public interface Context extends Registry {
    */
   @Nonnull Context removeResponseHeader(@Nonnull String name);
 
+  /**
+   * Clear/reset all the headers, including cookies.
+   *
+   * @return This context.
+   */
+  @Nonnull Context removeResponseHeaders();
+
   /**
    * Set response content length header.
    *
@@ -1068,4 +1075,20 @@ public interface Context extends Registry {
    */
   boolean isResponseStarted();
 
+  /**
+   * True if response headers are cleared on application error. If none set it uses the
+   * default/global value specified by {@link RouterOptions#getResetHeadersOnError()}.
+   *
+   * @return True if response headers are cleared on application error. If none set it uses the
+   *     default/global value specified by {@link RouterOptions#getResetHeadersOnError()}.
+   */
+  boolean getResetHeadersOnError();
+
+  /**
+   * Set whenever reset/clear headers on application error.
+   *
+   * @param value True for reset/clear headers.
+   * @return This context.
+   */
+  @Nonnull Context setResetHeadersOnError(boolean value);
 }

jooby/src/main/java/io/jooby/CorsHandler.java

@@ -70,6 +70,7 @@ public CorsHandler() {
             return ctx.send(StatusCode.FORBIDDEN);
           }
         } else if (isSimple(ctx)) {
+          ctx.setResetHeadersOnError(false);
           simple(ctx, options, origin);
         } else {
           return ctx.send(StatusCode.FORBIDDEN);

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

@@ -339,11 +339,13 @@ public interface DefaultContext extends Context {
     return setResponseHeader(name, RFC1123.format(Instant.ofEpochMilli(value.getTime())));
   }
 
-  @Override @Nonnull default Context setResponseHeader(@Nonnull String name, @Nonnull Instant value) {
+  @Override @Nonnull
+  default Context setResponseHeader(@Nonnull String name, @Nonnull Instant value) {
     return setResponseHeader(name, RFC1123.format(value));
   }
 
-  @Override @Nonnull default Context setResponseHeader(@Nonnull String name, @Nonnull Object value) {
+  @Override @Nonnull
+  default Context setResponseHeader(@Nonnull String name, @Nonnull Object value) {
     if (value instanceof Date) {
       return setResponseHeader(name, (Date) value);
     }
@@ -390,7 +392,8 @@ public interface DefaultContext extends Context {
     return responseStream(consumer);
   }
 
-  @Override default @Nonnull Context responseStream(@Nonnull SneakyThrows.Consumer<OutputStream> consumer)
+  @Override default @Nonnull Context responseStream(
+      @Nonnull SneakyThrows.Consumer<OutputStream> consumer)
       throws Exception {
     try (OutputStream out = responseStream()) {
       consumer.accept(out);
@@ -406,7 +409,8 @@ public interface DefaultContext extends Context {
     return responseWriter(contentType, contentType.getCharset());
   }
 
-  @Override default @Nonnull Context responseWriter(@Nonnull SneakyThrows.Consumer<PrintWriter> consumer)
+  @Override default @Nonnull Context responseWriter(
+      @Nonnull SneakyThrows.Consumer<PrintWriter> consumer)
       throws Exception {
     return responseWriter(MediaType.text, consumer);
   }
@@ -416,7 +420,8 @@ public interface DefaultContext extends Context {
     return responseWriter(contentType, contentType.getCharset(), consumer);
   }
 
-  @Override default @Nonnull Context responseWriter(@Nonnull MediaType contentType, @Nullable Charset charset,
+  @Override default @Nonnull Context responseWriter(@Nonnull MediaType contentType,
+      @Nullable Charset charset,
       @Nonnull SneakyThrows.Consumer<PrintWriter> consumer) throws Exception {
     try (PrintWriter writer = responseWriter(contentType, charset)) {
       consumer.accept(writer);
@@ -428,7 +433,8 @@ public interface DefaultContext extends Context {
     return sendRedirect(StatusCode.FOUND, location);
   }
 
-  @Override default @Nonnull Context sendRedirect(@Nonnull StatusCode redirect, @Nonnull String location) {
+  @Override default @Nonnull Context sendRedirect(@Nonnull StatusCode redirect,
+      @Nonnull String location) {
     setResponseHeader("location", location);
     return send(redirect);
   }
@@ -474,21 +480,25 @@ public interface DefaultContext extends Context {
    * @param statusCode Status code.
    * @return This context.
    */
-  @Override @Nonnull default Context sendError(@Nonnull Throwable cause, @Nonnull StatusCode statusCode) {
+  @Override @Nonnull default Context sendError(@Nonnull Throwable cause,
+      @Nonnull StatusCode statusCode) {
     Router router = getRouter();
     if (isResponseStarted()) {
       router.getLog().error(ErrorHandler.errorMessage(this, statusCode), cause);
     } else {
       try {
+        if (getResetHeadersOnError()) {
+          removeResponseHeaders();
+        }
         router.getErrorHandler().apply(this, cause, statusCode);
       } catch (Exception x) {
         router.getLog()
             .error("error handler resulted in exception {} {}", getMethod(), pathString(), x);
       }
-      /** rethrow fatal exceptions: */
-      if (SneakyThrows.isFatal(cause)) {
-        throw SneakyThrows.propagate(cause);
-      }
+    }
+    /** rethrow fatal exceptions: */
+    if (SneakyThrows.isFatal(cause)) {
+      throw SneakyThrows.propagate(cause);
     }
     return this;
   }

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

@@ -330,6 +330,11 @@ public Context setResponseHeader(@Nonnull String name, @Nonnull Instant value) {
     return this;
   }
 
+  @Nonnull @Override public Context removeResponseHeaders() {
+    ctx.removeResponseHeaders();
+    return this;
+  }
+
   @Override public long getResponseLength() {
     return ctx.getResponseLength();
   }
@@ -517,6 +522,15 @@ public Context sendError(@Nonnull Throwable cause, @Nonnull StatusCode statusCod
     return ctx.isResponseStarted();
   }
 
+  @Override public boolean getResetHeadersOnError() {
+    return ctx.getResetHeadersOnError();
+  }
+
+  @Override public Context setResetHeadersOnError(boolean value) {
+    ctx.setResetHeadersOnError(value);
+    return this;
+  }
+
   @Nonnull @Override public <T> T require(@Nonnull Class<T> type) throws RegistryException {
     return ctx.require(type);
   }

jooby/src/main/java/io/jooby/Route.java

@@ -270,6 +270,7 @@ public interface Handler extends Serializable {
    * Handler for {@link StatusCode#METHOD_NOT_ALLOWED} responses.
    */
   public static final Handler METHOD_NOT_ALLOWED = ctx -> {
+    ctx.setResetHeadersOnError(false);
     // Allow header was generated by routing algorithm
     if (ctx.getMethod().equals(Router.OPTIONS)) {
       return ctx.send(StatusCode.OK);