From 0fcbf8c6caafc4baa94447f7c24e4b4b5f9b6fa6 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Mon, 20 Jun 2016 12:15:32 +0200 Subject: [PATCH] Cleanup unnecessary modules and use current version across the board (elastic/elasticsearch#2556) Followup for elastic/elasticsearchelastic/elasticsearch#18969 Original commit: elastic/x-pack-elasticsearch@c86a5969c73d82061b512b8e1996c1d7f7f38d46 --- .../org/elasticsearch/marvel/MonitoringF.java | 3 +-- .../elasticsearch/shield/SecurityModule.java | 1 - .../transport/netty/ShieldNettyTransport.java | 4 ++-- .../org/elasticsearch/shield/ShieldF.java | 3 +-- .../shield/audit/AuditTrailModuleTests.java | 3 +-- .../LdapUserSearchSessionFactoryTests.java | 3 +-- ...ServerTransportFilterIntegrationTests.java | 5 ++--- .../netty/ShieldNettyTransportTests.java | 20 +++++++++---------- .../elasticsearch/xpack/watcher/WatcherF.java | 3 +-- .../WatcherExecutorServiceBenchmark.java | 3 +-- .../bench/WatcherScheduleEngineBenchmark.java | 3 +-- 11 files changed, 21 insertions(+), 30 deletions(-) diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MonitoringF.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MonitoringF.java index fd9c6478c1b..ef2efe487a8 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MonitoringF.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/MonitoringF.java @@ -7,7 +7,6 @@ package org.elasticsearch.marvel; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.node.MockNode; @@ -39,7 +38,7 @@ public class MonitoringF { } final CountDownLatch latch = new CountDownLatch(1); - final Node node = new MockNode(settings.build(), Version.CURRENT, + final Node node = new MockNode(settings.build(), Arrays.asList(XPackPlugin.class, XPackPlugin.class, XPackPlugin.class)); Runtime.getRuntime().addShutdownHook(new Thread() { diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SecurityModule.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SecurityModule.java index 5cc3881532f..cdfd0121d34 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SecurityModule.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SecurityModule.java @@ -42,7 +42,6 @@ public class SecurityModule extends AbstractShieldModule { bind(ShieldLifecycleService.class).asEagerSingleton(); bind(InternalClient.Secure.class).asEagerSingleton(); bind(InternalClient.class).to(InternalClient.Secure.class); - } else { bind(SecurityContext.class).toInstance(SecurityContext.Insecure.INSTANCE); bind(InternalClient.Insecure.class).asEagerSingleton(); diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransport.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransport.java index 89cf5b1287b..604c67d1f14 100644 --- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransport.java +++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransport.java @@ -84,10 +84,10 @@ public class ShieldNettyTransport extends NettyTransport { @Inject public ShieldNettyTransport(Settings settings, ThreadPool threadPool, NetworkService networkService, BigArrays bigArrays, - Version version, @Nullable IPFilter authenticator, @Nullable ServerSSLService serverSSLService, + @Nullable IPFilter authenticator, @Nullable ServerSSLService serverSSLService, ClientSSLService clientSSLService, NamedWriteableRegistry namedWriteableRegistry, CircuitBreakerService circuitBreakerService) { - super(settings, threadPool, networkService, bigArrays, version, namedWriteableRegistry, circuitBreakerService); + super(settings, threadPool, networkService, bigArrays, namedWriteableRegistry, circuitBreakerService); this.authenticator = authenticator; this.ssl = SSL_SETTING.get(settings); this.serverSslService = serverSSLService; diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/ShieldF.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/ShieldF.java index 62bf6ff6e99..7eea0b9718a 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/ShieldF.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/ShieldF.java @@ -7,7 +7,6 @@ package org.elasticsearch.shield; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.MockNode; @@ -63,7 +62,7 @@ public class ShieldF { writeFile(folder, "roles.yml", ShieldSettingsSource.CONFIG_ROLE_ALLOW_ALL)); final CountDownLatch latch = new CountDownLatch(1); - final Node node = new MockNode(settings.build(), Version.CURRENT, Arrays.asList(XPackPlugin.class)); + final Node node = new MockNode(settings.build(), Arrays.asList(XPackPlugin.class)); Runtime.getRuntime().addShutdownHook(new Thread() { @Override diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java index b7ae372caf7..99e2eeb8480 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java @@ -70,8 +70,7 @@ public class AuditTrailModuleTests extends ESTestCase { b.bind(CircuitBreakerService.class).toInstance(Node.createCircuitBreakerService(settingsModule.getSettings(), settingsModule.getClusterSettings())); b.bind(ThreadPool.class).toInstance(pool); - }, - new Version.Module(Version.CURRENT) + } ); AuditTrail auditTrail = injector.getInstance(AuditTrail.class); assertThat(auditTrail, instanceOf(AuditTrailService.class)); diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java index 2e72c4d0c1d..29b84be8df0 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java @@ -14,7 +14,6 @@ import com.unboundid.ldap.sdk.LDAPConnectionPoolHealthCheck; import com.unboundid.ldap.sdk.SimpleBindRequest; import com.unboundid.ldap.sdk.SingleServerSet; import org.elasticsearch.ElasticsearchSecurityException; -import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -539,7 +538,7 @@ public class LdapUserSearchSessionFactoryTests extends LdapTestCase { // having a quick start/stop cycle like below builder.put(XPackPlugin.featureEnabledSetting(Watcher.NAME), false); - try (Node node = new MockNode(builder.build(), Version.CURRENT, Collections.singletonList(XPackPlugin.class))) { + try (Node node = new MockNode(builder.build(), Collections.singletonList(XPackPlugin.class))) { node.start(); } } diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java index d2a0f072bba..d1ac3901b2c 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.shield.transport; -import org.elasticsearch.Version; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; @@ -105,7 +104,7 @@ public class ServerTransportFilterIntegrationTests extends ShieldIntegTestCase { .put(NetworkModule.HTTP_ENABLED.getKey(), false) .put(InternalCryptoService.FILE_SETTING.getKey(), systemKeyFile) .build(); - try (Node node = new MockNode(nodeSettings, Version.CURRENT, Collections.singletonList(XPackPlugin.class))) { + try (Node node = new MockNode(nodeSettings, Collections.singletonList(XPackPlugin.class))) { node.start(); assertGreenClusterState(node.client()); } @@ -138,7 +137,7 @@ public class ServerTransportFilterIntegrationTests extends ShieldIntegTestCase { .put("path.home", createTempDir()) .put(Node.NODE_MASTER_SETTING.getKey(), false) .build(); - try (Node node = new MockNode(nodeSettings, Version.CURRENT, Collections.singletonList(XPackPlugin.class))) { + try (Node node = new MockNode(nodeSettings, Collections.singletonList(XPackPlugin.class))) { node.start(); // assert that node is not connected by waiting for the timeout diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransportTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransportTests.java index 6bb348d13f8..95d48f2170b 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransportTests.java +++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/netty/ShieldNettyTransportTests.java @@ -52,7 +52,7 @@ public class ShieldNettyTransportTests extends ESTestCase { public void testThatSSLCanBeDisabledByProfile() throws Exception { Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", @@ -63,7 +63,7 @@ public class ShieldNettyTransportTests extends ESTestCase { public void testThatSSLCanBeEnabledByProfile() throws Exception { Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), false).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", @@ -74,7 +74,7 @@ public class ShieldNettyTransportTests extends ESTestCase { public void testThatProfileTakesDefaultSSLSetting() throws Exception { Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", Settings.EMPTY); @@ -84,7 +84,7 @@ public class ShieldNettyTransportTests extends ESTestCase { public void testDefaultClientAuth() throws Exception { Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", Settings.EMPTY); @@ -98,7 +98,7 @@ public class ShieldNettyTransportTests extends ESTestCase { .put(ShieldNettyTransport.SSL_SETTING.getKey(), true) .put(ShieldNettyTransport.CLIENT_AUTH_SETTING.getKey(), value).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", Settings.EMPTY); @@ -112,7 +112,7 @@ public class ShieldNettyTransportTests extends ESTestCase { .put(ShieldNettyTransport.SSL_SETTING.getKey(), true) .put(ShieldNettyTransport.CLIENT_AUTH_SETTING.getKey(), value).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", Settings.EMPTY); @@ -126,7 +126,7 @@ public class ShieldNettyTransportTests extends ESTestCase { .put(ShieldNettyTransport.SSL_SETTING.getKey(), true) .put(ShieldNettyTransport.CLIENT_AUTH_SETTING.getKey(), value).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", Settings.EMPTY); @@ -138,7 +138,7 @@ public class ShieldNettyTransportTests extends ESTestCase { String value = randomFrom(SSLClientAuth.REQUIRED.name(), SSLClientAuth.REQUIRED.name().toLowerCase(Locale.ROOT), "true", "TRUE"); Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", @@ -151,7 +151,7 @@ public class ShieldNettyTransportTests extends ESTestCase { String value = randomFrom(SSLClientAuth.NO.name(), "false", "FALSE", SSLClientAuth.NO.name().toLowerCase(Locale.ROOT)); Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), mock(NetworkService.class), - mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), + mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", @@ -164,7 +164,7 @@ public class ShieldNettyTransportTests extends ESTestCase { String value = randomFrom(SSLClientAuth.OPTIONAL.name(), SSLClientAuth.OPTIONAL.name().toLowerCase(Locale.ROOT)); Settings settings = Settings.builder().put(ShieldNettyTransport.SSL_SETTING.getKey(), true).build(); ShieldNettyTransport transport = new ShieldNettyTransport(settings, mock(ThreadPool.class), - mock(NetworkService.class), mock(BigArrays.class), Version.CURRENT, null, serverSSLService, clientSSLService, + mock(NetworkService.class), mock(BigArrays.class), null, serverSSLService, clientSSLService, mock(NamedWriteableRegistry.class), mock(CircuitBreakerService.class)); NettyMockUtil.setOpenChannelsHandlerToMock(transport); ChannelPipelineFactory factory = transport.configureServerChannelPipelineFactory("client", diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java index 4a91fc6e6f9..f29f86fd9be 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.watcher; import org.apache.lucene.util.IOUtils; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.Version; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.MockNode; @@ -58,7 +57,7 @@ public class WatcherF { "fc082467005d4072a914e0bb041882d0"); final CountDownLatch latch = new CountDownLatch(1); - final Node node = new MockNode(settings.build(), Version.CURRENT, Arrays.asList(XPackPlugin.class, XPackPlugin.class)); + final Node node = new MockNode(settings.build(), Arrays.asList(XPackPlugin.class, XPackPlugin.class)); Runtime.getRuntime().addShutdownHook(new Thread() { @Override diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java index 250d58d6f0b..3a55eb2205c 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.xpack.watcher.test.bench; -import org.elasticsearch.Version; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Module; @@ -59,7 +58,7 @@ public class WatcherExecutorServiceBenchmark { private static ScheduleTriggerEngineMock scheduler; protected static void start() throws Exception { - Node node = new MockNode(Settings.builder().put(SETTINGS).put("node.data", false).build(), Version.CURRENT, + Node node = new MockNode(Settings.builder().put(SETTINGS).put("node.data", false).build(), Arrays.asList(XPackBenchmarkPlugin.class)); client = node.client(); client.admin().cluster().prepareHealth("*").setWaitForGreenStatus().get(); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java index bec1608e710..4c272b34dd9 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java +++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java @@ -5,7 +5,6 @@ */ package org.elasticsearch.xpack.watcher.test.bench; -import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; @@ -138,7 +137,7 @@ public class WatcherScheduleEngineBenchmark { .put("xpack.watcher.trigger.schedule.engine", engine) .put("node.data", false) .build(); - try (Node node = new MockNode(settings, Version.CURRENT, Arrays.asList(XPackPlugin.class, XPackPlugin.class))) { + try (Node node = new MockNode(settings, Arrays.asList(XPackPlugin.class, XPackPlugin.class))) { try (final Client client = node.client()) { client.admin().cluster().prepareHealth().setWaitForNodes("2").get(); client.admin().indices().prepareDelete(HistoryStore.INDEX_PREFIX + "*").get();