Polish "Allow to configure validateTransactionState for Spring Batch"

See gh-44803
This commit is contained in:
Andy Wilkinson
2025-03-20 12:12:46 +00:00
parent f4a9236e01
commit adae2e1946
3 changed files with 50 additions and 4 deletions

View File

@@ -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

View File

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

View File

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