Skip to content

Commit a00d71f

Browse files
mbfredermbfreder
committed
remove helper class
1 parent 5a0b1b3 commit a00d71f

File tree

14 files changed

+364
-699
lines changed

14 files changed

+364
-699
lines changed

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

Lines changed: 168 additions & 125 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 449 deletions
This file was deleted.

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

Lines changed: 151 additions & 79 deletions
Large diffs are not rendered by default.

‎aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/AwsProxyExceptionHandlerTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
import com.amazonaws.serverless.exceptions.InvalidRequestEventException;
55
import com.amazonaws.serverless.exceptions.InvalidResponseObjectException;
6-
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper;
76
import com.amazonaws.serverless.proxy.model.ErrorModel;
87
import com.amazonaws.services.lambda.runtime.events.AwsProxyResponseEvent;
98
import com.fasterxml.jackson.core.JsonProcessingException;
109
import com.fasterxml.jackson.databind.ObjectMapper;
1110

11+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
1212
import static org.junit.jupiter.api.Assertions.*;
1313
import static org.mockito.ArgumentMatchers.any;
1414
import static org.mockito.Mockito.mock;
@@ -62,7 +62,7 @@ void typedHandle_InvalidRequestEventException_jsonContentTypeHeader() {
6262

6363
assertNotNull(resp);
6464
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
65-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE)); //resp.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE));
65+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE)); //resp.getMultiValueHeaders().getFirst(HttpHeaders.CONTENT_TYPE));
6666
}
6767

6868
@Test
@@ -89,7 +89,7 @@ void typedHandle_InvalidResponseObjectException_jsonContentTypeHeader() {
8989

9090
assertNotNull(resp);
9191
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
92-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
92+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
9393
}
9494

9595
@Test
@@ -127,7 +127,7 @@ void typedHandle_InternalServerErrorException_jsonContentTypeHeader() {
127127

128128
assertNotNull(resp);
129129
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
130-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
130+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
131131
}
132132

133133
@Test
@@ -138,7 +138,7 @@ void typedHandle_NullPointerException_responseObject()
138138
assertNotNull(resp);
139139
assertEquals(502, resp.getStatusCode());
140140
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
141-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
141+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
142142
String body = objectMapper.writeValueAsString(new ErrorModel(AwsProxyExceptionHandler.GATEWAY_TIMEOUT_ERROR));
143143
assertEquals(body, resp.getBody());
144144
}
@@ -181,7 +181,7 @@ void streamHandle_InvalidRequestEventException_jsonContentTypeHeader()
181181
AwsProxyResponseEvent resp = objectMapper.readValue(new ByteArrayInputStream(respStream.toByteArray()), AwsProxyResponseEvent.class);
182182
assertNotNull(resp);
183183
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
184-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
184+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
185185
}
186186

187187
@Test
@@ -222,7 +222,7 @@ void streamHandle_InvalidResponseObjectException_jsonContentTypeHeader()
222222
AwsProxyResponseEvent resp = objectMapper.readValue(new ByteArrayInputStream(respStream.toByteArray()), AwsProxyResponseEvent.class);
223223
assertNotNull(resp);
224224
assertTrue(resp.getMultiValueHeaders().containsKey(HttpHeaders.CONTENT_TYPE));
225-
assertEquals(MediaType.APPLICATION_JSON, AwsHttpServletRequestHelper.getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
225+
assertEquals(MediaType.APPLICATION_JSON, getFirst(resp.getMultiValueHeaders(), HttpHeaders.CONTENT_TYPE));
226226
}
227227

228228
@Test

‎aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/testutils/AwsProxyRequestBuilder.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
package com.amazonaws.serverless.proxy.internal.testutils;
1414

1515
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
16+
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest;
1617
import com.amazonaws.serverless.proxy.model.*;
1718

1819
import com.amazonaws.services.lambda.runtime.events.ApplicationLoadBalancerRequestEvent;
@@ -40,7 +41,7 @@
4041
import java.nio.charset.StandardCharsets;
4142
import java.util.*;
4243

43-
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper.*;
44+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
4445

4546

