Feature/http3 support 5.x

vertx-core/pom.xml

@@ -97,6 +97,11 @@
       <artifactId>netty-transport-classes-kqueue</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>io.netty.incubator</groupId>
+      <artifactId>netty-incubator-codec-http3</artifactId>
+      <version>0.0.28.Final</version>
+    </dependency>
 
     <!-- Jackson -->
     <dependency>

vertx-core/src/main/generated/io/vertx/core/http/Http3SettingsConverter.java

@@ -0,0 +1,63 @@
+package io.vertx.core.http;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Converter and mapper for {@link io.vertx.core.http.Http3Settings}.
+ * NOTE: This class has been automatically generated from the {@link io.vertx.core.http.Http3Settings} original class using Vert.x codegen.
+ */
+public class Http3SettingsConverter {
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, Http3Settings obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+        case "qpackMaxTableCapacity":
+          if (member.getValue() instanceof Number) {
+            obj.setQpackMaxTableCapacity(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "maxFieldSectionSize":
+          if (member.getValue() instanceof Number) {
+            obj.setMaxFieldSectionSize(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "qpackMaxBlockedStreams":
+          if (member.getValue() instanceof Number) {
+            obj.setQpackMaxBlockedStreams(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "enableConnectProtocol":
+          if (member.getValue() instanceof Number) {
+            obj.setEnableConnectProtocol(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "h3Datagram":
+          if (member.getValue() instanceof Number) {
+            obj.setH3Datagram(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "enableMetadata":
+          if (member.getValue() instanceof Number) {
+            obj.setEnableMetadata(((Number)member.getValue()).longValue());
+          }
+          break;
+      }
+    }
+  }
+
+   static void toJson(Http3Settings obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(Http3Settings obj, java.util.Map<String, Object> json) {
+    json.put("qpackMaxTableCapacity", obj.getQpackMaxTableCapacity());
+    json.put("maxFieldSectionSize", obj.getMaxFieldSectionSize());
+    json.put("qpackMaxBlockedStreams", obj.getQpackMaxBlockedStreams());
+    json.put("enableConnectProtocol", obj.getEnableConnectProtocol());
+    json.put("h3Datagram", obj.getH3Datagram());
+    json.put("enableMetadata", obj.getEnableMetadata());
+  }
+}

vertx-core/src/main/generated/io/vertx/core/http/HttpClientOptionsConverter.java

@@ -74,11 +74,6 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpCli
             obj.setDefaultPort(((Number)member.getValue()).intValue());
           }
           break;
-        case "protocolVersion":
-          if (member.getValue() instanceof String) {
-            obj.setProtocolVersion(io.vertx.core.http.HttpVersion.valueOf((String)member.getValue()));
-          }
-          break;
         case "maxChunkSize":
           if (member.getValue() instanceof Number) {
             obj.setMaxChunkSize(((Number)member.getValue()).intValue());
@@ -99,6 +94,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpCli
             obj.setInitialSettings(new io.vertx.core.http.Http2Settings((io.vertx.core.json.JsonObject)member.getValue()));
           }
           break;
+        case "initialHttp3Settings":
+          if (member.getValue() instanceof JsonObject) {
+            obj.setInitialHttp3Settings(new io.vertx.core.http.Http3Settings((io.vertx.core.json.JsonObject)member.getValue()));
+          }
+          break;
         case "alpnVersions":
           if (member.getValue() instanceof JsonArray) {
             java.util.ArrayList<io.vertx.core.http.HttpVersion> list =  new java.util.ArrayList<>();
@@ -149,6 +149,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpCli
             obj.setName((String)member.getValue());
           }
           break;
+        case "http3MultiplexingLimit":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3MultiplexingLimit(((Number)member.getValue()).intValue());
+          }
+          break;
       }
     }
   }
@@ -172,15 +177,15 @@ static void toJson(HttpClientOptions obj, java.util.Map<String, Object> json) {
       json.put("defaultHost", obj.getDefaultHost());
     }
     json.put("defaultPort", obj.getDefaultPort());
-    if (obj.getProtocolVersion() != null) {
-      json.put("protocolVersion", obj.getProtocolVersion().name());
-    }
     json.put("maxChunkSize", obj.getMaxChunkSize());
     json.put("maxInitialLineLength", obj.getMaxInitialLineLength());
     json.put("maxHeaderSize", obj.getMaxHeaderSize());
     if (obj.getInitialSettings() != null) {
       json.put("initialSettings", obj.getInitialSettings().toJson());
     }
+    if (obj.getInitialHttp3Settings() != null) {
+      json.put("initialHttp3Settings", obj.getInitialHttp3Settings().toJson());
+    }
     if (obj.getAlpnVersions() != null) {
       JsonArray array = new JsonArray();
       obj.getAlpnVersions().forEach(item -> array.add(item.name()));
@@ -198,5 +203,6 @@ static void toJson(HttpClientOptions obj, java.util.Map<String, Object> json) {
     if (obj.getName() != null) {
       json.put("name", obj.getName());
     }
+    json.put("http3MultiplexingLimit", obj.getHttp3MultiplexingLimit());
   }
 }

vertx-core/src/main/generated/io/vertx/core/http/HttpServerOptionsConverter.java

@@ -94,6 +94,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpSer
             obj.setInitialSettings(new io.vertx.core.http.Http2Settings((io.vertx.core.json.JsonObject)member.getValue()));
           }
           break;
+        case "initialHttp3Settings":
+          if (member.getValue() instanceof JsonObject) {
+            obj.setInitialHttp3Settings(new io.vertx.core.http.Http3Settings((io.vertx.core.json.JsonObject)member.getValue()));
+          }
+          break;
         case "alpnVersions":
           if (member.getValue() instanceof JsonArray) {
             java.util.ArrayList<io.vertx.core.http.HttpVersion> list =  new java.util.ArrayList<>();
@@ -214,6 +219,9 @@ static void toJson(HttpServerOptions obj, java.util.Map<String, Object> json) {
     if (obj.getInitialSettings() != null) {
       json.put("initialSettings", obj.getInitialSettings().toJson());
     }
+    if (obj.getInitialHttp3Settings() != null) {
+      json.put("initialHttp3Settings", obj.getInitialHttp3Settings().toJson());
+    }
     if (obj.getAlpnVersions() != null) {
       JsonArray array = new JsonArray();
       obj.getAlpnVersions().forEach(item -> array.add(item.name()));

vertx-core/src/main/generated/io/vertx/core/http/HttpSettingsConverter.java

@@ -0,0 +1,27 @@
+package io.vertx.core.http;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Converter and mapper for {@link io.vertx.core.http.HttpSettings}.
+ * NOTE: This class has been automatically generated from the {@link io.vertx.core.http.HttpSettings} original class using Vert.x codegen.
+ */
+public class HttpSettingsConverter {
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpSettings obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+      }
+    }
+  }
+
+   static void toJson(HttpSettings obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(HttpSettings obj, java.util.Map<String, Object> json) {
+  }
+}

vertx-core/src/main/generated/io/vertx/core/http/StreamPriorityBaseConverter.java

@@ -0,0 +1,48 @@
+package io.vertx.core.http;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Converter and mapper for {@link io.vertx.core.http.StreamPriorityBase}.
+ * NOTE: This class has been automatically generated from the {@link io.vertx.core.http.StreamPriorityBase} original class using Vert.x codegen.
+ */
+public class StreamPriorityBaseConverter {
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, StreamPriorityBase obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+        case "weight":
+          if (member.getValue() instanceof Number) {
+            obj.setWeight(((Number)member.getValue()).shortValue());
+          }
+          break;
+        case "dependency":
+          if (member.getValue() instanceof Number) {
+            obj.setDependency(((Number)member.getValue()).intValue());
+          }
+          break;
+        case "exclusive":
+          if (member.getValue() instanceof Boolean) {
+            obj.setExclusive((Boolean)member.getValue());
+          }
+          break;
+        case "incremental":
+          break;
+      }
+    }
+  }
+
+   static void toJson(StreamPriorityBase obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(StreamPriorityBase obj, java.util.Map<String, Object> json) {
+    json.put("weight", obj.getWeight());
+    json.put("dependency", obj.getDependency());
+    json.put("exclusive", obj.isExclusive());
+    json.put("incremental", obj.isIncremental());
+  }
+}

vertx-core/src/main/generated/io/vertx/core/net/ClientOptionsBaseConverter.java

@@ -19,6 +19,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ClientO
             obj.setTrustAll((Boolean)member.getValue());
           }
           break;
