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

Add more @Nullable parameters based on null usage

Browse Source 
Issue: SPR-15540
This commit is contained in:
Sebastien Deleuze
2017-05-31 21:35:52 +02:00
parent f9b319d3ba
commit 1f28825f9d
219 changed files with 441 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java
View File

@@ -23,6 +23,7 @@ import javax.resource.cci.ConnectionFactory;
import javax.resource.spi.LocalTransactionException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.lang.Nullable;
import org.springframework.transaction.CannotCreateTransactionException;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
@@ -262,7 +263,7 @@ public class CciLocalTransactionManager extends AbstractPlatformTransactionManag
private ConnectionHolder connectionHolder;
public void setConnectionHolder(ConnectionHolder connectionHolder) {
public void setConnectionHolder(@Nullable ConnectionHolder connectionHolder) {
this.connectionHolder = connectionHolder;
}

2
spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
View File

@@ -272,7 +272,7 @@ public class CciTemplate implements CciOperations {
*/
protected <T> T doExecute(
final InteractionSpec spec, final Record inputRecord, @Nullable final Record outputRecord,
final RecordExtractor<T> outputExtractor) throws DataAccessException {
@Nullable final RecordExtractor<T> outputExtractor) throws DataAccessException {
return execute(new InteractionCallback<T>() {
@Override

2
spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
View File

@@ -226,7 +226,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
* sibling {@link #afterDelivery()} explicitly, as part of its own processing.
*/
@Override
public void beforeDelivery(Method method) throws ResourceException {
public void beforeDelivery(@Nullable Method method) throws ResourceException {
this.beforeDeliveryCalled = true;
try {
this.transactionDelegate.beginTransaction();

7
spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
View File

@@ -32,6 +32,7 @@ import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.core.task.TaskRejectedException;
import org.springframework.core.task.TaskTimeoutException;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -94,7 +95,7 @@ public class SimpleTaskWorkManager implements WorkManager {
}
@Override
public void doWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
public void doWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
throws WorkException {
Assert.state(this.syncTaskExecutor != null, "No 'syncTaskExecutor' set");
@@ -107,7 +108,7 @@ public class SimpleTaskWorkManager implements WorkManager {
}
@Override
public long startWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
public long startWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
throws WorkException {
Assert.state(this.asyncTaskExecutor != null, "No 'asyncTaskExecutor' set");
@@ -120,7 +121,7 @@ public class SimpleTaskWorkManager implements WorkManager {
}
@Override
public void scheduleWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
public void scheduleWork(Work work, long startTimeout, @Nullable ExecutionContext executionContext, @Nullable WorkListener workListener)
throws WorkException {
Assert.state(this.asyncTaskExecutor != null, "No 'asyncTaskExecutor' set");

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

@@ -498,8 +498,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
* @see #prepareTransactionStatus
*/
protected final DefaultTransactionStatus prepareTransactionStatus(
TransactionDefinition definition, Object transaction, boolean newTransaction,
boolean newSynchronization, boolean debug, Object suspendedResources) {
TransactionDefinition definition, @Nullable Object transaction, boolean newTransaction,
boolean newSynchronization, boolean debug, @Nullable Object suspendedResources) {
DefaultTransactionStatus status = newTransactionStatus(
definition, transaction, newTransaction, newSynchronization, debug, suspendedResources);
@@ -512,7 +512,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
*/
protected DefaultTransactionStatus newTransactionStatus(
TransactionDefinition definition, Object transaction, boolean newTransaction,
boolean newSynchronization, boolean debug, Object suspendedResources) {
boolean newSynchronization, boolean debug, @Nullable Object suspendedResources) {
boolean actualNewSynchronization = newSynchronization &&
!TransactionSynchronizationManager.isSynchronizationActive();
@@ -610,7 +610,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
* @see #doResume
* @see #suspend
*/
protected final void resume(Object transaction, @Nullable SuspendedResourcesHolder resourcesHolder)
protected final void resume(@Nullable Object transaction, @Nullable SuspendedResourcesHolder resourcesHolder)
throws TransactionException {
if (resourcesHolder != null) {

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

@@ -120,7 +120,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
* Set a savepoint for this transaction. Useful for PROPAGATION_NESTED.
* @see org.springframework.transaction.TransactionDefinition#PROPAGATION_NESTED
*/
protected void setSavepoint(Object savepoint) {
protected void setSavepoint(@Nullable Object savepoint) {
this.savepoint = savepoint;
}