Skip to content

improve HttpServletRequest for Springboot4 #1590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobixlea merged 6 commits into from
Feb 17, 2026
Merged

improve HttpServletRequest for Springboot4 #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26dac66
improve HttpServletRequest for Springboot4
tobixlea Feb 12, 2026
7bdce8e
add null check to generateRequest1
tobixlea Feb 17, 2026
87bda8f
add attribute and null tests to http process test in SB3/4
tobixlea Feb 17, 2026
1a699a1
add further testing for v2 requests
tobixlea Feb 17, 2026
8b2db99
combine v2 request tests into one test
tobixlea Feb 17, 2026
dc667cf
Merge branch 'main' into sjc-spring-boot-update
tobixlea Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ot3/src/main/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,15 @@ private static HttpServletRequest generateRequest1(String request, Context lambd
populateQueryStringParametersV1(v1Request, httpRequest);
populateMultiValueQueryStringParametersV1(v1Request, httpRequest);

String contentType = null;
if (v1Request.getMultiValueHeaders() != null) {
MultiValueMapAdapter headers = new MultiValueMapAdapter(v1Request.getMultiValueHeaders());
httpRequest.setHeaders(headers);
contentType = v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
}
populateContentAndContentType(
v1Request.getBody(),
v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE),
contentType,
v1Request.isBase64Encoded(),
httpRequest
);
Expand Down
59 changes: 59 additions & 0 deletions ...rc/test/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;

import com.amazonaws.serverless.proxy.RequestReader;
import com.amazonaws.serverless.proxy.model.AlbContext;
Expand Down Expand Up @@ -218,6 +219,14 @@ public static Collection<String> data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT, API_GATEWAY_EVENT_V2, ALB_EVENT});
}

public static Collection<String> v1Data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT, ALB_EVENT});
}

public static Collection<String> v2Data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT_V2});
}

@MethodSource("data")
@ParameterizedTest
public void validateHttpServletRequestGenerationWithInputStream(String jsonEvent) {
Expand Down Expand Up @@ -268,6 +277,56 @@ public void validateRequestResponse(String jsonEvent) throws Exception {
}

}

@MethodSource("v1Data")
@ParameterizedTest
public void validateLambdaContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.API_GATEWAY_EVENT_PROPERTY));
}

@MethodSource("data")
@ParameterizedTest
public void validateSecurityContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.JAX_SECURITY_CONTEXT_PROPERTY));
}

@MethodSource("v1Data")
@ParameterizedTest
public void validateNullMultiValueHeaders(String jsonEvent) throws Exception {
Map<String, Object> event = mapper.readValue(jsonEvent, Map.class);
event.put("multiValueHeaders", null);
String modifiedEvent = mapper.writeValueAsString(event);
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(modifiedEvent, null, servletContext, mapper);
assertNotNull(request);
}

@MethodSource("data")
@ParameterizedTest
public void validateBase64EncodedBody(String jsonEvent) throws Exception {
String base64Body = java.util.Base64.getEncoder().encodeToString("test body".getBytes(StandardCharsets.UTF_8));
Map<String, Object> event = mapper.readValue(jsonEvent, Map.class);
event.put("body", base64Body);
event.put("isBase64Encoded", true);
String modifiedEvent = mapper.writeValueAsString(event);
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(modifiedEvent, null, servletContext, mapper);
assertNotNull(request);
}

@MethodSource("v2Data")
@ParameterizedTest
public void validateHttpApiContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.HTTP_API_CONTEXT_PROPERTY));
assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
}

@EnableAutoConfiguration
@Configuration
Expand Down
32 changes: 28 additions & 4 deletions ...ot4/src/main/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,35 @@ private static HttpServletRequest generateRequest1(String request, Context lambd
SecurityContextWriter securityWriter, ObjectMapper mapper, ServletContext servletContext) {
AwsProxyRequest v1Request = readValue(request, AwsProxyRequest.class, mapper);

// Use AWS container's servlet request instead of Spring Cloud Function's
AwsProxyHttpServletRequest httpServletRequest = new AwsProxyHttpServletRequest(v1Request, lambdaContext, securityWriter.writeSecurityContext(v1Request, lambdaContext));
httpServletRequest.setServletContext(servletContext);
return httpServletRequest;
ServerlessHttpServletRequest httpRequest = new ServerlessHttpServletRequest(servletContext, v1Request.getHttpMethod(), v1Request.getPath());
Copy link
Contributor

@reedham-aws reedham-aws Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the difference between AwsProxyHttpServletRequest and ServerlessHttpServletRequest? I guess they're both HttpServletRequests but could in theory have different behavior, right? This might be a basic question I'm just not very familiar.


populateQueryStringParametersV1(v1Request, httpRequest);
populateMultiValueQueryStringParametersV1(v1Request, httpRequest);

String contentType = null;
if (v1Request.getMultiValueHeaders() != null) {
MultiValueMapAdapter headers = new MultiValueMapAdapter(v1Request.getMultiValueHeaders());
httpRequest.setHeaders(headers);
contentType = v1Request.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
}
populateContentAndContentType(
v1Request.getBody(),
contentType,
v1Request.isBase64Encoded(),
httpRequest
);
if (v1Request.getRequestContext() != null) {
httpRequest.setAttribute(RequestReader.API_GATEWAY_CONTEXT_PROPERTY, v1Request.getRequestContext());
httpRequest.setAttribute(RequestReader.ALB_CONTEXT_PROPERTY, v1Request.getRequestContext().getElb());
}
httpRequest.setAttribute(RequestReader.API_GATEWAY_STAGE_VARS_PROPERTY, v1Request.getStageVariables());
httpRequest.setAttribute(RequestReader.API_GATEWAY_EVENT_PROPERTY, v1Request);
httpRequest.setAttribute(RequestReader.LAMBDA_CONTEXT_PROPERTY, lambdaContext);
httpRequest.setAttribute(RequestReader.JAX_SECURITY_CONTEXT_PROPERTY,
securityWriter.writeSecurityContext(v1Request, lambdaContext));
return httpRequest;
}




