Skip to content

Commit e83e79f

Browse files
Bump checkstyle from 8.18 to 8.29 (#232)
* Bump checkstyle from 8.18 to 8.29
1 parent fb5ff54 commit e83e79f

File tree

81 files changed

+15
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+15
-179
lines changed

pom.xml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4040
<awssdk.version>2.10.49</awssdk.version>
41-
<checkstyle.version>8.18</checkstyle.version>
41+
<checkstyle.version>8.29</checkstyle.version>
4242
<commons-io.version>2.6</commons-io.version>
4343
<jackson.version>2.10.1</jackson.version>
4444
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
@@ -211,7 +211,6 @@
211211
</dependency>
212212
</dependencies>
213213
<pluginRepositories>
214-
<!-- Supports software.amazon.awssdk:build-tools -->
215214
<pluginRepository>
216215
<id>jitpack.io</id>
217216
<url>https://jitpack.io</url>
@@ -226,6 +225,11 @@
226225
<version>${spotless.version}</version>
227226
<configuration>
228227
<java>
228+
<!-- this automatically inserts line breaks, so apply it before eclipse formatter! -->
229+
<importOrder>
230+
<order>com,java,javax,org,software</order>
231+
</importOrder>
232+
<removeUnusedImports/>
229233
<eclipse>
230234
<!-- This formatter covers alot of linting, but not 100% of what checkstyle will enforce -->
231235
<file>${basedir}/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml</file>
@@ -234,10 +238,6 @@
234238
<licenseHeader>
235239
<file>licenseHeader</file>
236240
</licenseHeader>
237-
<removeUnusedImports/>
238-
<importOrder>
239-
<order>com,java,javax,org,software</order>
240-
</importOrder>
241241
</java>
242242
</configuration>
243243
<executions>
@@ -342,11 +342,6 @@
342342
<artifactId>checkstyle</artifactId>
343343
<version>${checkstyle.version}</version>
344344
</dependency>
345-
<dependency>
346-
<groupId>com.github.aws.aws-sdk-java-v2</groupId>
347-
<artifactId>build-tools</artifactId>
348-
<version>2.10.18</version>
349-
</dependency>
350345
</dependencies>
351346
<executions>
352347
<execution>

src/main/java/software/amazon/cloudformation/LambdaWrapper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
package software.amazon.cloudformation;
1616

1717
import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
18-
1918
import com.amazonaws.AmazonServiceException;
2019
import com.amazonaws.services.lambda.runtime.Context;
2120
import com.amazonaws.services.lambda.runtime.LambdaLogger;
2221
import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
2322
import com.fasterxml.jackson.core.type.TypeReference;
2423
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
2524
import com.google.common.annotations.VisibleForTesting;
26-
2725
import java.io.IOException;
2826
import java.io.InputStream;
2927
import java.io.OutputStream;
@@ -36,14 +34,12 @@
3634
import java.util.List;
3735
import java.util.Map;
3836
import java.util.concurrent.TimeUnit;
39-
4037
import org.apache.commons.collections.CollectionUtils;
4138
import org.apache.commons.io.FileUtils;
4239
import org.apache.commons.io.IOUtils;
4340
import org.apache.commons.lang3.exception.ExceptionUtils;
4441
import org.json.JSONObject;
4542
import org.json.JSONTokener;
46-
4743
import software.amazon.awssdk.http.SdkHttpClient;
4844
import software.amazon.awssdk.http.apache.ApacheHttpClient;
4945
import software.amazon.awssdk.utils.StringUtils;

src/main/java/software/amazon/cloudformation/Response.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
package software.amazon.cloudformation;
1616

1717
import java.util.List;
18-
1918
import lombok.Data;
20-
2119
import software.amazon.cloudformation.proxy.HandlerErrorCode;
2220
import software.amazon.cloudformation.proxy.OperationStatus;
2321

src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package software.amazon.cloudformation.exceptions;
1616

1717
import lombok.Getter;
18-
1918
import software.amazon.cloudformation.proxy.HandlerErrorCode;
2019

2120
@Getter

src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package software.amazon.cloudformation.injection;
1616

1717
import java.net.URI;
18-
1918
import software.amazon.awssdk.http.SdkHttpClient;
2019
import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
2120

src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
package software.amazon.cloudformation.loggers;
1616

1717
import com.amazonaws.services.lambda.runtime.LambdaLogger;
18-
1918
import java.time.Instant;
2019
import java.util.UUID;
21-
2220
import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
2321
import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
2422
import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogStreamRequest;

src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
package software.amazon.cloudformation.loggers;
1616

1717
import com.amazonaws.services.lambda.runtime.LambdaLogger;
18-
1918
import java.time.Instant;
2019
import java.util.Date;
21-
2220
import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
2321
import software.amazon.awssdk.services.cloudwatchlogs.model.InputLogEvent;
2422
import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;

src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package software.amazon.cloudformation.metrics;
1616

1717
import java.time.Instant;
18-
1918
import software.amazon.cloudformation.Action;
2019
import software.amazon.cloudformation.proxy.HandlerErrorCode;
2120

src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.HashMap;
2020
import java.util.List;
2121
import java.util.Map;
22-
2322
import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
2423
import software.amazon.awssdk.services.cloudwatch.model.Dimension;
2524
import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;

src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.amazonaws.auth.BasicSessionCredentials;
2323
import com.google.common.base.Preconditions;
2424
import com.google.common.util.concurrent.Uninterruptibles;
25-
2625
import java.time.Duration;
2726
import java.time.Instant;
2827
import java.time.temporal.ChronoUnit;
@@ -31,9 +30,7 @@
3130
import java.util.function.BiFunction;
3231
import java.util.function.Function;
3332
import java.util.function.Supplier;
34-
3533
import javax.annotation.Nonnull;
36-
3734
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
3835
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
3936
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

0 commit comments

Comments
 (0)