Skip to content

Commit 2e103f6

Browse files
rmuirrmuir
committed
Don't use shaded APIs
1 parent 5390c01 commit 2e103f6

File tree

5 files changed

+21
-24
lines changed

5 files changed

+21
-24
lines changed

‎src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobContainer.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
import org.elasticsearch.common.blobstore.BlobStoreException;
2828
import org.elasticsearch.common.blobstore.support.AbstractBlobContainer;
2929
import org.elasticsearch.common.blobstore.support.PlainBlobMetaData;
30-
import org.elasticsearch.common.collect.ImmutableMap;
30+
import org.elasticsearch.common.collect.MapBuilder;
3131

3232
import java.io.FileNotFoundException;
3333
import java.io.IOException;
3434
import java.io.InputStream;
3535
import java.io.OutputStream;
36+
import java.util.Map;
3637

3738
/**
3839
*
@@ -104,8 +105,8 @@ public OutputStream createOutput(final String blobName) throws IOException {
104105
}
105106

106107
@Override
107-
public ImmutableMap<String, BlobMetaData> listBlobsByPrefix(@Nullable String blobNamePrefix) throws IOException {
108-
ImmutableMap.Builder<String, BlobMetaData> blobsBuilder = ImmutableMap.builder();
108+
public Map<String, BlobMetaData> listBlobsByPrefix(@Nullable String blobNamePrefix) throws IOException {
109+
MapBuilder<String, BlobMetaData> blobsBuilder = MapBuilder.newMapBuilder();
109110
ObjectListing prevListing = null;
110111
while (true) {
111112
ObjectListing list;
@@ -128,7 +129,7 @@ public ImmutableMap<String, BlobMetaData> listBlobsByPrefix(@Nullable String blo
128129
break;
129130
}
130131
}
131-
return blobsBuilder.build();
132+
return blobsBuilder.immutableMap();
132133
}
133134

134135
@Override
@@ -150,7 +151,7 @@ public void move(String sourceBlobName, String targetBlobName) throws IOExceptio
150151
}
151152

152153
@Override
153-
public ImmutableMap<String, BlobMetaData> listBlobs() throws IOException {
154+
public Map<String, BlobMetaData> listBlobs() throws IOException {
154155
return listBlobsByPrefix(null);
155156
}
156157

‎src/main/java/org/elasticsearch/cloud/aws/node/Ec2CustomNodeAttributes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.ExceptionsHelper;
2424
import org.elasticsearch.cloud.aws.AwsEc2Service;
2525
import org.elasticsearch.cluster.node.DiscoveryNodeService;
26-
import org.elasticsearch.common.collect.Maps;
2726
import org.elasticsearch.common.component.AbstractComponent;
2827
import org.elasticsearch.common.settings.Settings;
2928

@@ -34,6 +33,7 @@
3433
import java.net.URL;
3534
import java.net.URLConnection;
3635
import java.nio.charset.StandardCharsets;
36+
import java.util.HashMap;
3737
import java.util.Map;
3838

3939
/**
@@ -49,7 +49,7 @@ public Map<String, String> buildAttributes() {
4949
if (!settings.getAsBoolean("cloud.node.auto_attributes", false)) {
5050
return null;
5151
}
52-
Map<String, String> ec2Attributes = Maps.newHashMap();
52+
Map<String, String> ec2Attributes = new HashMap<>();
5353

5454
URLConnection urlConnection;
5555
InputStream in = null;

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
import org.elasticsearch.cloud.aws.AwsEc2Service;
2727
import org.elasticsearch.cluster.node.DiscoveryNode;
2828
import org.elasticsearch.common.Strings;
29-
import org.elasticsearch.common.collect.ImmutableMap;
30-
import org.elasticsearch.common.collect.ImmutableSet;
31-
import org.elasticsearch.common.collect.Lists;
32-
import org.elasticsearch.common.collect.Sets;
3329
import org.elasticsearch.common.component.AbstractComponent;
3430
import org.elasticsearch.common.inject.Inject;
3531
import org.elasticsearch.common.settings.Settings;
@@ -60,11 +56,11 @@ private static enum HostType {
6056

6157
private final boolean bindAnyGroup;
6258

63-
private final ImmutableSet<String> groups;
59+
private final Set<String> groups;
6460

65-
private final ImmutableMap<String, String> tags;
61+
private final Map<String, String> tags;
6662

67-
private final ImmutableSet<String> availabilityZones;
63+
private final Set<String> availabilityZones;
6864

6965
private final HostType hostType;
7066

@@ -78,15 +74,17 @@ public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportS
7874
this.hostType = HostType.valueOf(settings.get("discovery.ec2.host_type", "private_ip").toUpperCase(Locale.ROOT));
7975

8076
this.bindAnyGroup = settings.getAsBoolean("discovery.ec2.any_group", true);
81-
this.groups = ImmutableSet.copyOf(settings.getAsArray("discovery.ec2.groups"));
77+
this.groups = new HashSet<>();
78+
groups.addAll(Arrays.asList(settings.getAsArray("discovery.ec2.groups")));
8279

8380
this.tags = settings.getByPrefix("discovery.ec2.tag.").getAsMap();
8481

85-
Set<String> availabilityZones = Sets.newHashSet(settings.getAsArray("discovery.ec2.availability_zones"));
82+
Set<String> availabilityZones = new HashSet();
83+
availabilityZones.addAll(Arrays.asList(settings.getAsArray("discovery.ec2.availability_zones")));
8684
if (settings.get("discovery.ec2.availability_zones") != null) {
8785
availabilityZones.addAll(Strings.commaDelimitedListToSet(settings.get("discovery.ec2.availability_zones")));
8886
}
89-
this.availabilityZones = ImmutableSet.copyOf(availabilityZones);
87+
this.availabilityZones = availabilityZones;
9088

9189
if (logger.isDebugEnabled()) {
9290
logger.debug("using host_type [{}], tags [{}], groups [{}] with any_group [{}], availability_zones [{}]", hostType, tags, groups, bindAnyGroup, availabilityZones);
@@ -95,7 +93,7 @@ public AwsEc2UnicastHostsProvider(Settings settings, TransportService transportS
9593

9694
@Override
9795
public List<DiscoveryNode> buildDynamicNodes() {
98-
List<DiscoveryNode> discoNodes = Lists.newArrayList();
96+
List<DiscoveryNode> discoNodes = new ArrayList<>();
9997

10098
DescribeInstancesResult descInstances;
10199
try {

‎src/main/java/org/elasticsearch/plugin/cloud/aws/CloudAwsPlugin.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import org.elasticsearch.cloud.aws.AwsEc2Service;
2323
import org.elasticsearch.cloud.aws.AwsModule;
24-
import org.elasticsearch.cloud.aws.AwsS3Service;
25-
import org.elasticsearch.common.collect.Lists;
2624
import org.elasticsearch.common.component.LifecycleComponent;
2725
import org.elasticsearch.common.inject.Module;
2826
import org.elasticsearch.common.settings.Settings;
@@ -31,6 +29,7 @@
3129
import org.elasticsearch.repositories.s3.S3Repository;
3230
import org.elasticsearch.repositories.s3.S3RepositoryModule;
3331

32+
import java.util.ArrayList;
3433
import java.util.Collection;
3534

3635
/**
@@ -56,7 +55,7 @@ public String description() {
5655

5756
@Override
5857
public Collection<Module> modules(Settings settings) {
59-
Collection<Module> modules = Lists.newArrayList();
58+
Collection<Module> modules = new ArrayList<>();
6059
if (settings.getAsBoolean("cloud.enabled", true)) {
6160
modules.add(new AwsModule(settings));
6261
}
@@ -65,7 +64,7 @@ public Collection<Module> modules(Settings settings) {
6564

6665
@Override
6766
public Collection<Class<? extends LifecycleComponent>> services() {
68-
Collection<Class<? extends LifecycleComponent>> services = Lists.newArrayList();
67+
Collection<Class<? extends LifecycleComponent>> services = new ArrayList<>();
6968
if (settings.getAsBoolean("cloud.enabled", true)) {
7069
services.add(AwsModule.getS3ServiceClass(settings));
7170
services.add(AwsEc2Service.class);

‎src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.elasticsearch.cloud.aws.blobstore;
2121

22-
import org.elasticsearch.common.base.Charsets;
2322
import org.elasticsearch.test.ElasticsearchTestCase;
2423
import org.junit.Test;
2524

@@ -40,7 +39,7 @@ public class S3OutputStreamTest extends ElasticsearchTestCase {
4039
@Test
4140
public void testWriteLessDataThanBufferSize() throws IOException {
4241
MockDefaultS3OutputStream out = newS3OutputStream(BUFFER_SIZE);
43-
byte[] content = randomUnicodeOfLengthBetween(1, 512).getBytes(Charsets.UTF_8);
42+
byte[] content = randomUnicodeOfLengthBetween(1, 512).getBytes("UTF-8");
4443
copy(content, out);
4544

4645
// Checks length & content

0 commit comments

Comments
 (0)