Update Airlift to 268

core/trino-main/src/main/java/io/trino/server/ServerMainModule.java

@@ -22,7 +22,6 @@
 import com.google.inject.multibindings.ProvidesIntoSet;
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.airlift.http.server.HttpServerConfig;
 import io.airlift.slice.Slice;
 import io.airlift.stats.GcMonitor;
 import io.airlift.stats.JmxGcMonitor;
@@ -206,11 +205,6 @@ protected void setup(Binder binder)
         }
 
         binder.bind(StartupStatus.class).in(Scopes.SINGLETON);
-
-        configBinder(binder).bindConfigDefaults(HttpServerConfig.class, httpServerConfig -> {
-            httpServerConfig.setAdminEnabled(false);
-        });
-
         binder.bind(PreparedStatementEncoder.class).in(Scopes.SINGLETON);
         binder.bind(HttpRequestSessionContextFactory.class).in(Scopes.SINGLETON);
         install(new InternalCommunicationModule());

core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java

@@ -1491,7 +1491,7 @@ private static TestingHttpServer createTestingJwkServer()
         HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
 
-        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet(), ImmutableMap.of());
+        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet());
     }
 
     private static class JwkServlet

core/trino-main/src/test/java/io/trino/server/security/oauth2/TestOidcDiscovery.java

@@ -311,7 +311,7 @@ public MetadataServer(HttpServlet servlet)
             NodeInfo nodeInfo = new NodeInfo("test");
             HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
             HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
-            httpServer = new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet, ImmutableMap.of());
+            httpServer = new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet);
             httpServer.start();
         }
 

core/trino-main/src/test/java/io/trino/server/security/oauth2/TestingHydraIdentityProvider.java

@@ -230,7 +230,7 @@ private TestingHttpServer createTestingLoginAndConsentServer()
                 .setNodeInternalAddress(InetAddresses.toAddrString(InetAddress.getLocalHost())));
         HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
-        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new AcceptAllLoginsAndConsentsServlet(), ImmutableMap.of());
+        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new AcceptAllLoginsAndConsentsServlet());
     }
 
     private class AcceptAllLoginsAndConsentsServlet

core/trino-main/src/test/java/io/trino/server/ui/TestWebUi.java

@@ -1248,7 +1248,7 @@ private static TestingHttpServer createTestingJwkServer()
         HttpServerConfig config = new HttpServerConfig().setHttpPort(0);
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
 
-        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet(), ImmutableMap.of());
+        return new TestingHttpServer(httpServerInfo, nodeInfo, config, new JwkServlet());
     }
 
     private static class JwkServlet

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestingHttpServer.java

@@ -13,14 +13,11 @@
  */
 package io.trino.plugin.base.util;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteSource;
 import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.http.server.HttpServerInfo;
-import io.airlift.http.server.TheServlet;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
 import jakarta.servlet.Servlet;
@@ -33,7 +30,6 @@
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Map;
 
 public class TestingHttpServer
         implements Closeable
@@ -47,8 +43,7 @@ public TestingHttpServer()
                 new TestingNodeModule(),
                 new TestingHttpServerModule(),
                 binder -> {
-                    binder.bind(new TypeLiteral<Map<String, String>>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of());
-                    binder.bind(Servlet.class).annotatedWith(TheServlet.class).toInstance(new TestingHttpServlet());
+                    binder.bind(Servlet.class).toInstance(new TestingHttpServlet());
                 });
 
         Injector injector = app

plugin/trino-example-http/src/test/java/io/trino/plugin/example/ExampleHttpServer.java

@@ -13,15 +13,12 @@
  */
 package io.trino.plugin.example;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.http.server.TheServlet;
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
@@ -33,7 +30,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
-import java.util.Map;
 
 public class ExampleHttpServer
 {
@@ -71,8 +67,7 @@ private static class ExampleHttpServerModule
         @Override
         public void configure(Binder binder)
         {
-            binder.bind(new TypeLiteral<Map<String, String>>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of());
-            binder.bind(Servlet.class).annotatedWith(TheServlet.class).toInstance(new ExampleHttpServlet());
+            binder.bind(Servlet.class).toInstance(new ExampleHttpServlet());
         }
     }
 

plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/thrift/TestingThriftHttpMetastoreServer.java

@@ -13,13 +13,10 @@
  */
 package io.trino.plugin.hive.metastore.thrift;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.inject.Injector;
-import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.http.server.HttpServerInfo;
-import io.airlift.http.server.TheServlet;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
 import io.trino.hive.thrift.metastore.Database;
@@ -37,7 +34,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
-import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -59,8 +55,7 @@ public TestingThriftHttpMetastoreServer(ThriftMetastore delegate, Consumer<HttpS
                 new TestingNodeModule(),
                 new TestingHttpServerModule(),
                 binder -> {
-                    binder.bind(new TypeLiteral<Map<String, String>>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of());
-                    binder.bind(Servlet.class).annotatedWith(TheServlet.class).toInstance(thriftHttpServlet);
+                    binder.bind(Servlet.class).toInstance(thriftHttpServlet);
                 });
 
         Injector injector = app

plugin/trino-iceberg/src/test/java/org/apache/iceberg/rest/DelegatingRestSessionCatalog.java

@@ -13,7 +13,6 @@
  */
 package org.apache.iceberg.rest;
 
-import com.google.common.collect.ImmutableMap;
 import io.airlift.http.server.HttpServerConfig;
 import io.airlift.http.server.HttpServerInfo;
 import io.airlift.http.server.testing.TestingHttpServer;
@@ -67,7 +66,7 @@ public TestingHttpServer testServer()
         HttpServerInfo httpServerInfo = new HttpServerInfo(config, nodeInfo);
         RestCatalogServlet servlet = new RestCatalogServlet(adapter);
 
-        return new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet, ImmutableMap.of());
+        return new TestingHttpServer(httpServerInfo, nodeInfo, config, servlet);
     }
 
     public static Builder builder()

plugin/trino-prometheus/src/test/java/io/trino/plugin/prometheus/PrometheusHttpServer.java

@@ -13,15 +13,12 @@
  */
 package io.trino.plugin.prometheus;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
-import io.airlift.http.server.TheServlet;
 import io.airlift.http.server.testing.TestingHttpServer;
 import io.airlift.http.server.testing.TestingHttpServerModule;
 import io.airlift.node.testing.TestingNodeModule;
@@ -33,7 +30,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
-import java.util.Map;
 
 import static io.trino.plugin.prometheus.PrometheusClient.METRICS_ENDPOINT;
 
@@ -73,8 +69,7 @@ private static class PrometheusHttpServerModule
         @Override
         public void configure(Binder binder)
         {
-            binder.bind(new TypeLiteral<Map<String, String>>() {}).annotatedWith(TheServlet.class).toInstance(ImmutableMap.of());
-            binder.bind(Servlet.class).annotatedWith(TheServlet.class).toInstance(new PrometheusHttpServlet());
+            binder.bind(Servlet.class).toInstance(new PrometheusHttpServlet());
         }
     }
 

pom.xml

@@ -184,7 +184,7 @@
         <!-- keep dependency properties sorted -->
         <dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
         <dep.accumulo.version>3.0.0</dep.accumulo.version>
-        <dep.airlift.version>267</dep.airlift.version>
+        <dep.airlift.version>268</dep.airlift.version>
         <dep.alluxio.version>2.9.6</dep.alluxio.version>
         <dep.antlr.version>4.13.2</dep.antlr.version>
         <dep.avro.version>1.12.0</dep.avro.version>

service/trino-proxy/src/main/java/io/trino/proxy/ProxyModule.java

@@ -16,7 +16,6 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
-import io.airlift.http.server.HttpServerConfig;
 
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.http.client.HttpClientBinder.httpClientBinder;
@@ -28,10 +27,6 @@ public class ProxyModule
     @Override
     public void configure(Binder binder)
     {
-        configBinder(binder).bindConfigDefaults(HttpServerConfig.class, httpServerConfig -> {
-            httpServerConfig.setAdminEnabled(false);
-        });
-
         httpClientBinder(binder).bindHttpClient("proxy", ForProxy.class);
 
         configBinder(binder).bindConfig(ProxyConfig.class);