Skip to content

Commit 9f8f2ea

Browse files
committed
Remove ESIntegTestCase#pluginList
It was a useful method in 1.7 when javac's type inference wasn't as good, but now we can just replace it with `Arrays.asList`.
1 parent 8a97f05 commit 9f8f2ea

File tree

85 files changed

+152
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+152
-97
lines changed

core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ protected Settings nodeSettings(int ordinal) {
149149

150150
@Override
151151
protected Collection<Class<? extends Plugin>> nodePlugins() {
152-
return pluginList(InterceptingTransportService.TestPlugin.class, CustomScriptPlugin.class);
152+
return Arrays.asList(InterceptingTransportService.TestPlugin.class, CustomScriptPlugin.class);
153153
}
154154

155155
public static class CustomScriptPlugin extends MockScriptPlugin {

core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
import java.io.IOException;
6262
import java.util.ArrayList;
63+
import java.util.Arrays;
6364
import java.util.Collection;
6465
import java.util.Collections;
6566
import java.util.HashMap;
@@ -105,7 +106,7 @@ protected boolean addMockTransportService() {
105106

106107
@Override
107108
protected Collection<Class<? extends Plugin>> nodePlugins() {
108-
return pluginList(MockTransportService.TestPlugin.class, TestTaskPlugin.class);
109+
return Arrays.asList(MockTransportService.TestPlugin.class, TestTaskPlugin.class);
109110
}
110111

111112
@Override

core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.elasticsearch.test.junit.annotations.TestLogging;
4242
import org.elasticsearch.test.store.MockFSIndexStore;
4343

44+
import java.util.Arrays;
4445
import java.util.Collection;
4546
import java.util.HashMap;
4647
import java.util.HashSet;
@@ -64,7 +65,7 @@ public class IndicesShardStoreRequestIT extends ESIntegTestCase {
6465

6566
@Override
6667
protected Collection<Class<? extends Plugin>> nodePlugins() {
67-
return pluginList( MockFSIndexStore.TestPlugin.class);
68+
return Arrays.asList( MockFSIndexStore.TestPlugin.class);
6869
}
6970

7071
public void testEmpty() {

core/src/test/java/org/elasticsearch/bwcompat/IpFieldBwCompatIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
2222
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
2323

24+
import java.util.Arrays;
2425
import java.util.Collection;
2526

2627
import org.elasticsearch.Version;
@@ -39,7 +40,7 @@ public class IpFieldBwCompatIT extends ESIntegTestCase {
3940

4041
@Override
4142
protected Collection<Class<? extends Plugin>> nodePlugins() {
42-
return pluginList(InternalSettingsPlugin.class); // uses index.merge.enabled
43+
return Arrays.asList(InternalSettingsPlugin.class); // uses index.merge.enabled
4344
}
4445

4546
@Override

core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import java.io.InputStream;
6969
import java.nio.file.Files;
7070
import java.nio.file.Path;
71+
import java.util.Arrays;
7172
import java.util.Collection;
7273
import java.util.Collections;
7374
import java.util.List;
@@ -90,7 +91,7 @@ public class OldIndexBackwardsCompatibilityIT extends ESIntegTestCase {
9091

9192
@Override
9293
protected Collection<Class<? extends Plugin>> nodePlugins() {
93-
return pluginList(InternalSettingsPlugin.class);
94+
return Arrays.asList(InternalSettingsPlugin.class);
9495
}
9596

9697
List<String> indexes;

core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.hamcrest.Matchers;
5555

5656
import java.io.IOException;
57+
import java.util.Arrays;
5758
import java.util.Collection;
5859
import java.util.List;
5960
import java.util.Set;
@@ -123,7 +124,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
123124

124125
@Override
125126
protected Collection<Class<? extends Plugin>> nodePlugins() {
126-
return pluginList(TestPlugin.class,
127+
return Arrays.asList(TestPlugin.class,
127128
MockTransportService.TestPlugin.class);
128129
}
129130

core/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
3939
import org.elasticsearch.test.transport.MockTransportService;
4040

41+
import java.util.Arrays;
4142
import java.util.Collection;
4243
import java.util.Collections;
4344
import java.util.List;
@@ -57,7 +58,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
5758
@Override
5859
protected Collection<Class<? extends Plugin>> nodePlugins() {
5960
// disruption tests need MockTransportService
60-
return pluginList(MockTransportService.TestPlugin.class);
61+
return Arrays.asList(MockTransportService.TestPlugin.class);
6162
}
6263

6364
private void createStaleReplicaScenario() throws Exception {

core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.elasticsearch.test.ESIntegTestCase;
3333

3434
import java.util.ArrayList;
35+
import java.util.Arrays;
3536
import java.util.Collection;
3637
import java.util.HashMap;
3738
import java.util.Iterator;
@@ -48,7 +49,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase {
4849
@Override
4950
protected Collection<Class<? extends Plugin>> nodePlugins() {
5051
// Use the mock internal cluster info service, which has fake-able disk usages
51-
return pluginList(MockInternalClusterInfoService.TestPlugin.class);
52+
return Arrays.asList(MockInternalClusterInfoService.TestPlugin.class);
5253
}
5354

5455
public void testRerouteOccursOnDiskPassingHighWatermark() throws Exception {

core/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class ClusterServiceIT extends ESIntegTestCase {
6363

6464
@Override
6565
protected Collection<Class<? extends Plugin>> nodePlugins() {
66-
return pluginList(TestPlugin.class);
66+
return Arrays.asList(TestPlugin.class);
6767
}
6868

6969
public void testAckedUpdateTask() throws Exception {

core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class SettingsFilteringIT extends ESIntegTestCase {
4444

4545
@Override
4646
protected Collection<Class<? extends Plugin>> nodePlugins() {
47-
return pluginList(SettingsFilteringPlugin.class);
47+
return Arrays.asList(SettingsFilteringPlugin.class);
4848
}
4949

5050
public static class SettingsFilteringPlugin extends Plugin {

0 commit comments

Comments
 (0)