make clear difference between request and response attributes

Author: jknack

jooby/src/main/java/io/jooby/AssetHandler.java

@@ -87,9 +87,9 @@ public AssetHandler(AssetSource... sources) {
 
     long length = asset.getSize();
     if (length != -1) {
-      ctx.setContentLength(length);
+      ctx.setResponseLength(length);
     }
-    ctx.setContentType(asset.getContentType());
+    ctx.setResponseType(asset.getContentType());
     return ctx.sendStream(asset.stream());
   }
 

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

@@ -400,7 +400,7 @@ default MediaType accept(@Nonnull List<MediaType> produceTypes) {
    *
    * @return Request <code>Content-Type</code> header or <code>null</code> when missing.
    */
-  @Nullable default MediaType getContentType() {
+  @Nullable default MediaType getRequestType() {
     Value contentType = header("Content-Type");
     return contentType.isMissing() ? null : MediaType.valueOf(contentType.value());
   }
@@ -411,7 +411,7 @@ default MediaType accept(@Nonnull List<MediaType> produceTypes) {
    * @param defaults Default content type to use when the header is missing.
    * @return Request <code>Content-Type</code> header or <code>null</code> when missing.
    */
-  @Nonnull default MediaType getContentType(MediaType defaults) {
+  @Nonnull default MediaType getRequestType(MediaType defaults) {
     Value contentType = header("Content-Type");
     return contentType.isMissing() ? defaults : MediaType.valueOf(contentType.value());
   }
@@ -421,7 +421,7 @@ default MediaType accept(@Nonnull List<MediaType> produceTypes) {
    *
    * @return Request <code>Content-Length</code> header or <code>-1</code> when missing.
    */
-  default long getContentLength() {
+  default long getRequestLength() {
     Value contentLength = header("Content-Length");
     return contentLength.isMissing() ? -1 : contentLength.longValue();
   }
@@ -671,7 +671,7 @@ default long getContentLength() {
    * @return Instance of conversion type.
    */
   default @Nonnull <T> T body(@Nonnull Reified<T> type) {
-    return body(type, getContentType(MediaType.text));
+    return body(type, getRequestType(MediaType.text));
   }
 
   /**
@@ -698,7 +698,7 @@ default long getContentLength() {
    * @return Instance of conversion type.
    */
   default @Nonnull <T> T body(@Nonnull Class type) {
-    return body(type, getContentType(MediaType.text));
+    return body(type, getRequestType(MediaType.text));
   }
 
   /**
@@ -863,24 +863,24 @@ default long getContentLength() {
    * @param length Response length.
    * @return This context.
    */
-  @Nonnull Context setContentLength(long length);
+  @Nonnull Context setResponseLength(long length);
 
   /**
    * Set response content type header.
    *
    * @param contentType Content type.
    * @return This context.
    */
-  @Nonnull Context setContentType(@Nonnull String contentType);
+  @Nonnull Context setResponseType(@Nonnull String contentType);
 
   /**
    * Set response content type header.
    *
    * @param contentType Content type.
    * @return This context.
    */
-  @Nonnull default Context setContentType(@Nonnull MediaType contentType) {
-    return setContentType(contentType, contentType.getCharset());
+  @Nonnull default Context setResponseType(@Nonnull MediaType contentType) {
+    return setResponseType(contentType, contentType.getCharset());
   }
 
   /**
@@ -890,7 +890,7 @@ default long getContentLength() {
    * @param charset Charset.
    * @return This context.
    */
-  @Nonnull Context setContentType(@Nonnull MediaType contentType, @Nullable Charset charset);
+  @Nonnull Context setResponseType(@Nonnull MediaType contentType, @Nullable Charset charset);
 
   /**
    * Set the default response content type header. It is used if the response content type header
@@ -899,14 +899,14 @@ default long getContentLength() {
    * @param contentType Content type.
    * @return This context.
    */
-  @Nonnull Context setDefaultContentType(@Nonnull MediaType contentType);
+  @Nonnull Context setDefaultResponseType(@Nonnull MediaType contentType);
 
   /**
    * Get response content type.
    *
    * @return Response content type.
    */
-  @Nonnull MediaType getResponseContentType();
+  @Nonnull MediaType getResponseType();
 
   /**
    * Set response status code.
@@ -965,7 +965,7 @@ default long getContentLength() {
    * @return HTTP channel as output stream. Usually for chunked responses.
    */
   default @Nonnull OutputStream responseStream(@Nonnull MediaType contentType) {
-    setContentType(contentType);
+    setResponseType(contentType);
     return responseStream();
   }
 
@@ -979,7 +979,7 @@ default long getContentLength() {
    */
   default @Nonnull Context responseStream(@Nonnull MediaType contentType,
       @Nonnull Throwing.Consumer<OutputStream> consumer) throws Exception {
-    setContentType(contentType);
+    setResponseType(contentType);
     return responseStream(consumer);
   }
 
@@ -1169,9 +1169,9 @@ default long getContentLength() {
     InputStream content = file.stream();
     long length = file.getFileSize();
     if (length > 0) {
-      setContentLength(length);
+      setResponseLength(length);
     }
-    setDefaultContentType(file.getContentType());
+    setDefaultResponseType(file.getContentType());
     if (content instanceof FileInputStream) {
       sendFile(((FileInputStream) content).getChannel());
     } else {
@@ -1188,7 +1188,7 @@ default long getContentLength() {
    */
   default @Nonnull Context sendFile(@Nonnull Path file) {
     try {
-      setDefaultContentType(MediaType.byFile(file));
+      setDefaultResponseType(MediaType.byFile(file));
       return sendFile(FileChannel.open(file));
     } catch (IOException x) {
       throw Throwing.sneakyThrow(x);

jooby/src/main/java/io/jooby/ErrorHandler.java

@@ -79,12 +79,12 @@ public interface ErrorHandler {
           .append("</html>");
 
       ctx
-          .setContentType(MediaType.html)
+          .setResponseType(MediaType.html)
           .setStatusCode(statusCode)
           .sendString(html.toString());
     } else {
       String message = Optional.ofNullable(cause.getMessage()).orElse(statusCode.reason());
-      ctx.setContentType(json)
+      ctx.setResponseType(json)
           .setStatusCode(statusCode)
           .sendString("{\"message\":\"" + message + "\",\"statusCode\":" + statusCode.value()
               + ",\"reason\":\"" + statusCode.reason() + "\"}");

jooby/src/main/java/io/jooby/Renderer.java

@@ -28,7 +28,7 @@ public interface Renderer {
 
   /** To string renderer. */
   Renderer TO_STRING = (ctx, value) -> {
-    if (ctx.accept(ctx.getResponseContentType())) {
+    if (ctx.accept(ctx.getResponseType())) {
       return value.toString().getBytes(StandardCharsets.UTF_8);
     }
     throw new Err(StatusCode.NOT_ACCEPTABLE);

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

@@ -37,7 +37,7 @@ public interface TemplateEngine extends Renderer {
   String apply(Context ctx, ModelAndView modelAndView) throws Exception;
 
   @Override default byte[] render(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
-    ctx.setDefaultContentType(MediaType.html);
+    ctx.setDefaultResponseType(MediaType.html);
     String output = apply(ctx, (ModelAndView) value);
     return output.getBytes(StandardCharsets.UTF_8);
   }

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

@@ -122,7 +122,7 @@ public Stack executor(Executor executor) {
   };
 
   static final Route.Before SUPPORT_MEDIA_TYPE = ctx -> {
-    MediaType contentType = ctx.getContentType();
+    MediaType contentType = ctx.getRequestType();
     if (contentType == null) {
       throw new Err(StatusCode.UNSUPPORTED_MEDIA_TYPE);
     }

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

@@ -116,7 +116,7 @@ public SingleByteRange(String value, long start, long end, long contentLength,
   @Override public @Nonnull ByteRange apply(@Nonnull Context ctx) {
     ctx.setHeader("Accept-Ranges", "bytes");
     ctx.setHeader("Content-Range", contentRange);
-    ctx.setContentLength(contentLength);
+    ctx.setResponseLength(contentLength);
     ctx.setStatusCode(StatusCode.PARTIAL_CONTENT);
     return this;
   }

jooby/src/main/java/io/jooby/internal/handler/SendFileChannel.java

@@ -42,7 +42,7 @@ public SendFileChannel(Route.Handler next) {
       }
       if (file instanceof Path) {
         if (Files.exists((Path) file)) {
-          ctx.setDefaultContentType(MediaType.byFile((Path) file));
+          ctx.setDefaultResponseType(MediaType.byFile((Path) file));
           file = FileChannel.open((Path) file, StandardOpenOption.READ);
         } else {
           throw new FileNotFoundException(file.toString());

jooby/src/main/java/io/jooby/internal/handler/reactive/ChunkedSubscriber.java

@@ -50,7 +50,7 @@ public void onNext(Object item) {
       byte[] data = renderer.render(ctx, item);
 
       if (responseType == null) {
-        responseType = ctx.getResponseContentType();
+        responseType = ctx.getResponseType();
         if (responseType.isJson()) {
           data = prepend(data, JSON_LBRACKET);
         }

modules/jooby-jackson/src/main/java/io/jooby/json/Jackson.java

@@ -67,7 +67,7 @@ public static final ObjectMapper defaultObjectMapper() {
   }
 
   @Override public byte[] render(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
-    ctx.setDefaultContentType(MediaType.json);
+    ctx.setDefaultResponseType(MediaType.json);
     return mapper.writeValueAsBytes(value);
   }