Remove unnecessary explicit handle declaration

core/trino-main/src/main/java/io/trino/connector/system/GlobalSystemConnector.java

@@ -40,17 +40,6 @@ public GlobalSystemConnector(Set<SystemTable> systemTables, Set<Procedure> proce
         this.procedures = ImmutableSet.copyOf(requireNonNull(procedures, "procedures is null"));
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(SystemTableHandle.class)
-                .add(SystemColumnHandle.class)
-                .add(SystemSplit.class)
-                .add(GlobalSystemTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(TransactionId transactionId, IsolationLevel isolationLevel, boolean readOnly)
     {

core/trino-main/src/main/java/io/trino/metadata/HandleResolver.java

@@ -65,14 +65,11 @@ public Class<?> getHandleClass(String id)
         checkArgument(classLoader != null, "Unknown handle id: %s", id);
 
         try {
-            Class<?> handleClass = classLoader.loadClass(className);
-            if (handleClass != null) {
-                return handleClass;
-            }
+            return classLoader.loadClass(className);
         }
         catch (ClassNotFoundException ignored) {
+            throw new IllegalArgumentException("Handle ID not found: " + id);
         }
-        throw new IllegalArgumentException("Handle ID not found: " + id);
     }
 
     private static String classId(Class<?> handleClass)

core/trino-main/src/test/java/io/trino/connector/MockConnector.java

@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.slice.Slice;
 import io.trino.spi.HostAddress;
 import io.trino.spi.Page;
@@ -190,19 +189,6 @@ public class MockConnector
         this.tableProperties = requireNonNull(tableProperties, "tableProperties is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(MockConnectorTableHandle.class)
-                .add(MockConnectorColumnHandle.class)
-                .add(MockConnectorSplit.class)
-                .add(MockConnectorOutputTableHandle.class)
-                .add(MockConnectorInsertTableHandle.class)
-                .add(MockConnectorTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

core/trino-spi/src/main/java/io/trino/spi/connector/Connector.java

@@ -19,32 +19,13 @@
 import io.trino.spi.transaction.IsolationLevel;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
 
 public interface Connector
 {
-    /**
-     * @deprecated use {@link #getHandleClasses()}
-     */
-    @Deprecated
-    default Optional<ConnectorHandleResolver> getHandleResolver()
-    {
-        return Optional.empty();
-    }
-
-    /**
-     * Get all handle classes implemented by the connector.
-     * Every handle returned to the engine must be included.
-     */
-    default Set<Class<?>> getHandleClasses()
-    {
-        return emptySet();
-    }
-
     /**
      * @deprecated use {@link #beginTransaction(IsolationLevel, boolean, boolean)}
      */

core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorFactory.java

@@ -19,14 +19,5 @@ public interface ConnectorFactory
 {
     String getName();
 
-    /**
-     * @deprecated use {@link Connector#getHandleClasses()}
-     */
-    @Deprecated
-    default ConnectorHandleResolver getHandleResolver()
-    {
-        throw new UnsupportedOperationException();
-    }
-
     Connector create(String catalogName, Map<String, String> config, ConnectorContext context);
 }

plugin/trino-accumulo/src/main/java/io/trino/plugin/accumulo/AccumuloConnector.java

@@ -13,15 +13,11 @@
  */
 package io.trino.plugin.accumulo;
 
-import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.plugin.accumulo.conf.AccumuloSessionProperties;
 import io.trino.plugin.accumulo.conf.AccumuloTableProperties;
 import io.trino.plugin.accumulo.io.AccumuloPageSinkProvider;
 import io.trino.plugin.accumulo.io.AccumuloRecordSetProvider;
-import io.trino.plugin.accumulo.model.AccumuloColumnHandle;
-import io.trino.plugin.accumulo.model.AccumuloSplit;
-import io.trino.plugin.accumulo.model.AccumuloTableHandle;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
@@ -34,7 +30,6 @@
 import javax.inject.Inject;
 
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -78,17 +73,6 @@ public AccumuloConnector(
         this.tableProperties = requireNonNull(tableProperties, "tableProperties is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(AccumuloTableHandle.class)
-                .add(AccumuloColumnHandle.class)
-                .add(AccumuloSplit.class)
-                .add(AccumuloTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorMetadata getMetadata(ConnectorTransactionHandle transactionHandle)
     {

plugin/trino-atop/src/main/java/io/trino/plugin/atop/AtopConnector.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.atop;
 
-import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorAccessControl;
@@ -26,7 +25,6 @@
 import javax.inject.Inject;
 
 import java.util.Optional;
-import java.util.Set;
 
 import static java.util.Objects.requireNonNull;
 
@@ -54,17 +52,6 @@ public AtopConnector(
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(AtopTableHandle.class)
-                .add(AtopColumnHandle.class)
-                .add(AtopSplit.class)
-                .add(AtopTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

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

@@ -87,18 +87,6 @@ public JdbcConnector(
                 .collect(toImmutableList());
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(JdbcTableHandle.class)
-                .add(JdbcColumnHandle.class)
-                .add(JdbcSplit.class)
-                .add(JdbcOutputTableHandle.class)
-                .add(JdbcTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

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

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.bigquery;
 
-import com.google.common.collect.ImmutableSet;
 import io.airlift.log.Logger;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -24,8 +23,6 @@
 
 import javax.inject.Inject;
 
-import java.util.Set;
-
 import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
@@ -50,17 +47,6 @@ public BigQueryConnector(
         this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(BigQueryTableHandle.class)
-                .add(BigQueryColumnHandle.class)
-                .add(BigQuerySplit.class)
-                .add(BigQueryTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

plugin/trino-blackhole/src/main/java/io/trino/plugin/blackhole/BlackHoleConnector.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.blackhole;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -29,7 +28,6 @@
 import io.trino.spi.type.TypeSignatureParameter;
 
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 import static io.trino.plugin.base.session.PropertyMetadataUtil.durationProperty;
@@ -76,20 +74,6 @@ public BlackHoleConnector(
         this.executorService = executorService;
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(BlackHoleTableHandle.class)
-                .add(BlackHoleColumnHandle.class)
-                .add(BlackHoleSplit.class)
-                .add(BlackHoleOutputTableHandle.class)
-                .add(BlackHoleInsertTableHandle.class)
-                .add(BlackHolePartitioningHandle.class)
-                .add(BlackHoleTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

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

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.cassandra;
 
-import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -27,7 +26,6 @@
 import javax.inject.Inject;
 
 import java.util.List;
-import java.util.Set;
 
 import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
 import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
@@ -60,19 +58,6 @@ public CassandraConnector(
         this.sessionProperties = requireNonNull(sessionProperties.getSessionProperties(), "sessionProperties is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(CassandraTableHandle.class)
-                .add(CassandraColumnHandle.class)
-                .add(CassandraSplit.class)
-                .add(CassandraOutputTableHandle.class)
-                .add(CassandraInsertTableHandle.class)
-                .add(CassandraTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchConnector.java

@@ -55,17 +55,6 @@ public ElasticsearchConnector(
         this.nodesSystemTable = requireNonNull(nodesSystemTable, "nodesSystemTable is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(ElasticsearchTableHandle.class)
-                .add(ElasticsearchColumnHandle.class)
-                .add(ElasticsearchSplit.class)
-                .add(ElasticsearchTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {

plugin/trino-example-http/src/main/java/io/trino/plugin/example/ExampleConnector.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.example;
 
-import com.google.common.collect.ImmutableSet;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.trino.spi.connector.Connector;
 import io.trino.spi.connector.ConnectorMetadata;
@@ -24,8 +23,6 @@
 
 import javax.inject.Inject;
 
-import java.util.Set;
-
 import static io.trino.plugin.example.ExampleTransactionHandle.INSTANCE;
 import static java.util.Objects.requireNonNull;
 
@@ -50,17 +47,6 @@ public ExampleConnector(
         this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null");
     }
 
-    @Override
-    public Set<Class<?>> getHandleClasses()
-    {
-        return ImmutableSet.<Class<?>>builder()
-                .add(ExampleTableHandle.class)
-                .add(ExampleColumnHandle.class)
-                .add(ExampleSplit.class)
-                .add(ExampleTransactionHandle.class)
-                .build();
-    }
-
     @Override
     public ConnectorTransactionHandle beginTransaction(IsolationLevel isolationLevel, boolean readOnly, boolean autoCommit)
     {