Merge branch 'develop' into release/2.x

Author: RomanQed

build.gradle

@@ -36,10 +36,10 @@ dependencies {
     api group: 'io.github.amayaframework', name: 'amaya-environment', version: '1.0.2'
     api group: 'io.github.amayaframework', name: 'amaya-service', version: '1.0.0'
     api group: 'io.github.amayaframework', name: 'amaya-http', version: '1.0.2'
-    api group: 'io.github.amayaframework', name: 'amaya-context', version: '1.3.0'
+    api group: 'io.github.amayaframework', name: 'amaya-context', version: '1.3.1'
     api group: 'io.github.amayaframework', name: 'amaya-server', version: '1.3.0'
     api group: 'io.github.amayaframework', name: 'amaya-application', version: '1.1.4'
-    api group: 'io.github.amayaframework', name: 'amaya-web', version: '1.0.3'
+    api group: 'io.github.amayaframework', name: 'amaya-web', version: '1.1.0'
     // DI
     compileOnly group: 'io.github.amayaframework', name: 'amaya-di', version: '2.3.3'
 }

context/src/main/java/io/github/amayaframework/context/AbstractHttpResponse.java

@@ -149,8 +149,11 @@ public void sendError(HttpCode code) throws IOException {
     }
 
     @Override
-    public void sendRedirect(String location) throws IOException {
+    public void sendRedirect(String location, boolean encode) throws IOException {
         Objects.requireNonNull(location);
+        if (encode) {
+            location = response.encodeRedirectURL(location);
+        }
         response.sendRedirect(location);
         this.status = HttpCode.FOUND;
     }

context/src/main/java/io/github/amayaframework/context/HttpResponse.java

@@ -128,11 +128,37 @@ public interface HttpResponse extends Response, HttpTransaction {
      * the response should be considered to be committed and should not be written to.
      *
      * @param location the redirect location URL
+     * @param encode   the flag determines either url will be encoded with current session id
      * @throws IOException           if an input or output exception occurs
      * @throws IllegalStateException if the response was committed or if a partial URL is given and cannot be converted
      *                               into a valid URL
      */
-    void sendRedirect(String location) throws IOException;
+    void sendRedirect(String location, boolean encode) throws IOException;
+
+    /**
+     * Sends a temporary redirect response to the client using the specified redirect location URL
+     * and clears the buffer. The buffer will be replaced with the data set by this method. Calling this method sets
+     * the status code to {@link HttpCode#FOUND}. This method can accept relative URLs;the servlet container must
+     * convert the relative URL to an absolute URL before sending the response to the client.
+     * If the location is relative without a leading '/' the container interprets it as relative to the current request
+     * URI. If the location is relative with a leading '/' the container interprets it as relative to the servlet
+     * container root. If the location is relative with two leading '/' the container interprets it as a network-path
+     * reference (see <a href="http://www.ietf.org/rfc/rfc3986.txt"> RFC 3986: Uniform Resource Identifier (URI):
+     * Generic Syntax</a>, section 4.2 &quot;Relative Reference&quot;).
+     * <p>
+     * If the response has already been committed, this method throws an IllegalStateException. After using this method,
+     * the response should be considered to be committed and should not be written to.
+     * <p>
+     * Does not encode redirect url.
+     *
+     * @param location the redirect location URL
+     * @throws IOException           if an input or output exception occurs
+     * @throws IllegalStateException if the response was committed or if a partial URL is given and cannot be converted
+     *                               into a valid URL
+     */
+    default void sendRedirect(String location) throws IOException {
+        sendRedirect(location, false);
+    }
 
     /**
      * Gets the supplier of trailer headers.

web/build.gradle

@@ -31,6 +31,7 @@ dependencies {
     // Middlewares
     api group: 'com.github.romanqed', name: 'jconv', version: '1.1.0'
     // Amaya modules
+    compileOnly project(':http')
     compileOnly project(':options')
     compileOnly project(':environment')
     compileOnly project(':service')

web/src/main/java/io/github/amayaframework/web/AbstractWebApplication.java

@@ -4,6 +4,7 @@
 import io.github.amayaframework.application.AbstractApplication;
 import io.github.amayaframework.context.HttpContext;
 import io.github.amayaframework.environment.Environment;
+import io.github.amayaframework.http.HttpVersion;
 import io.github.amayaframework.options.GroupOptionSet;
 import io.github.amayaframework.server.HttpServer;
 import io.github.amayaframework.server.HttpServerConfig;
@@ -49,6 +50,13 @@ public void bind(InetSocketAddress address) {
         server.getConfig().addAddress(address);
     }
 
+    @Override
+    public void bind(InetSocketAddress address, HttpVersion version) {
+        Objects.requireNonNull(address);
+        Objects.requireNonNull(version);
+        server.getConfig().addAddress(address, version);
+    }
+
     @Override
     public void bind(int port) {
         if (port < 0 || port > 65535) {
@@ -57,6 +65,15 @@ public void bind(int port) {
         server.getConfig().addAddress(new InetSocketAddress(port));
     }
 
+    @Override
+    public void bind(int port, HttpVersion version) {
+        Objects.requireNonNull(version);
+        if (port < 0 || port > 65535) {
+            throw new IllegalArgumentException("Illegal port value: " + port);
+        }
+        server.getConfig().addAddress(new InetSocketAddress(port), version);
+    }
+
     @Override
     protected void doStart(Runnable1<HttpContext> handler) throws Throwable {
         this.manager.start();

web/src/main/java/io/github/amayaframework/web/WebApplication.java

@@ -4,6 +4,7 @@
 import com.github.romanqed.jfunc.Runnable2;
 import io.github.amayaframework.application.Application;
 import io.github.amayaframework.context.HttpContext;
+import io.github.amayaframework.http.HttpVersion;
 import io.github.amayaframework.server.HttpServerConfig;
 
 import java.net.InetSocketAddress;
@@ -22,18 +23,38 @@ public interface WebApplication extends Application<HttpContext> {
 
     /**
      * Binds web application to given address.
+     * If the implementation supports it, multiple bindings are possible.
      *
      * @param address the specified address that the server will listen to, must be non-null
      */
     void bind(InetSocketAddress address);
 
+    /**
+     * Binds web application to given address with the specified http version.
+     * If the implementation supports it, multiple bindings are possible.
+     *
+     * @param address the specified address that the server will listen to, must be non-null
+     * @param version the specified http version, must be non-null
+     */
+    void bind(InetSocketAddress address, HttpVersion version);
+
     /**
      * Binds web application to given port.
+     * If the implementation supports it, multiple bindings are possible.
      *
      * @param port the specified port that the server will listen to
      */
     void bind(int port);
 
+    /**
+     * Binds web application to given port with the specified http version.
+     * If the implementation supports it, multiple bindings are possible.
+     *
+     * @param port    the specified port that the server will listen to
+     * @param version the specified http version, must be non-null
+     */
+    void bind(int port, HttpVersion version);
+
     @Override
     void addHandler(Runnable2<HttpContext, Runnable1<HttpContext>> handler);
 

web/src/main/java/module-info.java

@@ -6,6 +6,7 @@
 module io.github.amayaframework.web {
     // Requires
     requires com.github.romanqed.jfunc;
+    requires io.github.amayaframework.http;
     requires io.github.amayaframework.options;
     requires io.github.amayaframework.environment;
     requires io.github.amayaframework.service;