Remove @ResourcePresence from integration tests

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

@@ -33,7 +33,6 @@
 import io.trino.server.testing.TestingTrinoServer;
 import io.trino.server.ui.OAuth2WebUiAuthenticationFilter;
 import io.trino.server.ui.WebUiModule;
-import io.trino.testing.ResourcePresence;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -378,12 +377,6 @@ private static void runTestServer(boolean useJwt)
         }
     }
 
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return hydraContainer.getContainerId() != null || databaseContainer.getContainerId() != null || migrationContainer.getContainerId() != null;
-    }
-
     public static void main(String[] args)
             throws Exception
     {

plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/CassandraServer.java

@@ -23,7 +23,6 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.log.Logger;
 import io.airlift.units.Duration;
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.cassandra.CassandraContainer;
 import org.testcontainers.containers.wait.CassandraQueryWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
@@ -175,10 +174,4 @@ public void close()
         session.close();
         dockerContainer.close();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
 }

plugin/trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/TestingClickHouseServer.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.clickhouse;
 
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -76,10 +75,4 @@ public void close()
     {
         dockerContainer.stop();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
 }

plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchServer.java

@@ -18,7 +18,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Resources;
 import com.google.common.net.HostAndPort;
-import io.trino.testing.ResourcePresence;
 import org.apache.http.HttpHost;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.apache.http.message.BasicHeader;
@@ -103,12 +102,6 @@ public void stop()
         deleteRecursively(configurationPath, ALLOW_INSECURE);
     }
 
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.getContainerId() != null;
-    }
-
     public HostAndPort getAddress()
     {
         return HostAndPort.fromString(container.getHttpHostAddress());

plugin/trino-exasol/src/test/java/io/trino/plugin/exasol/TestingExasolServer.java

@@ -16,7 +16,6 @@
 
 import com.exasol.containers.ExasolContainer;
 import com.exasol.containers.ExasolService;
-import io.trino.testing.ResourcePresence;
 import io.trino.testing.sql.JdbcSqlExecutor;
 import org.intellij.lang.annotations.Language;
 
@@ -109,10 +108,4 @@ public void close()
             throw new UncheckedIOException(ioe);
         }
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.getContainerId() != null;
-    }
 }

plugin/trino-hive/src/test/java/io/trino/plugin/hive/containers/HiveMinioDataLake.java

@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.trino.plugin.base.util.AutoCloseableCloser;
-import io.trino.testing.ResourcePresence;
 import io.trino.testing.containers.Minio;
 import io.trino.testing.minio.MinioClient;
 import org.testcontainers.containers.Network;
@@ -99,12 +98,6 @@ public void stop()
         state = State.STOPPED;
     }
 
-    @ResourcePresence
-    public boolean isNotStopped()
-    {
-        return state != State.STOPPED;
-    }
-
     public Network getNetwork()
     {
         return network;

plugin/trino-ignite/src/test/java/io/trino/plugin/ignite/TestingIgniteServer.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.ignite;
 
-import io.trino.testing.ResourcePresence;
 import io.trino.testing.SharedResource;
 
 import java.sql.Connection;
@@ -64,10 +63,4 @@ public void close()
     {
         dockerContainer.stop();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
 }

plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestingKuduServer.java

@@ -15,15 +15,12 @@
 
 import com.google.common.io.Closer;
 import com.google.common.net.HostAndPort;
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.ToxiproxyContainer;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 
 import static java.lang.String.format;
 
@@ -45,8 +42,6 @@ public class TestingKuduServer
     private final GenericContainer<?> master;
     private final GenericContainer<?> tabletServer;
 
-    private boolean stopped;
-
     public TestingKuduServer()
     {
         this(LATEST_TAG);
@@ -111,22 +106,5 @@ public void close()
         catch (IOException e) {
             throw new RuntimeException(e);
         }
-        stopped = true;
-    }
-
-    @ResourcePresence
-    public boolean isNotStopped()
-    {
-        return !stopped;
-    }
-
-    private static String getHostIPAddress()
-    {
-        try {
-            return InetAddress.getLocalHost().getHostAddress();
-        }
-        catch (UnknownHostException e) {
-            throw new RuntimeException(e);
-        }
     }
 }

plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestingMariaDbServer.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.mariadb;
 
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -87,10 +86,4 @@ public void close()
     {
         container.close();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.getContainerId() != null;
-    }
 }

plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/MongoServer.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.mongodb;
 
 import com.mongodb.ConnectionString;
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.MongoDBContainer;
 
 import java.io.Closeable;
@@ -48,10 +47,4 @@ public void close()
     {
         dockerContainer.close();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
 }

plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestingMySqlServer.java

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.mysql;
 
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.MySQLContainer;
 
 import java.io.Closeable;
@@ -134,10 +133,4 @@ public void close()
             throw new UncheckedIOException(e);
         }
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.getContainerId() != null;
-    }
 }

plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/MarquezServer.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.openlineage;
 
 import com.google.common.io.Closer;
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.PostgreSQLContainer;
@@ -142,10 +141,4 @@ public void close()
     {
         closer.close();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainerAPI.getContainerId() != null;
-    }
 }

plugin/trino-opensearch/src/test/java/io/trino/plugin/opensearch/OpenSearchServer.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.opensearch;
 
 import com.google.common.net.HostAndPort;
-import io.trino.testing.ResourcePresence;
 import org.opensearch.testcontainers.OpensearchContainer;
 import org.testcontainers.containers.Network;
 
@@ -66,12 +65,6 @@ public OpenSearchServer(Network network, String image, boolean secured, Map<Stri
         container.start();
     }
 
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.isRunning();
-    }
-
     public HostAndPort getAddress()
     {
         return HostAndPort.fromParts(container.getHost(), container.getMappedPort(9200));

plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/TestingOracleServer.java

@@ -25,7 +25,6 @@
 import io.trino.plugin.jdbc.RetryingConnectionFactory.DefaultRetryStrategy;
 import io.trino.plugin.jdbc.credential.StaticCredentialProvider;
 import io.trino.plugin.jdbc.jmx.StatisticsAwareConnectionFactory;
-import io.trino.testing.ResourcePresence;
 import oracle.jdbc.OracleDriver;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.utility.MountableFile;
@@ -149,10 +148,4 @@ public void close()
             throw new UncheckedIOException(ioe);
         }
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return container.getContainerId() != null;
-    }
 }

plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.phoenix5;
 
 import io.airlift.log.Logger;
-import io.trino.testing.ResourcePresence;
 import io.trino.testing.SharedResource;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -111,10 +110,4 @@ public String getJdbcUrl()
     {
         return format("jdbc:phoenix:localhost:%d:/hbase;phoenix.schema.isNamespaceMappingEnabled=true", port);
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return hbaseTestingUtility != null;
-    }
 }

plugin/trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestingPostgreSqlServer.java

@@ -17,7 +17,6 @@
 import com.google.common.collect.Sets;
 import io.trino.plugin.jdbc.RemoteDatabaseEvent;
 import io.trino.plugin.jdbc.RemoteLogTracingEvent;
-import io.trino.testing.ResourcePresence;
 import org.intellij.lang.annotations.Language;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.containers.output.OutputFrame;
@@ -243,12 +242,6 @@ public void close()
         }
     }
 
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
-
     public static class DatabaseEventsRecorder
     {
         private final Supplier<Stream<String>> loggedQueriesSource;

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

@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.prometheus;
 
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
@@ -68,10 +67,4 @@ public void close()
     {
         dockerContainer.close();
     }
-
-    @ResourcePresence
-    public boolean isRunning()
-    {
-        return dockerContainer.getContainerId() != null;
-    }
 }

plugin/trino-singlestore/src/test/java/io/trino/plugin/singlestore/TestingSingleStoreServer.java

@@ -14,7 +14,6 @@
 package io.trino.plugin.singlestore;
 
 import com.google.common.collect.ImmutableSet;
-import io.trino.testing.ResourcePresence;
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.utility.DockerImageName;
 
@@ -104,12 +103,6 @@ public void execute(String sql)
         execute(sql, getUsername(), getPassword());
     }
 
-    @ResourcePresence
-    public boolean isResourcePresent()
-    {
-        return isRunning() || getContainerId() != null;
-    }
-
     public void execute(String sql, String user, String password)
     {
         try (Connection connection = DriverManager.getConnection(getJdbcUrl(), user, password);