4647
/**
@@ -330,23 +331,23 @@ public AwsProxyRequestBuilder cookie(String name, String value) {
330331
}
331332

332333
cookies += (cookies.equals("")?"":"; ") + name + "=" + value;
333-
putSingle(request.getMultiValueHeaders(), HttpHeaders.COOKIE, cookies);
334+
AwsHttpServletRequest.putSingle(request.getMultiValueHeaders(), HttpHeaders.COOKIE, cookies);
334335
return this;
335336
}
336337

337338
public AwsProxyRequestBuilder scheme(String scheme) {
338339
if (request.getMultiValueHeaders() == null) {
339340
request.setMultiValueHeaders(new Headers());
340341
}
341-
putSingle(request.getMultiValueHeaders(),"CloudFront-Forwarded-Proto", scheme);
342+
AwsHttpServletRequest.putSingle(request.getMultiValueHeaders(),"CloudFront-Forwarded-Proto", scheme);
342343
return this;
343344
}
344345

345346
public AwsProxyRequestBuilder serverName(String serverName) {
346347
if (request.getMultiValueHeaders() == null) {
347348
request.setMultiValueHeaders(new Headers());
348349
}
349-
putSingle(request.getMultiValueHeaders(), "Host", serverName);
350+
AwsHttpServletRequest.putSingle(request.getMultiValueHeaders(), "Host", serverName);
350351
return this;
351352
}
352353

@@ -379,7 +380,7 @@ public AwsProxyRequestBuilder basicAuth(String username, String password) {
379380
// we remove the existing authorization strategy
380381
request.getMultiValueHeaders().remove(HttpHeaders.AUTHORIZATION);
381382
String authHeader = "Basic " + Base64.getMimeEncoder().encodeToString((username + ":" + password).getBytes(Charset.defaultCharset()));
382-
List<String> values = findKey(request.getMultiValueHeaders(), HttpHeaders.AUTHORIZATION);
383+
List<String> values = AwsHttpServletRequest.findKey(request.getMultiValueHeaders(), HttpHeaders.AUTHORIZATION);
383384
values.add(authHeader);
384385
return this;
385386
}

‎aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyAwsProxyTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515

1616
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
17-
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper;
1817
import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
1918
import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
2019
import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
@@ -43,6 +42,7 @@
4342
import java.util.Collection;
4443
import java.util.UUID;
4544

45+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
4646
import static org.junit.jupiter.api.Assertions.assertEquals;
4747
import static org.junit.jupiter.api.Assertions.assertNotNull;
4848
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -157,7 +157,7 @@ void headers_getHeaders_echo(String reqType) {
157157

158158
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
159159
assertEquals(200, output.getStatusCode());
160-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
160+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
161161

162162
validateMapResponseModel(output);
163163
}
@@ -172,7 +172,7 @@ void headers_servletRequest_echo(String reqType) {
172172

173173
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
174174
assertEquals(200, output.getStatusCode());
175-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
175+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
176176

177177
validateMapResponseModel(output);
178178
}
@@ -188,7 +188,7 @@ void headers_servletRequest_failedDependencyInjection_expectInternalServerError(
188188
.build();
189189

190190
AwsProxyResponseEvent output = handlerWithoutRegisteredDependencies.proxy(request, lambdaContext);
191-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
191+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
192192
assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), output.getStatusCode());
193193
}
194194

@@ -211,7 +211,7 @@ void context_serverInfo_correctContext(String reqType) {
211211
AwsProxyRequestBuilder request = getRequestBuilder("/echo/servlet-context", "GET");
212212
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
213213
assertEquals(200, output.getStatusCode());
214-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
214+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
215215

216216
validateSingleValueModel(output, AwsServletContext.SERVER_INFO);
217217
}
@@ -225,7 +225,7 @@ void requestScheme_valid_expectHttps(String reqType) {
225225

226226
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
227227
assertEquals(200, output.getStatusCode());
228-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
228+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
229229

230230
validateSingleValueModel(output, "https");
231231
}
@@ -239,7 +239,7 @@ void requestFilter_injectsServletRequest_expectCustomAttribute(String reqType) {
239239

240240
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
241241
assertEquals(200, output.getStatusCode());
242-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
242+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
243243

244244
validateSingleValueModel(output, ServletRequestFilter.FILTER_ATTRIBUTE_VALUE);
245245
}
@@ -255,7 +255,7 @@ void authorizer_securityContext_customPrincipalSuccess(String reqType) {
255255

256256
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
257257
assertEquals(200, output.getStatusCode());
258-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
258+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
259259
validateSingleValueModel(output, AUTHORIZER_PRINCIPAL_ID);
260260
}
261261

@@ -272,7 +272,7 @@ void authorizer_securityContext_customAuthorizerContextSuccess(String reqType) {
272272

273273
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
274274
assertEquals(200, output.getStatusCode());
275-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
275+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
276276

277277
validateSingleValueModel(output, CUSTOM_HEADER_VALUE);
278278
}

‎aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyParamEncodingTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
5-
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper;
65
import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
76
import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
87
import com.amazonaws.serverless.proxy.jersey.model.MapResponseModel;
@@ -30,6 +29,7 @@
3029
import java.util.Arrays;
3130
import java.util.Collection;
3231

32+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
3333
import static org.junit.jupiter.api.Assertions.assertEquals;
3434
import static org.junit.jupiter.api.Assertions.assertNotNull;
3535
import static org.junit.jupiter.api.Assertions.fail;
@@ -136,7 +136,7 @@ void queryString_uriInfo_echo(String reqType) {
136136

137137
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
138138
assertEquals(200, output.getStatusCode());
139-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
139+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
140140

141141
validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
142142
}
@@ -151,7 +151,7 @@ void queryString_notEncoded_echo(String reqType) {
151151

152152
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
153153
assertEquals(200, output.getStatusCode());
154-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
154+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
155155

156156
validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
157157
}
@@ -167,7 +167,7 @@ void queryString_encoded_echo(String reqType) {
167167

168168
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
169169
assertEquals(200, output.getStatusCode());
170-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type"));
170+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type"));
171171

172172
validateMapResponseModel(output, QUERY_STRING_KEY, QUERY_STRING_NON_ENCODED_VALUE);
173173
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.amazonaws.serverless.exceptions.ContainerInitializationException;
44
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
5-
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper;
65
import com.amazonaws.serverless.proxy.internal.servlet.AwsLambdaServletContainerHandler;
76
import com.amazonaws.serverless.proxy.internal.servlet.AwsServletRegistration;
87
import com.amazonaws.serverless.proxy.model.*;
@@ -41,6 +40,7 @@
4140
import java.util.EnumSet;
4241
import java.util.UUID;
4342

43+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
4444
import static org.junit.jupiter.api.Assertions.*;
4545
import static org.junit.jupiter.api.Assumptions.assumeFalse;
4646
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -153,7 +153,7 @@ void headers_getHeaders_echo(String reqType) {
153153

154154
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
155155
assertEquals(200, output.getStatusCode());
156-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
156+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
157157
validateMapResponseModel(output);
158158
}
159159

@@ -167,7 +167,7 @@ void headers_servletRequest_echo(String reqType) {
167167

168168
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
169169
assertEquals(200, output.getStatusCode());
170-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
170+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
171171

172172
validateMapResponseModel(output);
173173
}
@@ -182,7 +182,7 @@ void queryString_uriInfo_echo(String reqType) {
182182

183183
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
184184
assertEquals(200, output.getStatusCode());
185-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
185+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
186186

187187
validateMapResponseModel(output);
188188
}
@@ -263,7 +263,7 @@ void authorizer_securityContext_customPrincipalSuccess(String reqType) {
263263

264264
AwsProxyResponseEvent output = executeRequest(request, lambdaContext);
265265
assertEquals(200, output.getStatusCode());
266-
assertEquals("application/json", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
266+
assertEquals("application/json", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
267267

268268
validateSingleValueModel(output, AUTHORIZER_PRINCIPAL_ID);
269269
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.amazonaws.serverless.exceptions.ContainerInitializationException;
44
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
5-
import com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequestHelper;
65
import com.amazonaws.serverless.proxy.internal.servlet.AwsServletContext;
76
import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
87
import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
@@ -23,6 +22,7 @@
2322

2423
import java.util.EnumSet;
2524

25+
import static com.amazonaws.serverless.proxy.internal.servlet.AwsHttpServletRequest.getFirst;
2626
import static org.junit.jupiter.api.Assertions.*;
2727

2828
// we don't use the spring annotations to pretend we are running in the actual container
@@ -58,7 +58,7 @@ void context_autowireValidContext_echoContext() {
5858

5959
AwsProxyResponseEvent output = handler.proxy(request, lambdaContext);
6060
assertEquals(200, output.getStatusCode());
61-
assertEquals("text/plain", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
61+
assertEquals("text/plain", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
6262
assertEquals(STAGE, output.getBody());
6363
}
6464

@@ -71,7 +71,7 @@ void context_contextAware_contextEcho() {
7171

7272
AwsProxyResponseEvent output = handler.proxy(request, lambdaContext);
7373
assertEquals(200, output.getStatusCode());
74-
assertEquals("text/plain", AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
74+
assertEquals("text/plain", getFirst(output.getMultiValueHeaders(), "Content-Type").split(";")[0]);
7575
assertEquals(STAGE, output.getBody());
7676
}
7777

@@ -86,7 +86,7 @@ void filter_customHeaderFilter_echoHeaders() {
8686
assertNotNull(output.getMultiValueHeaders());
8787
assertTrue(output.getMultiValueHeaders().size() > 0);
8888
assertNotNull(output.getMultiValueHeaders().get(CustomHeaderFilter.HEADER_NAME));
89-
assertEquals(CustomHeaderFilter.HEADER_VALUE, AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), CustomHeaderFilter.HEADER_NAME));
89+
assertEquals(CustomHeaderFilter.HEADER_VALUE, getFirst(output.getMultiValueHeaders(), CustomHeaderFilter.HEADER_NAME));
9090
}
9191

9292
@Test
@@ -128,8 +128,8 @@ void cookie_injectInResponse_expectCustomSetCookie() {
128128
assertEquals(200, output.getStatusCode());
129129
assertTrue(output.getMultiValueHeaders().containsKey(HttpHeaders.SET_COOKIE));
130130

131-
assertTrue(AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), HttpHeaders.SET_COOKIE).contains(ContextResource.COOKIE_NAME + "=" + ContextResource.COOKIE_VALUE));
132-
assertTrue(AwsHttpServletRequestHelper.getFirst(output.getMultiValueHeaders(), HttpHeaders.SET_COOKIE).contains(ContextResource.COOKIE_DOMAIN));
131+
assertTrue(getFirst(output.getMultiValueHeaders(), HttpHeaders.SET_COOKIE).contains(ContextResource.COOKIE_NAME + "=" + ContextResource.COOKIE_VALUE));
132+
assertTrue(getFirst(output.getMultiValueHeaders(), HttpHeaders.SET_COOKIE).contains(ContextResource.COOKIE_DOMAIN));
133133
}
134134
}
135135

0 commit comments

Comments
 (0)