Absorb CatalogNameModule into CatalogContextModule

There are some places where this binding is used in a different context
than as a way to pass the catalog name to the connector plugin; in those
places the module is inlined, so that we can remove it entirely.

Author: ksobolew

lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemManager.java

@@ -28,7 +28,6 @@
 import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.plugin.base.jmx.ConnectorObjectNameGeneratorModule;
 import io.trino.plugin.base.jmx.MBeanServerModule;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.ConnectorContext;
 import org.weakref.jmx.guice.MBeanModule;
 
@@ -62,10 +61,7 @@ public HdfsFileSystemManager(
         modules.add(new HdfsModule());
         modules.add(new HdfsAuthenticationModule());
         modules.add(new HiveCosModule());
-        modules.add(new ConnectorContextModule(context));
-        modules.add(binder -> {
-            binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-        });
+        modules.add(new ConnectorContextModule(catalogName, context));
 
         if (azureEnabled) {
             modules.add(new HiveAzureModule());

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/CatalogNameModule.java

@@ -23,6 +23,7 @@
 import io.trino.spi.PageIndexerFactory;
 import io.trino.spi.PageSorter;
 import io.trino.spi.VersionEmbedder;
+import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.MetadataProvider;
 import io.trino.spi.type.TypeManager;
@@ -32,16 +33,20 @@
 public class ConnectorContextModule
         implements Module
 {
+    private final String catalogName;
     private final ConnectorContext context;
 
-    public ConnectorContextModule(ConnectorContext context)
+    public ConnectorContextModule(String catalogName, ConnectorContext context)
     {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.context = requireNonNull(context, "context is null");
     }
 
     @Override
     public void configure(Binder binder)
     {
+        binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
+
         binder.bind(OpenTelemetry.class).toInstance(context.getOpenTelemetry());
         binder.bind(Tracer.class).toInstance(context.getTracer());
         binder.bind(Node.class).toInstance(context.getCurrentNode());

lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/ConnectorContextModule.java

@@ -18,8 +18,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
-import io.trino.plugin.base.CatalogNameModule;
 import io.trino.spi.QueryId;
+import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.ConnectorAccessControl;
 import io.trino.spi.connector.ConnectorSecurityContext;
 import io.trino.spi.connector.ConnectorTransactionHandle;
@@ -855,7 +855,7 @@ public void testRefreshing(@TempDir Path tempDir)
 
     protected ConnectorAccessControl createAccessControl(Map<String, String> configProperties)
     {
-        Bootstrap bootstrap = new Bootstrap(new CatalogNameModule("test_catalog"), new FileBasedAccessControlModule());
+        Bootstrap bootstrap = new Bootstrap(binder -> binder.bind(CatalogName.class).toInstance(new CatalogName("test_catalog")), new FileBasedAccessControlModule());
 
         Injector injector = bootstrap
                 .doNotInitializeLogging()

lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/security/BaseFileBasedConnectorAccessControlTest.java

@@ -16,7 +16,6 @@
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
 import io.trino.plugin.base.ConnectorContextModule;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -42,10 +41,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
         Bootstrap app = new Bootstrap(
                 "io.trino.bootstrap.catalog." + catalogName,
                 new AiModule(),
-                new ConnectorContextModule(context),
-                binder -> {
-                    binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-                });
+                new ConnectorContextModule(catalogName, context));
 
         Injector injector = app
                 .doNotInitializeLogging()

plugin/trino-ai-functions/src/main/java/io/trino/plugin/ai/functions/AiConnectorFactory.java

@@ -17,7 +17,6 @@
 import com.google.inject.Module;
 import io.airlift.bootstrap.Bootstrap;
 import io.trino.plugin.base.ConnectorContextModule;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -57,8 +56,7 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
 
         Bootstrap app = new Bootstrap(
                 "io.trino.bootstrap.catalog." + catalogName,
-                new ConnectorContextModule(context),
-                binder -> binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName)),
+                new ConnectorContextModule(catalogName, context),
                 new JdbcModule(),
                 module.get());
 

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/JdbcConnectorFactory.java

@@ -19,7 +19,6 @@
 import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.plugin.base.jmx.ConnectorObjectNameGeneratorModule;
 import io.trino.plugin.base.jmx.MBeanServerModule;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorContext;
 import io.trino.spi.connector.ConnectorFactory;
@@ -53,10 +52,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
                 new MBeanServerModule(),
                 new MBeanModule(),
                 new ConnectorObjectNameGeneratorModule("io.trino.plugin.bigquery", "trino.plugin.bigquery"),
-                new ConnectorContextModule(context),
-                binder -> {
-                    binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-                });
+                new ConnectorContextModule(catalogName, context));
 
         Injector injector = app
                 .doNotInitializeLogging()

plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnectorFactory.java

@@ -45,7 +45,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
 
         Bootstrap app = new Bootstrap(
                 "io.trino.bootstrap.catalog." + catalogName,
-                new ConnectorContextModule(context),
+                new ConnectorContextModule(catalogName, context),
                 new MBeanModule(),
                 new JsonModule(),
                 new CassandraClientModule(context.getTypeManager()),

plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraConnectorFactory.java

@@ -21,7 +21,6 @@
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.json.JsonModule;
 import io.trino.filesystem.manager.FileSystemModule;
-import io.trino.plugin.base.CatalogNameModule;
 import io.trino.plugin.base.ConnectorContextModule;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorAccessControl;
 import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorPageSinkProvider;
@@ -33,7 +32,6 @@
 import io.trino.plugin.base.session.SessionPropertiesProvider;
 import io.trino.plugin.deltalake.metastore.DeltaLakeMetastoreModule;
 import io.trino.plugin.hive.HiveConfig;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.classloader.ThreadContextClassLoader;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -90,16 +88,12 @@ public static Connector createConnector(
                     new ConnectorObjectNameGeneratorModule("io.trino.plugin.deltalake", "trino.plugin.deltalake"),
                     new JsonModule(),
                     new MBeanServerModule(),
-                    new CatalogNameModule(catalogName),
                     metastoreModule.orElse(new DeltaLakeMetastoreModule()),
                     new DeltaLakeModule(),
                     new DeltaLakeSecurityModule(),
                     new DeltaLakeSynchronizerModule(),
                     new FileSystemModule(catalogName, context, false),
-                    new ConnectorContextModule(context),
-                    binder -> {
-                        binder.bind(CatalogName.class).toInstance(new CatalogName(catalogName));
-                    },
+                    new ConnectorContextModule(catalogName, context),
                     module);
 
             Injector injector = app

plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeConnectorFactory.java

@@ -38,7 +38,6 @@
 import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
 import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
 import io.trino.spi.TrinoException;
-import io.trino.spi.catalog.CatalogName;
 import io.trino.spi.connector.Assignment;
 import io.trino.spi.connector.ColumnHandle;
 import io.trino.spi.connector.ColumnMetadata;
@@ -187,10 +186,7 @@ public void setUp()
         Bootstrap app = new Bootstrap(
                 // connector dependencies
                 new JsonModule(),
-                new ConnectorContextModule(context),
-                binder -> {
-                    binder.bind(CatalogName.class).toInstance(new CatalogName("test"));
-                },
+                new ConnectorContextModule("test", context),
                 // connector modules
                 new DeltaLakeSecurityModule(),
                 new DeltaLakeMetastoreModule(),