mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-17 12:09:16 +00:00
Add nullability annotations to module/spring-boot-tx
See gh-46587
This commit is contained in:
+4
-1
@@ -21,6 +21,8 @@ import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
import org.springframework.boot.util.LambdaSafe;
|
||||
import org.springframework.transaction.TransactionManager;
|
||||
|
||||
@@ -56,7 +58,8 @@ public final class TransactionManagerCustomizers {
|
||||
* @param customizers the customizers
|
||||
* @return the new instance
|
||||
*/
|
||||
public static TransactionManagerCustomizers of(Collection<? extends TransactionManagerCustomizer<?>> customizers) {
|
||||
public static TransactionManagerCustomizers of(
|
||||
@Nullable Collection<? extends TransactionManagerCustomizer<?>> customizers) {
|
||||
return new TransactionManagerCustomizers(
|
||||
(customizers != null) ? new ArrayList<>(customizers) : Collections.emptyList());
|
||||
}
|
||||
|
||||
+8
-6
@@ -19,6 +19,8 @@ package org.springframework.boot.transaction.autoconfigure;
|
||||
import java.time.Duration;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.convert.DurationUnit;
|
||||
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
|
||||
@@ -39,26 +41,26 @@ public class TransactionProperties implements TransactionManagerCustomizer<Abstr
|
||||
* used.
|
||||
*/
|
||||
@DurationUnit(ChronoUnit.SECONDS)
|
||||
private Duration defaultTimeout;
|
||||
private @Nullable Duration defaultTimeout;
|
||||
|
||||
/**
|
||||
* Whether to roll back on commit failures.
|
||||
*/
|
||||
private Boolean rollbackOnCommitFailure;
|
||||
private @Nullable Boolean rollbackOnCommitFailure;
|
||||
|
||||
public Duration getDefaultTimeout() {
|
||||
public @Nullable Duration getDefaultTimeout() {
|
||||
return this.defaultTimeout;
|
||||
}
|
||||
|
||||
public void setDefaultTimeout(Duration defaultTimeout) {
|
||||
public void setDefaultTimeout(@Nullable Duration defaultTimeout) {
|
||||
this.defaultTimeout = defaultTimeout;
|
||||
}
|
||||
|
||||
public Boolean getRollbackOnCommitFailure() {
|
||||
public @Nullable Boolean getRollbackOnCommitFailure() {
|
||||
return this.rollbackOnCommitFailure;
|
||||
}
|
||||
|
||||
public void setRollbackOnCommitFailure(Boolean rollbackOnCommitFailure) {
|
||||
public void setRollbackOnCommitFailure(@Nullable Boolean rollbackOnCommitFailure) {
|
||||
this.rollbackOnCommitFailure = rollbackOnCommitFailure;
|
||||
}
|
||||
|
||||
|
||||
+3
@@ -17,4 +17,7 @@
|
||||
/**
|
||||
* Auto-configuration for transaction support.
|
||||
*/
|
||||
@NullMarked
|
||||
package org.springframework.boot.transaction.autoconfigure;
|
||||
|
||||
import org.jspecify.annotations.NullMarked;
|
||||
|
||||
+3
@@ -17,4 +17,7 @@
|
||||
/**
|
||||
* Auto-configuration for JTA.
|
||||
*/
|
||||
@NullMarked
|
||||
package org.springframework.boot.transaction.jta.autoconfigure;
|
||||
|
||||
import org.jspecify.annotations.NullMarked;
|
||||
|
||||
Reference in New Issue
Block a user