Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing @Nullable annotations on parameters

Browse Source 
Issue: SPR-15540
This commit is contained in:
Sebastien Deleuze
2017-05-31 12:37:54 +02:00
parent ad2c0f8410
commit b47d713e14
380 changed files with 1085 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
View File

@@ -19,6 +19,7 @@ package org.springframework.transaction.interceptor;
import java.io.Serializable;
import java.lang.reflect.Method;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -53,7 +54,8 @@ public class CompositeTransactionAttributeSource implements TransactionAttribute
@Override
public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
@Nullable
public TransactionAttribute getTransactionAttribute(Method method, @Nullable Class<?> targetClass) {
for (TransactionAttributeSource tas : this.transactionAttributeSources) {
TransactionAttribute ta = tas.getTransactionAttribute(method, targetClass);
if (ta != null) {

3
spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
View File

@@ -19,6 +19,7 @@ package org.springframework.transaction.interceptor;
import java.io.Serializable;
import java.lang.reflect.Method;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
@@ -52,7 +53,7 @@ public class MatchAlwaysTransactionAttributeSource implements TransactionAttribu
@Override
public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
public TransactionAttribute getTransactionAttribute(Method method, @Nullable Class<?> targetClass) {
return (method == null || ClassUtils.isUserLevelMethod(method) ? this.transactionAttribute : null);
}

5
spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
View File

@@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
@@ -82,7 +83,7 @@ public class MethodMapTransactionAttributeSource
}
@Override
public void setBeanClassLoader(ClassLoader beanClassLoader) {
public void setBeanClassLoader(@Nullable ClassLoader beanClassLoader) {
this.beanClassLoader = beanClassLoader;
}
@@ -207,7 +208,7 @@ public class MethodMapTransactionAttributeSource
@Override
public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
public TransactionAttribute getTransactionAttribute(Method method, @Nullable Class<?> targetClass) {
if (this.eagerlyInitialized) {
return this.transactionAttributeMap.get(method);
}

3
spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
View File

@@ -26,6 +26,7 @@ import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.PatternMatchUtils;
@@ -100,7 +101,7 @@ public class NameMatchTransactionAttributeSource implements TransactionAttribute
@Override
public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
public TransactionAttribute getTransactionAttribute(Method method, @Nullable Class<?> targetClass) {
if (!ClassUtils.isUserLevelMethod(method)) {
return null;
}

2
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
View File

@@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils;
abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
@Override
public boolean matches(Method method, Class<?> targetClass) {
public boolean matches(Method method, @Nullable Class<?> targetClass) {
if (TransactionalProxy.class.isAssignableFrom(targetClass)) {
return false;
}

2
spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java
View File

@@ -1200,7 +1200,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
//---------------------------------------------------------------------
@Override
public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
public Transaction createTransaction(@Nullable String name, int timeout) throws NotSupportedException, SystemException {
TransactionManager tm = getTransactionManager();
Assert.state(tm != null, "No JTA TransactionManager available");
if (timeout >= 0) {

3
spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
View File

@@ -21,6 +21,7 @@ import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -51,7 +52,7 @@ public class SimpleTransactionFactory implements TransactionFactory {
@Override
public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
public Transaction createTransaction(@Nullable String name, int timeout) throws NotSupportedException, SystemException {
if (timeout >= 0) {
this.transactionManager.setTransactionTimeout(timeout);
}

3
spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java
View File

@@ -26,6 +26,7 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.springframework.lang.Nullable;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionSystemException;
@@ -301,7 +302,7 @@ public class WebLogicJtaTransactionManager extends JtaTransactionManager {
}
@Override
public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
public Transaction createTransaction(@Nullable String name, int timeout) throws NotSupportedException, SystemException {
if (this.weblogicUserTransactionAvailable && name != null) {
try {
if (timeout >= 0) {

2
spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java
View File

@@ -334,7 +334,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
* @see #doBegin
*/
@Override
public final TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
public final TransactionStatus getTransaction(@Nullable TransactionDefinition definition) throws TransactionException {
Object transaction = doGetTransaction();
// Cache debug flag to avoid repeated checks.

3
spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
View File

@@ -16,6 +16,7 @@
package org.springframework.transaction;
import org.springframework.lang.Nullable;
import org.springframework.transaction.support.CallbackPreferringPlatformTransactionManager;
import org.springframework.transaction.support.SimpleTransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
@@ -47,7 +48,7 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr
@Override
public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
public TransactionStatus getTransaction(@Nullable TransactionDefinition definition) throws TransactionException {
throw new UnsupportedOperationException();
}

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

@@ -32,6 +32,7 @@ import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.ClassPathResource;
import org.springframework.lang.Nullable;
import org.springframework.tests.sample.beans.DerivedTestBean;
import org.springframework.tests.sample.beans.ITestBean;
import org.springframework.tests.sample.beans.TestBean;
@@ -147,7 +148,7 @@ public class BeanFactoryTransactionTests {
ptm = new PlatformTransactionManager() {
private boolean invoked;
@Override
public TransactionStatus getTransaction(TransactionDefinition def) throws TransactionException {
public TransactionStatus getTransaction(@Nullable TransactionDefinition def) throws TransactionException {
if (invoked) {
throw new IllegalStateException("getTransaction should not get invoked more than once");
}
@@ -231,7 +232,7 @@ public class BeanFactoryTransactionTests {
int counter = 0;
@Override
public boolean matches(Method method, Class<?> clazz) {
public boolean matches(Method method, @Nullable Class<?> clazz) {
counter++;
return true;
}

3
spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
View File

@@ -16,6 +16,7 @@
package org.springframework.transaction.interceptor;
import org.springframework.lang.Nullable;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
@@ -38,7 +39,7 @@ public class PlatformTransactionManagerFacade implements PlatformTransactionMana
public static PlatformTransactionManager delegate;
@Override
public TransactionStatus getTransaction(TransactionDefinition definition) {
public TransactionStatus getTransaction(@Nullable TransactionDefinition definition) {
return delegate.getTransaction(definition);
}

3
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
View File

@@ -26,6 +26,7 @@ import org.junit.rules.ExpectedException;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.lang.Nullable;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
@@ -303,7 +304,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable {
@Override
public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
public TransactionStatus getTransaction(@Nullable TransactionDefinition definition) throws TransactionException {
throw new UnsupportedOperationException();
}