Add missing @Nullable annotations on parameters

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

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();
}

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;
}

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);
}

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();
}