From e4c5f50a1dccecf6773d56b949cb0c0f92ef5974 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 2 Feb 2022 13:05:48 +0100 Subject: [PATCH] Fixed checkstyle --- .../zipkin2/ZipkinHttpSenderConfiguration.java | 3 ++- ...ZipkinHttpSenderConfigurationReactiveTests.java | 4 ---- .../ZipkinHttpSenderConfigurationTests.java | 14 -------------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java index c49706cd7..185edc8c5 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfiguration.java @@ -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 { } } + } diff --git a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java index 306de3dca..59a70a671 100644 --- a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java +++ b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java @@ -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; diff --git a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationTests.java b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationTests.java index bb06c66e9..5b9715b26 100644 --- a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationTests.java +++ b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationTests.java @@ -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 {