Skip to content

Commit fa18da3

Browse files
committed
<modify>: adjust code format, delete no-use packages.
1 parent f7623bd commit fa18da3

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,16 @@
3232
import zipkin2.reporter.SpanBytesEncoder;
3333
import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
3434
import zipkin2.reporter.brave.MutableSpanBytesEncoder;
35-
import zipkin2.reporter.urlconnection.URLConnectionSender;
3635

3736
import org.springframework.beans.factory.ObjectProvider;
3837
import org.springframework.boot.actuate.autoconfigure.tracing.ConditionalOnEnabledTracing;
3938
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4039
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
4140
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
42-
import org.springframework.boot.context.properties.ConfigurationProperties;
4341
import org.springframework.boot.context.properties.EnableConfigurationProperties;
44-
import org.springframework.boot.web.client.RestTemplateBuilder;
4542
import org.springframework.context.annotation.Bean;
4643
import org.springframework.context.annotation.Configuration;
4744
import org.springframework.context.annotation.Import;
48-
import org.springframework.web.client.RestTemplate;
49-
import org.springframework.web.reactive.function.client.WebClient;
5045

5146
/**
5247
* Configurations for Zipkin. Those are imported by {@link ZipkinAutoConfiguration}.
@@ -57,9 +52,7 @@
5752
class ZipkinConfigurations {
5853

5954
@Configuration(proxyBeanMethods = false)
60-
@Import({
61-
HttpClientSenderConfiguration.class
62-
})
55+
@Import({ HttpClientSenderConfiguration.class })
6356
static class SenderConfiguration {
6457

6558
}
@@ -76,9 +69,9 @@ ZipkinHttpClientSender httpClientSender(ZipkinProperties properties, Encoding en
7669
ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
7770
ObjectProvider<HttpEndpointSupplier.Factory> endpointSupplierFactoryProvider) {
7871
ZipkinConnectionDetails connectionDetails = connectionDetailsProvider
79-
.getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
72+
.getIfAvailable(() -> new PropertiesZipkinConnectionDetails(properties));
8073
HttpEndpointSupplier.Factory endpointSupplierFactory = endpointSupplierFactoryProvider
81-
.getIfAvailable(HttpEndpointSuppliers::constantFactory);
74+
.getIfAvailable(HttpEndpointSuppliers::constantFactory);
8275
Builder httpClientBuilder = HttpClient.newBuilder().connectTimeout(properties.getConnectTimeout());
8376
customizers.orderedStream().forEach((customizer) -> customizer.customize(httpClientBuilder));
8477
return new ZipkinHttpClientSender(encoding, endpointSupplierFactory, connectionDetails.getSpanEndpoint(),

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsSenderConfigurationTests.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.tracing.zipkin;
1818

19-
import java.io.IOException;
20-
import java.nio.charset.StandardCharsets;
21-
import java.util.List;
22-
import java.util.concurrent.TimeUnit;
23-
24-
import okhttp3.mockwebserver.MockResponse;
25-
import okhttp3.mockwebserver.MockWebServer;
26-
import okhttp3.mockwebserver.RecordedRequest;
2719
import org.junit.jupiter.api.Test;
2820
import org.mockito.ArgumentMatchers;
2921
import zipkin2.reporter.BytesMessageSender;
@@ -36,10 +28,8 @@
3628
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3729
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3830
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
39-
import org.springframework.boot.web.client.RestTemplateBuilder;
4031
import org.springframework.context.annotation.Bean;
4132
import org.springframework.context.annotation.Configuration;
42-
import org.springframework.web.reactive.function.client.WebClient;
4333

4434
import static org.assertj.core.api.Assertions.assertThat;
4535
import static org.mockito.BDDMockito.then;

0 commit comments

Comments
 (0)