diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 2b84b7ca7092f..2cf3707db6f21 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -27,7 +27,7 @@
1.19.0
1.19.0-alpha
1.8.1
- 4.1.9
+ 4.2.1
1.10.1
2.1.12
0.22.0
@@ -51,7 +51,7 @@
1.2.2
1.0.13
2.7.0
- 2.27.0
+ 2.28.0
3.22.0
1.3.0
1.2.1
@@ -110,7 +110,7 @@
1.0.1.Final
1.20.1.Final
3.4.3.Final
- 4.3.4
+ 4.3.5
4.5.13
4.4.15
@@ -134,7 +134,7 @@
14.0.1.Final
4.5.0.Final
3.1.1
- 4.1.82.Final
+ 4.1.85.Final
1.8.0
1.0.3
3.5.0.Final
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AbstractRequestWrapper.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AbstractRequestWrapper.java
deleted file mode 100644
index a88ae3ecc0c68..0000000000000
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AbstractRequestWrapper.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package io.quarkus.vertx.http.runtime;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
-import javax.security.cert.X509Certificate;
-
-import io.netty.handler.codec.DecoderResult;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Context;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.MultiMap;
-import io.vertx.core.buffer.Buffer;
-import io.vertx.core.http.Cookie;
-import io.vertx.core.http.HttpConnection;
-import io.vertx.core.http.HttpFrame;
-import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.HttpServerFileUpload;
-import io.vertx.core.http.HttpServerRequest;
-import io.vertx.core.http.HttpServerResponse;
-import io.vertx.core.http.HttpVersion;
-import io.vertx.core.http.ServerWebSocket;
-import io.vertx.core.http.StreamPriority;
-import io.vertx.core.http.impl.HttpServerRequestInternal;
-import io.vertx.core.net.NetSocket;
-import io.vertx.core.net.SocketAddress;
-
-public abstract class AbstractRequestWrapper
- implements HttpServerRequest, HttpServerRequestInternal {
-
- protected final HttpServerRequest delegate;
-
- protected AbstractRequestWrapper(HttpServerRequest request) {
- delegate = request;
- }
-
- @Override
- public long bytesRead() {
- return delegate.bytesRead();
- }
-
- @Override
- public HttpServerRequest exceptionHandler(Handler handler) {
- delegate.exceptionHandler(handler);
- return this;
- }
-
- @Override
- public HttpServerRequest handler(Handler handler) {
- delegate.handler(handler);
- return this;
- }
-
- @Override
- public HttpServerRequest pause() {
- delegate.pause();
- return this;
- }
-
- @Override
- public HttpServerRequest resume() {
- delegate.resume();
- return this;
- }
-
- @Override
- public HttpServerRequest fetch(long amount) {
- delegate.fetch(amount);
- return this;
- }
-
- @Override
- public HttpServerRequest endHandler(Handler handler) {
- delegate.endHandler(handler);
- return this;
- }
-
- @Override
- public HttpVersion version() {
- return delegate.version();
- }
-
- @Override
- public HttpMethod method() {
- return delegate.method();
- }
-
- @Override
- public String uri() {
- return delegate.uri();
- }
-
- @Override
- public String path() {
- return delegate.path();
- }
-
- @Override
- public String query() {
- return delegate.query();
- }
-
- @Override
- public HttpServerResponse response() {
- return delegate.response();
- }
-
- @Override
- public MultiMap headers() {
- return delegate.headers();
- }
-
- @Override
- public String getHeader(String s) {
- return delegate.getHeader(s);
- }
-
- @Override
- public String getHeader(CharSequence charSequence) {
- return delegate.getHeader(charSequence);
- }
-
- @Override
- public MultiMap params() {
- return delegate.params();
- }
-
- @Override
- public String getParam(String s) {
- return delegate.getParam(s);
- }
-
- @Override
- public SocketAddress remoteAddress() {
- return delegate.remoteAddress();
- }
-
- @Override
- public SocketAddress localAddress() {
- return delegate.localAddress();
- }
-
- @Override
- @Deprecated
- public X509Certificate[] peerCertificateChain() throws SSLPeerUnverifiedException {
- return delegate.peerCertificateChain();
- }
-
- @Override
- public SSLSession sslSession() {
- return delegate.sslSession();
- }
-
- @Override
- public String absoluteURI() {
- return delegate.absoluteURI();
- }
-
- @Override
- public String scheme() {
- return delegate.scheme();
- }
-
- @Override
- public String host() {
- return delegate.host();
- }
-
- @Override
- public HttpServerRequest customFrameHandler(Handler handler) {
- delegate.customFrameHandler(handler);
- return this;
- }
-
- @Override
- public HttpConnection connection() {
- return delegate.connection();
- }
-
- @Override
- public HttpServerRequest bodyHandler(Handler handler) {
- delegate.bodyHandler(handler);
- return this;
- }
-
- @Override
- public HttpServerRequest setExpectMultipart(boolean b) {
- delegate.setExpectMultipart(b);
- return this;
- }
-
- @Override
- public boolean isExpectMultipart() {
- return delegate.isExpectMultipart();
- }
-
- @Override
- public HttpServerRequest uploadHandler(Handler handler) {
- delegate.uploadHandler(handler);
- return this;
- }
-
- @Override
- public MultiMap formAttributes() {
- return delegate.formAttributes();
- }
-
- @Override
- public String getFormAttribute(String s) {
- return delegate.getFormAttribute(s);
- }
-
- @Override
- public boolean isEnded() {
- return delegate.isEnded();
- }
-
- @Override
- public boolean isSSL() {
- return delegate.isSSL();
- }
-
- @Override
- public HttpServerRequest streamPriorityHandler(Handler handler) {
- delegate.streamPriorityHandler(handler);
- return this;
- }
-
- @Override
- public StreamPriority streamPriority() {
- return delegate.streamPriority();
- }
-
- @Override
- public Cookie getCookie(String name) {
- return delegate.getCookie(name);
- }
-
- @Override
- public int cookieCount() {
- return delegate.cookieCount();
- }
-
- @Override
- @Deprecated
- public Map cookieMap() {
- return delegate.cookieMap();
- }
-
- @Override
- public String getParam(String paramName, String defaultValue) {
- return delegate.getParam(paramName, defaultValue);
- }
-
- @Override
- public int streamId() {
- return delegate.streamId();
- }
-
- @Override
- public Cookie getCookie(String name, String domain, String path) {
- return delegate.getCookie(name, domain, path);
- }
-
- @Override
- public Set cookies(String name) {
- return delegate.cookies(name);
- }
-
- @Override
- public Set cookies() {
- return delegate.cookies();
- }
-
- @Override
- public HttpServerRequest body(Handler> handler) {
- return delegate.body(handler);
- }
-
- @Override
- public void end(Handler> handler) {
- delegate.end(handler);
- }
-
- @Override
- public void toNetSocket(Handler> handler) {
- delegate.toNetSocket(handler);
- }
-
- @Override
- public void toWebSocket(Handler> handler) {
- delegate.toWebSocket(handler);
- }
-
- @Override
- public HttpServerRequest routed(String route) {
- return delegate.routed(route);
- }
-
- @Override
- public Future body() {
- return delegate.body();
- }
-
- @Override
- public Future end() {
- return delegate.end();
- }
-
- @Override
- public Future toNetSocket() {
- return delegate.toNetSocket();
- }
-
- @Override
- public Future toWebSocket() {
- return delegate.toWebSocket();
- }
-
- @Override
- public Context context() {
- return ((HttpServerRequestInternal) delegate).context();
- }
-
- @Override
- public Object metric() {
- return ((HttpServerRequestInternal) delegate).metric();
- }
-
- @Override
- public DecoderResult decoderResult() {
- return delegate.decoderResult();
- }
-
- @Override
- public HttpServerRequest setParamsCharset(String charset) {
- delegate.setParamsCharset(charset);
- return this;
- }
-
- @Override
- public String getParamsCharset() {
- return delegate.getParamsCharset();
- }
-}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedServerRequestWrapper.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedServerRequestWrapper.java
index 9458c19dd8e41..be66878e384a1 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedServerRequestWrapper.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedServerRequestWrapper.java
@@ -25,12 +25,11 @@
import io.vertx.core.http.ServerWebSocket;
import io.vertx.core.http.StreamPriority;
import io.vertx.core.http.impl.HttpServerRequestInternal;
+import io.vertx.core.http.impl.HttpServerRequestWrapper;
import io.vertx.core.net.NetSocket;
import io.vertx.core.net.SocketAddress;
-class ForwardedServerRequestWrapper implements HttpServerRequest, HttpServerRequestInternal {
-
- private final HttpServerRequestInternal delegate;
+class ForwardedServerRequestWrapper extends HttpServerRequestWrapper implements HttpServerRequest {
private final ForwardedParser forwardedParser;
private boolean modified;
@@ -42,7 +41,7 @@ class ForwardedServerRequestWrapper implements HttpServerRequest, HttpServerRequ
private String absoluteURI;
ForwardedServerRequestWrapper(HttpServerRequest request, ForwardingProxyOptions forwardingProxyOptions) {
- delegate = (HttpServerRequestInternal) request;
+ super((HttpServerRequestInternal) request);
forwardedParser = new ForwardedParser(delegate, forwardingProxyOptions);
}
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ResumingRequestWrapper.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ResumingRequestWrapper.java
index 95bdc6ef09b40..f30dbe982d058 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ResumingRequestWrapper.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ResumingRequestWrapper.java
@@ -4,13 +4,15 @@
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpServerFileUpload;
import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.impl.HttpServerRequestInternal;
+import io.vertx.core.http.impl.HttpServerRequestWrapper;
-class ResumingRequestWrapper extends AbstractRequestWrapper {
+class ResumingRequestWrapper extends HttpServerRequestWrapper {
private boolean userSetState;
ResumingRequestWrapper(HttpServerRequest request) {
- super(request);
+ super((HttpServerRequestInternal) request);
}
@Override
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/QuarkusRequestWrapper.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/QuarkusRequestWrapper.java
index 8ec30b3390928..515fa0ab5818f 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/QuarkusRequestWrapper.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/filters/QuarkusRequestWrapper.java
@@ -9,14 +9,15 @@
import org.jboss.logging.Logger;
-import io.quarkus.vertx.http.runtime.AbstractRequestWrapper;
import io.vertx.core.Handler;
import io.vertx.core.http.Cookie;
import io.vertx.core.http.CookieSameSite;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.http.impl.HttpServerRequestInternal;
+import io.vertx.core.http.impl.HttpServerRequestWrapper;
-public class QuarkusRequestWrapper extends AbstractRequestWrapper {
+public class QuarkusRequestWrapper extends HttpServerRequestWrapper {
/**
* Huge hack, to work around the fact that there is no way to directly access this class once it is wrapped,
@@ -37,7 +38,7 @@ public class QuarkusRequestWrapper extends AbstractRequestWrapper {
private final BiConsumer cookieConsumer;
public QuarkusRequestWrapper(HttpServerRequest event, BiConsumer cookieConsumer) {
- super(event);
+ super((HttpServerRequestInternal) event);
this.cookieConsumer = cookieConsumer;
this.response = new ResponseWrapper(delegate.response(), event);
event.exceptionHandler(new Handler() {
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 5d7b152defe7f..5d026f7e7cc5d 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -57,7 +57,7 @@
1.1.6
1.8.0
1.13.2
- 4.3.4
+ 4.3.5
4.5.1
1.0.0.Final
2.0.0.Final
diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml
index 2de6593d6f117..d56ecf6c40460 100644
--- a/jakarta/rewrite.yml
+++ b/jakarta/rewrite.yml
@@ -132,7 +132,7 @@ recipeList:
newValue: 6.0.0
- org.openrewrite.maven.ChangePropertyValue:
key: quarkus-http.version
- newValue: 5.0.0.Alpha2
+ newValue: 5.0.0.Alpha3
# Transaction
- org.openrewrite.maven.ChangePropertyValue:
key: version.jta