Skip to content

Commit a66c4d3

Browse files
philwebbphilwebb
committed
Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private classes do not have unnecessary public methods. Test classes have also been unified as much as possible to use default scoped inner-classes. Closes spring-projectsgh-7316
1 parent 0a02a3a commit a66c4d3

File tree

910 files changed

+3753
-3944
lines changed

Some content is hidden

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

910 files changed

+3753
-3944
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private CorsConfiguration getCorsConfiguration() {
155155
static class IgnoredPathsSecurityConfiguration {
156156

157157
@Bean
158-
public WebFilterChainPostProcessor webFilterChainPostProcessor() {
158+
WebFilterChainPostProcessor webFilterChainPostProcessor() {
159159
return new WebFilterChainPostProcessor();
160160
}
161161

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ private SslContextBuilder createSslContext() {
8383
* @return a Mono of the access level that should be granted
8484
* @throws CloudFoundryAuthorizationException if the token is not authorized
8585
*/
86-
public Mono<AccessLevel> getAccessLevel(String token, String applicationId)
87-
throws CloudFoundryAuthorizationException {
86+
Mono<AccessLevel> getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException {
8887
String uri = getPermissionsUri(applicationId);
8988
return this.webClient.get().uri(uri).header("Authorization", "bearer " + token).retrieve().bodyToMono(Map.class)
9089
.map(this::getAccessLevel).onErrorMap(this::mapError);
@@ -118,7 +117,7 @@ private String getPermissionsUri(String applicationId) {
118117
* Return a Mono of all token keys known by the UAA.
119118
* @return a Mono of token keys
120119
*/
121-
public Mono<Map<String, String>> fetchTokenKeys() {
120+
Mono<Map<String, String>> fetchTokenKeys() {
122121
return getUaaUrl().flatMap(this::fetchTokenKeys);
123122
}
124123

@@ -141,7 +140,7 @@ private Map<String, String> extractTokenKeys(Map<String, Object> response) {
141140
* Return a Mono of URL of the UAA.
142141
* @return the UAA url Mono
143142
*/
144-
public Mono<String> getUaaUrl() {
143+
Mono<String> getUaaUrl() {
145144
this.uaaUrl = this.webClient.get().uri(this.cloudControllerUrl + "/info").retrieve().bodyToMono(Map.class)
146145
.map((response) -> (String) response.get("token_endpoint")).cache()
147146
.onErrorMap((ex) -> new CloudFoundryAuthorizationException(Reason.SERVICE_UNAVAILABLE,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ReactiveTokenValidator {
5050
this.securityService = securityService;
5151
}
5252

53-
public Mono<Void> validate(Token token) {
53+
Mono<Void> validate(Token token) {
5454
return validateAlgorithm(token).then(validateKeyIdAndSignature(token)).then(validateExpiry(token))
5555
.then(validateIssuer(token)).then(validateAudience(token));
5656
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class CloudFoundrySecurityService {
6565
* @return the access level that should be granted
6666
* @throws CloudFoundryAuthorizationException if the token is not authorized
6767
*/
68-
public AccessLevel getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException {
68+
AccessLevel getAccessLevel(String token, String applicationId) throws CloudFoundryAuthorizationException {
6969
try {
7070
URI uri = getPermissionsUri(applicationId);
7171
RequestEntity<?> request = RequestEntity.get(uri).header("Authorization", "bearer " + token).build();
@@ -99,7 +99,7 @@ private URI getPermissionsUri(String applicationId) {
9999
* Return all token keys known by the UAA.
100100
* @return a list of token keys
101101
*/
102-
public Map<String, String> fetchTokenKeys() {
102+
Map<String, String> fetchTokenKeys() {
103103
try {
104104
return extractTokenKeys(this.restTemplate.getForObject(getUaaUrl() + "/token_keys", Map.class));
105105
}
@@ -121,7 +121,7 @@ private Map<String, String> extractTokenKeys(Map<?, ?> response) {
121121
* Return the URL of the UAA.
122122
* @return the UAA url
123123
*/
124-
public String getUaaUrl() {
124+
String getUaaUrl() {
125125
if (this.uaaUrl == null) {
126126
try {
127127
Map<?, ?> response = this.restTemplate.getForObject(this.cloudControllerUrl + "/info", Map.class);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class TokenValidator {
4646
this.securityService = cloudFoundrySecurityService;
4747
}
4848

49-
public void validate(Token token) {
49+
void validate(Token token) {
5050
validateAlgorithm(token);
5151
validateKeyIdAndSignature(token);
5252
validateExpiry(token);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static class WebEndpointServletConfiguration {
136136

137137
@Bean
138138
@ConditionalOnMissingBean(ServletEndpointsSupplier.class)
139-
public ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext,
139+
ServletEndpointDiscoverer servletEndpointDiscoverer(ApplicationContext applicationContext,
140140
ObjectProvider<PathMapper> endpointPathMappers,
141141
ObjectProvider<EndpointFilter<ExposableServletEndpoint>> filters) {
142142
return new ServletEndpointDiscoverer(applicationContext,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
class JerseyWebEndpointManagementContextConfiguration {
6161

6262
@Bean
63-
public ResourceConfigCustomizer webEndpointRegistrar(WebEndpointsSupplier webEndpointsSupplier,
63+
ResourceConfigCustomizer webEndpointRegistrar(WebEndpointsSupplier webEndpointsSupplier,
6464
ServletEndpointsSupplier servletEndpointsSupplier, EndpointMediaTypes endpointMediaTypes,
6565
WebEndpointProperties webEndpointProperties) {
6666
List<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class HealthEndpointConfiguration {
3838

3939
@Bean
4040
@ConditionalOnMissingBean
41-
public HealthEndpoint healthEndpoint(HealthAggregator healthAggregator, HealthIndicatorRegistry registry) {
41+
HealthEndpoint healthEndpoint(HealthAggregator healthAggregator, HealthIndicatorRegistry registry) {
4242
return new HealthEndpoint(new CompositeHealthIndicator(healthAggregator, registry));
4343
}
4444

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointWebExtensionConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class HealthEndpointWebExtensionConfiguration {
4848

4949
@Bean
5050
@ConditionalOnMissingBean
51-
public HealthStatusHttpMapper createHealthStatusHttpMapper(HealthIndicatorProperties healthIndicatorProperties) {
51+
HealthStatusHttpMapper createHealthStatusHttpMapper(HealthIndicatorProperties healthIndicatorProperties) {
5252
HealthStatusHttpMapper statusHttpMapper = new HealthStatusHttpMapper();
5353
if (healthIndicatorProperties.getHttpMapping() != null) {
5454
statusHttpMapper.addStatusMapping(healthIndicatorProperties.getHttpMapping());
@@ -58,7 +58,7 @@ public HealthStatusHttpMapper createHealthStatusHttpMapper(HealthIndicatorProper
5858

5959
@Bean
6060
@ConditionalOnMissingBean
61-
public HealthWebEndpointResponseMapper healthWebEndpointResponseMapper(HealthStatusHttpMapper statusHttpMapper,
61+
HealthWebEndpointResponseMapper healthWebEndpointResponseMapper(HealthStatusHttpMapper statusHttpMapper,
6262
HealthEndpointProperties properties) {
6363
return new HealthWebEndpointResponseMapper(statusHttpMapper, properties.getShowDetails(),
6464
properties.getRoles());
@@ -72,7 +72,7 @@ static class ReactiveWebHealthConfiguration {
7272
@Bean
7373
@ConditionalOnMissingBean
7474
@ConditionalOnBean(HealthEndpoint.class)
75-
public ReactiveHealthEndpointWebExtension reactiveHealthEndpointWebExtension(
75+
ReactiveHealthEndpointWebExtension reactiveHealthEndpointWebExtension(
7676
ObjectProvider<HealthAggregator> healthAggregator, ReactiveHealthIndicatorRegistry registry,
7777
HealthWebEndpointResponseMapper responseMapper) {
7878
return new ReactiveHealthEndpointWebExtension(new CompositeReactiveHealthIndicator(
@@ -88,7 +88,7 @@ static class ServletWebHealthConfiguration {
8888
@Bean
8989
@ConditionalOnMissingBean
9090
@ConditionalOnBean(HealthEndpoint.class)
91-
public HealthEndpointWebExtension healthEndpointWebExtension(HealthEndpoint healthEndpoint,
91+
HealthEndpointWebExtension healthEndpointWebExtension(HealthEndpoint healthEndpoint,
9292
HealthWebEndpointResponseMapper responseMapper) {
9393
return new HealthEndpointWebExtension(healthEndpoint, responseMapper);
9494
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static class ReactiveHealthIndicatorConfiguration {
7777

7878
@Bean
7979
@ConditionalOnMissingBean
80-
public ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry(
80+
ReactiveHealthIndicatorRegistry reactiveHealthIndicatorRegistry(
8181
Map<String, ReactiveHealthIndicator> reactiveHealthIndicators,
8282
Map<String, HealthIndicator> healthIndicators) {
8383
return new ReactiveHealthIndicatorRegistryFactory()

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorRegistryBeans.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class HealthIndicatorRegistryBeans {
3737
private HealthIndicatorRegistryBeans() {
3838
}
3939

40-
public static HealthIndicatorRegistry get(ApplicationContext applicationContext) {
40+
static HealthIndicatorRegistry get(ApplicationContext applicationContext) {
4141
Map<String, HealthIndicator> indicators = new LinkedHashMap<>();
4242
indicators.putAll(applicationContext.getBeansOfType(HealthIndicator.class));
4343
if (ClassUtils.isPresent("reactor.core.publisher.Flux", null)) {
@@ -49,7 +49,7 @@ public static HealthIndicatorRegistry get(ApplicationContext applicationContext)
4949

5050
private static class ReactiveHealthIndicators {
5151

52-
public Map<String, HealthIndicator> get(ApplicationContext applicationContext) {
52+
Map<String, HealthIndicator> get(ApplicationContext applicationContext) {
5353
Map<String, HealthIndicator> indicators = new LinkedHashMap<>();
5454
applicationContext.getBeansOfType(ReactiveHealthIndicator.class)
5555
.forEach((name, indicator) -> indicators.put(name, adapt(indicator)));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CompositeMeterRegistryConfiguration {
4242

4343
@Bean
4444
@Primary
45-
public CompositeMeterRegistry compositeMeterRegistry(Clock clock, List<MeterRegistry> registries) {
45+
CompositeMeterRegistry compositeMeterRegistry(Clock clock, List<MeterRegistry> registries) {
4646
return new CompositeMeterRegistry(clock, registries);
4747
}
4848

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2018 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,8 +29,9 @@
2929
* {@link Duration} (applicable to only timers).
3030
*
3131
* @author Phillip Webb
32+
* @since 2.2.0
3233
*/
33-
final class MeterValue {
34+
public final class MeterValue {
3435

3536
private final Object value;
3637

@@ -43,8 +44,7 @@ final class MeterValue {
4344
}
4445

4546
/**
46-
* Return the underlying value of the SLA in form suitable to apply to the given meter
47-
* type.
47+
* Return the underlying value in form suitable to apply to the given meter type.
4848
* @param meterType the meter type
4949
* @return the value or {@code null} if the value cannot be applied
5050
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
class NoOpMeterRegistryConfiguration {
3838

3939
@Bean
40-
public CompositeMeterRegistry noOpMeterRegistry(Clock clock) {
40+
CompositeMeterRegistry noOpMeterRegistry(Clock clock) {
4141
return new CompositeMeterRegistry(clock);
4242
}
4343

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CacheMeterBinderProvidersConfiguration {
4747
static class CaffeineCacheMeterBinderProviderConfiguration {
4848

4949
@Bean
50-
public CaffeineCacheMeterBinderProvider caffeineCacheMeterBinderProvider() {
50+
CaffeineCacheMeterBinderProvider caffeineCacheMeterBinderProvider() {
5151
return new CaffeineCacheMeterBinderProvider();
5252
}
5353

@@ -58,7 +58,7 @@ public CaffeineCacheMeterBinderProvider caffeineCacheMeterBinderProvider() {
5858
static class EhCache2CacheMeterBinderProviderConfiguration {
5959

6060
@Bean
61-
public EhCache2CacheMeterBinderProvider ehCache2CacheMeterBinderProvider() {
61+
EhCache2CacheMeterBinderProvider ehCache2CacheMeterBinderProvider() {
6262
return new EhCache2CacheMeterBinderProvider();
6363
}
6464

@@ -69,7 +69,7 @@ public EhCache2CacheMeterBinderProvider ehCache2CacheMeterBinderProvider() {
6969
static class HazelcastCacheMeterBinderProviderConfiguration {
7070

7171
@Bean
72-
public HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() {
72+
HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() {
7373
return new HazelcastCacheMeterBinderProvider();
7474
}
7575

@@ -80,7 +80,7 @@ public HazelcastCacheMeterBinderProvider hazelcastCacheMeterBinderProvider() {
8080
static class JCacheCacheMeterBinderProviderConfiguration {
8181

8282
@Bean
83-
public JCacheCacheMeterBinderProvider jCacheCacheMeterBinderProvider() {
83+
JCacheCacheMeterBinderProvider jCacheCacheMeterBinderProvider() {
8484
return new JCacheCacheMeterBinderProvider();
8585
}
8686

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsRegistrarConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ class CacheMetricsRegistrarConfiguration {
5959
}
6060

6161
@Bean
62-
public CacheMetricsRegistrar cacheMetricsRegistrar() {
62+
CacheMetricsRegistrar cacheMetricsRegistrar() {
6363
return this.cacheMetricsRegistrar;
6464
}
6565

6666
@PostConstruct
67-
public void bindCachesToRegistry() {
67+
void bindCachesToRegistry() {
6868
this.cacheManagers.forEach(this::bindCacheManagerToRegistry);
6969
}
7070

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static class DataSourcePoolMetadataMetricsConfiguration {
6666
private static final String DATASOURCE_SUFFIX = "dataSource";
6767

6868
@Autowired
69-
public void bindDataSourcesToRegistry(Map<String, DataSource> dataSources, MeterRegistry registry,
69+
void bindDataSourcesToRegistry(Map<String, DataSource> dataSources, MeterRegistry registry,
7070
ObjectProvider<DataSourcePoolMetadataProvider> metadataProviders) {
7171
List<DataSourcePoolMetadataProvider> metadataProvidersList = metadataProviders.stream()
7272
.collect(Collectors.toList());
@@ -109,7 +109,7 @@ static class HikariDataSourceMetricsConfiguration {
109109
}
110110

111111
@Autowired
112-
public void bindMetricsRegistryToHikariDataSources(Collection<DataSource> dataSources) {
112+
void bindMetricsRegistryToHikariDataSources(Collection<DataSource> dataSources) {
113113
for (DataSource dataSource : dataSources) {
114114
HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(dataSource, HikariDataSource.class);
115115
if (hikariDataSource != null) {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class RestTemplateMetricsConfiguration {
4545

4646
@Bean
4747
@ConditionalOnMissingBean(RestTemplateExchangeTagsProvider.class)
48-
public DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() {
48+
DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() {
4949
return new DefaultRestTemplateExchangeTagsProvider();
5050
}
5151

5252
@Bean
53-
public MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(MeterRegistry meterRegistry,
53+
MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(MeterRegistry meterRegistry,
5454
RestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider, MetricsProperties properties) {
5555
ClientRequest request = properties.getWeb().getClient().getRequest();
5656
return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateExchangeTagsProvider,

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class WebClientMetricsConfiguration {
4141

4242
@Bean
4343
@ConditionalOnMissingBean
44-
public WebClientExchangeTagsProvider defaultWebClientExchangeTagsProvider() {
44+
WebClientExchangeTagsProvider defaultWebClientExchangeTagsProvider() {
4545
return new DefaultWebClientExchangeTagsProvider();
4646
}
4747

4848
@Bean
49-
public MetricsWebClientCustomizer metricsWebClientCustomizer(MeterRegistry meterRegistry,
49+
MetricsWebClientCustomizer metricsWebClientCustomizer(MeterRegistry meterRegistry,
5050
WebClientExchangeTagsProvider tagsProvider, MetricsProperties properties) {
5151
ClientRequest request = properties.getWeb().getClient().getRequest();
5252
return new MetricsWebClientCustomizer(meterRegistry, tagsProvider, request.getMetricName(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ protected RequestMatcher createDelegate(WebApplicationContext context,
299299
*/
300300
private static class RequestMatcherFactory {
301301

302-
public RequestMatcher antPath(RequestMatcherProvider matcherProvider, String... parts) {
302+
RequestMatcher antPath(RequestMatcherProvider matcherProvider, String... parts) {
303303
StringBuilder pattern = new StringBuilder();
304304
for (String part : parts) {
305305
pattern.append(part);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/trace/http/HttpTraceAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static class ServletTraceFilterConfiguration {
5555

5656
@Bean
5757
@ConditionalOnMissingBean
58-
public HttpTraceFilter httpTraceFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) {
58+
HttpTraceFilter httpTraceFilter(HttpTraceRepository repository, HttpExchangeTracer tracer) {
5959
return new HttpTraceFilter(repository, tracer);
6060
}
6161

@@ -67,7 +67,7 @@ static class ReactiveTraceFilterConfiguration {
6767

6868
@Bean
6969
@ConditionalOnMissingBean
70-
public HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer,
70+
HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository, HttpExchangeTracer tracer,
7171
HttpTraceProperties traceProperties) {
7272
return new HttpTraceWebFilter(repository, tracer, traceProperties.getInclude());
7373
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
class JerseyManagementContextConfiguration {
3535

3636
@Bean
37-
public ServletRegistrationBean<ServletContainer> jerseyServletRegistration(
38-
JerseyApplicationPath jerseyApplicationPath, ResourceConfig resourceConfig) {
37+
ServletRegistrationBean<ServletContainer> jerseyServletRegistration(JerseyApplicationPath jerseyApplicationPath,
38+
ResourceConfig resourceConfig) {
3939
return new ServletRegistrationBean<>(new ServletContainer(resourceConfig),
4040
jerseyApplicationPath.getUrlMapping());
4141
}
4242

4343
@Bean
44-
public ResourceConfig resourceConfig(ObjectProvider<ResourceConfigCustomizer> resourceConfigCustomizers) {
44+
ResourceConfig resourceConfig(ObjectProvider<ResourceConfigCustomizer> resourceConfigCustomizers) {
4545
ResourceConfig resourceConfig = new ResourceConfig();
4646
resourceConfigCustomizers.orderedStream().forEach((customizer) -> customizer.customize(resourceConfig));
4747
return resourceConfig;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DispatcherServletsMappingDescriptionProvider dispatcherServletMappingDescription
8989
static class ReactiveWebConfiguration {
9090

9191
@Bean
92-
public DispatcherHandlersMappingDescriptionProvider dispatcherHandlerMappingDescriptionProvider() {
92+
DispatcherHandlersMappingDescriptionProvider dispatcherHandlerMappingDescriptionProvider() {
9393
return new DispatcherHandlersMappingDescriptionProvider();
9494
}
9595

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ private void propagateCloseIfNecessary(ApplicationContext applicationContext) {
196196
}
197197
}
198198

199-
public static void addIfPossible(ApplicationContext parentContext,
200-
ConfigurableApplicationContext childContext) {
199+
static void addIfPossible(ApplicationContext parentContext, ConfigurableApplicationContext childContext) {
201200
if (parentContext instanceof ConfigurableApplicationContext) {
202201
add((ConfigurableApplicationContext) parentContext, childContext);
203202
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private int readOrder(AnnotationMetadata annotationMetadata) {
127127
return (order != null) ? order : Ordered.LOWEST_PRECEDENCE;
128128
}
129129

130-
public String getClassName() {
130+
String getClassName() {
131131
return this.className;
132132
}
133133

@@ -136,7 +136,7 @@ public int getOrder() {
136136
return this.order;
137137
}
138138

139-
public ManagementContextType getContextType() {
139+
ManagementContextType getContextType() {
140140
return this.contextType;
141141
}
142142

0 commit comments

Comments
 (0)