Skip to content

Commit cf0872f

Browse files
committed
checkstyle fixes
1 parent fd2e012 commit cf0872f

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import org.apache.hadoop.fs.s3a.statistics.impl.AwsStatisticsCollector;
5050
import org.apache.hadoop.fs.store.LogExactlyOnce;
5151

52-
import static org.apache.hadoop.fs.s3a.Constants.AWS_REGION;
53-
import static org.apache.hadoop.fs.s3a.Constants.AWS_S3_CENTRAL_REGION;
5452
import static org.apache.hadoop.fs.s3a.Constants.AWS_S3_DEFAULT_REGION;
5553
import static org.apache.hadoop.fs.s3a.Constants.CENTRAL_ENDPOINT;
5654
import static org.apache.hadoop.fs.s3a.impl.AWSHeaders.REQUESTER_PAYS_HEADER;
@@ -231,7 +229,8 @@ protected ClientOverrideConfiguration createClientOverrideConfiguration(
231229
* @param <BuilderT> S3 client builder type
232230
* @param <ClientT> S3 client type
233231
*/
234-
private <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT> void configureEndpointAndRegion(
232+
private <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT>
233+
void configureEndpointAndRegion(
235234
BuilderT builder, S3ClientCreationParameters parameters, Configuration conf) {
236235
URI endpoint = getS3Endpoint(parameters.getEndpoint(), conf);
237236

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Collections;
3535
import java.util.Date;
3636
import java.util.EnumSet;
37-
import java.util.HashMap;
3837
import java.util.Iterator;
3938
import java.util.List;
4039
import java.util.Locale;
@@ -54,7 +53,6 @@
5453

5554
import software.amazon.awssdk.core.ResponseInputStream;
5655
import software.amazon.awssdk.core.exception.SdkException;
57-
import software.amazon.awssdk.regions.Region;
5856
import software.amazon.awssdk.services.s3.S3AsyncClient;
5957
import software.amazon.awssdk.services.s3.S3Client;
6058
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
@@ -83,7 +81,6 @@
8381
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
8482
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
8583
import software.amazon.awssdk.services.s3.model.S3Error;
86-
import software.amazon.awssdk.services.s3.model.S3Exception;
8784
import software.amazon.awssdk.services.s3.model.S3Object;
8885
import software.amazon.awssdk.services.s3.model.SelectObjectContentRequest;
8986
import software.amazon.awssdk.services.s3.model.SelectObjectContentResponseHandler;
@@ -98,7 +95,6 @@
9895
import software.amazon.awssdk.transfer.s3.model.FileUpload;
9996
import software.amazon.awssdk.transfer.s3.model.UploadFileRequest;
10097

101-
import org.apache.commons.lang3.StringUtils;
10298
import org.apache.hadoop.fs.impl.prefetch.ExecutorServiceFuturePool;
10399
import org.slf4j.Logger;
104100
import org.slf4j.LoggerFactory;
@@ -246,7 +242,6 @@
246242
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.CSE_PADDING_LENGTH;
247243
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.DEFAULT_UPLOAD_PART_COUNT_LIMIT;
248244
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.DELETE_CONSIDERED_IDEMPOTENT;
249-
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.SC_301_MOVED_PERMANENTLY;
250245
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.SC_403_FORBIDDEN;
251246
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.SC_404_NOT_FOUND;
252247
import static org.apache.hadoop.fs.s3a.impl.InternalConstants.UPLOAD_PART_COUNT_LIMIT;

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ClientFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
3030
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
31-
import software.amazon.awssdk.regions.Region;
3231
import software.amazon.awssdk.services.s3.S3AsyncClient;
3332
import software.amazon.awssdk.services.s3.S3Client;
3433
import software.amazon.awssdk.transfer.s3.S3TransferManager;

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AEndpointRegion.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void testEndpointOverride() throws Throwable {
133133
describe("Create a client with a configured endpoint");
134134
Configuration conf = getConfiguration();
135135

136-
S3Client client = createS3Client(conf, AWS_ENDPOINT_TEST, null,US_EAST_2);
136+
S3Client client = createS3Client(conf, AWS_ENDPOINT_TEST, null, US_EAST_2);
137137

138138
intercept(AwsServiceException.class, "Exception thrown by interceptor", () -> client.headBucket(
139139
HeadBucketRequest.builder().bucket(getFileSystem().getBucket()).build()));
@@ -144,7 +144,7 @@ public void testCentralEndpoint() throws Throwable {
144144
describe("Create a client with the central endpoint");
145145
Configuration conf = getConfiguration();
146146

147-
S3Client client = createS3Client(conf, CENTRAL_ENDPOINT, null,US_EAST_1);
147+
S3Client client = createS3Client(conf, CENTRAL_ENDPOINT, null, US_EAST_1);
148148

149149
intercept(AwsServiceException.class, "Exception thrown by interceptor", () -> client.headBucket(
150150
HeadBucketRequest.builder().bucket(getFileSystem().getBucket()).build()));
@@ -243,9 +243,9 @@ public void beforeExecution(Context.BeforeExecution context,
243243
.describedAs("Endpoint is overridden").isEqualTo(null);
244244
}
245245

246-
Assertions.assertThat(
247-
executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION).toString())
248-
.describedAs("Incorrect region set").isEqualTo(region);
246+
Assertions.assertThat(
247+
executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION).toString())
248+
.describedAs("Incorrect region set").isEqualTo(region);
249249

250250
// We don't actually want to make a request, so exit early.
251251
throw AwsServiceException.builder().message("Exception thrown by interceptor").build();

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFilesystem.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.net.URI;
2727
import java.nio.file.AccessDeniedException;
2828

29-
import software.amazon.awssdk.regions.Region;
3029
import software.amazon.awssdk.services.s3.S3Client;
3130
import software.amazon.awssdk.services.s3.model.HeadBucketResponse;
3231
import org.junit.AfterClass;

0 commit comments

Comments
 (0)