Browse Source

Polishing

(cherry picked from commit 5a92aa4)
pull/1119/head
Juergen Hoeller 9 years ago
parent
commit
9cc625ee2c
  1. 2
      spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java
  2. 4
      spring-core/src/main/java/org/springframework/core/io/UrlResource.java
  3. 8
      spring-core/src/main/java/org/springframework/util/ClassUtils.java
  4. 6
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java

2
spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java

@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
/**
* {@link Resource} implementation for {@code java.io.File} handles.
* Obviously supports resolution as File, and also as URL.
* Supports resolution as a {@code File} and also as a {@code URL}.
* Implements the extended {@link WritableResource} interface.
*
* @author Juergen Hoeller

4
spring-core/src/main/java/org/springframework/core/io/UrlResource.java

@ -32,7 +32,7 @@ import org.springframework.util.StringUtils; @@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
/**
* {@link Resource} implementation for {@code java.net.URL} locators.
* <p>Supports resolution as a {@code URL} and also as a {@code File} in
* Supports resolution as a {@code URL} and also as a {@code File} in
* case of the {@code "file:"} protocol.
*
* @author Juergen Hoeller
@ -134,6 +134,7 @@ public class UrlResource extends AbstractFileResolvingResource { @@ -134,6 +134,7 @@ public class UrlResource extends AbstractFileResolvingResource {
}
}
/**
* Determine a cleaned URL for the given original URL.
* @param originalUrl the original URL
@ -152,7 +153,6 @@ public class UrlResource extends AbstractFileResolvingResource { @@ -152,7 +153,6 @@ public class UrlResource extends AbstractFileResolvingResource {
}
}
/**
* This implementation opens an InputStream for the given URL.
* <p>It sets the {@code useCaches} flag to {@code false},

8
spring-core/src/main/java/org/springframework/util/ClassUtils.java

@ -56,16 +56,16 @@ public abstract class ClassUtils { @@ -56,16 +56,16 @@ public abstract class ClassUtils {
/** Prefix for internal non-primitive array class names: "[L" */
private static final String NON_PRIMITIVE_ARRAY_PREFIX = "[L";
/** The package separator character '.' */
/** The package separator character: '.' */
private static final char PACKAGE_SEPARATOR = '.';
/** The path separator character '/' */
/** The path separator character: '/' */
private static final char PATH_SEPARATOR = '/';
/** The inner class separator character '$' */
/** The inner class separator character: '$' */
private static final char INNER_CLASS_SEPARATOR = '$';
/** The CGLIB class separator character "$$" */
/** The CGLIB class separator: "$$" */
public static final String CGLIB_CLASS_SEPARATOR = "$$";
/** The ".class" file suffix */

6
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java

@ -137,11 +137,7 @@ public class ServletWrappingController extends AbstractController @@ -137,11 +137,7 @@ public class ServletWrappingController extends AbstractController
@Override
public void afterPropertiesSet() throws Exception {
if (this.servletClass == null) {
throw new IllegalArgumentException("servletClass is required");
}
if (!Servlet.class.isAssignableFrom(this.servletClass)) {
throw new IllegalArgumentException("servletClass [" + this.servletClass.getName() +
"] needs to implement interface [javax.servlet.Servlet]");
throw new IllegalArgumentException("'servletClass' is required");
}
if (this.servletName == null) {
this.servletName = this.beanName;

Loading…
Cancel
Save