SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed checkstyle

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-02-02 13:05:48 +01:00
parent 074b55dadd
commit e4c5f50a1d
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java
View File

@@ -145,7 +145,7 @@ class ZipkinHttpSenderConfiguration {
}
static class NonWebApplicationOrServletCondition extends AnyNestedCondition {
static final class NonWebApplicationOrServletCondition extends AnyNestedCondition {
private NonWebApplicationOrServletCondition() {
super(ConfigurationPhase.REGISTER_BEAN);
@@ -162,4 +162,5 @@ class ZipkinHttpSenderConfiguration {
}
}
}

4
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java
View File

@@ -29,16 +29,12 @@ import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
import org.springframework.cloud.gateway.config.GatewayAutoConfiguration;
import org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration;
import org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration;
import org.springframework.cloud.sleuth.autoconfig.TraceNoOpAutoConfiguration;
import org.springframework.cloud.sleuth.zipkin2.WebClientSender;
import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import static org.assertj.core.api.BDDAssertions.then;

14
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationTests.java
View File

@@ -18,10 +18,8 @@ package org.springframework.cloud.sleuth.autoconfig.zipkin2;
import org.assertj.core.api.BDDAssertions;
import org.junit.jupiter.api.Test;
import zipkin2.reporter.Sender;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.cloud.sleuth.zipkin2.WebClientSender;
import org.springframework.cloud.sleuth.zipkin2.ZipkinProperties;
import org.springframework.cloud.sleuth.zipkin2.ZipkinRestTemplateCustomizer;
import org.springframework.cloud.sleuth.zipkin2.ZipkinRestTemplateProvider;
@@ -44,18 +42,6 @@ class ZipkinHttpSenderConfigurationTests {
});
}
@Test
void should_use_web_client_when_reactive_type() {
ApplicationContextRunner runner = new ApplicationContextRunner().withUserConfiguration(
ZipkinHttpSenderConfiguration.class, ZipkinProperties.class)
.withPropertyValues("spring.main.web-application-type=REACTIVE");
runner.run(context -> {
Sender sender = context.getBean(Sender.class);
assertThat(sender).isInstanceOf(WebClientSender.class);
});
}
@Configuration(proxyBeanMethods = false)
static class Config {