(iceberg) branch main updated: AWS, Core: Slim down Jetty config for tests (#10945)

[amoghj]

This is an automated email from the ASF dual-hosted git repository.

amoghj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 9f12cf91dc AWS, Core: Slim down Jetty config for tests (#10945)
9f12cf91dc is described below

commit 9f12cf91dce532b68ce542379647bdc24cd94d07
Author: Eduard Tudenhoefner <etudenhoef...@gmail.com>
AuthorDate: Thu Aug 15 22:40:43 2024 +0200

    AWS, Core: Slim down Jetty config for tests (#10945)
---
 .../java/org/apache/iceberg/aws/s3/signer/TestS3RestSigner.java  | 8 ++------
 core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java  | 9 ++-------
 .../test/java/org/apache/iceberg/rest/TestRESTViewCatalog.java   | 8 ++------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git 
a/aws/src/test/java/org/apache/iceberg/aws/s3/signer/TestS3RestSigner.java 
b/aws/src/test/java/org/apache/iceberg/aws/s3/signer/TestS3RestSigner.java
index 08f356ca7a..f2a70aee29 100644
--- a/aws/src/test/java/org/apache/iceberg/aws/s3/signer/TestS3RestSigner.java
+++ b/aws/src/test/java/org/apache/iceberg/aws/s3/signer/TestS3RestSigner.java
@@ -171,12 +171,8 @@ public class TestS3RestSigner {
         new S3SignerServlet(S3ObjectMapper.mapper(), 
ImmutableList.of(deleteObjectsWithBody));
     ServletContextHandler servletContext =
         new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-    servletContext.setContextPath("/");
-    ServletHolder servletHolder = new ServletHolder(servlet);
-    servletHolder.setInitParameter("javax.ws.rs.Application", 
"ServiceListPublic");
-    servletContext.addServlet(servletHolder, "/*");
-    servletContext.setVirtualHosts(null);
-    servletContext.setGzipHandler(new GzipHandler());
+    servletContext.addServlet(new ServletHolder(servlet), "/*");
+    servletContext.setHandler(new GzipHandler());
 
     Server server = new Server(0);
     server.setHandler(servletContext);
diff --git a/core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java 
b/core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java
index ced15b8651..1c15cfab43 100644
--- a/core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java
+++ b/core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java
@@ -155,15 +155,10 @@ public class TestRESTCatalog extends 
CatalogTests<RESTCatalog> {
           }
         };
 
-    RESTCatalogServlet servlet = new RESTCatalogServlet(adaptor);
     ServletContextHandler servletContext =
         new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-    servletContext.setContextPath("/");
-    ServletHolder servletHolder = new ServletHolder(servlet);
-    servletHolder.setInitParameter("javax.ws.rs.Application", 
"ServiceListPublic");
-    servletContext.addServlet(servletHolder, "/*");
-    servletContext.setVirtualHosts(null);
-    servletContext.setGzipHandler(new GzipHandler());
+    servletContext.addServlet(new ServletHolder(new 
RESTCatalogServlet(adaptor)), "/*");
+    servletContext.setHandler(new GzipHandler());
 
     this.httpServer = new Server(0);
     httpServer.setHandler(servletContext);
diff --git 
a/core/src/test/java/org/apache/iceberg/rest/TestRESTViewCatalog.java 
b/core/src/test/java/org/apache/iceberg/rest/TestRESTViewCatalog.java
index f67c4b078e..db0969620d 100644
--- a/core/src/test/java/org/apache/iceberg/rest/TestRESTViewCatalog.java
+++ b/core/src/test/java/org/apache/iceberg/rest/TestRESTViewCatalog.java
@@ -92,15 +92,11 @@ public class TestRESTViewCatalog extends 
ViewCatalogTests<RESTCatalog> {
           }
         };
 
-    RESTCatalogServlet servlet = new RESTCatalogServlet(adaptor);
     ServletContextHandler servletContext =
         new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
     servletContext.setContextPath("/");
-    ServletHolder servletHolder = new ServletHolder(servlet);
-    servletHolder.setInitParameter("javax.ws.rs.Application", 
"ServiceListPublic");
-    servletContext.addServlet(servletHolder, "/*");
-    servletContext.setVirtualHosts(null);
-    servletContext.setGzipHandler(new GzipHandler());
+    servletContext.addServlet(new ServletHolder(new 
RESTCatalogServlet(adaptor)), "/*");
+    servletContext.setHandler(new GzipHandler());
 
     this.httpServer = new Server(0);
     httpServer.setHandler(servletContext);