Merge branch 'develop' into release/2.x

Author: RomanQed

build.gradle

@@ -35,10 +35,11 @@ dependencies {
     api group: 'io.github.amayaframework', name: 'amaya-options', version: '1.2.1'
     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-context', version: '1.1.2'
-    api group: 'io.github.amayaframework', name: 'amaya-server', version: '1.1.3'
+    api group: 'io.github.amayaframework', name: 'amaya-http', version: '1.0.1'
+    api group: 'io.github.amayaframework', name: 'amaya-context', version: '1.1.4'
+    api group: 'io.github.amayaframework', name: 'amaya-server', version: '1.2.0'
     api group: 'io.github.amayaframework', name: 'amaya-application', version: '1.1.4'
-    api group: 'io.github.amayaframework', name: 'amaya-web', version: '1.0.2'
+    api group: 'io.github.amayaframework', name: 'amaya-web', version: '1.0.3'
     // DI
     compileOnly group: 'io.github.amayaframework', name: 'amaya-di', version: '2.3.3'
 }

context/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     // Servlets
     compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
     // Http
-    api group: 'io.github.amayaframework', name: 'amaya-http', version: '1.0.0'
+    compileOnly project(':http')
 }
 
 test {

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

@@ -123,18 +123,27 @@ public HttpCode getStatus() {
 
     @Override
     public void setStatus(HttpCode code) {
+        if (!code.isSupported(version)) {
+            throw new UnsupportedHttpDefinition(version, code);
+        }
         response.setStatus(code.getCode());
         this.status = code;
     }
 
     @Override
     public void sendError(HttpCode code, String message) throws IOException {
+        if (!code.isSupported(version)) {
+            throw new UnsupportedHttpDefinition(version, code);
+        }
         response.sendError(code.getCode(), message);
         this.status = code;
     }
 
     @Override
     public void sendError(HttpCode code) throws IOException {
+        if (!code.isSupported(version)) {
+            throw new UnsupportedHttpDefinition(version, code);
+        }
         response.sendError(code.getCode());
         this.status = code;
     }

http/src/main/java/io/github/amayaframework/http/HttpVersion.java

@@ -12,13 +12,16 @@ public final class HttpVersion implements Comparable<HttpVersion> {
     public static final HttpVersion HTTP_1_0 = new HttpVersion("HTTP/1.0", 10);
     public static final HttpVersion HTTP_1_1 = new HttpVersion("HTTP/1.1", 11);
     public static final HttpVersion HTTP_2_0 = new HttpVersion("HTTP/2.0", 20);
+    public static final HttpVersion HTTP_3_0 = new HttpVersion("HTTP/3.0", 30);
 
     private static final Map<String, HttpVersion> VERSIONS = Map.of(
             "HTTP/1.0", HTTP_1_0,
             "HTTP/1", HTTP_1_0,
             "HTTP/1.1", HTTP_1_1,
             "HTTP/2.0", HTTP_2_0,
-            "HTTP/2", HTTP_2_0
+            "HTTP/2", HTTP_2_0,
+            "HTTP/3.0", HTTP_3_0,
+            "HTTP/3", HTTP_3_0
     );
     final String tag;
     final int number;
@@ -64,6 +67,9 @@ public static HttpVersion of(int number) {
             case 2:
             case 20:
                 return HTTP_2_0;
+            case 3:
+            case 30:
+                return HTTP_3_0;
         }
         return null;
     }

http/src/test/java/io/github/amayaframework/http/HttpVersionTest.java

@@ -21,25 +21,42 @@ public void testPredefined() {
         assertEquals(HttpVersion.HTTP_2_0, HttpVersion.of(20));
         assertEquals(HttpVersion.HTTP_2_0, HttpVersion.of("HTTP/2"));
         assertEquals(HttpVersion.HTTP_2_0, HttpVersion.of("HTTP/2.0"));
+        // 3.0
+        assertEquals(HttpVersion.HTTP_3_0, HttpVersion.of(3));
+        assertEquals(HttpVersion.HTTP_3_0, HttpVersion.of(30));
+        assertEquals(HttpVersion.HTTP_3_0, HttpVersion.of("HTTP/3"));
+        assertEquals(HttpVersion.HTTP_3_0, HttpVersion.of("HTTP/3.0"));
     }
 
     @Test
     public void testComparisons() {
         var http1 = HttpVersion.HTTP_1_0;
         var http11 = HttpVersion.HTTP_1_1;
         var http2 = HttpVersion.HTTP_2_0;
+        var http3 = HttpVersion.HTTP_3_0;
+        // http/1
         assertTrue(http1.before(http11));
         assertFalse(http1.after(http11));
         assertTrue(http1.before(http2));
         assertFalse(http1.after(http2));
+        // http/1.1
         assertTrue(http11.after(http1));
         assertFalse(http11.before(http1));
         assertTrue(http11.before(http2));
         assertFalse(http11.after(http2));
+        // http/2
         assertTrue(http2.after(http1));
         assertFalse(http2.before(http1));
         assertTrue(http2.after(http11));
         assertFalse(http2.before(http11));
+        // http/3
+        assertTrue(http3.after(http11));
+        assertFalse(http3.before(http11));
+        assertTrue(http3.after(http1));
+        assertFalse(http3.before(http1));
+        assertTrue(http3.after(http2));
+        assertTrue(http3.after(http2));
+        assertFalse(http3.before(http2));
         assertEquals(-1, http1.compareTo(http11));
         assertEquals(1, http11.compareTo(http1));
     }

server/build.gradle

@@ -28,8 +28,12 @@ dependencies {
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
     // JFunc
     api group: 'com.github.romanqed', name: 'jfunc', version: '1.1.4'
+    // Amaya environment
+    compileOnly project(':environment')
     // Amaya options
     compileOnly project(':options')
+    // Amaya http lib
+    compileOnly project(':http')
     // Amaya context
     compileOnly project(':context')
     // Amaya services

server/src/main/java/io/github/amayaframework/server/HttpServer.java

@@ -2,12 +2,33 @@
 
 import com.github.romanqed.jfunc.Runnable1;
 import io.github.amayaframework.context.HttpContext;
+import io.github.amayaframework.http.HttpVersion;
+
+import java.net.InetSocketAddress;
 
 /**
  * An interface describing an abstract http server.
  */
 public interface HttpServer extends Server<HttpContext> {
 
+    /**
+     * Binds server to given {@link InetSocketAddress} 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 server 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);
+
     /**
      * Gets http server config. Any config changes are reflected on the server and vice versa.
      *

server/src/main/java/io/github/amayaframework/server/HttpServerConfig.java

@@ -2,6 +2,8 @@
 
 import io.github.amayaframework.http.HttpVersion;
 
+import java.net.InetSocketAddress;
+
 /**
  * An interface describing the http server config.
  */
@@ -22,6 +24,14 @@ public interface HttpServerConfig extends ServerConfig {
      */
     void setHttpVersion(HttpVersion version);
 
+    /**
+     * Adds given address to listened set and starts listen it with specified http protocol.
+     *
+     * @param address the specified address to be listened, must be non-null
+     * @param version the specified http version, must be non-null
+     */
+    void addAddress(InetSocketAddress address, HttpVersion version);
+
     /**
      * Gets the {@link MimeFormatter} instance used by server. The default value depends on the implementation.
      *

server/src/main/java/io/github/amayaframework/server/HttpServerFactory.java

@@ -1,13 +1,25 @@
 package io.github.amayaframework.server;
 
 import io.github.amayaframework.context.HttpContext;
+import io.github.amayaframework.environment.Environment;
 import io.github.amayaframework.options.OptionSet;
 
 /**
  * An interface describing an abstract {@link HttpServer} factory.
  */
 public interface HttpServerFactory extends ServerFactory<HttpContext> {
 
+    /**
+     * Creates a {@link HttpServer} instance with given options and environment.
+     *
+     * @param set the specified {@link OptionSet} instance, containing initial server options
+     * @param env the specified {@link Environment} instance
+     * @return ready to use, the properly configured {@link HttpServer} instance
+     */
+    default HttpServer create(OptionSet set, Environment env) {
+        return create(set);
+    }
+
     /**
      * Creates a {@link HttpServer} instance with given options.
      *
@@ -17,6 +29,17 @@ public interface HttpServerFactory extends ServerFactory<HttpContext> {
     @Override
     HttpServer create(OptionSet set);
 
+    /**
+     * Creates a {@link HttpServer} instance with environment and default options,
+     * defined by the factory implementation.
+     *
+     * @param env the specified {@link Environment} instance
+     * @return ready to use, the properly configured {@link HttpServer} instance
+     */
+    default HttpServer create(Environment env) {
+        return create();
+    }
+
     /**
      * Creates a {@link HttpServer} instance with default options, defined by the factory implementation.
      *

server/src/main/java/io/github/amayaframework/server/ServerFactory.java

@@ -1,6 +1,7 @@
 package io.github.amayaframework.server;
 
 import io.github.amayaframework.context.Context;
+import io.github.amayaframework.environment.Environment;
 import io.github.amayaframework.options.OptionSet;
 
 /**
@@ -10,6 +11,17 @@
  */
 public interface ServerFactory<T extends Context> {
 
+    /**
+     * Creates a {@link Server} instance with given options and environment.
+     *
+     * @param set the specified {@link OptionSet} instance, containing initial server options
+     * @param env the specified {@link Environment} instance
+     * @return ready to use, the properly configured {@link Server} instance
+     */
+    default Server<T> create(OptionSet set, Environment env) {
+        return create(set);
+    }
+
     /**
      * Creates a {@link Server} instance with given options.
      *
@@ -18,6 +30,16 @@ public interface ServerFactory<T extends Context> {
      */
     Server<T> create(OptionSet set);
 
+    /**
+     * Creates a {@link Server} instance with environment and default options, defined by the factory implementation.
+     *
+     * @param env the specified {@link Environment} instance
+     * @return ready to use, the properly configured {@link Server} instance
+     */
+    default Server<T> create(Environment env) {
+        return create();
+    }
+
     /**
      * Creates a {@link Server} instance with default options, defined by the factory implementation.
      *