add Springboot4 to CI workflow

Author: tobixlea

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

@@ -82,6 +82,18 @@ jobs:
       - name: Build with Spring Boot 3.3.x
         run: ./gha_build.sh springboot3 false false -Dspringboot.version=3.3.6 -Dspring.version=6.1.15 -Dspringsecurity.version=6.3.5 -Ddependency-check.skip=true
 
+  build_springboot4:
+    name: Build and test SpringBoot 4
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+      - name: Build latest
+        run: ./gha_build.sh springboot4 true true
 # temporarily disabled as Struts is not released at the moment
 #  build_struts2:
 #    name: Build and test Struts

aws-serverless-java-container-core/pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <jaxrs.version>3.1.0</jaxrs.version>
-        <servlet.version>6.0.0</servlet.version>
+        <servlet.version>6.1.0</servlet.version>
         <jackson.version>3.0.2</jackson.version> 
     </properties>
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletResponse.java

@@ -28,6 +28,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.ws.rs.core.HttpHeaders;
+import java.nio.ByteBuffer;
 import jakarta.ws.rs.core.MediaType;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -150,6 +151,16 @@ public void sendRedirect(String s) throws IOException {
         flushBuffer();
     }
 
+    @Override
+    public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException {
+        setStatus(sc);
+        addHeader(HttpHeaders.LOCATION, location);
+        if (clearBuffer) {
+            resetBuffer();
+        }
+        flushBuffer();
+    }
+
 
     @Override
     public void setDateHeader(String s, long l) {
@@ -297,6 +308,25 @@ public void write(int b) throws IOException {
                 }
             }
 
+            @Override
+            public void write(ByteBuffer b) throws IOException {
+                try {
+                    if (b.hasArray()) {
+                        bodyOutputStream.write(b.array(), b.arrayOffset() + b.position(), b.remaining());
+                        b.position(b.limit());
+                    } else {
+                        byte[] buf = new byte[b.remaining()];
+                        b.get(buf);
+                        bodyOutputStream.write(buf);
+                    }
+                } catch (Exception e) {
+                    log.error("Cannot write to output stream", e);
+                    if (listener != null) {
+                        listener.onError(e);
+                    }
+                }
+            }
+
             @Override
             public void flush() throws IOException {
                 flushBuffer();

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java

@@ -607,12 +607,22 @@ private List<String> getHeaderValues(String key) {
 
         if (request.getRequestSource() == RequestSource.API_GATEWAY) {
             if ("referer".equals(key.toLowerCase(Locale.ENGLISH))) {
-                values.add(request.getRequestContext().getIdentity().getCaller());
-                return values;
+                if (request.getRequestContext() != null && request.getRequestContext().getIdentity() != null) {
+                    String caller = request.getRequestContext().getIdentity().getCaller();
+                    if (caller != null) {
+                        values.add(caller);
+                        return values;
+                    }
+                }
             }
             if ("user-agent".equals(key.toLowerCase(Locale.ENGLISH))) {
-                values.add(request.getRequestContext().getIdentity().getUserAgent());
-                return values;
+                if (request.getRequestContext() != null && request.getRequestContext().getIdentity() != null) {
+                    String userAgent = request.getRequestContext().getIdentity().getUserAgent();
+                    if (userAgent != null) {
+                        values.add(userAgent);
+                        return values;
+                    }
+                }
             }
         }
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsServletInputStream.java

@@ -20,6 +20,7 @@
 import jakarta.servlet.ServletInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 
 public class AwsServletInputStream extends ServletInputStream {
     private static Logger log = LoggerFactory.getLogger(AwsServletInputStream.class);
@@ -73,4 +74,23 @@ public int read()
         }
         return readByte;
     }
+
+    @Override
+    public int read(ByteBuffer b) throws IOException {
+        if (bodyStream == null || bodyStream instanceof NullInputStream) {
+            return -1;
+        }
+        if (!b.hasRemaining()) {
+            return 0;
+        }
+        byte[] buf = new byte[b.remaining()];
+        int bytesRead = bodyStream.read(buf);
+        if (bytesRead > 0) {
+            b.put(buf, 0, bytesRead);
+        }
+        if (bytesRead == -1) {
+            finished = true;
+        }
+        return bytesRead;
+    }
 }