Skip to content

Commit 203f843

Browse files
rjernstrjernst
authored
Collapse packages in ec2 discovery plugin (elastic#23909)
This commit collapses all the classes inside ec2 discovery to a single package name.
1 parent 471af48 commit 203f843

20 files changed

+44
-56
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -3811,22 +3811,22 @@
38113811
<suppress files="plugins[/\\]discovery-azure-classic[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]azure[/\\]classic[/\\]AzureSimpleTests.java" checks="LineLength" />
38123812
<suppress files="plugins[/\\]discovery-azure-classic[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]azure[/\\]classic[/\\]AzureTwoStartedNodesTests.java" checks="LineLength" />
38133813
<suppress files="plugins[/\\]discovery-azure-classic[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]azure[/\\]classic[/\\]DiscoveryAzureClassicClientYamlTestSuiteIT.java" checks="LineLength" />
3814-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AwsEc2Service.java" checks="LineLength" />
3815-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AwsEc2ServiceImpl.java" checks="LineLength" />
3816-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]network[/\\]Ec2NameResolver.java" checks="LineLength" />
3817-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]util[/\\]SocketAccess.java" checks="LineLength" />
3814+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AwsEc2Service.java" checks="LineLength" />
3815+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AwsEc2ServiceImpl.java" checks="LineLength" />
3816+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2NameResolver.java" checks="LineLength" />
3817+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]SocketAccess.java" checks="LineLength" />
38183818
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AwsEc2UnicastHostsProvider.java" checks="LineLength" />
3819-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]plugin[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryPlugin.java" checks="LineLength" />
3820-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AWSSignersTests.java" checks="LineLength" />
3821-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AbstractAwsTestCase.java" checks="LineLength" />
3822-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]aws[/\\]AwsEc2ServiceImplTests.java" checks="LineLength" />
3819+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryPlugin.java" checks="LineLength" />
3820+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AWSSignersTests.java" checks="LineLength" />
3821+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AbstractAwsTestCase.java" checks="LineLength" />
3822+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AwsEc2ServiceImplTests.java" checks="LineLength" />
38233823
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AmazonEC2Mock.java" checks="LineLength" />
38243824
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryClusterFormationTests.java" checks="LineLength" />
38253825
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoverySettingsTests.java" checks="LineLength" />
38263826
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryTests.java" checks="LineLength" />
38273827
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryUpdateSettingsTests.java" checks="LineLength" />
38283828
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2NetworkTests.java" checks="LineLength" />
3829-
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]plugin[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryPluginTests.java" checks="LineLength" />
3829+
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]Ec2DiscoveryPluginTests.java" checks="LineLength" />
38303830
<suppress files="plugins[/\\]discovery-file[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]file[/\\]FileBasedDiscoveryPlugin.java" checks="LineLength" />
38313831
<suppress files="plugins[/\\]discovery-file[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]file[/\\]FileBasedUnicastHostsProvider.java" checks="LineLength" />
38323832
<suppress files="plugins[/\\]discovery-file[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]file[/\\]FileBasedDiscoveryClientYamlTestSuiteIT.java" checks="LineLength" />

‎plugins/discovery-ec2/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
esplugin {
2121
description 'The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.'
22-
classname 'org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin'
22+
classname 'org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin'
2323
}
2424

