Break cycle between TransactionManagerCustomizers and TransactionManager
Closes gh-36801pull/37630/head
Andy Wilkinson
1 year ago
parent
72a4e1ebae
commit
96986a6b51
@ -0,0 +1,46 @@
|
||||
/*
|
||||
* Copyright 2012-2023 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.transaction;
|
||||
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.TransactionManager;
|
||||
|
||||
/**
|
||||
* Auto-configuration for the customization of a {@link TransactionManager}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
* @since 3.2.0
|
||||
*/
|
||||
@ConditionalOnClass(PlatformTransactionManager.class)
|
||||
@AutoConfiguration(before = TransactionAutoConfiguration.class)
|
||||
@EnableConfigurationProperties(TransactionProperties.class)
|
||||
public class TransactionManagerCustomizationAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
TransactionManagerCustomizers platformTransactionManagerCustomizers(
|
||||
ObjectProvider<PlatformTransactionManagerCustomizer<?>> customizers) {
|
||||
return new TransactionManagerCustomizers(customizers.orderedStream().toList());
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
/*
|
||||
* Copyright 2012-2023 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.transaction;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link TransactionManagerCustomizationAutoConfiguration}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
class TransactionManagerCustomizationAutoConfigurationTests {
|
||||
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(TransactionManagerCustomizationAutoConfiguration.class));
|
||||
|
||||
@Test
|
||||
void autoConfiguresTransactionManagerCustomizers() {
|
||||
this.contextRunner.run((context) -> {
|
||||
TransactionManagerCustomizers customizers = context.getBean(TransactionManagerCustomizers.class);
|
||||
assertThat(customizers).extracting("customizers")
|
||||
.asList()
|
||||
.singleElement()
|
||||
.isInstanceOf(TransactionProperties.class);
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
void autoConfiguredTransactionManagerCustomizersBacksOff() {
|
||||
this.contextRunner.withUserConfiguration(CustomTransactionManagerCustomizersConfiguration.class)
|
||||
.run((context) -> {
|
||||
TransactionManagerCustomizers customizers = context.getBean(TransactionManagerCustomizers.class);
|
||||
assertThat(customizers).extracting("customizers").asList().isEmpty();
|
||||
});
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
static class CustomTransactionManagerCustomizersConfiguration {
|
||||
|
||||
@Bean
|
||||
TransactionManagerCustomizers customTransactionManagerCustomizers() {
|
||||
return new TransactionManagerCustomizers(Collections.emptyList());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue