Skip to content

Commit e15657d

Browse files
sapessisapessi
committed
Merge branch 'smpeters-master' into core
2 parents a34b0ef + 6dd0570 commit e15657d

File tree

19 files changed

+32
-43
lines changed

19 files changed

+32
-43
lines changed

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/AwsProxySecurityContextWriter.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class AwsProxySecurityContextWriter implements SecurityContextWriter<AwsP
3535
// Implementation - SecurityContextWriter
3636
//-------------------------------------------------------------
3737

38+
@Override
3839
public SecurityContext writeSecurityContext(AwsProxyRequest event, Context lambdaContext) {
3940
currentContext = new AwsProxySecurityContext(lambdaContext, event);
4041

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/jaxrs/AwsProxySecurityContext.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,14 @@
1212
*/
1313
package com.amazonaws.serverless.proxy.internal.jaxrs;
1414

15-
import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
1615
import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
1716
import com.amazonaws.serverless.proxy.model.CognitoAuthorizerClaims;
1817
import com.amazonaws.services.lambda.runtime.Context;
1918

20-
import com.fasterxml.jackson.core.type.TypeReference;
21-
2219
import javax.ws.rs.core.SecurityContext;
2320

24-
import java.io.IOException;
2521
import java.security.Principal;
26-
import java.util.Base64;
27-
import java.util.Map;
2822

29-
import static com.amazonaws.serverless.proxy.model.AwsProxyRequest.*;
3023
import static com.amazonaws.serverless.proxy.model.AwsProxyRequest.RequestSource.API_GATEWAY;
3124

3225

@@ -84,6 +77,7 @@ public AwsProxySecurityContext(final Context lambdaContext, final AwsProxyReques
8477
// Implementation - SecurityContext
8578
//-------------------------------------------------------------
8679

80+
@Override
8781
public Principal getUserPrincipal() {
8882
if (getAuthenticationScheme() == null) {
8983
return () -> null;
@@ -120,16 +114,19 @@ public Principal getUserPrincipal() {
120114
}
121115

122116

117+
@Override
123118
public boolean isUserInRole(String role) {
124119
return (role.equals(event.getRequestContext().getIdentity().getUserArn()));
125120
}
126121

127122

123+
@Override
128124
public boolean isSecure() {
129125
return getAuthenticationScheme() != null;
130126
}
131127

132128

129+
@Override
133130
public String getAuthenticationScheme() {
134131
switch (event.getRequestSource()) {
135132
case API_GATEWAY:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class AwsFilterChainManager extends FilterChainManager<AwsServletContext>
4040
* Returns the filter holders stored in the <code>AwsServletContext</code> object
4141
* @return The map of filter holders
4242
*/
43+
@Override
4344
protected Map<String, FilterHolder> getFilterHolders() {
4445
return servletContext.getFilterHolders();
4546
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import java.util.Collections;
6666
import java.util.Enumeration;
6767
import java.util.HashMap;
68-
import java.util.Iterator;
6968
import java.util.List;
7069
import java.util.Locale;
7170
import java.util.Map;
@@ -567,6 +566,7 @@ public String getServerName() {
567566
.append(".amazonaws.com").toString();
568567
}
569568

569+
@Override
570570
public int getServerPort() {
571571
if (request.getMultiValueHeaders() == null) {
572572
return 443;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121
import com.amazonaws.serverless.proxy.model.AwsProxyResponse;
2222
import com.amazonaws.services.lambda.runtime.Context;
2323

24-
import org.apache.http.HttpStatus;
25-
2624
import javax.ws.rs.core.Response;
2725

2826
import java.util.Base64;
29-
import java.util.HashMap;
30-
import java.util.Map;
3127

3228

3329
/**

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1919

2020
import javax.servlet.http.Part;
21-
import javax.ws.rs.core.MultivaluedHashMap;
2221
import java.io.ByteArrayInputStream;
2322
import java.io.FileOutputStream;
2423
import java.io.IOException;
@@ -117,7 +116,7 @@ public String getHeader(String s) {
117116
@Override
118117
public Collection<String> getHeaders(String s) {
119118
if (headers == null) {
120-
return Collections.EMPTY_LIST;
119+
return Collections.emptyList();
121120
}
122121
return headers.get(s);
123122
}
@@ -126,7 +125,7 @@ public Collection<String> getHeaders(String s) {
126125
@Override
127126
public Collection<String> getHeaderNames() {
128127
if (headers == null) {
129-
return Collections.EMPTY_LIST;
128+
return Collections.emptyList();
130129
}
131130
return headers.keySet();
132131
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.io.IOException;
3939
import java.io.InputStream;
4040
import java.io.UnsupportedEncodingException;
41-
import java.net.URLDecoder;
4241
import java.net.URLEncoder;
4342
import java.nio.charset.Charset;
4443
import java.nio.charset.StandardCharsets;

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/ContainerConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.amazonaws.serverless.proxy.internal.servlet.AwsProxyHttpServletRequest;
55

66
import java.util.ArrayList;
7+
import java.util.Arrays;
78
import java.util.HashSet;
89
import java.util.List;
910

@@ -237,9 +238,7 @@ public void setQueryStringCaseSensitive(boolean queryStringCaseSensitive) {
237238
*/
238239
public void addBinaryContentTypes(String... contentTypes) {
239240
if(contentTypes != null) {
240-
for(String type: contentTypes) {
241-
binaryContentTypes.add(type);
242-
}
241+
binaryContentTypes.addAll(Arrays.asList(contentTypes));
243242
}
244243
}
245244

‎aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/model/MultiValuedTreeMap.java‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ public MultiValuedTreeMap(Comparator<Key> comparator) {
3636
map = new TreeMap<>(comparator);
3737
}
3838

39+
@Override
3940
public void add(Key key, Value value) {
4041
List<Value> values = findKey(key);
4142
values.add(value);
4243
}
4344

45+
@Override
4446
public Value getFirst(Key key) {
4547
List<Value> values = get(key);
4648
if (values == null || values.size() == 0) {
@@ -49,24 +51,29 @@ public Value getFirst(Key key) {
4951
return values.get(0);
5052
}
5153

54+
@Override
5255
public void putSingle(Key key, Value value) {
5356
List<Value> values = findKey(key);
5457
values.clear();
5558
values.add(value);
5659
}
5760

61+
@Override
5862
public void clear() {
5963
map.clear();
6064
}
6165

66+
@Override
6267
public boolean containsKey(Object key) {
6368
return map.containsKey(key);
6469
}
6570

71+
@Override
6672
public boolean containsValue(Object value) {
6773
return map.containsValue(value);
6874
}
6975

76+
@Override
7077
public Set<Entry<Key, List<Value>>> entrySet() {
7178
return map.entrySet();
7279
}
@@ -75,6 +82,7 @@ public boolean equals(Object o) {
7582
return map.equals(o);
7683
}
7784

85+
@Override
7886
public List<Value> get(Object key) {
7987
return map.get(key);
8088
}
@@ -83,46 +91,56 @@ public int hashCode() {
8391
return map.hashCode();
8492
}
8593

94+
@Override
8695
public boolean isEmpty() {
8796
return map.isEmpty();
8897
}
8998

99+
@Override
90100
public Set<Key> keySet() {
91101
return map.keySet();
92102
}
93103

104+
@Override
94105
public List<Value> put(Key key, List<Value> value) {
95106
return map.put(key, value);
96107
}
97108

109+
@Override
98110
public void putAll(Map<? extends Key, ? extends List<Value>> t) {
99111
map.putAll(t);
100112
}
101113

114+
@Override
102115
public List<Value> remove(Object key) {
103116
return map.remove(key);
104117
}
105118

119+
@Override
106120
public int size() {
107121
return map.size();
108122
}
109123

124+
@Override
110125
public Collection<List<Value>> values() {
111126
return map.values();
112127
}
113128

129+
@Override
114130
public void addAll(Key key, Value... newValues) {
115131
for (Value value : newValues) {
116132
add(key, value);
117133
}
118134
}
119135

136+
@Override
120137
public void addAll(Key key, List<Value> valueList) {
121138
for (Value value : valueList) {
122139
add(key, value);
123140
}
124141
}
125142

143+
@Override
126144
public void addFirst(Key key, Value value) {
127145
List<Value> values = get(key);
128146
if (values == null) {
@@ -133,6 +151,7 @@ public void addFirst(Key key, Value value) {
133151
}
134152
}
135153

154+
@Override
136155
public boolean equalsIgnoreValueOrder(MultivaluedMap<Key, Value> vmap) {
137156
if (this == vmap) {
138157
return true;
@@ -163,13 +182,13 @@ private List<Value> findKey(Key key) {
163182
return values;
164183
}
165184

185+
@Override
166186
@SuppressFBWarnings("CN_IDIOM_NO_SUPER_CALL")
167187
public MultiValuedTreeMap<Key, Value> clone() {
168188
MultiValuedTreeMap<Key, Value> clone = new MultiValuedTreeMap<>();
169189
for (Key key : keySet()) {
170190
List<Value> value = get(key);
171-
List<Value> newValue = new ArrayList<>();
172-
newValue.addAll(value);
191+
List<Value> newValue = new ArrayList<>(value);
173192
clone.put(key, newValue);
174193
}
175194
return clone;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import static org.junit.Assert.*;
1616

1717
import java.util.List;
18-
import java.util.Map;
1918

2019

2120
public class AwsHttpServletRequestTest {

0 commit comments

Comments
 (0)