aws-cloudformation · johnttompkins · Mar 10, 2020 · Jan 31, 2020 · Feb 11, 2020 · Feb 11, 2020
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <awssdk.version>2.10.49</awssdk.version>
-        <checkstyle.version>8.18</checkstyle.version>
+        <checkstyle.version>8.29</checkstyle.version>
         <commons-io.version>2.6</commons-io.version>
         <jackson.version>2.10.1</jackson.version>
         <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
@@ -211,7 +211,6 @@
         </dependency>
     </dependencies>
     <pluginRepositories>
-        <!-- Supports software.amazon.awssdk:build-tools -->
         <pluginRepository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -226,6 +225,11 @@
                 <version>${spotless.version}</version>
                 <configuration>
                     <java>
+                        <!-- this automatically inserts line breaks, so apply it before eclipse formatter! -->
+                        <importOrder>
+                            <order>com,java,javax,org,software</order>
+                        </importOrder>
+                        <removeUnusedImports/>
                         <eclipse>
                             <!-- This formatter covers alot of linting, but not 100% of what checkstyle will enforce -->
                             <file>${basedir}/src/main/resources/com/amazonaws/cloudformation/eclipse-java-formatter.xml</file>
@@ -234,10 +238,6 @@
                         <licenseHeader>
                             <file>licenseHeader</file>
                         </licenseHeader>
-                        <removeUnusedImports/>
-                        <importOrder>
-                            <order>com,java,javax,org,software</order>
-                        </importOrder>
                     </java>
                 </configuration>
                 <executions>
@@ -342,11 +342,6 @@
                         <artifactId>checkstyle</artifactId>
                         <version>${checkstyle.version}</version>
                     </dependency>
-                    <dependency>
-                        <groupId>com.github.aws.aws-sdk-java-v2</groupId>
-                        <artifactId>build-tools</artifactId>
-                        <version>2.10.18</version>
-                    </dependency>
                 </dependencies>
                 <executions>
                     <execution>

diff --git a/src/main/java/software/amazon/cloudformation/LambdaWrapper.java b/src/main/java/software/amazon/cloudformation/LambdaWrapper.java
@@ -15,15 +15,13 @@
 package software.amazon.cloudformation;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,14 +34,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.utils.StringUtils;

diff --git a/src/main/java/software/amazon/cloudformation/Response.java b/src/main/java/software/amazon/cloudformation/Response.java
@@ -15,9 +15,7 @@
 package software.amazon.cloudformation;
 
 import java.util.List;
-
 import lombok.Data;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 import software.amazon.cloudformation.proxy.OperationStatus;
 

diff --git a/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java b/src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.exceptions;
 
 import lombok.Getter;
-
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 
 @Getter

diff --git a/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java b/src/main/java/software/amazon/cloudformation/injection/CloudFormationProvider.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.injection;
 
 import java.net.URI;
-
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
 

diff --git a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogHelper.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.loggers;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
-
 import java.time.Instant;
 import java.util.UUID;
-
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogGroupRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.CreateLogStreamRequest;

diff --git a/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java b/src/main/java/software/amazon/cloudformation/loggers/CloudWatchLogPublisher.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.loggers;
 
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
-
 import java.time.Instant;
 import java.util.Date;
-
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.InputLogEvent;
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;

diff --git a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisher.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.metrics;
 
 import java.time.Instant;
-
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.proxy.HandlerErrorCode;
 

diff --git a/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java b/src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;
 import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java b/src/main/java/software/amazon/cloudformation/proxy/AmazonWebServicesClientProxy.java
@@ -22,7 +22,6 @@
 import com.amazonaws.auth.BasicSessionCredentials;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Uninterruptibles;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
@@ -31,9 +30,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
 import javax.annotation.Nonnull;
-
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java b/src/main/java/software/amazon/cloudformation/proxy/CloudFormationCallbackAdapter.java
@@ -15,11 +15,8 @@
 package software.amazon.cloudformation.proxy;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-
 import java.util.UUID;
