admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistent formatting

Browse Source
This commit is contained in:
Juergen Hoeller
2016-03-24 19:54:28 +01:00
parent 2ea7fcde3e
commit 0891fbaf97
14 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
+1 -1
View File
@@ -218,7 +218,7 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
if (!matchingPatterns.isEmpty()) {
Comparator<String> patternComparator = getPathMatcher().getPatternComparator(lookupPath);
Collections.sort(matchingPatterns, patternComparator);
for(String pattern : matchingPatterns) {
for (String pattern : matchingPatterns) {
String pathWithinMapping = getPathMatcher().extractPathWithinPattern(pattern, lookupPath);
String pathMapping = lookupPath.substring(0, lookupPath.indexOf(pathWithinMapping));
if (logger.isTraceEnabled()) {
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
+2 -2
View File
@@ -123,9 +123,9 @@ public class VersionResourceResolver extends AbstractResourceResolver {
List<String> patternsList = Arrays.asList(pathPatterns);
List<String> prefixedPatterns = new ArrayList<String>(pathPatterns.length);
String versionPrefix = "/" + version;
for(String pattern : patternsList) {
for (String pattern : patternsList) {
prefixedPatterns.add(pattern);
if(!pattern.startsWith(versionPrefix) && !patternsList.contains(versionPrefix + pattern)) {
if (!pattern.startsWith(versionPrefix) && !patternsList.contains(versionPrefix + pattern)) {
prefixedPatterns.add(versionPrefix + pattern);
}
}