Expand Down
74 changes: 74 additions & 0 deletions ...rc/test/java/com/amazonaws/serverless/proxy/spring/AwsSpringHttpProcessingUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;

import com.amazonaws.serverless.proxy.RequestReader;
import com.amazonaws.serverless.proxy.model.AlbContext;
Expand Down Expand Up @@ -219,6 +220,14 @@ public static Collection<String> data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT, API_GATEWAY_EVENT_V2, ALB_EVENT});
}

public static Collection<String> v1Data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT, ALB_EVENT});
}

public static Collection<String> v2Data() {
return Arrays.asList(new String[]{API_GATEWAY_EVENT_V2});
}

@MethodSource("data")
@ParameterizedTest
public void validateHttpServletRequestGenerationWithInputStream(String jsonEvent) {
Expand Down Expand Up @@ -254,8 +263,73 @@ public void validateHttpServletRequestGenerationWithJson(String jsonEvent) {
// spot check some headers
assertRequest(request);
}

@MethodSource("data")
@ParameterizedTest
public void validateRequestResponse(String jsonEvent) throws Exception {
try (ConfigurableApplicationContext context = SpringApplication.run(EmptyApplication.class);) {
ServerlessMVC mvc = ServerlessMVC.INSTANCE((ServletWebServerApplicationContext) context);
AwsProxyHttpServletResponseWriter responseWriter = new AwsProxyHttpServletResponseWriter();
AwsProxyResponse awsResponse = AwsSpringHttpProcessingUtils.processRequest(
AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null,
mvc.getServletContext(), mapper), mvc, responseWriter);
assertEquals("hello", awsResponse.getBody());
assertEquals(200, awsResponse.getStatusCode());
}

}


@MethodSource("v1Data")
@ParameterizedTest
public void validateLambdaContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.API_GATEWAY_EVENT_PROPERTY));
}

@MethodSource("data")
@ParameterizedTest
public void validateSecurityContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.JAX_SECURITY_CONTEXT_PROPERTY));
}

@MethodSource("v1Data")
@ParameterizedTest
public void validateNullMultiValueHeaders(String jsonEvent) throws Exception {
Map<String, Object> event = mapper.readValue(jsonEvent, Map.class);
event.put("multiValueHeaders", null);
String modifiedEvent = mapper.writeValueAsString(event);
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(modifiedEvent, null, servletContext, mapper);
assertNotNull(request);
}

@MethodSource("data")
@ParameterizedTest
public void validateBase64EncodedBody(String jsonEvent) throws Exception {
String base64Body = java.util.Base64.getEncoder().encodeToString("test body".getBytes(StandardCharsets.UTF_8));
Map<String, Object> event = mapper.readValue(jsonEvent, Map.class);
event.put("body", base64Body);
event.put("isBase64Encoded", true);
String modifiedEvent = mapper.writeValueAsString(event);
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(modifiedEvent, null, servletContext, mapper);
assertNotNull(request);
}

@MethodSource("v2Data")
@ParameterizedTest
public void validateHttpApiContextAttribute(String jsonEvent) {
ServerlessServletContext servletContext = new ServerlessServletContext();
HttpServletRequest request = AwsSpringHttpProcessingUtils.generateHttpServletRequest(jsonEvent, null, servletContext, mapper);
assertNotNull(request.getAttribute(RequestReader.HTTP_API_CONTEXT_PROPERTY));
assertNotNull(request.getAttribute(RequestReader.HTTP_API_STAGE_VARS_PROPERTY));
assertNotNull(request.getAttribute(RequestReader.HTTP_API_EVENT_PROPERTY));
}

@EnableAutoConfiguration
@Configuration
@EnableWebSecurity
Expand Down
Loading