Remove MonitoringClient from x-pack (#42770)

This commit removes the monitoring client from x-pack. This class is a relic of the TransportClient and was only used in a test.
elastic · May 31, 2019 · b84ba2a · b84ba2a
1 parent 56c1ed5
commit b84ba2a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 66 deletions.
diff --git a/...n/core/src/main/java/org/elasticsearch/xpack/core/monitoring/client/MonitoringClient.java b/...n/core/src/main/java/org/elasticsearch/xpack/core/monitoring/client/MonitoringClient.java
diff --git a/.../test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java b/.../test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java
@@ -105,7 +105,7 @@ public void testExport() throws Exception {
                 }
 
                 assertBusy(() -> {
-                    MonitoringBulkRequestBuilder bulk = monitoringClient().prepareMonitoringBulk();
+                    MonitoringBulkRequestBuilder bulk = new MonitoringBulkRequestBuilder(client());
                     monitoringDocs.forEach(bulk::add);
                     assertEquals(RestStatus.OK, bulk.get().status());
                     refresh();

diff --git a/...toring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java b/...toring/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.store.MockFSIndexStore;
 import org.elasticsearch.test.transport.MockTransportService;
-import org.elasticsearch.xpack.core.monitoring.client.MonitoringClient;
 import org.elasticsearch.xpack.core.monitoring.exporter.MonitoringTemplateUtils;
 import org.elasticsearch.xpack.core.monitoring.test.MockPainlessScriptEngine;
 import org.elasticsearch.xpack.monitoring.LocalStateMonitoring;
@@ -74,10 +73,6 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
                 MockIngestPlugin.class, CommonAnalysisPlugin.class);
     }
 
-    protected MonitoringClient monitoringClient() {
-        return new MonitoringClient(client());
-    }
-
     @Override
     protected Set<String> excludeTemplates() {
         return new HashSet<>(monitoringTemplateNames());