Skip to content

Commit 1109c8f

Browse files
jpfennellyjpfennelly
committed
Convert tabs to spaces
1 parent f68e755 commit 1109c8f

File tree

5 files changed

+213
-212
lines changed

5 files changed

+213
-212
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ protected List<String> getQueryParamValuesAsList(MultiValuedTreeMap<String, Stri
607607
}
608608

609609
protected Map<String, String[]> generateParameterMap(MultiValuedTreeMap<String, String> qs, ContainerConfig config) {
610-
return generateParameterMap(qs, config, false);
610+
return generateParameterMap(qs, config, false);
611611
}
612612

613613
protected Map<String, String[]> generateParameterMap(MultiValuedTreeMap<String, String> qs, ContainerConfig config, boolean decodeQueryParams) {
@@ -621,22 +621,22 @@ protected Map<String, String[]> generateParameterMap(MultiValuedTreeMap<String,
621621
.collect(Collectors.toMap(Map.Entry::getKey, (e) -> e.getValue().toArray(new String[0])));
622622
}
623623

624-
// decode all keys and values in map
625-
final MultiValuedTreeMap<String, String> decodedQs = new MultiValuedTreeMap<String, String>();
626-
if (decodeQueryParams) {
627-
for (Map.Entry<String, List<String>> entry : qs.entrySet()) {
628-
String k = decodeValueIfEncoded(entry.getKey());
629-
List<String> v = getQueryParamValuesAsList(qs, entry.getKey(), false).stream()
630-
.map(AwsHttpServletRequest::decodeValueIfEncoded)
631-
.collect(Collectors.toList());
632-
// addAll in case map has 2 keys that are identical once decoded
633-
decodedQs.addAll(k, v);
634-
}
635-
} else {
636-
decodedQs.putAll(qs);
637-
}
638-
639-
Map<String, List<String>> queryStringParams;
624+
// decode all keys and values in map
625+
final MultiValuedTreeMap<String, String> decodedQs = new MultiValuedTreeMap<String, String>();
626+
if (decodeQueryParams) {
627+
for (Map.Entry<String, List<String>> entry : qs.entrySet()) {
628+
String k = decodeValueIfEncoded(entry.getKey());
629+
List<String> v = getQueryParamValuesAsList(qs, entry.getKey(), false).stream()
630+
.map(AwsHttpServletRequest::decodeValueIfEncoded)
631+
.collect(Collectors.toList());
632+
// addAll in case map has 2 keys that are identical once decoded
633+
decodedQs.addAll(k, v);
634+
}
635+
} else {
636+
decodedQs.putAll(qs);
637+
}
638+
639+
Map<String, List<String>> queryStringParams;
640640
if (config.isQueryStringCaseSensitive()) {
641641
queryStringParams = decodedQs;
642642
} else {

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -326,25 +326,25 @@ public String getContentType() {
326326
@Override
327327
public String getParameter(String s) {
328328

329-
// decode key if ALB
330-
if (request.getRequestSource() == RequestSource.ALB) {
331-
s = decodeValueIfEncoded(s);
332-
}
329+
// decode key if ALB
330+
if (request.getRequestSource() == RequestSource.ALB) {
331+
s = decodeValueIfEncoded(s);
332+
}
333333

334334
String queryStringParameter = getFirstQueryParamValue(request.getMultiValueQueryStringParameters(), s, config.isQueryStringCaseSensitive());
335-
if (queryStringParameter != null) {
336-
if (request.getRequestSource() == RequestSource.ALB) {
337-
queryStringParameter = decodeValueIfEncoded(queryStringParameter);
338-
}
339-
return queryStringParameter;
340-
}
335+
if (queryStringParameter != null) {
336+
if (request.getRequestSource() == RequestSource.ALB) {
337+
queryStringParameter = decodeValueIfEncoded(queryStringParameter);
338+
}
339+
return queryStringParameter;
340+
}
341341

342-
String[] bodyParams = getFormBodyParameterCaseInsensitive(s);
343-
if (bodyParams.length == 0) {
344-
return null;
345-
} else {
346-
return bodyParams[0];
347-
}
342+
String[] bodyParams = getFormBodyParameterCaseInsensitive(s);
343+
if (bodyParams.length == 0) {
344+
return null;
345+
} else {
346+
return bodyParams[0];
347+
}
348348
}
349349

350350

@@ -357,40 +357,41 @@ public Enumeration<String> getParameterNames() {
357357

358358
Set<String> paramNames = request.getMultiValueQueryStringParameters().keySet();
359359
if (request.getRequestSource() == RequestSource.ALB) {
360-
paramNames = paramNames.stream().map(AwsProxyHttpServletRequest::decodeValueIfEncoded).collect(Collectors.toSet());
360+
paramNames = paramNames.stream().map(AwsProxyHttpServletRequest::decodeValueIfEncoded).collect(Collectors.toSet());
361361
}
362-
362+
363363
return Collections.enumeration(
364-
Stream.concat(formParameterNames.stream(), paramNames.stream())
365-
.collect(Collectors.toSet()));
364+
Stream.concat(formParameterNames.stream(), paramNames.stream())
365+
.collect(Collectors.toSet()));
366366
}
367367

368368

369369
@Override
370370
@SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS") // suppressing this as according to the specs we should be returning null here if we can't find params
371371
public String[] getParameterValues(String s) {
372-
373-
// decode key if ALB
374-
if (request.getRequestSource() == RequestSource.ALB) {
375-
s = decodeValueIfEncoded(s);
376-
}
377-
378-
// TODO lots of back and forth arrays and lists here, sort it out!
372+
373+
// TODO lots of back and forth arrays and lists here, sort it out!
379374
List<String> values = new ArrayList<>(Arrays.asList(getQueryParamValues(request.getMultiValueQueryStringParameters(), s, config.isQueryStringCaseSensitive())));
380375
// List<String> values = getQueryParamValuesAsList(request.getMultiValueQueryStringParameters(), s, config.isQueryStringCaseSensitive());
376+
// decode key if ALB
377+
if (request.getRequestSource() == RequestSource.ALB) {
378+
s = decodeValueIfEncoded(s);
379+
}
380+
381381

382382
// decode values if ALB
383-
if (request.getRequestSource() == RequestSource.ALB) {
384-
values = values.stream().map(AwsHttpServletRequest::decodeValueIfEncoded).collect(Collectors.toList());
383+
if (values != null && request.getRequestSource() == RequestSource.ALB) {
384+
values = values.stream().map(AwsHttpServletRequest::decodeValueIfEncoded).collect(Collectors.toList());
385385
}
386386

387387
values.addAll(Arrays.asList(getFormBodyParameterCaseInsensitive(s)));
388-
388+
389389
if (values.size() == 0) {
390390
return null;
391391
} else {
392392
return values.toArray(new String[0]);
393393
}
394+
394395
}
395396

396397

‎aws-serverless-java-container-core/src/test/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequestTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ void parameterMap_generateParameterMap_formEncodedAndQueryString() {
386386

387387
@Test
388388
void parameterMap_generateParameterMap_differentCasing_caseSensitive() {
389-
ContainerConfig caseSensitiveConfig = ContainerConfig.defaultConfig();
390-
caseSensitiveConfig.setQueryStringCaseSensitive(true);
391-
AwsProxyHttpServletRequest request = new AwsProxyHttpServletRequest(differentCasing, mockContext, null, caseSensitiveConfig);
389+
ContainerConfig caseSensitiveConfig = ContainerConfig.defaultConfig();
390+
caseSensitiveConfig.setQueryStringCaseSensitive(true);
391+
AwsProxyHttpServletRequest request = new AwsProxyHttpServletRequest(differentCasing, mockContext, null, caseSensitiveConfig);
392392
Map<String, String[]> paramMap = null;
393393
try {
394394
paramMap = request.generateParameterMap(request.getAwsProxyRequest().getMultiValueQueryStringParameters(), caseSensitiveConfig);
@@ -403,8 +403,8 @@ void parameterMap_generateParameterMap_differentCasing_caseSensitive() {
403403

404404
@Test
405405
void parameterMap_generateParameterMap_differentCasing_caseInsensitive() {
406-
ContainerConfig caseInsensitiveConfig = ContainerConfig.defaultConfig();
407-
caseInsensitiveConfig.setQueryStringCaseSensitive(false);
406+
ContainerConfig caseInsensitiveConfig = ContainerConfig.defaultConfig();
407+
caseInsensitiveConfig.setQueryStringCaseSensitive(false);
408408

409409
AwsProxyHttpServletRequest request = new AwsProxyHttpServletRequest(differentCasing, mockContext, null, caseInsensitiveConfig);
410410

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,26 +92,26 @@ public AwsProxyRequestBuilder(String path, String httpMethod) {
9292
//-------------------------------------------------------------
9393

9494
public AwsProxyRequestBuilder alb() {
95-
/*
96-
* This method sets up the requestContext to look like an ALB request and also
97-
* re-encodes URL query params, since ALBs do not decode them. This now returns
98-
* a new AwsProxyRequestBuilder with the new query param state, so the original
99-
* builder maintains the original configured state and can be then be reused in
100-
* further unit tests. For now the simplest way to accomplish a deep copy is by
101-
* serializing to JSON then deserializing.
102-
*/
103-
104-
ObjectMapper objectMapper = new ObjectMapper();
105-
AwsProxyRequest albRequest = null;
106-
try {
107-
String json = objectMapper.writeValueAsString(this.request);
108-
albRequest = objectMapper.readValue(json, AwsProxyRequest.class);
109-
} catch (JsonProcessingException jpe) {
110-
throw new RuntimeException(jpe);
111-
}
112-
95+
/*
96+
* This method sets up the requestContext to look like an ALB request and also
97+
* re-encodes URL query params, since ALBs do not decode them. This now returns
98+
* a new AwsProxyRequestBuilder with the new query param state, so the original
99+
* builder maintains the original configured state and can be then be reused in
100+
* further unit tests. For now the simplest way to accomplish a deep copy is by
101+
* serializing to JSON then deserializing.
102+
*/
103+
104+
ObjectMapper objectMapper = new ObjectMapper();
105+
AwsProxyRequest albRequest = null;
106+
try {
107+
String json = objectMapper.writeValueAsString(this.request);
108+
albRequest = objectMapper.readValue(json, AwsProxyRequest.class);
109+
} catch (JsonProcessingException jpe) {
110+
throw new RuntimeException(jpe);
111+
}
112+
113113
if (albRequest.getRequestContext() == null) {
114-
albRequest.setRequestContext(new AwsProxyRequestContext());
114+
albRequest.setRequestContext(new AwsProxyRequestContext());
115115
}
116116
albRequest.getRequestContext().setElb(new AlbContext());
117117
albRequest.getRequestContext().getElb().setTargetGroupArn(

0 commit comments

Comments
 (0)