2525
versions << [

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2Service.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.ClientConfiguration;
2323
import com.amazonaws.Protocol;
@@ -33,7 +33,7 @@
3333
import java.util.Locale;
3434
import java.util.function.Function;
3535

36-
public interface AwsEc2Service {
36+
interface AwsEc2Service {
3737
Setting<Boolean> AUTO_ATTRIBUTE_SETTING = Setting.boolSetting("cloud.node.auto_attributes", false, Property.NodeScope);
3838

3939
// Global AWS settings (shared between discovery-ec2 and repository-s3)

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import java.io.Closeable;
2323
import java.io.IOException;
@@ -40,13 +40,13 @@
4040
import org.elasticsearch.common.component.AbstractComponent;
4141
import org.elasticsearch.common.settings.Settings;
4242

43-
public class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Service, Closeable {
43+
class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Service, Closeable {
4444

4545
public static final String EC2_METADATA_URL = "http://169.254.169.254/latest/meta-data/";
4646

4747
private AmazonEC2Client client;
4848

49-
public AwsEc2ServiceImpl(Settings settings) {
49+
AwsEc2ServiceImpl(Settings settings) {
5050
super(settings);
5151
}
5252

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
import org.apache.logging.log4j.message.ParameterizedMessage;
3232
import org.apache.logging.log4j.util.Supplier;
3333
import org.elasticsearch.Version;
34-
import org.elasticsearch.cloud.aws.AwsEc2Service;
35-
import org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2;
36-
import org.elasticsearch.cloud.aws.util.SocketAccess;
34+
import org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2;
3735
import org.elasticsearch.cluster.node.DiscoveryNode;
3836
import org.elasticsearch.common.component.AbstractComponent;
3937
import org.elasticsearch.common.settings.Settings;
@@ -52,13 +50,13 @@
5250
import static java.util.Collections.disjoint;
5351
import static java.util.Collections.emptyMap;
5452
import static java.util.Collections.emptySet;
55-
import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.TAG_PREFIX;
56-
import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_DNS;
57-
import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_IP;
58-
import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_DNS;
59-
import static org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_IP;
53+
import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.TAG_PREFIX;
54+
import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_DNS;
55+
import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PRIVATE_IP;
56+
import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_DNS;
57+
import static org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2.HostType.PUBLIC_IP;
6058

61-
public class AwsEc2UnicastHostsProvider extends AbstractComponent implements UnicastHostsProvider {
59+
class AwsEc2UnicastHostsProvider extends AbstractComponent implements UnicastHostsProvider {
6260

6361
private final TransportService transportService;
6462

@@ -76,7 +74,7 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni
7674

7775
private final DiscoNodesCache discoNodes;
7876

79-
public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportService, AwsEc2Service awsEc2Service) {
77+
AwsEc2UnicastHostsProvider(Settings settings, TransportService transportService, AwsEc2Service awsEc2Service) {
8078
super(settings);
8179
this.transportService = transportService;
8280
this.client = awsEc2Service.client();

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsSigner.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsSigner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.ClientConfiguration;
2323
import com.amazonaws.auth.SignerFactory;
2424
import org.apache.logging.log4j.Logger;
2525
import org.elasticsearch.common.logging.Loggers;
2626

27-
public class AwsSigner {
27+
class AwsSigner {
2828

2929
private static final Logger logger = Loggers.getLogger(AwsSigner.class);
3030

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPlugin.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.plugin.discovery.ec2;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.util.json.Jackson;
2323
import java.io.BufferedReader;
@@ -41,10 +41,6 @@
4141
import org.apache.lucene.util.IOUtils;
4242
import org.apache.lucene.util.SetOnce;
4343
import org.elasticsearch.SpecialPermission;
44-
import org.elasticsearch.cloud.aws.AwsEc2Service;
45-
import org.elasticsearch.cloud.aws.AwsEc2ServiceImpl;
46-
import org.elasticsearch.cloud.aws.network.Ec2NameResolver;
47-
import org.elasticsearch.cloud.aws.util.SocketAccess;
4844
import org.elasticsearch.cluster.service.ClusterService;
4945
import org.elasticsearch.common.SuppressForbidden;
5046
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -55,7 +51,6 @@
5551
import org.elasticsearch.common.settings.Settings;
5652
import org.elasticsearch.discovery.Discovery;
5753
import org.elasticsearch.discovery.DiscoveryModule;
58-
import org.elasticsearch.discovery.ec2.AwsEc2UnicastHostsProvider;
5954
import org.elasticsearch.discovery.zen.UnicastHostsProvider;
6055
import org.elasticsearch.discovery.zen.ZenDiscovery;
6156
import org.elasticsearch.node.Node;

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2NameResolver.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws.network;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import org.apache.lucene.util.IOUtils;
23-
import org.elasticsearch.cloud.aws.AwsEc2ServiceImpl;
24-
import org.elasticsearch.cloud.aws.util.SocketAccess;
2523
import org.elasticsearch.common.SuppressForbidden;
2624
import org.elasticsearch.common.component.AbstractComponent;
2725
import org.elasticsearch.common.network.NetworkService.CustomNameResolver;
@@ -53,7 +51,7 @@
5351
*
5452
* @author Paul_Loy (keteracel)
5553
*/
56-
public class Ec2NameResolver extends AbstractComponent implements CustomNameResolver {
54+
class Ec2NameResolver extends AbstractComponent implements CustomNameResolver {
5755

5856
/**
5957
* enum that can be added to over time with more meta-data types (such as ipv6 when this is available)
@@ -84,7 +82,7 @@ private enum Ec2HostnameType {
8482
/**
8583
* Construct a {@link CustomNameResolver}.
8684
*/
87-
public Ec2NameResolver(Settings settings) {
85+
Ec2NameResolver(Settings settings) {
8886
super(settings);
8987
}
9088

‎plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/util/SocketAccess.java renamed to ‎plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/SocketAccess.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws.util;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import org.elasticsearch.SpecialPermission;
2323

@@ -33,7 +33,7 @@
3333
* {@link SocketPermission} 'connect' to establish connections. This class wraps the operations requiring access in
3434
* {@link AccessController#doPrivileged(PrivilegedAction)} blocks.
3535
*/
36-
public final class SocketAccess {
36+
final class SocketAccess {
3737

3838
private SocketAccess() {}
3939

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java renamed to ‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AWSSignersTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.ClientConfiguration;
2323
import org.elasticsearch.common.settings.Settings;
24-
import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin;
24+
import org.elasticsearch.discovery.ec2.AwsSigner;
25+
import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin;
2526
import org.elasticsearch.test.ESTestCase;
2627
import org.junit.BeforeClass;
2728

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java renamed to ‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AbstractAwsTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import org.elasticsearch.common.Strings;
2323
import org.elasticsearch.common.io.PathUtils;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.common.settings.SettingsException;
2626
import org.elasticsearch.env.Environment;
27-
import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin;
27+
import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin;
2828
import org.elasticsearch.plugins.Plugin;
2929
import org.elasticsearch.test.ESIntegTestCase;
3030
import org.elasticsearch.test.ESIntegTestCase.ThirdParty;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImplTests.java renamed to ‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImplTests.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.ClientConfiguration;
2323
import com.amazonaws.Protocol;
2424
import com.amazonaws.auth.AWSCredentials;
2525
import com.amazonaws.auth.AWSCredentialsProvider;
2626
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
2727
import org.elasticsearch.common.settings.Settings;
28+
import org.elasticsearch.discovery.ec2.AwsEc2Service;
29+
import org.elasticsearch.discovery.ec2.AwsEc2ServiceImpl;
2830
import org.elasticsearch.test.ESTestCase;
2931

3032
import static org.hamcrest.Matchers.containsString;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceMock.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import com.amazonaws.services.ec2.AmazonEC2;
2323
import com.amazonaws.services.ec2.model.Tag;
24-
import org.elasticsearch.cloud.aws.AwsEc2Service;
2524
import org.elasticsearch.common.component.AbstractLifecycleComponent;
2625
import org.elasticsearch.common.settings.Settings;
2726

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/CloudAwsClientYamlTestSuiteIT.java renamed to ‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/CloudAwsClientYamlTestSuiteIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.cloud.aws;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import com.carrotsearch.randomizedtesting.annotations.Name;
2323
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryClusterFormationTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@
2424
import com.sun.net.httpserver.HttpServer;
2525
import org.apache.http.NameValuePair;
2626
import org.apache.http.client.utils.URLEncodedUtils;
27-
import org.elasticsearch.cloud.aws.AwsEc2Service;
2827
import org.elasticsearch.common.SuppressForbidden;
2928
import org.elasticsearch.common.io.FileSystemUtils;
3029
import org.elasticsearch.common.logging.Loggers;
3130
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.mocksocket.MockHttpServer;
33-
import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin;
3432
import org.elasticsearch.plugins.Plugin;
3533
import org.elasticsearch.test.ESIntegTestCase;
3634
import org.junit.AfterClass;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/plugin/discovery/ec2/Ec2DiscoveryPluginTests.java renamed to ‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPluginTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.plugin.discovery.ec2;
20+
package org.elasticsearch.discovery.ec2;
2121

2222
import java.io.UncheckedIOException;
2323
import java.nio.file.Files;
2424
import java.nio.file.Path;
2525
import java.util.Arrays;
2626

27-
import org.elasticsearch.cloud.aws.AwsEc2Service;
27+
import org.elasticsearch.discovery.ec2.AwsEc2Service;
2828
import org.elasticsearch.common.settings.Settings;
29+
import org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin;
2930
import org.elasticsearch.node.Node;
3031
import org.elasticsearch.test.ESTestCase;
3132

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoverySettingsTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.discovery.ec2;
2121

2222
import com.amazonaws.Protocol;
23-
import org.elasticsearch.cloud.aws.AwsEc2Service;
2423
import org.elasticsearch.common.settings.Settings;
2524
import org.elasticsearch.test.ESTestCase;
2625

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
import com.amazonaws.services.ec2.model.Tag;
2323
import org.elasticsearch.Version;
24-
import org.elasticsearch.cloud.aws.AwsEc2Service;
25-
import org.elasticsearch.cloud.aws.AwsEc2Service.DISCOVERY_EC2;
24+
import org.elasticsearch.discovery.ec2.AwsEc2Service.DISCOVERY_EC2;
2625
import org.elasticsearch.cluster.node.DiscoveryNode;
2726
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
2827
import org.elasticsearch.common.network.NetworkService;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222

2323
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
24-
import org.elasticsearch.cloud.aws.AbstractAwsTestCase;
2524
import org.elasticsearch.common.settings.Settings;
2625
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
2726
import org.elasticsearch.test.ESIntegTestCase.Scope;

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2NetworkTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.elasticsearch.discovery.ec2;
2121

22-
import org.elasticsearch.cloud.aws.network.Ec2NameResolver;
2322
import org.elasticsearch.common.network.NetworkService;
2423
import org.elasticsearch.common.settings.Settings;
2524
import org.elasticsearch.test.ESTestCase;

0 commit comments

Comments
 (0)