+        case "protocolVersion":
+          if (member.getValue() instanceof String) {
+            obj.setProtocolVersion(io.vertx.core.http.HttpVersion.valueOf((String)member.getValue()));
+          }
+          break;
         case "connectTimeout":
           if (member.getValue() instanceof Number) {
             obj.setConnectTimeout(((Number)member.getValue()).intValue());
@@ -59,6 +64,9 @@ static void toJson(ClientOptionsBase obj, JsonObject json) {
 
    static void toJson(ClientOptionsBase obj, java.util.Map<String, Object> json) {
     json.put("trustAll", obj.isTrustAll());
+    if (obj.getProtocolVersion() != null) {
+      json.put("protocolVersion", obj.getProtocolVersion().name());
+    }
     json.put("connectTimeout", obj.getConnectTimeout());
     if (obj.getMetricsName() != null) {
       json.put("metricsName", obj.getMetricsName());

vertx-core/src/main/generated/io/vertx/core/net/ProxyOptionsConverter.java

@@ -39,6 +39,16 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ProxyOp
             obj.setType(io.vertx.core.net.ProxyType.valueOf((String)member.getValue()));
           }
           break;
+        case "connectTimeout":
+          if (member.getValue() instanceof Number) {
+            obj.setConnectTimeout(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "connectTimeoutUnit":
+          if (member.getValue() instanceof String) {
+            obj.setConnectTimeoutUnit(java.util.concurrent.TimeUnit.valueOf((String)member.getValue()));
+          }
+          break;
       }
     }
   }
@@ -61,5 +71,9 @@ static void toJson(ProxyOptions obj, java.util.Map<String, Object> json) {
     if (obj.getType() != null) {
       json.put("type", obj.getType().name());
     }
+    json.put("connectTimeout", obj.getConnectTimeout());
+    if (obj.getConnectTimeoutUnit() != null) {
+      json.put("connectTimeoutUnit", obj.getConnectTimeoutUnit().name());
+    }
   }
 }

vertx-core/src/main/generated/io/vertx/core/net/SSLOptionsConverter.java

@@ -43,6 +43,41 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SSLOpti
             obj.setUseAlpn((Boolean)member.getValue());
           }
           break;
+        case "http3":
+          if (member.getValue() instanceof Boolean) {
+            obj.setHttp3((Boolean)member.getValue());
+          }
+          break;
+        case "http3InitialMaxStreamsBidirectional":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxStreamsBidirectional(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "http3InitialMaxData":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxData(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "http3InitialMaxStreamDataBidirectionalLocal":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxStreamDataBidirectionalLocal(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "http3InitialMaxStreamDataBidirectionalRemote":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxStreamDataBidirectionalRemote(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "http3InitialMaxStreamDataUnidirectional":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxStreamDataUnidirectional(((Number)member.getValue()).longValue());
+          }
+          break;
+        case "http3InitialMaxStreamsUnidirectional":
+          if (member.getValue() instanceof Number) {
+            obj.setHttp3InitialMaxStreamsUnidirectional(((Number)member.getValue()).longValue());
+          }
+          break;
         case "enabledSecureTransportProtocols":
           if (member.getValue() instanceof JsonArray) {
             java.util.LinkedHashSet<java.lang.String> list =  new java.util.LinkedHashSet<>();
@@ -98,6 +133,13 @@ static void toJson(SSLOptions obj, java.util.Map<String, Object> json) {
       json.put("crlValues", array);
     }
     json.put("useAlpn", obj.isUseAlpn());
+    json.put("http3", obj.isHttp3());
+    json.put("http3InitialMaxStreamsBidirectional", obj.getHttp3InitialMaxStreamsBidirectional());
+    json.put("http3InitialMaxData", obj.getHttp3InitialMaxData());
+    json.put("http3InitialMaxStreamDataBidirectionalLocal", obj.getHttp3InitialMaxStreamDataBidirectionalLocal());
+    json.put("http3InitialMaxStreamDataBidirectionalRemote", obj.getHttp3InitialMaxStreamDataBidirectionalRemote());
+    json.put("http3InitialMaxStreamDataUnidirectional", obj.getHttp3InitialMaxStreamDataUnidirectional());
+    json.put("http3InitialMaxStreamsUnidirectional", obj.getHttp3InitialMaxStreamsUnidirectional());
     if (obj.getEnabledSecureTransportProtocols() != null) {
       JsonArray array = new JsonArray();
       obj.getEnabledSecureTransportProtocols().forEach(item -> array.add(item));

vertx-core/src/main/generated/io/vertx/core/net/TCPSSLOptionsConverter.java

@@ -83,6 +83,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, TCPSSLO
             obj.setUseAlpn((Boolean)member.getValue());
           }
           break;
+        case "http3":
+          if (member.getValue() instanceof Boolean) {
+            obj.setHttp3((Boolean)member.getValue());
+          }
+          break;
         case "enabledSecureTransportProtocols":
           if (member.getValue() instanceof JsonArray) {
             java.util.LinkedHashSet<java.lang.String> list =  new java.util.LinkedHashSet<>();
@@ -158,6 +163,7 @@ static void toJson(TCPSSLOptions obj, java.util.Map<String, Object> json) {
       json.put("crlValues", array);
     }
     json.put("useAlpn", obj.isUseAlpn());
+    json.put("http3", obj.isHttp3());
     if (obj.getEnabledSecureTransportProtocols() != null) {
       JsonArray array = new JsonArray();
       obj.getEnabledSecureTransportProtocols().forEach(item -> array.add(item));

vertx-core/src/main/java/examples/HTTP2Examples.java

@@ -220,17 +220,17 @@ public void example19(Vertx vertx, HttpClientOptions options) {
   }
 
   public void example20(HttpConnection connection) {
-    connection.updateSettings(new Http2Settings().setMaxConcurrentStreams(100));
+    connection.updateHttpSettings(new Http2Settings().setMaxConcurrentStreams(100));
   }
 
   public void example21(HttpConnection connection) {
     connection
-      .updateSettings(new Http2Settings().setMaxConcurrentStreams(100))
+      .updateHttpSettings(new Http2Settings().setMaxConcurrentStreams(100))
       .onSuccess(v -> System.out.println("The settings update has been acknowledged "));
   }
 
   public void example22(HttpConnection connection) {
-    connection.remoteSettingsHandler(settings -> {
+    connection.remoteHttpSettingsHandler(settings -> {
       System.out.println("Received new settings");
     });
   }