-
 import org.json.JSONObject;
-
 import software.amazon.awssdk.services.cloudformation.CloudFormationClient;
 import software.amazon.awssdk.services.cloudformation.model.RecordHandlerProgressRequest;
 import software.amazon.awssdk.services.cloudformation.model.RecordHandlerProgressResponse;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
@@ -16,7 +16,6 @@
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import software.amazon.cloudformation.Action;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java b/src/main/java/software/amazon/cloudformation/proxy/LoggerProxy.java
@@ -16,7 +16,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.loggers.LogPublisher;
 
 public class LoggerProxy implements Logger {

diff --git a/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java b/src/main/java/software/amazon/cloudformation/proxy/MetricsPublisherProxy.java
@@ -17,7 +17,6 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.Action;
 import software.amazon.cloudformation.metrics.MetricsPublisher;
 

diff --git a/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java b/src/main/java/software/amazon/cloudformation/proxy/ProgressEvent.java
@@ -15,10 +15,8 @@
 package software.amazon.cloudformation.proxy;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import java.util.List;
 import java.util.function.Function;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java b/src/main/java/software/amazon/cloudformation/proxy/ProxyClient.java
@@ -16,7 +16,6 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
-
 import software.amazon.awssdk.awscore.AwsRequest;
 import software.amazon.awssdk.awscore.AwsResponse;
 

diff --git a/src/main/java/software/amazon/cloudformation/proxy/RequestData.java b/src/main/java/software/amazon/cloudformation/proxy/RequestData.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy;
 
 import java.util.Map;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

diff --git a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy;
 
 import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerTestPayload.java
@@ -18,7 +18,6 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import software.amazon.cloudformation.Action;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java b/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java
@@ -27,7 +27,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -36,7 +35,6 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import javax.annotation.concurrent.ThreadSafe;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java b/src/main/java/software/amazon/cloudformation/proxy/aws/AWSServiceSerdeModule.java
@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.deser.Deserializers;
 import com.fasterxml.jackson.databind.ser.Serializers;
-
 import software.amazon.awssdk.core.SdkPojo;
 import software.amazon.awssdk.utils.builder.SdkBuilder;
 

diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoDeserializer.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -33,7 +32,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java b/src/main/java/software/amazon/cloudformation/proxy/aws/SdkPojoSerializer.java
@@ -19,13 +19,11 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Map;
-
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java b/src/main/java/software/amazon/cloudformation/proxy/delay/AbstractDelay.java
@@ -15,9 +15,7 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/BaseBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Blended.java
@@ -17,7 +17,6 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Constant.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/DelayBasedBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java b/src/main/java/software/amazon/cloudformation/proxy/delay/Exponential.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayAbstractBase.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MinDelayBasedBuilder.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import java.time.Duration;
-
 import software.amazon.cloudformation.proxy.Delay;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java b/src/main/java/software/amazon/cloudformation/proxy/delay/MultipleOf.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.proxy.delay;
 
 import com.google.common.base.Preconditions;
-
 import java.time.Duration;
 
 /**

diff --git a/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java b/src/main/java/software/amazon/cloudformation/resource/IdentifierUtils.java
@@ -15,7 +15,6 @@
 package software.amazon.cloudformation.resource;
 
 import java.util.Random;
-
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class IdentifierUtils {

diff --git a/src/main/java/software/amazon/cloudformation/resource/Serializer.java b/src/main/java/software/amazon/cloudformation/resource/Serializer.java
@@ -22,9 +22,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
 import java.io.IOException;
-
 import software.amazon.cloudformation.proxy.aws.AWSServiceSerdeModule;
 
 public class Serializer {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
     package software.amazon.cloudformation.exceptions;
     import lombok.Getter;
     import software.amazon.cloudformation.proxy.HandlerErrorCode;
     @Getter
@@ Expand Down @@