Polishing

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionAspectSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -31,7 +31,7 @@
 
 /**
  * Base class for asynchronous method execution aspects, such as
- * {@link org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
+ * {@code org.springframework.scheduling.annotation.AnnotationAsyncExecutionInterceptor}
  * or {@code org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect}.
  *
  * <p>Provides support for <i>executor qualification</i> on a method-by-method basis.

spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -20,7 +20,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.FutureTask;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,6 +31,8 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.CustomizableThreadCreator;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -47,21 +48,23 @@ public void setup() {
 				"executorContext.xml", ExecutorBeanDefinitionParserTests.class);
 	}
 
+
 	@Test
 	public void defaultExecutor() throws Exception {
-		Object executor = this.context.getBean("default");
+		ThreadPoolTaskExecutor executor = this.context.getBean("default", ThreadPoolTaskExecutor.class);
 		assertEquals(1, getCorePoolSize(executor));
 		assertEquals(Integer.MAX_VALUE, getMaxPoolSize(executor));
 		assertEquals(Integer.MAX_VALUE, getQueueCapacity(executor));
 		assertEquals(60, getKeepAliveSeconds(executor));
 		assertEquals(false, getAllowCoreThreadTimeOut(executor));
+
 		FutureTask<String> task = new FutureTask<String>(new Callable<String>() {
 			@Override
 			public String call() throws Exception {
 				return "foo";
 			}
 		});
-		((ThreadPoolTaskExecutor)executor).execute(task);
+		executor.execute(task);
 		assertEquals("foo", task.get());
 	}
 

spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -20,10 +20,11 @@
 import java.lang.reflect.Proxy;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
 import org.springframework.aop.target.HotSwappableTargetSource;
@@ -40,51 +41,61 @@
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionStatus;
 
+import static org.junit.Assert.*;
 import static org.mockito.BDDMockito.*;
 
+
 /**
  * Test cases for AOP transaction management.
  *
  * @author Rod Johnson
+ * @author Juergen Hoeller
  * @since 23.04.2003
  */
-public class BeanFactoryTransactionTests extends TestCase {
+public class BeanFactoryTransactionTests {
 
 	private DefaultListableBeanFactory factory;
 
-	@Override
+
+	@Before
 	public void setUp() {
 		this.factory = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(
 				new ClassPathResource("transactionalBeanFactory.xml", getClass()));
 	}
 
+
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory1() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory1");
 		assertTrue("testBean is a dynamic proxy", Proxy.isProxyClass(testBean.getClass()));
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory2DynamicProxy() throws NoSuchMethodException {
 		this.factory.preInstantiateSingletons();
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2DynamicProxy");
 		assertTrue("testBean is a dynamic proxy", Proxy.isProxyClass(testBean.getClass()));
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory2Cglib() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Cglib");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(testBean));
 		doTestGetsAreNotTransactional(testBean);
 	}
 
+	@Test
 	public void testProxyFactory2Lazy() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Lazy");
 		assertFalse(factory.containsSingleton("target"));
 		assertEquals(666, testBean.getAge());
 		assertTrue(factory.containsSingleton("target"));
 	}
 
+	@Test
 	public void testCglibTransactionProxyImplementsNoInterfaces() throws NoSuchMethodException {
 		ImplementsNoInterfaces ini = (ImplementsNoInterfaces) factory.getBean("cglibNoInterfaces");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(ini));
@@ -99,6 +110,7 @@ public void testCglibTransactionProxyImplementsNoInterfaces() throws NoSuchMetho
 		assertEquals(2, ptm.commits);
 	}
 
+	@Test
 	public void testGetsAreNotTransactionalWithProxyFactory3() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory3");
 		assertTrue("testBean is a full proxy", testBean instanceof DerivedTestBean);
@@ -158,14 +170,16 @@ public void rollback(TransactionStatus status) throws TransactionException {
 		assertTrue(testBean.getAge() == age);
 	}
 
+	@Test
 	public void testGetBeansOfTypeWithAbstract() {
-		Map beansOfType = factory.getBeansOfType(ITestBean.class, true, true);
+		Map<String, ITestBean> beansOfType = factory.getBeansOfType(ITestBean.class, true, true);
 		assertNotNull(beansOfType);
 	}
 
 	/**
 	 * Check that we fail gracefully if the user doesn't set any transaction attributes.
 	 */
