Note that the {@code SimpleThreadScope} does not clean
* up any objects associated with it. As such, it's typically preferable to
* use the {@link org.springframework.web.context.request.RequestScope RequestScope}
- * in Web environments.
+ * in web environments.
*
*
Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
*
@@ -59,9 +59,10 @@ public class SimpleThreadScope implements Scope {
}
};
+
@Override
public Object get(String name, ObjectFactory> objectFactory) {
- Map scope = threadScope.get();
+ Map scope = this.threadScope.get();
Object object = scope.get(name);
if (object == null) {
object = objectFactory.getObject();
@@ -72,14 +73,14 @@ public class SimpleThreadScope implements Scope {
@Override
public Object remove(String name) {
- Map scope = threadScope.get();
+ Map scope = this.threadScope.get();
return scope.remove(name);
}
@Override
public void registerDestructionCallback(String name, Runnable callback) {
logger.warn("SimpleThreadScope does not support destruction callbacks. " +
- "Consider using a RequestScope in a Web environment.");
+ "Consider using RequestScope in a web environment.");
}
@Override
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
index 9b0c2b099f..ebc0d355dc 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
@@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
- * Additional and overridden tests for the CGLIB proxy.
+ * Additional and overridden tests for CGLIB proxies.
*
* @author Rod Johnson
* @author Juergen Hoeller
@@ -51,7 +51,8 @@ import static org.junit.Assert.*;
@SuppressWarnings("serial")
public final class CglibProxyTests extends AbstractAopProxyTests implements Serializable {
- private static final String DEPENDENCY_CHECK_CONTEXT = CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml";
+ private static final String DEPENDENCY_CHECK_CONTEXT =
+ CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml";
@Override
@@ -317,15 +318,13 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
@Test
@SuppressWarnings("resource")
public void testWithDependencyChecking() {
- ApplicationContext ctx =
- new ClassPathXmlApplicationContext(DEPENDENCY_CHECK_CONTEXT, getClass());
+ ApplicationContext ctx = new ClassPathXmlApplicationContext(DEPENDENCY_CHECK_CONTEXT, getClass());
ctx.getBean("testBean");
}
@Test
public void testAddAdviceAtRuntime() {
TestBean bean = new TestBean();
-
CountingBeforeAdvice cba = new CountingBeforeAdvice();
ProxyFactory pf = new ProxyFactory();
@@ -335,17 +334,13 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
pf.setProxyTargetClass(true);
TestBean proxy = (TestBean) pf.getProxy();
-
assertTrue(AopUtils.isCglibProxy(proxy));
proxy.getAge();
-
assertEquals(0, cba.getCalls());
((Advised) proxy).addAdvice(cba);
-
proxy.getAge();
-
assertEquals(1, cba.getCalls());
}
@@ -357,7 +352,6 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
proxyFactory.setProxyTargetClass(true);
MyBean proxy = (MyBean) proxyFactory.getProxy();
-
assertEquals(4, proxy.add(1, 3));
assertEquals(1, advice.getCalls("add"));
}
@@ -415,7 +409,6 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
public final void foo() {
}
}
-
}
@@ -452,7 +445,6 @@ class NoArgCtorTestBean {
public void reset() {
called = false;
}
-
}
@@ -461,15 +453,11 @@ class ProtectedMethodTestBean {
protected String getString() {
return "foo";
}
-
}
class UnsupportedInterceptor implements MethodInterceptor {
- /**
- * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
- */
@Override
public Object invoke(MethodInvocation mi) throws Throwable {
throw new UnsupportedOperationException(mi.getMethod().getName());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
index 6db102fc64..f26bf2656e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
@@ -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.
@@ -1009,7 +1009,7 @@ public interface JdbcOperations {
* @param batchArgs the List of Object arrays containing the batch of arguments for the query
* @return an array containing the numbers of rows affected by each update in the batch
*/
- public int[] batchUpdate(String sql, List