Browse Source

Polish "Use Java 8 forEach method on Map"

pull/1722/head
Patrick0308 8 years ago committed by Juergen Hoeller
parent
commit
6f4d25a6e6
  1. 12
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java

12
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java

@ -150,12 +150,10 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe @@ -150,12 +150,10 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
HttpServletRequest request, Map<String, String> uriVariables) {
Map<String, MultiValueMap<String, String>> result = new LinkedHashMap<>();
for (Entry<String, String> uriVar : uriVariables.entrySet()) {
String uriVarValue = uriVar.getValue();
uriVariables.forEach((uriVarKey, uriVarValue) -> {
int equalsIndex = uriVarValue.indexOf('=');
if (equalsIndex == -1) {
continue;
return;
}
String matrixVariables;
@ -166,12 +164,12 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe @@ -166,12 +164,12 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
}
else {
matrixVariables = uriVarValue.substring(semicolonIndex + 1);
uriVariables.put(uriVar.getKey(), uriVarValue.substring(0, semicolonIndex));
uriVariables.put(uriVarKey, uriVarValue.substring(0, semicolonIndex));
}
MultiValueMap<String, String> vars = WebUtils.parseMatrixVariables(matrixVariables);
result.put(uriVar.getKey(), getUrlPathHelper().decodeMatrixVariables(request, vars));
}
result.put(uriVarKey, getUrlPathHelper().decodeMatrixVariables(request, vars));
});
return result;
}

Loading…
Cancel
Save