Convert to java rest test

Author: felixbarny

test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
 import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteComponentTemplateAction;
 import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteComposableIndexTemplateAction;
-import org.elasticsearch.action.admin.indices.template.get.GetComposableIndexTemplateAction;
 import org.elasticsearch.action.datastreams.DeleteDataStreamAction;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.ingest.DeletePipelineRequest;
@@ -76,7 +75,6 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -157,28 +155,10 @@ public void tearDown() throws Exception {
                 throw e;
             }
         }
-        var indexTemplates = client().execute(
-            GetComposableIndexTemplateAction.INSTANCE,
-            new GetComposableIndexTemplateAction.Request(TEST_REQUEST_TIMEOUT, "*")
-        ).actionGet().indexTemplates();
-        var deleteComposableIndexTemplateRequest = new TransportDeleteComposableIndexTemplateAction.Request(
-            indexTemplates.keySet().stream().filter(Predicate.not(ESRestTestCase::isXPackTemplate)).toArray(String[]::new)
-        );
-        if (deleteComposableIndexTemplateRequest.names().length > 0) {
-            assertAcked(
-                client().execute(TransportDeleteComposableIndexTemplateAction.TYPE, deleteComposableIndexTemplateRequest).actionGet()
-            );
-        }
-        var componentTemplates = client().execute(
-            GetComposableIndexTemplateAction.INSTANCE,
-            new GetComposableIndexTemplateAction.Request(TEST_REQUEST_TIMEOUT, "*")
-        ).actionGet().indexTemplates();
-        var deleteComponentTemplateRequest = new TransportDeleteComponentTemplateAction.Request(
-            componentTemplates.keySet().stream().filter(Predicate.not(ESRestTestCase::isXPackTemplate)).toArray(String[]::new)
-        );
-        if (deleteComponentTemplateRequest.names().length > 0) {
-            assertAcked(client().execute(TransportDeleteComponentTemplateAction.TYPE, deleteComponentTemplateRequest).actionGet());
-        }
+        var deleteComposableIndexTemplateRequest = new TransportDeleteComposableIndexTemplateAction.Request("*");
+        assertAcked(client().execute(TransportDeleteComposableIndexTemplateAction.TYPE, deleteComposableIndexTemplateRequest).actionGet());
+        var deleteComponentTemplateRequest = new TransportDeleteComponentTemplateAction.Request("*");
+        assertAcked(client().execute(TransportDeleteComponentTemplateAction.TYPE, deleteComponentTemplateRequest).actionGet());
         assertAcked(indicesAdmin().prepareDelete("*").setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN).get());
         Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
         assertThat(

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -2283,7 +2283,7 @@ private static void assertAcked(String message, Response response) throws IOExce
     /**
      * Is this template one that is automatically created by xpack?
      */
-    public static boolean isXPackTemplate(String name) {
+    protected static boolean isXPackTemplate(String name) {
         if (name.startsWith(".monitoring-")) {
             return true;
         }

x-pack/plugin/otel-data/build.gradle

@@ -9,6 +9,7 @@ import com.google.protobuf.gradle.GenerateProtoTask
 plugins {
   id 'elasticsearch.internal-es-plugin'
   id 'elasticsearch.internal-yaml-rest-test'
+  id 'elasticsearch.internal-java-rest-test'
   id 'elasticsearch.internal-cluster-test'
   id('com.google.protobuf') version '0.9.5'
 }
@@ -50,7 +51,6 @@ dependencies {
   api project(":libs:exponential-histogram")
   compileOnly project(path: xpackModule('core'))
   testImplementation(testArtifact(project(xpackModule('core'))))
-  // for yamlRestTest
   clusterModules project(':modules:data-streams')
   clusterModules project(':modules:ingest-common')
   clusterModules project(':modules:ingest-geoip')
@@ -65,40 +65,20 @@ dependencies {
   clusterModules project(xpackModule('stack'))
   clusterModules project(xpackModule('wildcard'))
   clusterModules project(xpackModule('mapper-version'))
-  // for internalClusterTest
-  testImplementation project(':modules:data-streams')
-  testImplementation project(':x-pack:plugin:esql')
-  testImplementation project(':x-pack:plugin:esql-core')
-  testImplementation project(':modules:data-streams')
-  testImplementation project(':modules:ingest-common')
-  testImplementation project(':modules:ingest-geoip')
-  testImplementation project(':modules:ingest-user-agent')
-  testImplementation project(':modules:lang-mustache')
-  testImplementation project(':modules:lang-painless')
-  testImplementation project(':modules:lang-painless:spi')
-  testImplementation project(':modules:mapper-extras')
-  testImplementation project(xpackModule('analytics'))
-  testImplementation project(xpackModule('ilm'))
-  testImplementation project(xpackModule('mapper-aggregate-metric'))
-  testImplementation project(xpackModule('mapper-constant-keyword'))
-  testImplementation project(xpackModule('mapper-counted-keyword'))
-  testImplementation project(xpackModule('stack'))
-  testImplementation project(xpackModule('wildcard'))
-  testImplementation project(xpackModule('mapper-version'))
 
   def otelVersion = "1.53.0"
-  testImplementation "io.opentelemetry:opentelemetry-api:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-common:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-context:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-sdk:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-sdk-common:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-sdk-metrics:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-exporter-common:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-exporter-otlp:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-exporter-otlp-common:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-exporter-sender-jdk:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"
-  testImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-api:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-common:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-context:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-sdk:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-sdk-common:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-sdk-metrics:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-exporter-common:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-exporter-otlp:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-exporter-otlp-common:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-exporter-sender-jdk:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"
+  javaRestTestImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"
 
   implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
   // The protobuf plugin only adds a dependency for the variant relevant for the current platform.
@@ -184,3 +164,7 @@ tasks.named("thirdPartyAudit").configure {
 tasks.named("licenseHeaders").configure {
   excludes << 'io/opentelemetry/proto/**/*'
 }
+
+tasks.named("javaRestTest").configure {
+  usesDefaultDistribution("Requires a bunch of xpack plugins")
+}