patch: Added CI against spring 5.1 and 5.2. Updated unit tests to skip SpringBoot tests when running against Spring 5.2 since SpringBoot 1.5 is deprecated and newer breaking changes are not supported

Author: sapessi

.github/workflows/continuous-integration-workflow.yml

@@ -50,6 +50,12 @@ jobs:
         run: ./gha_build.sh spring false false -Dspring.version=4.3.25.RELEASE -Dspring-security.version=4.2.13.RELEASE
       - name: Build Spring 5.0
         run: ./gha_build.sh spring false false -Dspring.version=5.0.15.RELEASE -Dspring-security.version=5.0.13.RELEASE
+      - name: Build Spring 5.1
+        run: ./gha_build.sh spring false false -Dspring.version=5.1.14.RELEASE -Dspring-security.version=5.1.8.RELEASE
+      - name: Build Spring 5.2
+        # we reduce the minCoverage for this run because it will skip the SpringBoot 1.5 tests since they are no longer compatible with
+        # Spring core 5.2 and above. SpringBoot 1.5 is deprecated
+        run: ./gha_build.sh spring false false -Dspring.version=5.2.5.RELEASE -Dspring-security.version=5.2.2.RELEASE -Djacoco.minCoverage=0.4
 
   build_springboot2:
     name: Build and test SpringBoot 2

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SlowAppTest.java

@@ -11,10 +11,13 @@
 import com.amazonaws.serverless.proxy.spring.springslowapp.SlowAppConfig;
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.core.SpringVersion;
 
 import java.time.Instant;
+import java.util.Objects;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 
 public class SlowAppTest {
 
@@ -40,6 +43,11 @@ public void springSlowApp_continuesInBackgroundThread_returnsCorrect() {
 
     @Test
     public void springBootSlowApp_continuesInBackgroundThread_returnsCorrect() {
+        // We skip the tests if we are running against Spring 5.2.x - SpringBoot 1.5 is deprecated and no longer
+        // breaking changes in the latest Spring releases have not been supported in it.
+        // TODO: Update the check to verify any Spring version above 5.2
+        assumeFalse(Objects.requireNonNull(SpringVersion.getVersion()).startsWith("5.2"));
+
         SBLambdaHandler slowApp = null;
         try {
             slowApp = new SBLambdaHandler();

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringBootAppTest.java

@@ -12,23 +12,34 @@
 import com.amazonaws.serverless.proxy.spring.springbootapp.LambdaHandler;
 import com.amazonaws.serverless.proxy.spring.springbootapp.TestController;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.core.SpringVersion;
 
 import javax.ws.rs.core.HttpHeaders;
 import java.io.IOException;
+import java.util.Objects;
 
 import static com.amazonaws.serverless.proxy.spring.springbootapp.TestController.CUSTOM_HEADER_NAME;
 import static com.amazonaws.serverless.proxy.spring.springbootapp.TestController.CUSTOM_QS_NAME;
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 
 
 public class SpringBootAppTest {
     private LambdaHandler handler = new LambdaHandler();
     private MockLambdaContext context = new MockLambdaContext();
     private ObjectMapper mapper = new ObjectMapper();
 
+    @BeforeClass
+    public static void before() {
+        // We skip the tests if we are running against Spring 5.2.x - SpringBoot 1.5 is deprecated and no longer
+        // breaking changes in the latest Spring releases have not been supported in it.
+        // TODO: Update the check to verify any Spring version above 5.2
+        assumeFalse(Objects.requireNonNull(SpringVersion.getVersion()).startsWith("5.2"));
+    }
+
     @Test
     public void testMethod_springSecurity_doesNotThrowException() {
         AwsProxyRequest req = new AwsProxyRequestBuilder("/test", "GET").build();

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringBootSecurityTest.java

@@ -12,20 +12,32 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.springframework.core.SpringVersion;
 
 import javax.ws.rs.core.HttpHeaders;
 import java.io.IOException;
 import java.util.Base64;
+import java.util.Objects;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 
 
 public class SpringBootSecurityTest {
     private LambdaHandler handler = new LambdaHandler();
     private MockLambdaContext context = new MockLambdaContext();
     private ObjectMapper mapper = new ObjectMapper();
 
+    @BeforeClass
+    public static void before() {
+        // We skip the tests if we are running against Spring 5.2.x - SpringBoot 1.5 is deprecated and no longer
+        // breaking changes in the latest Spring releases have not been supported in it.
+        // TODO: Update the check to verify any Spring version above 5.2
+        assumeFalse(Objects.requireNonNull(SpringVersion.getVersion()).startsWith("5.2"));
+    }
+
     @Test
     public void correctUser_springSecurityBasicAuth_requestSucceeds() throws JsonProcessingException {
         String authValue = Base64.getMimeEncoder().encodeToString((TestSecurityConfig.USERNAME + ":" + TestSecurityConfig.PASSWORD).getBytes());

aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/embedded/ServerlessServletEmbeddedServerFactoryTest.java

@@ -3,18 +3,30 @@
 import com.amazonaws.serverless.exceptions.ContainerInitializationException;
 import com.amazonaws.serverless.proxy.spring.SpringBootLambdaContainerHandler;
 import com.amazonaws.serverless.proxy.spring.springbootapp.TestApplication;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.boot.context.embedded.EmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerException;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.core.SpringVersion;
 
 import javax.servlet.*;
 import java.io.IOException;
+import java.util.Objects;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 
 public class ServerlessServletEmbeddedServerFactoryTest {
 
+    @BeforeClass
+    public static void before() {
+        // We skip the tests if we are running against Spring 5.2.x - SpringBoot 1.5 is deprecated and no longer
+        // breaking changes in the latest Spring releases have not been supported in it.
+        // TODO: Update the check to verify any Spring version above 5.2
+        assumeFalse(Objects.requireNonNull(SpringVersion.getVersion()).startsWith("5.2"));
+    }
+
     // initialize a container handler to that the embedded factory can grab its instnace
     private SpringBootLambdaContainerHandler h = SpringBootLambdaContainerHandler.getAwsProxyHandler(TestApplication.class);