+	@Test
 	public void testNoTransactionAttributeSource() {
 		try {
 			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -181,6 +195,7 @@ public void testNoTransactionAttributeSource() {
 	/**
 	 * Test that we can set the target to a dynamic TargetSource.
 	 */
+	@Test
 	public void testDynamicTargetSource() throws NoSuchMethodException {
 		// Install facade
 		CallCountingTransactionManager txMan = new CallCountingTransactionManager();
@@ -211,7 +226,7 @@ public static class InvocationCounterPointcut extends StaticMethodMatcherPointcu
 		int counter = 0;
 
 		@Override
-		public boolean matches(Method method, Class clazz) {
+		public boolean matches(Method method, Class<?> clazz) {
 			counter++;
 			return true;
 		}

spring-web/src/main/java/org/springframework/web/context/request/async/NoSupportAsyncWebRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -49,6 +49,7 @@ public boolean isAsyncStarted() {
 		return false;
 	}
 
+
 	// Not supported
 
 	public void startAsync() {

spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.servlet.AsyncContext;
 import javax.servlet.AsyncEvent;
 import javax.servlet.AsyncListener;
@@ -36,7 +35,7 @@
  * <p>The servlet and all filters involved in an async request must have async
  * support enabled using the Servlet API or by adding an
  * {@code <async-support>true</async-support>} element to servlet and filter
- * declarations in web.xml
+ * declarations in {@code web.xml}.
  *
  * @author Rossen Stoyanchev
  * @since 3.2
@@ -63,9 +62,9 @@ public StandardServletAsyncWebRequest(HttpServletRequest request, HttpServletRes
 		super(request, response);
 	}
 
+
 	/**
-	 * {@inheritDoc}
-	 * <p>In Servlet 3 async processing, the timeout period begins after the
+	 * In Servlet 3 async processing, the timeout period begins after the
 	 * container processing thread has exited.
 	 */
 	public void setTimeout(Long timeout) {
@@ -82,7 +81,7 @@ public void addCompletionHandler(Runnable runnable) {
 	}
 
 	public boolean isAsyncStarted() {
-		return ((this.asyncContext != null) && getRequest().isAsyncStarted());
+		return (this.asyncContext != null && getRequest().isAsyncStarted());
 	}
 
 	/**
@@ -101,6 +100,7 @@ public void startAsync() {
 				"or by adding \"<async-supported>true</async-supported>\" to servlet and " +
 				"filter declarations in web.xml.");
 		Assert.state(!isAsyncComplete(), "Async processing has already completed");
+
 		if (isAsyncStarted()) {
 			return;
 		}
@@ -116,6 +116,7 @@ public void dispatch() {
 		this.asyncContext.dispatch();
 	}
 
+
 	// ---------------------------------------------------------------------
 	// Implementation of AsyncListener methods
 	// ---------------------------------------------------------------------

spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.context.request.async;
 
 import java.lang.reflect.Constructor;
@@ -67,18 +68,17 @@ public static WebAsyncManager getAsyncManager(WebRequest webRequest) {
 	}
 
 	/**
-	 * Create an AsyncWebRequest instance. By default an instance of
-	 * {@link StandardServletAsyncWebRequest} is created if running in Servlet
-	 * 3.0 (or higher) environment or as a fallback, an instance of
-	 * {@link NoSupportAsyncWebRequest} is returned.
-	 *
+	 * Create an AsyncWebRequest instance. By default, an instance of
+	 * {@link StandardServletAsyncWebRequest} gets created when running in
+	 * Servlet 3.0 (or higher) environment - as a fallback, an instance
+	 * of {@link NoSupportAsyncWebRequest} will be returned.
 	 * @param request the current request
 	 * @param response the current response
-	 * @return an AsyncWebRequest instance, never {@code null}
+	 * @return an AsyncWebRequest instance (never {@code null})
 	 */
 	public static AsyncWebRequest createAsyncWebRequest(HttpServletRequest request, HttpServletResponse response) {
-		return ClassUtils.hasMethod(ServletRequest.class, "startAsync") ?
-				createStandardServletAsyncWebRequest(request, response) : new NoSupportAsyncWebRequest(request, response);
+		return (ClassUtils.hasMethod(ServletRequest.class, "startAsync") ?
+				createStandardServletAsyncWebRequest(request, response) : new NoSupportAsyncWebRequest(request, response));
 	}
 
 	private static AsyncWebRequest createStandardServletAsyncWebRequest(HttpServletRequest request, HttpServletResponse response) {
@@ -90,8 +90,8 @@ private static AsyncWebRequest createStandardServletAsyncWebRequest(HttpServletR
 			}
 			return (AsyncWebRequest) BeanUtils.instantiateClass(standardAsyncRequestConstructor, request, response);
 		}
-		catch (Throwable t) {
-			throw new IllegalStateException("Failed to instantiate StandardServletAsyncWebRequest", t);
+		catch (Throwable ex) {
+			throw new IllegalStateException("Failed to instantiate StandardServletAsyncWebRequest", ex);
 		}
 	}
 

spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -94,6 +94,9 @@ public interface MultipartFile {
 	 * <p>If the file has been moved in the filesystem, this operation cannot
 	 * be invoked again. Therefore, call this method just once to be able to
 	 * work with any storage mechanism.
+	 * <p><strong>Note:</strong> when using Servlet 3.0 multipart support you
+	 * need to configure the location relative to which files will be copied
+	 * as explained in {@link javax.servlet.http.Part#write}.
 	 * @param dest the destination file
 	 * @throws IOException in case of reading or writing errors
 	 * @throws IllegalStateException if the file has already been moved