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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-10-26 11:23:42 +02:00
parent 3ceb05f63c
commit 2acfb2e0ff
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
*/
protected String toAbsolutePath(String path, HttpServletRequest request) {
String absolutePath = path;
if(!path.startsWith("/")) {
if (!path.startsWith("/")) {
ResourceUrlProvider urlProvider = findResourceUrlProvider(request);
Assert.state(urlProvider != null, "No ResourceUrlProvider");
String requestPath = urlProvider.getUrlPathHelper().getRequestUri(request);

22
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
View File

@@ -36,8 +36,7 @@ import org.springframework.web.util.UrlPathHelper;
/**
* A filter that wraps the {@link HttpServletResponse} and overrides its
* {@link HttpServletResponse#encodeURL(String) encodeURL} method in order to
* translate internal resource request URLs into public URL paths for external
* use.
* translate internal resource request URLs into public URL paths for external use.
*
* @author Jeremy Grelle
* @author Rossen Stoyanchev
@@ -52,7 +51,8 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
throws IOException, ServletException {
throws ServletException, IOException {
if (!(request instanceof HttpServletRequest) || !(response instanceof HttpServletResponse)) {
throw new ServletException("ResourceUrlEncodingFilter only supports HTTP requests");
}
@@ -63,6 +63,7 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
filterChain.doFilter(wrappedRequest, wrappedResponse);
}
private static class ResourceUrlEncodingRequestWrapper extends HttpServletRequestWrapper {
@Nullable
@@ -78,11 +79,11 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
}
@Override
public void setAttribute(String name, Object o) {
super.setAttribute(name, o);
public void setAttribute(String name, Object value) {
super.setAttribute(name, value);
if (ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR.equals(name)) {
if(o instanceof ResourceUrlProvider) {
initLookupPath((ResourceUrlProvider) o);
if (value instanceof ResourceUrlProvider) {
initLookupPath((ResourceUrlProvider) value);
}
}
@@ -109,10 +110,11 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
@Nullable
public String resolveUrlPath(String url) {
if (this.resourceUrlProvider == null) {
logger.debug("Request attribute exposing ResourceUrlProvider not found");
logger.trace("ResourceUrlProvider not available via request attribute " +
"ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR");
return null;
}
if (url.startsWith(this.prefixLookupPath)) {
if (this.indexLookupPath != null && url.startsWith(this.prefixLookupPath)) {
int suffixIndex = getQueryParamsIndex(url);
String suffix = url.substring(suffixIndex);
String lookupPath = url.substring(this.indexLookupPath, suffixIndex);
@@ -150,4 +152,4 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean {
}
}
}
}