Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor iterator of Map with Java8's Map.forEach

Browse Source 
See gh-1459
This commit is contained in:
diguage
2017-06-13 17:53:13 +08:00
committed by Stephane Nicoll
parent 7018804e84
commit 1ef5f61ab2
18 changed files with 72 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
View File

@@ -26,7 +26,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.StringTokenizer;
import javax.servlet.ServletContext;
@@ -182,11 +181,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
// parameter
Map<String, String[]> parentParams = parentRequest.getParameterMap();
for (Map.Entry<String, String[]> parentParam : parentParams.entrySet()) {
String paramName = parentParam.getKey();
String[] paramValues = parentParam.getValue();
request.addParameter(paramName, paramValues);
}
parentParams.forEach(request::addParameter);
// cookie
Cookie[] parentCookies = parentRequest.getCookies();
@@ -314,9 +309,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
}
private void headers(MockHttpServletRequest request) {
for (Entry<String, String> header : this.webRequest.getAdditionalHeaders().entrySet()) {
request.addHeader(header.getKey(), header.getValue());
}
this.webRequest.getAdditionalHeaders().forEach(request::addHeader);
}
private MockHttpSession httpSession(MockHttpServletRequest request, final String sessionid) {
@@ -359,14 +352,13 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
}
private void params(MockHttpServletRequest request, UriComponents uriComponents) {
for (Entry<String, List<String>> entry : uriComponents.getQueryParams().entrySet()) {
String name = entry.getKey();
uriComponents.getQueryParams().forEach((name, values) -> {
String urlDecodedName = urlDecode(name);
for (String value : entry.getValue()) {
values.forEach(value -> {
value = (value != null ? urlDecode(value) : "");
request.addParameter(urlDecodedName, value);
}
}
});
});
for (NameValuePair param : this.webRequest.getRequestParameters()) {
request.addParameter(param.getName(), param.getValue());
}

15
spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
View File

@@ -28,7 +28,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
@@ -310,9 +309,7 @@ public class MockHttpServletRequestBuilder
* @param httpHeaders the headers and values to add
*/
public MockHttpServletRequestBuilder headers(HttpHeaders httpHeaders) {
for (Map.Entry<String, List<String>> entry : httpHeaders.entrySet()) {
this.headers.addAll(entry.getKey(), entry.getValue());
}
httpHeaders.forEach(this.headers::addAll);
return this;
}
@@ -697,12 +694,10 @@ public class MockHttpServletRequestBuilder
}
private void addRequestParams(MockHttpServletRequest request, MultiValueMap<String, String> map) {
for (Entry<String, List<String>> entry : map.entrySet()) {
for (String value : entry.getValue()) {
value = (value != null ? UriUtils.decode(value, StandardCharsets.UTF_8) : null);
request.addParameter(UriUtils.decode(entry.getKey(), StandardCharsets.UTF_8), value);
}
}
map.forEach((key, values) -> values.forEach(value -> {
value = (value != null ? UriUtils.decode(value, StandardCharsets.UTF_8) : null);
request.addParameter(UriUtils.decode(key, StandardCharsets.UTF_8), value);
}));
}
private MultiValueMap<String, String> parseFormData(final MediaType mediaType) {