Skip to content

Commit c642f6d

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-41613
2 parents 2199a31 + 5f666ee commit c642f6d

File tree

69 files changed

+279
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+279
-302
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
3636
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
3737
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
38-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
3938
import org.springframework.boot.actuate.health.HealthEndpoint;
4039
import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
4140
import org.springframework.boot.actuate.info.GitInfoContributor;
@@ -114,7 +113,8 @@ public CloudFoundryInfoEndpointWebExtension cloudFoundryInfoEndpointWebExtension
114113
@SuppressWarnings("removal")
115114
public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServletHandlerMapping(
116115
ParameterValueMapper parameterMapper, EndpointMediaTypes endpointMediaTypes,
117-
RestTemplateBuilder restTemplateBuilder, ServletEndpointsSupplier servletEndpointsSupplier,
116+
RestTemplateBuilder restTemplateBuilder,
117+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
118118
ControllerEndpointsSupplier controllerEndpointsSupplier, ApplicationContext applicationContext) {
119119
CloudFoundryWebEndpointDiscoverer discoverer = new CloudFoundryWebEndpointDiscoverer(applicationContext,
120120
parameterMapper, endpointMediaTypes, null, Collections.emptyList(), Collections.emptyList());

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

+17-13
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121
import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
2222
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
23-
import org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint;
24-
import org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar;
25-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
2623
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2724
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
2825
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -48,22 +45,26 @@ public class ServletEndpointManagementContextConfiguration {
4845

4946
@Bean
5047
@SuppressWarnings("removal")
51-
public IncludeExcludeEndpointFilter<ExposableServletEndpoint> servletExposeExcludePropertyEndpointFilter(
48+
public IncludeExcludeEndpointFilter<org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint> servletExposeExcludePropertyEndpointFilter(
5249
WebEndpointProperties properties) {
5350
WebEndpointProperties.Exposure exposure = properties.getExposure();
54-
return new IncludeExcludeEndpointFilter<>(ExposableServletEndpoint.class, exposure.getInclude(),
51+
return new IncludeExcludeEndpointFilter<>(
52+
org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint.class, exposure.getInclude(),
5553
exposure.getExclude());
5654
}
5755

5856
@Configuration(proxyBeanMethods = false)
5957
@ConditionalOnClass(DispatcherServlet.class)
60-
@SuppressWarnings("removal")
6158
public static class WebMvcServletEndpointManagementContextConfiguration {
6259

6360
@Bean
64-
public ServletEndpointRegistrar servletEndpointRegistrar(WebEndpointProperties properties,
65-
ServletEndpointsSupplier servletEndpointsSupplier, DispatcherServletPath dispatcherServletPath) {
66-
return new ServletEndpointRegistrar(dispatcherServletPath.getRelativePath(properties.getBasePath()),
61+
@SuppressWarnings({ "deprecation", "removal" })
62+
public org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar servletEndpointRegistrar(
63+
WebEndpointProperties properties,
64+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
65+
DispatcherServletPath dispatcherServletPath) {
66+
return new org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar(
67+
dispatcherServletPath.getRelativePath(properties.getBasePath()),
6768
servletEndpointsSupplier.getEndpoints());
6869
}
6970

@@ -72,13 +73,16 @@ public ServletEndpointRegistrar servletEndpointRegistrar(WebEndpointProperties p
7273
@Configuration(proxyBeanMethods = false)
7374
@ConditionalOnClass(ResourceConfig.class)
7475
@ConditionalOnMissingClass("org.springframework.web.servlet.DispatcherServlet")
75-
@SuppressWarnings("removal")
7676
public static class JerseyServletEndpointManagementContextConfiguration {
7777

7878
@Bean
79-
public ServletEndpointRegistrar servletEndpointRegistrar(WebEndpointProperties properties,
80-
ServletEndpointsSupplier servletEndpointsSupplier, JerseyApplicationPath jerseyApplicationPath) {
81-
return new ServletEndpointRegistrar(jerseyApplicationPath.getRelativePath(properties.getBasePath()),
79+
@SuppressWarnings({ "deprecation", "removal" })
80+
public org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar servletEndpointRegistrar(
81+
WebEndpointProperties properties,
82+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
83+
JerseyApplicationPath jerseyApplicationPath) {
84+
return new org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar(
85+
jerseyApplicationPath.getRelativePath(properties.getBasePath()),
8286
servletEndpointsSupplier.getEndpoints());
8387
}
8488

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java

+12-14
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@
2929
import org.springframework.boot.actuate.endpoint.invoke.OperationInvokerAdvisor;
3030
import org.springframework.boot.actuate.endpoint.invoke.ParameterValueMapper;
3131
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
32-
import org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint;
3332
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
3433
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
3534
import org.springframework.boot.actuate.endpoint.web.PathMapper;
3635
import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
37-
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointDiscoverer;
3836
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
3937
import org.springframework.boot.actuate.endpoint.web.annotation.ExposableControllerEndpoint;
40-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointDiscoverer;
41-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
4238
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointDiscoverer;
4339
import org.springframework.boot.autoconfigure.AutoConfiguration;
4440
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -96,10 +92,12 @@ public WebEndpointDiscoverer webEndpointDiscoverer(ParameterValueMapper paramete
9692

9793
@Bean
9894
@ConditionalOnMissingBean(ControllerEndpointsSupplier.class)
99-
@SuppressWarnings("removal")
100-
public ControllerEndpointDiscoverer controllerEndpointDiscoverer(ObjectProvider<PathMapper> endpointPathMappers,
95+
@SuppressWarnings({ "deprecation", "removal" })
96+
public org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointDiscoverer controllerEndpointDiscoverer(
97+
ObjectProvider<PathMapper> endpointPathMappers,
10198
ObjectProvider<Collection<EndpointFilter<ExposableControllerEndpoint>>> filters) {
102-
return new ControllerEndpointDiscoverer(this.applicationContext, endpointPathMappers.orderedStream().toList(),
99+
return new org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointDiscoverer(
100+
this.applicationContext, endpointPathMappers.orderedStream().toList(),
103101
filters.getIfAvailable(Collections::emptyList));
104102
}
105103

@@ -125,16 +123,16 @@ public IncludeExcludeEndpointFilter<ExposableControllerEndpoint> controllerExpos
125123

126124
@Configuration(proxyBeanMethods = false)
127125
@ConditionalOnWebApplication(type = Type.SERVLET)
128-
@SuppressWarnings("removal")
129126
static class WebEndpointServletConfiguration {
130127

131128
@Bean
132-
@ConditionalOnMissingBean(ServletEndpointsSupplier.class)
133-
ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext,
134-
ObjectProvider<PathMapper> endpointPathMappers,
135-
ObjectProvider<EndpointFilter<ExposableServletEndpoint>> filters) {
136-
return new ServletEndpointDiscoverer(applicationContext, endpointPathMappers.orderedStream().toList(),
137-
filters.orderedStream().toList());
129+
@SuppressWarnings({ "deprecation", "removal" })
130+
@ConditionalOnMissingBean(org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier.class)
131+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointDiscoverer servletEndpointDiscoverer(
132+
ApplicationContext applicationContext, ObjectProvider<PathMapper> endpointPathMappers,
133+
ObjectProvider<EndpointFilter<org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint>> filters) {
134+
return new org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointDiscoverer(
135+
applicationContext, endpointPathMappers.orderedStream().toList(), filters.orderedStream().toList());
138136
}
139137

140138
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfiguration.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@
4545
import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
4646
import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
4747
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
48-
import org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint;
4948
import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
5049
import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
5150
import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
52-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
5351
import org.springframework.boot.actuate.endpoint.web.jersey.JerseyEndpointResourceFactory;
5452
import org.springframework.boot.actuate.endpoint.web.jersey.JerseyHealthEndpointAdditionalPathResourceFactory;
5553
import org.springframework.boot.actuate.health.HealthEndpoint;
@@ -86,7 +84,8 @@ class JerseyWebEndpointManagementContextConfiguration {
8684
@Bean
8785
@SuppressWarnings("removal")
8886
JerseyWebEndpointsResourcesRegistrar jerseyWebEndpointsResourcesRegistrar(Environment environment,
89-
WebEndpointsSupplier webEndpointsSupplier, ServletEndpointsSupplier servletEndpointsSupplier,
87+
WebEndpointsSupplier webEndpointsSupplier,
88+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
9089
EndpointMediaTypes endpointMediaTypes, WebEndpointProperties webEndpointProperties) {
9190
String basePath = webEndpointProperties.getBasePath();
9291
boolean shouldRegisterLinks = shouldRegisterLinksMapping(webEndpointProperties, environment, basePath);
@@ -130,7 +129,7 @@ static class JerseyWebEndpointsResourcesRegistrar implements ManagementContextRe
130129

131130
private final WebEndpointsSupplier webEndpointsSupplier;
132131

133-
private final ServletEndpointsSupplier servletEndpointsSupplier;
132+
private final org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier;
134133

135134
private final EndpointMediaTypes mediaTypes;
136135

@@ -139,8 +138,8 @@ static class JerseyWebEndpointsResourcesRegistrar implements ManagementContextRe
139138
private final boolean shouldRegisterLinks;
140139

141140
JerseyWebEndpointsResourcesRegistrar(WebEndpointsSupplier webEndpointsSupplier,
142-
ServletEndpointsSupplier servletEndpointsSupplier, EndpointMediaTypes endpointMediaTypes,
143-
String basePath, boolean shouldRegisterLinks) {
141+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
142+
EndpointMediaTypes endpointMediaTypes, String basePath, boolean shouldRegisterLinks) {
144143
this.webEndpointsSupplier = webEndpointsSupplier;
145144
this.servletEndpointsSupplier = servletEndpointsSupplier;
146145
this.mediaTypes = endpointMediaTypes;
@@ -155,7 +154,8 @@ public void customize(ResourceConfig config) {
155154

156155
private void register(ResourceConfig config) {
157156
Collection<ExposableWebEndpoint> webEndpoints = this.webEndpointsSupplier.getEndpoints();
158-
Collection<ExposableServletEndpoint> servletEndpoints = this.servletEndpointsSupplier.getEndpoints();
157+
Collection<org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint> servletEndpoints = this.servletEndpointsSupplier
158+
.getEndpoints();
159159
EndpointLinksResolver linksResolver = getLinksResolver(webEndpoints, servletEndpoints);
160160
EndpointMapping mapping = new EndpointMapping(this.basePath);
161161
Collection<Resource> endpointResources = new JerseyEndpointResourceFactory().createEndpointResources(
@@ -164,7 +164,7 @@ private void register(ResourceConfig config) {
164164
}
165165

166166
private EndpointLinksResolver getLinksResolver(Collection<ExposableWebEndpoint> webEndpoints,
167-
Collection<ExposableServletEndpoint> servletEndpoints) {
167+
Collection<org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint> servletEndpoints) {
168168
List<ExposableEndpoint<?>> endpoints = new ArrayList<>(webEndpoints.size() + servletEndpoints.size());
169169
endpoints.addAll(webEndpoints);
170170
endpoints.addAll(servletEndpoints);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfiguration.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
4444
import org.springframework.boot.actuate.endpoint.web.WebServerNamespace;
4545
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
46-
import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
4746
import org.springframework.boot.actuate.endpoint.web.servlet.AdditionalHealthEndpointPathsWebMvcHandlerMapping;
4847
import org.springframework.boot.actuate.endpoint.web.servlet.ControllerEndpointHandlerMapping;
4948
import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
@@ -84,9 +83,10 @@ public class WebMvcEndpointManagementContextConfiguration {
8483
@ConditionalOnMissingBean
8584
@SuppressWarnings("removal")
8685
public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier,
87-
ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier,
88-
EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties,
89-
WebEndpointProperties webEndpointProperties, Environment environment) {
86+
org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier servletEndpointsSupplier,
87+
ControllerEndpointsSupplier controllerEndpointsSupplier, EndpointMediaTypes endpointMediaTypes,
88+
CorsEndpointProperties corsProperties, WebEndpointProperties webEndpointProperties,
89+
Environment environment) {
9090
List<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();
9191
Collection<ExposableWebEndpoint> webEndpoints = webEndpointsSupplier.getEndpoints();
9292
allEndpoints.addAll(webEndpoints);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.boot.actuate.autoconfigure.metrics.export.ConditionalOnEnabledMetricsExport;
3030
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
3131
import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusScrapeEndpoint;
32-
import org.springframework.boot.actuate.metrics.export.prometheus.PrometheusSimpleclientScrapeEndpoint;
3332
import org.springframework.boot.autoconfigure.AutoConfiguration;
3433
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -81,7 +80,8 @@ static class PrometheusScrapeEndpointConfiguration {
8180

8281
@SuppressWarnings("removal")
8382
@Bean
84-
@ConditionalOnMissingBean({ PrometheusScrapeEndpoint.class, PrometheusSimpleclientScrapeEndpoint.class })
83+
@ConditionalOnMissingBean({ PrometheusScrapeEndpoint.class,
84+
org.springframework.boot.actuate.metrics.export.prometheus.PrometheusSimpleclientScrapeEndpoint.class })
8585
PrometheusScrapeEndpoint prometheusEndpoint(PrometheusRegistry prometheusRegistry,
8686
PrometheusConfig prometheusConfig) {
8787
return new PrometheusScrapeEndpoint(prometheusRegistry, prometheusConfig.prometheusProperties());

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

-6
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ protected void postSpans(URI endpoint, byte[] body) throws IOException {
6868
postSpans(endpoint, headers, body);
6969
}
7070

71-
/**
72-
* This will send span(s) as a POST to a zipkin endpoint.
73-
* @param endpoint the POST endpoint. For example, http://localhost:9411/api/v2/spans.
74-
* @param headers headers for the POST request
75-
* @param body list of possibly gzipped, encoded spans.
76-
*/
7771
abstract void postSpans(URI endpoint, HttpHeaders headers, byte[] body) throws IOException;
7872

7973
HttpHeaders getDefaultHeaders() {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static class RestTemplateSenderConfiguration {
9494

9595
@Bean
9696
@ConditionalOnMissingBean(BytesMessageSender.class)
97-
@SuppressWarnings("removal")
97+
@SuppressWarnings({ "deprecation", "removal" })
9898
ZipkinRestTemplateSender restTemplateSender(ZipkinProperties properties, Encoding encoding,
9999
ObjectProvider<ZipkinRestTemplateBuilderCustomizer> customizers,
100100
ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,
@@ -111,7 +111,7 @@ ZipkinRestTemplateSender restTemplateSender(ZipkinProperties properties, Encodin
111111
restTemplateBuilder.build());
112112
}
113113

114-
@SuppressWarnings("removal")
114+
@SuppressWarnings({ "deprecation", "removal" })
115115
private RestTemplateBuilder applyCustomizers(RestTemplateBuilder restTemplateBuilder,
116116
ObjectProvider<ZipkinRestTemplateBuilderCustomizer> customizers) {
117117
Iterable<ZipkinRestTemplateBuilderCustomizer> orderedCustomizers = () -> customizers.orderedStream()
@@ -132,7 +132,7 @@ static class WebClientSenderConfiguration {
132132

133133
@Bean
134134
@ConditionalOnMissingBean(BytesMessageSender.class)
135-
@SuppressWarnings("removal")
135+
@SuppressWarnings({ "deprecation", "removal" })
136136
ZipkinWebClientSender webClientSender(ZipkinProperties properties, Encoding encoding,
137137
ObjectProvider<ZipkinWebClientBuilderCustomizer> customizers,
138138
ObjectProvider<ZipkinConnectionDetails> connectionDetailsProvider,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

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

19-
import zipkin2.reporter.HttpEndpointSupplier;
19+
import zipkin2.reporter.HttpEndpointSupplier.Factory;
2020

2121
import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
2222

2323
/**
2424
* Details required to establish a connection to a Zipkin server.
2525
* <p>
2626
* Note: {@linkplain #getSpanEndpoint()} is only read once and passed to a bean of type
27-
* {@link HttpEndpointSupplier.Factory} which defaults to no-op (constant).
27+
* {@link Factory HttpEndpointSupplier.Factory} which defaults to no-op (constant).
2828
*
2929
* @author Moritz Halbritter
3030
* @since 3.1.0

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

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

19-
import java.net.http.HttpClient;
19+
import java.net.http.HttpClient.Builder;
2020

2121
/**
2222
* Callback interface that can be implemented by beans wishing to customize the
23-
* {@link HttpClient.Builder} used to send spans to Zipkin.
23+
* {@link Builder HttpClient.Builder} used to send spans to Zipkin.
2424
*
2525
* @author Moritz Halbritter
2626
* @since 3.3.0
@@ -32,6 +32,6 @@ public interface ZipkinHttpClientBuilderCustomizer {
3232
* Customize the http client builder.
3333
* @param httpClient the http client builder to customize
3434
*/
35-
void customize(HttpClient.Builder httpClient);
35+
void customize(Builder httpClient);
3636

3737
}

0 commit comments

Comments
 (0)