Skip to content

Commit c55b5d7

Browse files
philwebbphilwebb
committed
Polish
1 parent 44d8e09 commit c55b5d7

File tree

62 files changed

+240
-232
lines changed

Some content is hidden

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

62 files changed

+240
-232
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2323
import org.springframework.boot.actuate.endpoint.ParameterMapper;
2424
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
25+
import org.springframework.boot.actuate.endpoint.web.EndpointPathResolver;
2526
import org.springframework.boot.actuate.endpoint.web.annotation.WebAnnotationEndpointDiscoverer;
2627
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2728
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -82,7 +83,7 @@ public CloudFoundryWebEndpointServletHandlerMapping cloudFoundryWebEndpointServl
8283
RestTemplateBuilder builder) {
8384
WebAnnotationEndpointDiscoverer endpointDiscoverer = new WebAnnotationEndpointDiscoverer(
8485
this.applicationContext, parameterMapper, cachingConfigurationFactory,
85-
endpointMediaTypes, (id) -> id);
86+
endpointMediaTypes, EndpointPathResolver.useEndpointId());
8687
return new CloudFoundryWebEndpointServletHandlerMapping(
8788
new EndpointMapping("/cloudfoundryapplication"),
8889
endpointDiscoverer.discoverEndpoints(), endpointMediaTypes,
@@ -142,7 +143,6 @@ public void init(WebSecurity builder) throws Exception {
142143

143144
@Override
144145
public void configure(WebSecurity builder) throws Exception {
145-
146146
}
147147

148148
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.springframework.core.env.Environment;
2121

2222
/**
23-
* Default {@link EndpointPathResolver} implementation that use the
24-
* {@link Environment} to determine if an endpoint has a custom path.
23+
* Default {@link EndpointPathResolver} implementation that use the {@link Environment} to
24+
* determine if an endpoint has a custom path.
2525
*
2626
* @author Stephane Nicoll
2727
*/

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@
6868
@EnableConfigurationProperties(MetricsProperties.class)
6969
@Import({ MeterBindersConfiguration.class, WebMvcMetricsConfiguration.class,
7070
WebFluxMetricsConfiguration.class, RestTemplateMetricsConfiguration.class,
71-
DataSourcePoolMetricsConfiguration.class,
72-
AtlasExportConfiguration.class, DatadogExportConfiguration.class,
73-
GangliaExportConfiguration.class, GraphiteExportConfiguration.class,
74-
InfluxExportConfiguration.class, JmxExportConfiguration.class,
75-
PrometheusExportConfiguration.class, SimpleExportConfiguration.class,
76-
StatsdExportConfiguration.class })
71+
DataSourcePoolMetricsConfiguration.class, AtlasExportConfiguration.class,
72+
DatadogExportConfiguration.class, GangliaExportConfiguration.class,
73+
GraphiteExportConfiguration.class, InfluxExportConfiguration.class,
74+
JmxExportConfiguration.class, PrometheusExportConfiguration.class,
75+
SimpleExportConfiguration.class, StatsdExportConfiguration.class })
7776
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
7877
public class MetricsAutoConfiguration {
7978

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
package org.springframework.boot.actuate.autoconfigure.metrics.jdbc;
1818

1919
import java.util.Collection;
20+
import java.util.List;
2021
import java.util.Map;
2122

2223
import javax.sql.DataSource;
2324

2425
import io.micrometer.core.instrument.MeterRegistry;
26+
import io.micrometer.core.instrument.Tag;
2527
import io.micrometer.core.instrument.Tags;
2628

2729
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,12 +64,13 @@ public DataSourcePoolMetricsConfiguration(MeterRegistry registry,
6264

6365
@Autowired
6466
public void bindDataSourcesToRegistry(Map<String, DataSource> dataSources) {
65-
for (Map.Entry<String, DataSource> entry : dataSources.entrySet()) {
66-
String beanName = entry.getKey();
67-
DataSource dataSource = entry.getValue();
68-
new DataSourcePoolMetrics(dataSource, this.metadataProviders, this.metricName,
69-
Tags.zip("name", getDataSourceName(beanName))).bindTo(this.registry);
70-
}
67+
dataSources.forEach(this::bindDataSourceToRegistry);
68+
}
69+
70+
private void bindDataSourceToRegistry(String beanName, DataSource dataSource) {
71+
List<Tag> tags = Tags.zip("name", getDataSourceName(beanName));
72+
new DataSourcePoolMetrics(dataSource, this.metadataProviders, this.metricName,
73+
tags).bindTo(this.registry);
7174
}
7275

7376
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb()
220220
}
221221

222222
@Test
223-
public void endpointPathCustomizationIsNotApplied()
224-
throws Exception {
223+
public void endpointPathCustomizationIsNotApplied() throws Exception {
225224
TestPropertyValues.of("endpoints.test.web.path=another/custom")
226225
.applyTo(this.context);
227226
this.context.register(TestConfiguration.class);

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryMvcWebEndpointIntegrationTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.boot.actuate.endpoint.cache.CachingConfiguration;
3333
import org.springframework.boot.actuate.endpoint.convert.ConversionServiceParameterMapper;
3434
import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
35+
import org.springframework.boot.actuate.endpoint.web.EndpointPathResolver;
3536
import org.springframework.boot.actuate.endpoint.web.annotation.WebAnnotationEndpointDiscoverer;
3637
import org.springframework.boot.endpoint.web.EndpointMapping;
3738
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -219,7 +220,7 @@ public WebAnnotationEndpointDiscoverer webEndpointDiscoverer(
219220
DefaultConversionService.getSharedInstance());
220221
return new WebAnnotationEndpointDiscoverer(applicationContext,
221222
parameterMapper, (id) -> new CachingConfiguration(0),
222-
endpointMediaTypes, (id) -> id);
223+
endpointMediaTypes, EndpointPathResolver.useEndpointId());
223224
}
224225

225226
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public class MetricsAutoConfigurationTests {
4747
@Test
4848
public void autoConfiguredDataSourceIsInstrumented() {
4949
this.contextRunner
50-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
50+
.withConfiguration(
51+
AutoConfigurations.of(DataSourceAutoConfiguration.class))
5152
.withPropertyValues("spring.datasource.generate-unique-name=true",
5253
"spring.metrics.use-global-registry=false")
5354
.run((context) -> {
@@ -61,7 +62,8 @@ public void autoConfiguredDataSourceIsInstrumented() {
6162
@Test
6263
public void autoConfiguredDataSourceWithCustomMetricName() {
6364
this.contextRunner
64-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
65+
.withConfiguration(
66+
AutoConfigurations.of(DataSourceAutoConfiguration.class))
6567
.withPropertyValues("spring.datasource.generate-unique-name=true",
6668
"spring.metrics.jdbc.datasource-metric-name=custom.name",
6769
"spring.metrics.use-global-registry=false")
@@ -76,7 +78,8 @@ public void autoConfiguredDataSourceWithCustomMetricName() {
7678
@Test
7779
public void dataSourceInstrumentationCanBeDisabled() {
7880
this.contextRunner
79-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
81+
.withConfiguration(
82+
AutoConfigurations.of(DataSourceAutoConfiguration.class))
8083
.withPropertyValues("spring.datasource.generate-unique-name=true",
8184
"spring.metrics.jdbc.instrument-datasource=false",
8285
"spring.metrics.use-global-registry=false")
@@ -90,15 +93,15 @@ public void dataSourceInstrumentationCanBeDisabled() {
9093

9194
@Test
9295
public void allDataSourcesCanBeInstrumented() {
93-
this.contextRunner
94-
.withUserConfiguration(TwoDataSourcesConfiguration.class)
95-
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
96+
this.contextRunner.withUserConfiguration(TwoDataSourcesConfiguration.class)
97+
.withConfiguration(
98+
AutoConfigurations.of(DataSourceAutoConfiguration.class))
9699
.withPropertyValues("metrics.use-global-registry=false")
97100
.run((context) -> {
98-
context.getBean("firstDataSource", DataSource.class)
99-
.getConnection().getMetaData();
100-
context.getBean("secondOne", DataSource.class)
101-
.getConnection().getMetaData();
101+
context.getBean("firstDataSource", DataSource.class).getConnection()
102+
.getMetaData();
103+
context.getBean("secondOne", DataSource.class).getConnection()
104+
.getMetaData();
102105
MeterRegistry registry = context.getBean(MeterRegistry.class);
103106
assertThat(registry.find("data.source.max.connections")
104107
.tags("name", "first").meter()).isPresent();

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ParameterMappingException.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
/**
2020
* A {@code ParameterMappingException} is thrown when a failure occurs during
21-
* {@link ParameterMapper#mapParameter(Object, Class) operation parameter
22-
* mapping}.
21+
* {@link ParameterMapper#mapParameter(Object, Class) operation parameter mapping}.
2322
*
2423
* @author Andy Wilkinson
2524
* @since 2.0.0

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/convert/ConversionServiceParameterMapper.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@
2323
import org.springframework.format.support.DefaultFormattingConversionService;
2424

2525
/**
26-
* {@link ParameterMapper} that uses a {@link ConversionService} to map parameter
27-
* values if necessary.
26+
* {@link ParameterMapper} that uses a {@link ConversionService} to map parameter values
27+
* if necessary.
2828
*
2929
* @author Stephane Nicoll
3030
* @author Phillip Webb
3131
* @since 2.0.0
3232
*/
33-
public class ConversionServiceParameterMapper
34-
implements ParameterMapper {
33+
public class ConversionServiceParameterMapper implements ParameterMapper {
3534

3635
private final ConversionService conversionService;
3736

@@ -43,8 +42,7 @@ public ConversionServiceParameterMapper() {
4342
* Create a new instance with the {@link ConversionService} to use.
4443
* @param conversionService the conversion service
4544
*/
46-
public ConversionServiceParameterMapper(
47-
ConversionService conversionService) {
45+
public ConversionServiceParameterMapper(ConversionService conversionService) {
4846
this.conversionService = new BinderConversionService(conversionService);
4947
}
5048

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxAnnotationEndpointDiscoverer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ private static class JmxEndpointOperationFactory
115115
public JmxEndpointOperation createOperation(String endpointId,
116116
AnnotationAttributes operationAttributes, Object target, Method method,
117117
OperationType type, long timeToLive) {
118-
ReflectiveOperationInvoker invoker = new ReflectiveOperationInvoker(
119-
target, method, this.parameterMapper);
118+
ReflectiveOperationInvoker invoker = new ReflectiveOperationInvoker(target,
119+
method, this.parameterMapper);
120120
String operationName = method.getName();
121121
Class<?> outputType = getJmxType(method.getReturnType());
122122
String description = getDescription(method,

0 commit comments

Comments
 (0)