Browse Source

Polishing

pull/31632/head
Sam Brannen 2 years ago
parent
commit
7006d0a80e
  1. 7
      spring-core/src/main/java/org/springframework/util/ResourceUtils.java
  2. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
  3. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

7
spring-core/src/main/java/org/springframework/util/ResourceUtils.java

@ -33,7 +33,7 @@ import org.springframework.lang.Nullable;
* <p>Consider using Spring's Resource abstraction in the core package * <p>Consider using Spring's Resource abstraction in the core package
* for handling all kinds of file resources in a uniform manner. * for handling all kinds of file resources in a uniform manner.
* {@link org.springframework.core.io.ResourceLoader}'s {@code getResource()} * {@link org.springframework.core.io.ResourceLoader}'s {@code getResource()}
* method can resolve any location to a {@link org.springframework.core.io.Resource} * method can resolve any location to an {@link org.springframework.core.io.Resource}
* object, which in turn allows one to obtain a {@code java.io.File} in the * object, which in turn allows one to obtain a {@code java.io.File} in the
* file system through its {@code getFile()} method. * file system through its {@code getFile()} method.
* *
@ -275,8 +275,9 @@ public abstract class ResourceUtils {
} }
/** /**
* Determine whether the given URL points to a resource in a jar file. * Determine whether the given URL points to a resource in a jar file
* i.e. has protocol "jar", "war, ""zip", "vfszip" or "wsjar". * &mdash; for example, whether the URL has protocol "jar", "war, "zip",
* "vfszip", or "wsjar".
* @param url the URL to check * @param url the URL to check
* @return whether the URL has been identified as a JAR URL * @return whether the URL has been identified as a JAR URL
*/ */

2
spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java

@ -151,7 +151,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
* is under one of the {@link #setAllowedLocations allowed locations}. * is under one of the {@link #setAllowedLocations allowed locations}.
* @param resource the resource to check * @param resource the resource to check
* @param location the location relative to which the resource was found * @param location the location relative to which the resource was found
* @return "true" if resource is in a valid location, "false" otherwise. * @return "true" if resource is in a valid location, "false" otherwise
*/ */
protected boolean checkResource(Resource resource, Resource location) throws IOException { protected boolean checkResource(Resource resource, Resource location) throws IOException {
if (isResourceUnderLocation(resource, location)) { if (isResourceUnderLocation(resource, location)) {

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

@ -210,7 +210,7 @@ public class PathResourceResolver extends AbstractResourceResolver {
* is under one of the {@linkplain #setAllowedLocations allowed locations}. * is under one of the {@linkplain #setAllowedLocations allowed locations}.
* @param resource the resource to check * @param resource the resource to check
* @param location the location relative to which the resource was found * @param location the location relative to which the resource was found
* @return "true" if resource is in a valid location, "false" otherwise. * @return "true" if resource is in a valid location, "false" otherwise
* @since 4.1.2 * @since 4.1.2
*/ */
protected boolean checkResource(Resource resource, Resource location) throws IOException { protected boolean checkResource(Resource resource, Resource location) throws IOException {

Loading…
Cancel
Save