From a7645ed4f0feab375e31716f10426e55ae0c9b2a Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Tue, 4 Aug 2015 11:42:17 +0200 Subject: [PATCH] Fix compilation issue following removal of Streams.copyToStringFromClasspath() from core Original commit: elastic/x-pack-elasticsearch@d7d0dfd640864c2a55a6f4d75817b8074d52d6e8 --- .../java/org/elasticsearch/marvel/agent/AgentUtilsTests.java | 4 ++-- .../agent/renderer/cluster/ClusterStateRendererTests.java | 4 ++-- .../agent/renderer/cluster/ClusterStatsRendererTests.java | 4 ++-- .../agent/renderer/indices/IndexRecoveryRendererTests.java | 4 ++-- .../agent/renderer/indices/IndexStatsRendererTests.java | 4 ++-- .../marvel/agent/renderer/node/NodeStatsRendererTests.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/AgentUtilsTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/AgentUtilsTests.java index 6cdc221938c..ef1b3d0351c 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/AgentUtilsTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/AgentUtilsTests.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.marvel.agent; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.marvel.agent.support.AgentUtils; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.StreamsUtils; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; @@ -28,7 +28,7 @@ public class AgentUtilsTests extends ESTestCase { @Test public void testVersionIsExtractableFromIndexTemplate() throws IOException { - byte[] template = Streams.copyToBytesFromClasspath("/marvel_index_template.json"); + byte[] template = StreamsUtils.copyToBytesFromClasspath("/marvel_index_template.json"); MatcherAssert.assertThat(AgentUtils.parseIndexVersionFromTemplate(template), Matchers.greaterThan(0)); } diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java index 8d00e87e7d1..cc82b2388e9 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java @@ -10,12 +10,12 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.marvel.agent.collector.cluster.ClusterStateMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; import org.elasticsearch.marvel.agent.renderer.RendererTestUtils; import org.elasticsearch.test.ESSingleNodeTestCase; +import org.elasticsearch.test.StreamsUtils; import org.junit.Test; public class ClusterStateRendererTests extends ESSingleNodeTestCase { @@ -44,7 +44,7 @@ public class ClusterStateRendererTests extends ESSingleNodeTestCase { String result = RendererTestUtils.renderAsJSON(marvelDoc, renderer); logger.debug("--> loading sample document from file {}", SAMPLE_FILE); - String expected = Streams.copyToStringFromClasspath(SAMPLE_FILE); + String expected = StreamsUtils.copyToStringFromClasspath(SAMPLE_FILE); String nodeId = clusterState.getNodes().getLocalNodeId(); logger.debug("--> replace the local node id in sample document with {}", nodeId); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java index 600c08c286c..5a56e497fe2 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java @@ -6,11 +6,11 @@ package org.elasticsearch.marvel.agent.renderer.cluster; import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.marvel.agent.collector.cluster.ClusterStatsMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; import org.elasticsearch.marvel.agent.renderer.RendererTestUtils; import org.elasticsearch.test.ESSingleNodeTestCase; +import org.elasticsearch.test.StreamsUtils; import org.junit.Test; public class ClusterStatsRendererTests extends ESSingleNodeTestCase { @@ -32,7 +32,7 @@ public class ClusterStatsRendererTests extends ESSingleNodeTestCase { String result = RendererTestUtils.renderAsJSON(marvelDoc, renderer); logger.debug("--> loading sample document from file {}", SAMPLE_FILE); - String expected = Streams.copyToStringFromClasspath(SAMPLE_FILE); + String expected = StreamsUtils.copyToStringFromClasspath(SAMPLE_FILE); logger.debug("--> comparing both documents, they must have the same structure"); RendererTestUtils.assertJSONStructure(result, expected); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java index c79cf8b7bea..e8208e72e80 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java @@ -9,7 +9,6 @@ import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse; import org.elasticsearch.action.admin.indices.recovery.ShardRecoveryResponse; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.recovery.RecoveryState; @@ -17,6 +16,7 @@ import org.elasticsearch.marvel.agent.collector.indices.IndexRecoveryMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; import org.elasticsearch.marvel.agent.renderer.RendererTestUtils; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.StreamsUtils; import org.junit.Test; import java.util.ArrayList; @@ -60,7 +60,7 @@ public class IndexRecoveryRendererTests extends ESTestCase { String result = RendererTestUtils.renderAsJSON(marvelDoc, renderer); logger.debug("--> loading sample document from file {}", SAMPLE_FILE); - String expected = Streams.copyToStringFromClasspath(SAMPLE_FILE); + String expected = StreamsUtils.copyToStringFromClasspath(SAMPLE_FILE); logger.debug("--> comparing both documents, they must be identical"); RendererTestUtils.assertJSONStructureAndValues(result, expected); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java index 54eb3530bc4..511df3e0bcd 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java @@ -8,7 +8,6 @@ package org.elasticsearch.marvel.agent.renderer.indices; import org.elasticsearch.action.admin.indices.stats.CommonStats; import org.elasticsearch.action.admin.indices.stats.IndexStats; import org.elasticsearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.index.indexing.IndexingStats; import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.store.StoreStats; @@ -16,6 +15,7 @@ import org.elasticsearch.marvel.agent.collector.indices.IndexStatsMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; import org.elasticsearch.marvel.agent.renderer.RendererTestUtils; import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.StreamsUtils; import org.junit.Test; public class IndexStatsRendererTests extends ESTestCase { @@ -52,7 +52,7 @@ public class IndexStatsRendererTests extends ESTestCase { String result = RendererTestUtils.renderAsJSON(marvelDoc, renderer); logger.debug("--> loading sample document from file {}", SAMPLE_FILE); - String expected = Streams.copyToStringFromClasspath(SAMPLE_FILE); + String expected = StreamsUtils.copyToStringFromClasspath(SAMPLE_FILE); logger.debug("--> comparing both documents, they must be identical"); RendererTestUtils.assertJSONStructureAndValues(result, expected); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java index 44ddd76e15e..a469abe28b1 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java @@ -6,12 +6,12 @@ package org.elasticsearch.marvel.agent.renderer.node; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.marvel.agent.collector.node.NodeStatsMarvelDoc; import org.elasticsearch.marvel.agent.renderer.Renderer; import org.elasticsearch.marvel.agent.renderer.RendererTestUtils; import org.elasticsearch.node.service.NodeService; import org.elasticsearch.test.ESSingleNodeTestCase; +import org.elasticsearch.test.StreamsUtils; import org.junit.Test; public class NodeStatsRendererTests extends ESSingleNodeTestCase { @@ -35,7 +35,7 @@ public class NodeStatsRendererTests extends ESSingleNodeTestCase { String result = RendererTestUtils.renderAsJSON(marvelDoc, renderer); logger.debug("--> loading sample document from file {}", SAMPLE_FILE); - String expected = Streams.copyToStringFromClasspath(SAMPLE_FILE); + String expected = StreamsUtils.copyToStringFromClasspath(SAMPLE_FILE); logger.debug("--> comparing both documents, they must have the same structure"); RendererTestUtils.assertJSONStructure(result, expected);