Skip to content

Commit 4a1cbd2

Browse files
dadoonetdadoonet
committed
Update to elasticsearch 1.0.0.RC1
Closes #45.
1 parent 9cc331b commit 4a1cbd2

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>org.elasticsearch</groupId>
88
<artifactId>elasticsearch-cloud-aws</artifactId>
9-
<version>1.17.0-SNAPSHOT</version>
9+
<version>2.0.0.RC1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111
<description>AWS Cloud plugin for ElasticSearch</description>
1212
<inceptionYear>2009</inceptionYear>
@@ -31,7 +31,7 @@
3131
</parent>
3232

3333
<properties>
34-
<elasticsearch.version>0.90.10</elasticsearch.version>
34+
<elasticsearch.version>1.0.0.RC1-SNAPSHOT</elasticsearch.version>
3535
<lucene.version>4.6.0</lucene.version>
3636
<tests.output>onerror</tests.output>
3737
<tests.jvms>1</tests.jvms>

‎src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.amazonaws.internal.StaticCredentialsProvider;
2626
import com.amazonaws.services.ec2.AmazonEC2;
2727
import com.amazonaws.services.ec2.AmazonEC2Client;
28-
import org.elasticsearch.ElasticSearchException;
29-
import org.elasticsearch.ElasticSearchIllegalArgumentException;
28+
import org.elasticsearch.ElasticsearchException;
29+
import org.elasticsearch.ElasticsearchIllegalArgumentException;
3030
import org.elasticsearch.cloud.aws.network.Ec2NameResolver;
3131
import org.elasticsearch.cloud.aws.node.Ec2CustomNodeAttributes;
3232
import org.elasticsearch.cluster.node.DiscoveryNodeService;
@@ -66,7 +66,7 @@ public synchronized AmazonEC2 client() {
6666
} else if ("https".equals(protocol)) {
6767
clientConfiguration.setProtocol(Protocol.HTTPS);
6868
} else {
69-
throw new ElasticSearchIllegalArgumentException("No protocol supported [" + protocol + "], can either be [http] or [https]");
69+
throw new ElasticsearchIllegalArgumentException("No protocol supported [" + protocol + "], can either be [http] or [https]");
7070
}
7171
String account = componentSettings.get("access_key", settings.get("cloud.account"));
7272
String key = componentSettings.get("secret_key", settings.get("cloud.key"));
@@ -78,7 +78,7 @@ public synchronized AmazonEC2 client() {
7878
try {
7979
proxyPort = Integer.parseInt(portString, 10);
8080
} catch (NumberFormatException ex) {
81-
throw new ElasticSearchIllegalArgumentException("The configured proxy port value [" + portString + "] is invalid", ex);
81+
throw new ElasticsearchIllegalArgumentException("The configured proxy port value [" + portString + "] is invalid", ex);
8282
}
8383
clientConfiguration.withProxyHost(proxyHost).setProxyPort(proxyPort);
8484
}
@@ -123,7 +123,7 @@ public synchronized AmazonEC2 client() {
123123
} else if (region.equals("sa-east") || region.equals("sa-east-1")) {
124124
endpoint = "ec2.sa-east-1.amazonaws.com";
125125
} else {
126-
throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
126+
throw new ElasticsearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
127127
}
128128
if (endpoint != null) {
129129
logger.debug("using ec2 region [{}], with endpoint [{}]", region, endpoint);
@@ -136,15 +136,15 @@ public synchronized AmazonEC2 client() {
136136
}
137137

138138
@Override
139-
protected void doStart() throws ElasticSearchException {
139+
protected void doStart() throws ElasticsearchException {
140140
}
141141

142142
@Override
143-
protected void doStop() throws ElasticSearchException {
143+
protected void doStop() throws ElasticsearchException {
144144
}
145145

146146
@Override
147-
protected void doClose() throws ElasticSearchException {
147+
protected void doClose() throws ElasticsearchException {
148148
if (client != null) {
149149
client.shutdown();
150150
}

‎src/main/java/org/elasticsearch/cloud/aws/AwsS3Service.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import com.amazonaws.internal.StaticCredentialsProvider;
2626
import com.amazonaws.services.s3.AmazonS3;
2727
import com.amazonaws.services.s3.AmazonS3Client;
28-
import org.elasticsearch.ElasticSearchException;
29-
import org.elasticsearch.ElasticSearchIllegalArgumentException;
28+
import org.elasticsearch.ElasticsearchException;
29+
import org.elasticsearch.ElasticsearchIllegalArgumentException;
3030
import org.elasticsearch.common.component.AbstractLifecycleComponent;
3131
import org.elasticsearch.common.inject.Inject;
3232
import org.elasticsearch.common.settings.Settings;
@@ -58,7 +58,7 @@ public synchronized AmazonS3 client() {
5858
} else if ("https".equals(protocol)) {
5959
clientConfiguration.setProtocol(Protocol.HTTPS);
6060
} else {
61-
throw new ElasticSearchIllegalArgumentException("No protocol supported [" + protocol + "], can either be [http] or [https]");
61+
throw new ElasticsearchIllegalArgumentException("No protocol supported [" + protocol + "], can either be [http] or [https]");
6262
}
6363
String account = componentSettings.get("access_key", settings.get("cloud.account"));
6464
String key = componentSettings.get("secret_key", settings.get("cloud.key"));
@@ -70,7 +70,7 @@ public synchronized AmazonS3 client() {
7070
try {
7171
proxyPort = Integer.parseInt(portString, 10);
7272
} catch (NumberFormatException ex) {
73-
throw new ElasticSearchIllegalArgumentException("The configured proxy port value [" + portString + "] is invalid", ex);
73+
throw new ElasticsearchIllegalArgumentException("The configured proxy port value [" + portString + "] is invalid", ex);
7474
}
7575
clientConfiguration.withProxyHost(proxyHost).setProxyPort(proxyPort);
7676
}
@@ -126,7 +126,7 @@ public synchronized AmazonS3 client() {
126126
} else if ("sa-east-1".equals(region)) {
127127
endpoint = "s3-sa-east-1.amazonaws.com";
128128
} else {
129-
throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
129+
throw new ElasticsearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
130130
}
131131
if (endpoint != null) {
132132
logger.debug("using s3 region [{}], with endpoint [{}]", region, endpoint);
@@ -138,15 +138,15 @@ public synchronized AmazonS3 client() {
138138
}
139139

140140
@Override
141-
protected void doStart() throws ElasticSearchException {
141+
protected void doStart() throws ElasticsearchException {
142142
}
143143

144144
@Override
145-
protected void doStop() throws ElasticSearchException {
145+
protected void doStop() throws ElasticsearchException {
146146
}
147147

148148
@Override
149-
protected void doClose() throws ElasticSearchException {
149+
protected void doClose() throws ElasticsearchException {
150150
if (client != null) {
151151
client.shutdown();
152152
}

‎src/main/java/org/elasticsearch/gateway/s3/S3Gateway.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.elasticsearch.gateway.s3;
2121

22-
import org.elasticsearch.ElasticSearchException;
23-
import org.elasticsearch.ElasticSearchIllegalArgumentException;
22+
import org.elasticsearch.ElasticsearchException;
23+
import org.elasticsearch.ElasticsearchIllegalArgumentException;
2424
import org.elasticsearch.cloud.aws.AwsS3Service;
2525
import org.elasticsearch.cloud.aws.blobstore.S3BlobStore;
2626
import org.elasticsearch.cluster.ClusterName;
@@ -53,7 +53,7 @@ public S3Gateway(Settings settings, ThreadPool threadPool, ClusterService cluste
5353

5454
String bucket = componentSettings.get("bucket");
5555
if (bucket == null) {
56-
throw new ElasticSearchIllegalArgumentException("No bucket defined for s3 gateway");
56+
throw new ElasticsearchIllegalArgumentException("No bucket defined for s3 gateway");
5757
}
5858

5959
String region = componentSettings.get("region");
@@ -98,7 +98,7 @@ public S3Gateway(Settings settings, ThreadPool threadPool, ClusterService cluste
9898
}
9999

100100
@Override
101-
protected void doClose() throws ElasticSearchException {
101+
protected void doClose() throws ElasticsearchException {
102102
super.doClose();
103103
concurrentStreamPool.shutdown();
104104
}

0 commit comments

Comments
 (0)