diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index be2161ad14..9bdf51e17b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -143,8 +143,7 @@ public class BatchAutoConfiguration { @Override protected boolean getValidateTransactionState() { - Boolean validateTransactionState = this.properties.getJdbc().getValidateTransactionState(); - return (validateTransactionState != null) ? validateTransactionState : super.getValidateTransactionState(); + return this.properties.getJdbc().isValidateTransactionState(); } @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java index 8df4cf2055..3bdb237c52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java @@ -71,7 +71,7 @@ public class BatchProperties { /** * Whether to validate the transaction state. */ - private Boolean validateTransactionState; + private boolean validateTransactionState = true; /** * Transaction isolation level to use when creating job meta-data for new jobs. @@ -99,7 +99,7 @@ public class BatchProperties { */ private DatabaseInitializationMode initializeSchema = DatabaseInitializationMode.EMBEDDED; - public Boolean getValidateTransactionState() { + public boolean isValidateTransactionState() { return this.validateTransactionState; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchPropertiesTests.java new file mode 100644 index 0000000000..a89fef9895 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchPropertiesTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2012-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.autoconfigure.batch; + +import org.junit.jupiter.api.Test; + +import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link BatchProperties}. + * + * @author Andy Wilkinson + */ +class BatchPropertiesTests { + + @Test + void validateTransactionStateDefaultMatchesSpringBatchDefault() { + assertThat(new BatchProperties().getJdbc().isValidateTransactionState()) + .isEqualTo(new TestBatchConfiguration().getValidateTransactionState()); + } + + static class TestBatchConfiguration extends DefaultBatchConfiguration { + + @Override + public boolean getValidateTransactionState() { + return super.getValidateTransactionState(); + } + + } + +}