Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move @ConditionalOnClass from methods to inner classes

Browse Source 
Closes gh-31353
This commit is contained in:
Moritz Halbritter
2022-06-13 13:41:58 +02:00
parent 2ae398ae84
commit 42e8f65b80
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java
View File

@@ -28,11 +28,11 @@ import zipkin2.reporter.urlconnection.URLConnectionSender;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.web.client.RestTemplate;
/**
@@ -43,23 +43,36 @@ import org.springframework.web.client.RestTemplate;
class ZipkinConfigurations {
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(ZipkinProperties.class)
@Import({ UrlConnectionSenderConfiguration.class, RestTemplateSenderConfiguration.class })
static class SenderConfiguration {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(URLConnectionSender.class)
@EnableConfigurationProperties(ZipkinProperties.class)
static class UrlConnectionSenderConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnClass(URLConnectionSender.class)
Sender urlConnectionSender(ZipkinProperties properties) {
@ConditionalOnMissingBean(Sender.class)
URLConnectionSender urlConnectionSender(ZipkinProperties properties) {
return URLConnectionSender.newBuilder().connectTimeout((int) properties.getConnectTimeout().getSeconds())
.readTimeout((int) properties.getReadTimeout().getSeconds()).endpoint(properties.getEndpoint())
.build();
}
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(RestTemplate.class)
@EnableConfigurationProperties(ZipkinProperties.class)
static class RestTemplateSenderConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean(Sender.class)
@ConditionalOnBean(RestTemplateBuilder.class)
@ConditionalOnMissingClass("zipkin2.reporter.urlconnection.URLConnectionSender")
Sender restTemplateSender(ZipkinProperties properties, RestTemplateBuilder restTemplateBuilder) {
ZipkinRestTemplateSender restTemplateSender(ZipkinProperties properties,
RestTemplateBuilder restTemplateBuilder) {
RestTemplate restTemplate = restTemplateBuilder.setConnectTimeout(properties.getConnectTimeout())
.setReadTimeout(properties.getReadTimeout()).build();
return new ZipkinRestTemplateSender(properties.getEndpoint(), restTemplate);
@@ -73,7 +86,7 @@ class ZipkinConfigurations {
@Bean
@ConditionalOnMissingBean
@ConditionalOnBean(Sender.class)
Reporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
return AsyncReporter.builder(sender).build(encoder);
}