Update dependencies

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>147</version>
+        <version>148</version>
     </parent>
 
     <groupId>pl.net.was</groupId>
@@ -47,22 +47,22 @@
         <air.check.fail-checkstyle>true</air.check.fail-checkstyle>
         <air.check.skip-checkstyle>false</air.check.skip-checkstyle>
 
-        <dep.trino.version>433</dep.trino.version>
-        <dep.airlift.version>237</dep.airlift.version>
+        <dep.trino.version>434</dep.trino.version>
+        <dep.airlift.version>239</dep.airlift.version>
         <dep.slice.version>2.2</dep.slice.version>
-        <dep.opentelemetry.version>1.31.0</dep.opentelemetry.version>
-        <dep.opentelemetry-instrumentation.version>1.31.0</dep.opentelemetry-instrumentation.version>
+        <dep.opentelemetry.version>1.32.0</dep.opentelemetry.version>
+        <dep.opentelemetry-instrumentation.version>1.32.0</dep.opentelemetry-instrumentation.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
         <dep.guava.version>32.1.3-jre</dep.guava.version>
         <dep.guice.version>7.0.0</dep.guice.version>
         <dep.errorprone.version>2.23.0</dep.errorprone.version>
-        <dep.jackson.version>2.15.3</dep.jackson.version>
+        <dep.jackson.version>2.16.0</dep.jackson.version>
         <dep.testng.version>7.8.0</dep.testng.version>
         <dep.joda.version>2.12.5</dep.joda.version>
         <dep.junit.version>5.10.1</dep.junit.version>
         <dep.slf4j.version>2.0.9</dep.slf4j.version>
         <dep.assertj-core.version>3.24.2</dep.assertj-core.version>
-        <dep.logback.version>1.4.11</dep.logback.version>
+        <dep.logback.version>1.4.14</dep.logback.version>
         <dep.plugin.surefire.version>3.1.2</dep.plugin.surefire.version>
 
         <air.javadoc.lint>-missing</air.javadoc.lint>
@@ -81,7 +81,7 @@
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-bom</artifactId>
-                <version>1.9.20</version>
+                <version>1.9.21</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/pl/net/was/trino/git/GitConnector.java

@@ -18,6 +18,7 @@
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorRecordSetProvider;
+import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorSplitManager;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.transaction.IsolationLevel;
@@ -47,13 +48,13 @@ public GitConnector(
     }
 
     @Override
-    public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly)
+    public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {
         return INSTANCE;
     }
 
     @Override
-    public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandle)
+    public ConnectorMetadata getMetadata(ConnectorSession session, ConnectorTransactionHandle transactionHandle)
     {
         return metadata;
     }

src/main/java/pl/net/was/trino/git/GitConnectorFactory.java

@@ -42,15 +42,13 @@ public Connector create(String catalogName, Map<String, String> requiredConfig,
             // A plugin is not required to use Guice; it is just very convenient
             Bootstrap app = new Bootstrap(
                     new JsonModule(),
-                    new GitModule(context.getTypeManager()));
+                    new GitModule(catalogName, context.getTypeManager()));
 
             Injector injector = app
                     .doNotInitializeLogging()
                     .setRequiredConfigurationProperties(requiredConfig)
                     .initialize();
-            GitConnector connector = injector.getInstance(GitConnector.class);
-            ((GitMetadata) connector.getMetadata(null)).setCatalogName(catalogName);
-            return connector;
+            return injector.getInstance(GitConnector.class);
         }
         catch (Exception e) {
             throwIfUnchecked(e);

src/main/java/pl/net/was/trino/git/GitMetadata.java

@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.inject.BindingAnnotation;
 import com.google.inject.Inject;
 import io.airlift.slice.Slice;
 import io.trino.spi.connector.ColumnHandle;
@@ -43,6 +44,10 @@
 import io.trino.spi.statistics.Estimate;
 import io.trino.spi.statistics.TableStatistics;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,11 +66,17 @@ public class GitMetadata
     private String catalogName;
 
     @Inject
-    public GitMetadata(GitClient gitClient)
+    public GitMetadata(@CatalogName String catalogName, GitClient gitClient)
     {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.gitClient = requireNonNull(gitClient, "client is null");
     }
 
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ElementType.FIELD, ElementType.PARAMETER})
+    @BindingAnnotation
+    public @interface CatalogName {}
+
     @Override
     public List<String> listSchemaNames(ConnectorSession session)
     {
@@ -208,11 +219,6 @@ public Optional<ConnectorViewDefinition> getView(ConnectorSession session, Schem
         return Optional.ofNullable(gitClient.getView(catalogName, viewName.getSchemaName(), viewName.getTableName()));
     }
 
-    public void setCatalogName(String catalogName)
-    {
-        this.catalogName = catalogName;
-    }
-
     @Override
     public TableStatistics getTableStatistics(ConnectorSession session, ConnectorTableHandle tableHandle)
     {

src/main/java/pl/net/was/trino/git/GitModule.java

@@ -32,17 +32,20 @@
 public class GitModule
         implements Module
 {
+    private final String catalogName;
     private final TypeManager typeManager;
 
     @Inject
-    public GitModule(TypeManager typeManager)
+    public GitModule(String catalogName, TypeManager typeManager)
     {
+        this.catalogName = requireNonNull(catalogName, "catalogName is null");
         this.typeManager = requireNonNull(typeManager, "typeManager is null");
     }
 
     @Override
     public void configure(Binder binder)
     {
+        binder.bindConstant().annotatedWith(GitMetadata.CatalogName.class).to(catalogName);
         binder.bind(TypeManager.class).toInstance(typeManager);
 
         binder.bind(GitConnector.class).in(Scopes.SINGLETON);

src/test/java/pl/net/was/trino/git/TestGitMetadata.java

@@ -59,7 +59,7 @@ public void setUp()
         GitConfig config = new GitConfig();
         config.setUri(new URI(url));
         GitClient client = new GitClient(config);
-        metadata = new GitMetadata(client);
+        metadata = new GitMetadata("test", client);
     }
 
     @Test