From 203f8433c20ff8a383557ed9a7f801cb26bb3aa1 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 5 Apr 2017 23:51:49 -0700 Subject: [PATCH] Collapse packages in ec2 discovery plugin (#23909) This commit collapses all the classes inside ec2 discovery to a single package name. --- .../main/resources/checkstyle_suppressions.xml | 18 +++++++++--------- plugins/discovery-ec2/build.gradle | 2 +- .../aws => discovery/ec2}/AwsEc2Service.java | 4 ++-- .../ec2}/AwsEc2ServiceImpl.java | 6 +++--- .../ec2/AwsEc2UnicastHostsProvider.java | 18 ++++++++---------- .../aws => discovery/ec2}/AwsSigner.java | 4 ++-- .../discovery/ec2/Ec2DiscoveryPlugin.java | 7 +------ .../ec2}/Ec2NameResolver.java | 8 +++----- .../util => discovery/ec2}/SocketAccess.java | 4 ++-- .../aws => discovery/ec2}/AWSSignersTests.java | 5 +++-- .../ec2}/AbstractAwsTestCase.java | 4 ++-- .../ec2}/AwsEc2ServiceImplTests.java | 4 +++- .../discovery/ec2/AwsEc2ServiceMock.java | 1 - .../ec2}/CloudAwsClientYamlTestSuiteIT.java | 2 +- .../ec2/Ec2DiscoveryClusterFormationTests.java | 2 -- .../discovery/ec2/Ec2DiscoveryPluginTests.java | 5 +++-- .../ec2/Ec2DiscoverySettingsTests.java | 1 - .../discovery/ec2/Ec2DiscoveryTests.java | 3 +-- .../ec2/Ec2DiscoveryUpdateSettingsTests.java | 1 - .../discovery/ec2/Ec2NetworkTests.java | 1 - 20 files changed, 44 insertions(+), 56 deletions(-) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AwsEc2Service.java (99%) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AwsEc2ServiceImpl.java (98%) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AwsSigner.java (97%) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{plugin => }/discovery/ec2/Ec2DiscoveryPlugin.java (96%) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{cloud/aws/network => discovery/ec2}/Ec2NameResolver.java (94%) rename plugins/discovery-ec2/src/main/java/org/elasticsearch/{cloud/aws/util => discovery/ec2}/SocketAccess.java (96%) rename plugins/discovery-ec2/src/test/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AWSSignersTests.java (94%) rename plugins/discovery-ec2/src/test/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AbstractAwsTestCase.java (96%) rename plugins/discovery-ec2/src/test/java/org/elasticsearch/{cloud/aws => discovery/ec2}/AwsEc2ServiceImplTests.java (98%) rename plugins/discovery-ec2/src/test/java/org/elasticsearch/{cloud/aws => discovery/ec2}/CloudAwsClientYamlTestSuiteIT.java (97%) rename plugins/discovery-ec2/src/test/java/org/elasticsearch/{plugin => }/discovery/ec2/Ec2DiscoveryPluginTests.java (95%) diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 8ff0930e9d1..11882b2faa9 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -3811,22 +3811,22 @@ - - - - + + + + - - - - + + + + - + diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index 9ad2f8d02e2..793d8559782 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -19,7 +19,7 @@ esplugin { description 'The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.' - classname 'org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin' + classname 'org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin' } versions << [ diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2Service.java similarity index 99% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2Service.java index 125dfa4a69a..b246ec21de2 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2Service.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import com.amazonaws.ClientConfiguration; import com.amazonaws.Protocol; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Locale; import java.util.function.Function; -public interface AwsEc2Service { +interface AwsEc2Service { Setting AUTO_ATTRIBUTE_SETTING = Setting.boolSetting("cloud.node.auto_attributes", false, Property.NodeScope); // Global AWS settings (shared between discovery-ec2 and repository-s3) diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImpl.java similarity index 98% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImpl.java index f47a2f398da..6f4252c447a 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import java.io.Closeable; import java.io.IOException; @@ -40,13 +40,13 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; -public class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Service, Closeable { +class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Service, Closeable { public static final String EC2_METADATA_URL = "http://169.254.169.254/latest/meta-data/"; private AmazonEC2Client client; - public AwsEc2ServiceImpl(Settings settings) { + AwsEc2ServiceImpl(Settings settings) { super(settings); } diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java index d2a8f6e5f3f..04ec87a7038 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java @@ -31,9 +31,7 @@ import com.amazonaws.services.ec2.model.Tag; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.elasticsearch.Version; -import org.elasticsearch.cloud.aws.AwsEc2Service; -import org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2; -import org.elasticsearch.cloud.aws.util.SocketAccess; +import org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.settings.Settings; @@ -52,13 +50,13 @@ import java.util.Set; import static java.util.Collections.disjoint; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.TAG_PREFIX; -import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_DNS; -import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_IP; -import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_DNS; -import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_IP; +import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.TAG_PREFIX; +import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_DNS; +import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_IP; +import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_DNS; +import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_IP; -public class AwsEc2UnicastHostsProvider extends AbstractComponent implements UnicastHostsProvider { +class AwsEc2UnicastHostsProvider extends AbstractComponent implements UnicastHostsProvider { private final TransportService transportService; @@ -76,7 +74,7 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni private final DiscoNodesCache discoNodes; - public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportService, AwsEc2Service awsEc2Service) { + AwsEc2UnicastHostsProvider(Settings settings, TransportService transportService, AwsEc2Service awsEc2Service) { super(settings); this.transportService = transportService; this.client = awsEc2Service.client(); diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsSigner.java similarity index 97% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsSigner.java index 11732725e9d..394559f12ef 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsSigner.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import com.amazonaws.ClientConfiguration; import com.amazonaws.auth.SignerFactory; import org.apache.logging.log4j.Logger; import org.elasticsearch.common.logging.Loggers; -public class AwsSigner { +class AwsSigner { private static final Logger logger = Loggers.getLogger(AwsSigner.class); diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPlugin.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java similarity index 96% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPlugin.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java index 0529404ea9f..d78197e875b 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPlugin.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.plugin.discovery.ec2; +package org.elasticsearch.discovery.ec2; import com.amazonaws.util.json.Jackson; import java.io.BufferedReader; @@ -41,10 +41,6 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.SetOnce; import org.elasticsearch.SpecialPermission; -import org.elasticsearch.cloud.aws.AwsEc2Service; -import org.elasticsearch.cloud.aws.AwsEc2ServiceImpl; -import org.elasticsearch.cloud.aws.network.Ec2NameResolver; -import org.elasticsearch.cloud.aws.util.SocketAccess; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -55,7 +51,6 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.discovery.DiscoveryModule; -import org.elasticsearch.discovery.ec2.AwsEc2UnicastHostsProvider; import org.elasticsearch.discovery.zen.UnicastHostsProvider; import org.elasticsearch.discovery.zen.ZenDiscovery; import org.elasticsearch.node.Node; diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java similarity index 94% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java index e47475ac361..1793c8154b0 100755 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.cloud.aws.network; +package org.elasticsearch.discovery.ec2; import org.apache.lucene.util.IOUtils; -import org.elasticsearch.cloud.aws.AwsEc2ServiceImpl; -import org.elasticsearch.cloud.aws.util.SocketAccess; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.network.NetworkService.CustomNameResolver; @@ -53,7 +51,7 @@ import java.nio.charset.StandardCharsets; * * @author Paul_Loy (keteracel) */ -public class Ec2NameResolver extends AbstractComponent implements CustomNameResolver { +class Ec2NameResolver extends AbstractComponent implements CustomNameResolver { /** * enum that can be added to over time with more meta-data types (such as ipv6 when this is available) @@ -84,7 +82,7 @@ public class Ec2NameResolver extends AbstractComponent implements CustomNameReso /** * Construct a {@link CustomNameResolver}. */ - public Ec2NameResolver(Settings settings) { + Ec2NameResolver(Settings settings) { super(settings); } diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/SocketAccess.java similarity index 96% rename from plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java rename to plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/SocketAccess.java index 2c68369bb99..4b33ad3c020 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/SocketAccess.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws.util; +package org.elasticsearch.discovery.ec2; import org.elasticsearch.SpecialPermission; @@ -33,7 +33,7 @@ import java.security.PrivilegedExceptionAction; * {@link SocketPermission} 'connect' to establish connections. This class wraps the operations requiring access in * {@link AccessController#doPrivileged(PrivilegedAction)} blocks. */ -public final class SocketAccess { +final class SocketAccess { private SocketAccess() {} diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AWSSignersTests.java similarity index 94% rename from plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java rename to plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AWSSignersTests.java index 555e9f5c10a..d9d3599b59b 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AWSSignersTests.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import com.amazonaws.ClientConfiguration; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin; +import org.elasticsearch.discovery.ec2.AwsSigner; +import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin; import org.elasticsearch.test.ESTestCase; import org.junit.BeforeClass; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AbstractAwsTestCase.java similarity index 96% rename from plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java rename to plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AbstractAwsTestCase.java index a9e16c30dc2..43706e0d6f7 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AbstractAwsTestCase.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.env.Environment; -import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin; +import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ThirdParty; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImplTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImplTests.java similarity index 98% rename from plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImplTests.java rename to plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImplTests.java index d6284a0faed..51a14d9cf60 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImplTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImplTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import com.amazonaws.ClientConfiguration; import com.amazonaws.Protocol; @@ -25,6 +25,8 @@ import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.DefaultAWSCredentialsProviderChain; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.discovery.ec2.AwsEc2Service; +import org.elasticsearch.discovery.ec2.AwsEc2ServiceImpl; import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.containsString; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceMock.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceMock.java index 19a5c8d3b96..e29821efda2 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceMock.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceMock.java @@ -21,7 +21,6 @@ package org.elasticsearch.discovery.ec2; import com.amazonaws.services.ec2.AmazonEC2; import com.amazonaws.services.ec2.model.Tag; -import org.elasticsearch.cloud.aws.AwsEc2Service; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.settings.Settings; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/CloudAwsClientYamlTestSuiteIT.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/CloudAwsClientYamlTestSuiteIT.java similarity index 97% rename from plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/CloudAwsClientYamlTestSuiteIT.java rename to plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/CloudAwsClientYamlTestSuiteIT.java index 3488b5ea49c..168c169dfae 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/CloudAwsClientYamlTestSuiteIT.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/CloudAwsClientYamlTestSuiteIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cloud.aws; +package org.elasticsearch.discovery.ec2; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryClusterFormationTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryClusterFormationTests.java index 4def3737563..9cac7079c56 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryClusterFormationTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryClusterFormationTests.java @@ -24,13 +24,11 @@ import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpServer; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.elasticsearch.cloud.aws.AwsEc2Service; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.mocksocket.MockHttpServer; -import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.junit.AfterClass; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPluginTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPluginTests.java similarity index 95% rename from plugins/discovery-ec2/src/test/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPluginTests.java rename to plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPluginTests.java index 14ba0d2339a..9bb75c0b09f 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPluginTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPluginTests.java @@ -17,15 +17,16 @@ * under the License. */ -package org.elasticsearch.plugin.discovery.ec2; +package org.elasticsearch.discovery.ec2; import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; -import org.elasticsearch.cloud.aws.AwsEc2Service; +import org.elasticsearch.discovery.ec2.AwsEc2Service; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin; import org.elasticsearch.node.Node; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoverySettingsTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoverySettingsTests.java index 1fef33fdca3..a72b973ea1f 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoverySettingsTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoverySettingsTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.discovery.ec2; import com.amazonaws.Protocol; -import org.elasticsearch.cloud.aws.AwsEc2Service; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java index d05ca712f18..b8cda950f79 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java @@ -21,8 +21,7 @@ package org.elasticsearch.discovery.ec2; import com.amazonaws.services.ec2.model.Tag; import org.elasticsearch.Version; -import org.elasticsearch.cloud.aws.AwsEc2Service; -import org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2; +import org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.network.NetworkService; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java index 41f5af48eb4..fca70e2b436 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.discovery.ec2; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; -import org.elasticsearch.cloud.aws.AbstractAwsTestCase; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.Scope; diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2NetworkTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2NetworkTests.java index 11ba53ca59e..ece9b206396 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2NetworkTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2NetworkTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.discovery.ec2; -import org.elasticsearch.cloud.aws.network.Ec2NameResolver; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase;