Browse Source

Polishing

pull/529/head
Juergen Hoeller 11 years ago
parent
commit
9353332a61
  1. 6
      spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java
  2. 3
      spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java
  3. 2
      spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java
  4. 7
      spring-core/src/main/java/org/springframework/core/io/FileSystemResource.java

6
spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactory.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 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.
@ -19,7 +19,6 @@ package org.springframework.aop.framework; @@ -19,7 +19,6 @@ package org.springframework.aop.framework;
import org.aopalliance.intercept.Interceptor;
import org.springframework.aop.TargetSource;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
@ -47,9 +46,8 @@ public class ProxyFactory extends ProxyCreatorSupport { @@ -47,9 +46,8 @@ public class ProxyFactory extends ProxyCreatorSupport {
* @param target the target object to be proxied
*/
public ProxyFactory(Object target) {
Assert.notNull(target, "Target object must not be null");
setInterfaces(ClassUtils.getAllInterfaces(target));
setTarget(target);
setInterfaces(ClassUtils.getAllInterfaces(target));
}
/**

3
spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java

@ -91,7 +91,8 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B @@ -91,7 +91,8 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
}
if (exceptionHandler != null) {
this.exceptionHandler = exceptionHandler;
} else {
}
else {
this.exceptionHandler = new SimpleAsyncUncaughtExceptionHandler();
}
this.advice = buildAdvice(executor, this.exceptionHandler);

2
spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java

@ -62,6 +62,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr @@ -62,6 +62,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr
private Class<? extends Annotation> asyncAnnotationType;
private Executor executor;
private AsyncUncaughtExceptionHandler exceptionHandler;
@ -93,6 +94,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr @@ -93,6 +94,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr
/**
* Set the {@link AsyncUncaughtExceptionHandler} to use to handle uncaught
* exceptions thrown by asynchronous method executions.
* @since 4.1
*/
public void setExceptionHandler(AsyncUncaughtExceptionHandler exceptionHandler) {
this.exceptionHandler = exceptionHandler;

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

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 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.
@ -45,7 +45,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso @@ -45,7 +45,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
/**
* Create a new FileSystemResource from a File handle.
* Create a new {@code FileSystemResource} from a {@link File} handle.
* <p>Note: When building relative resources via {@link #createRelative},
* the relative path will apply <i>at the same directory level</i>:
* e.g. new File("C:/dir1"), relative path "dir2" -> "C:/dir2"!
@ -62,7 +62,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso @@ -62,7 +62,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
}
/**
* Create a new FileSystemResource from a file path.
* Create a new {@code FileSystemResource} from a file path.
* <p>Note: When building relative resources via {@link #createRelative},
* it makes a difference whether the specified resource base path here
* ends with a slash or not. In the case of "C:/dir1/", relative paths
@ -77,6 +77,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso @@ -77,6 +77,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
this.path = StringUtils.cleanPath(path);
}
/**
* Return the file path for this resource.
*/

Loading…
Cancel
Save