Skip to content

Commit 0638531

Browse files
committed
Add nullability annotations to module/spring-boot-tx
See gh-46587
1 parent e30cad4 commit 0638531

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionManagerCustomizers.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.Collections;
2222
import java.util.List;
2323

24+
import org.jspecify.annotations.Nullable;
25+
2426
import org.springframework.boot.util.LambdaSafe;
2527
import org.springframework.transaction.TransactionManager;
2628

@@ -56,7 +58,8 @@ public void customize(TransactionManager transactionManager) {
5658
* @param customizers the customizers
5759
* @return the new instance
5860
*/
59-
public static TransactionManagerCustomizers of(Collection<? extends TransactionManagerCustomizer<?>> customizers) {
61+
public static TransactionManagerCustomizers of(
62+
@Nullable Collection<? extends TransactionManagerCustomizer<?>> customizers) {
6063
return new TransactionManagerCustomizers(
6164
(customizers != null) ? new ArrayList<>(customizers) : Collections.emptyList());
6265
}

module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/TransactionProperties.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.time.Duration;
2020
import java.time.temporal.ChronoUnit;
2121

22+
import org.jspecify.annotations.Nullable;
23+
2224
import org.springframework.boot.context.properties.ConfigurationProperties;
2325
import org.springframework.boot.convert.DurationUnit;
2426
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
@@ -39,26 +41,26 @@ public class TransactionProperties implements TransactionManagerCustomizer<Abstr
3941
* used.
4042
*/
4143
@DurationUnit(ChronoUnit.SECONDS)
42-
private Duration defaultTimeout;
44+
private @Nullable Duration defaultTimeout;
4345

4446
/**
4547
* Whether to roll back on commit failures.
4648
*/
47-
private Boolean rollbackOnCommitFailure;
49+
private @Nullable Boolean rollbackOnCommitFailure;
4850

49-
public Duration getDefaultTimeout() {
51+
public @Nullable Duration getDefaultTimeout() {
5052
return this.defaultTimeout;
5153
}
5254

53-
public void setDefaultTimeout(Duration defaultTimeout) {
55+
public void setDefaultTimeout(@Nullable Duration defaultTimeout) {
5456
this.defaultTimeout = defaultTimeout;
5557
}
5658

57-
public Boolean getRollbackOnCommitFailure() {
59+
public @Nullable Boolean getRollbackOnCommitFailure() {
5860
return this.rollbackOnCommitFailure;
5961
}
6062

61-
public void setRollbackOnCommitFailure(Boolean rollbackOnCommitFailure) {
63+
public void setRollbackOnCommitFailure(@Nullable Boolean rollbackOnCommitFailure) {
6264
this.rollbackOnCommitFailure = rollbackOnCommitFailure;
6365
}
6466

module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/autoconfigure/package-info.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@
1717
/**
1818
* Auto-configuration for transaction support.
1919
*/
20+
@NullMarked
2021
package org.springframework.boot.transaction.autoconfigure;
22+
23+
import org.jspecify.annotations.NullMarked;

module/spring-boot-tx/src/main/java/org/springframework/boot/transaction/jta/autoconfigure/package-info.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@
1717
/**
1818
* Auto-configuration for JTA.
1919
*/
20+
@NullMarked
2021
package org.springframework.boot.transaction.jta.autoconfigure;
22+
23+
import org.jspecify.annotations.NullMarked;

0 commit comments

Comments
 (0)