diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml
index 66445b698a25c..59a435bbff114 100644
--- a/presto-iceberg/pom.xml
+++ b/presto-iceberg/pom.xml
@@ -14,8 +14,8 @@
${project.parent.basedir}
17
- 1.6.1
- 0.95.0
+ 1.8.1
+ 0.103.0
true
@@ -613,7 +613,7 @@
org.apache.httpcomponents.core5
httpcore5
- 5.2.4
+ 5.3.1
diff --git a/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java b/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java
index 588f556065616..0fca1ffae07aa 100644
--- a/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java
+++ b/presto-iceberg/src/test/java/org/apache/iceberg/rest/IcebergRestCatalogServlet.java
@@ -25,7 +25,7 @@
import org.apache.iceberg.exceptions.RESTException;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.io.CharStreams;
-import org.apache.iceberg.rest.RESTCatalogAdapter.HTTPMethod;
+import org.apache.iceberg.rest.HTTPRequest.HTTPMethod;
import org.apache.iceberg.rest.RESTCatalogAdapter.Route;
import org.apache.iceberg.rest.responses.ErrorResponse;
import org.apache.iceberg.util.Pair;
@@ -111,15 +111,18 @@ protected void execute(ServletRequestContext context, HttpServletResponse respon
}
try {
+ HTTPRequest request = restCatalogAdapter.buildRequest(
+ context.method(),
+ context.path(),
+ context.queryParams(),
+ context.headers(),
+ context.body());
Object responseBody =
restCatalogAdapter.execute(
- context.method(),
- context.path(),
- context.queryParams(),
- context.body(),
+ request,
context.route().responseClass(),
- context.headers(),
- handle(response));
+ handleResponseError(response),
+ handleResponseHeader(response));
if (responseBody != null) {
RESTObjectMapper.mapper().writeValue(response.getWriter(), responseBody);
@@ -143,7 +146,15 @@ protected void execute(ServletRequestContext context, HttpServletResponse respon
}
}
- protected Consumer handle(HttpServletResponse response)
+ private Consumer