Browse Source

Polishing

pull/1119/head
Juergen Hoeller 9 years ago
parent
commit
28e7c11234
  1. 6
      spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
  2. 10
      spring-core/src/main/java/org/springframework/core/io/Resource.java
  3. 1
      spring-core/src/main/java/org/springframework/util/ClassUtils.java
  4. 3
      spring-web/src/main/java/org/springframework/http/HttpStatus.java
  5. 1
      spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java

6
spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java

@ -21,7 +21,6 @@ import java.io.InputStream; @@ -21,7 +21,6 @@ import java.io.InputStream;
import java.io.NotSerializableException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Proxy;
import org.springframework.util.ClassUtils;
@ -139,8 +138,9 @@ public class ConfigurableObjectInputStream extends ObjectInputStream { @@ -139,8 +138,9 @@ public class ConfigurableObjectInputStream extends ObjectInputStream {
/**
* Return the fallback ClassLoader to use when no ClassLoader was specified
* and ObjectInputStream's own default ClassLoader failed.
* <p>The default implementation simply returns {@code null}.
* and ObjectInputStream's own default class loader failed.
* <p>The default implementation simply returns {@code null}, indicating
* that no specific fallback is available.
*/
protected ClassLoader getFallbackClassLoader() throws IOException {
return null;

10
spring-core/src/main/java/org/springframework/core/io/Resource.java

@ -37,20 +37,20 @@ import java.net.URL; @@ -37,20 +37,20 @@ import java.net.URL;
* @see #getFile()
* @see WritableResource
* @see ContextResource
* @see FileSystemResource
* @see ClassPathResource
* @see UrlResource
* @see ClassPathResource
* @see FileSystemResource
* @see PathResource
* @see ByteArrayResource
* @see InputStreamResource
* @see PathResource
*/
public interface Resource extends InputStreamSource {
/**
* Determine whether this resource actually exists in physical form.
* <p>This method performs a definitive existence check, whereas the
* existence of a {@code Resource} handle only guarantees a
* valid descriptor handle.
* existence of a {@code Resource} handle only guarantees a valid
* descriptor handle.
*/
boolean exists();

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

@ -1159,7 +1159,6 @@ public abstract class ClassUtils { @@ -1159,7 +1159,6 @@ public abstract class ClassUtils {
@SuppressWarnings("deprecation")
public static Class<?> createCompositeInterface(Class<?>[] interfaces, ClassLoader classLoader) {
Assert.notEmpty(interfaces, "Interfaces must not be empty");
Assert.notNull(classLoader, "ClassLoader must not be null");
return Proxy.getProxyClass(classLoader, interfaces);
}

3
spring-web/src/main/java/org/springframework/http/HttpStatus.java

@ -326,7 +326,8 @@ public enum HttpStatus { @@ -326,7 +326,8 @@ public enum HttpStatus {
/**
* {@code 451 Unavailable For Legal Reasons}.
* @see <a href="https://tools.ietf.org/html/draft-ietf-httpbis-legally-restricted-status-04">
* An HTTP Status Code to Report Legal Obstacles</a>
* An HTTP Status Code to Report Legal Obstacles</a>
* @since 4.3
*/
UNAVAILABLE_FOR_LEGAL_REASONS(451, "Unavailable For Legal Reasons"),

1
spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java

@ -99,7 +99,6 @@ public class XsltView extends AbstractUrlBasedView { @@ -99,7 +99,6 @@ public class XsltView extends AbstractUrlBasedView {
* to build the TransformerFactory for this view.
*/
public void setTransformerFactoryClass(Class<? extends TransformerFactory> transformerFactoryClass) {
Assert.isAssignable(TransformerFactory.class, transformerFactoryClass);
this.transformerFactoryClass = transformerFactoryClass;
}

Loading…
Cancel
Save