Skip to content

Commit 598e9bb

Browse files
philwebbphilwebb
committed
Polish
1 parent dfb9dc2 commit 598e9bb

File tree

18 files changed

+185
-252
lines changed

18 files changed

+185
-252
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public JmxConfig jmxConfig(JmxProperties jmxProperties) {
5858

5959
@Bean
6060
@ConditionalOnMissingBean
61-
public JmxMeterRegistry jmxMeterRegistry(JmxConfig config, Clock clock) {
62-
return new JmxMeterRegistry(config, clock);
61+
public JmxMeterRegistry jmxMeterRegistry(JmxConfig jmxConfig, Clock clock) {
62+
return new JmxMeterRegistry(jmxConfig, clock);
6363
}
6464

6565
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public NewRelicConfig newRelicConfig(NewRelicProperties props) {
5959

6060
@Bean
6161
@ConditionalOnMissingBean
62-
public NewRelicMeterRegistry newRelicMeterRegistry(NewRelicConfig config,
62+
public NewRelicMeterRegistry newRelicMeterRegistry(NewRelicConfig newRelicConfig,
6363
Clock clock) {
64-
return new NewRelicMeterRegistry(config, clock);
64+
return new NewRelicMeterRegistry(newRelicConfig, clock);
6565
}
6666

6767
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public WavefrontConfig wavefrontConfig(WavefrontProperties props) {
5858

5959
@Bean
6060
@ConditionalOnMissingBean
61-
public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig config,
61+
public WavefrontMeterRegistry wavefrontMeterRegistry(WavefrontConfig wavefrontConfig,
6262
Clock clock) {
63-
return new WavefrontMeterRegistry(config, clock);
63+
return new WavefrontMeterRegistry(wavefrontConfig, clock);
6464
}
6565

6666
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ public void backsOffWithoutAClock() {
5757
@Test
5858
public void autoConfiguresUseTagsAsPrefix() {
5959
this.contextRunner.withUserConfiguration(BaseConfiguration.class)
60-
.withPropertyValues("management.metrics.export.graphite.tags-as-prefix=app")
60+
.withPropertyValues(
61+
"management.metrics.export.graphite.tags-as-prefix=app")
6162
.run((context) -> {
6263
assertThat(context).hasSingleBean(GraphiteMeterRegistry.class);
63-
GraphiteMeterRegistry registry = context.getBean(
64-
GraphiteMeterRegistry.class);
64+
GraphiteMeterRegistry registry = context
65+
.getBean(GraphiteMeterRegistry.class);
6566
registry.counter("test.count", Tags.of("app", "myapp"));
6667
assertThat(registry.getDropwizardRegistry().getMeters())
6768
.containsOnlyKeys("myapp.testCount");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ static class CustomConfigConfiguration {
126126

127127
@Bean
128128
public JmxConfig customConfig() {
129-
return k -> null;
129+
return (key) -> null;
130130
}
131131

132132
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static class CustomConfigConfiguration {
128128

129129
@Bean
130130
public StatsdConfig customConfig() {
131-
return k -> null;
131+
return (key) -> null;
132132
}
133133

134134
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationTests.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,26 @@ public class WebMvcEndpointChildContextConfigurationTests {
3939
public void contextShouldConfigureRequestContextFilter() {
4040
this.contextRunner
4141
.withUserConfiguration(WebMvcEndpointChildContextConfiguration.class)
42-
.run(context -> assertThat(context).hasSingleBean(OrderedRequestContextFilter.class));
42+
.run((context) -> assertThat(context)
43+
.hasSingleBean(OrderedRequestContextFilter.class));
4344
}
4445

4546
@Test
4647
public void contextShouldNotConfigureRequestContextFilterWhenPresent() {
47-
this.contextRunner
48-
.withUserConfiguration(ExistingConfig.class, WebMvcEndpointChildContextConfiguration.class)
49-
.run(context -> {
48+
this.contextRunner.withUserConfiguration(ExistingConfig.class,
49+
WebMvcEndpointChildContextConfiguration.class).run((context) -> {
5050
assertThat(context).hasSingleBean(RequestContextFilter.class);
5151
assertThat(context).hasBean("testRequestContextFilter");
5252
});
5353
}
5454

5555
@Test
5656
public void contextShouldNotConfigureRequestContextFilterWhenRequestContextListenerPresent() {
57-
this.contextRunner
58-
.withUserConfiguration(RequestContextListenerConfig.class,
59-
WebMvcEndpointChildContextConfiguration.class)
60-
.run(context -> {
57+
this.contextRunner.withUserConfiguration(RequestContextListenerConfig.class,
58+
WebMvcEndpointChildContextConfiguration.class).run((context) -> {
6159
assertThat(context).hasSingleBean(RequestContextListener.class);
62-
assertThat(context).doesNotHaveBean(OrderedRequestContextFilter.class);
60+
assertThat(context)
61+
.doesNotHaveBean(OrderedRequestContextFilter.class);
6362
});
6463
}
6564

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 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.
@@ -74,19 +74,17 @@ public static Tag status(ServerWebExchange exchange) {
7474
*/
7575
public static Tag uri(ServerWebExchange exchange) {
7676
if (exchange != null) {
77-
PathPattern pathPattern = exchange.getAttribute(
78-
HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
77+
PathPattern pathPattern = exchange
78+
.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
7979
if (pathPattern != null) {
8080
return Tag.of("uri", pathPattern.getPatternString());
8181
}
82-
else {
83-
HttpStatus status = exchange.getResponse().getStatusCode();
84-
if (status != null && status.is3xxRedirection()) {
85-
return URI_REDIRECTION;
86-
}
87-
if (status != null && status.equals(HttpStatus.NOT_FOUND)) {
88-
return URI_NOT_FOUND;
89-
}
82+
HttpStatus status = exchange.getResponse().getStatusCode();
83+
if (status != null && status.is3xxRedirection()) {
84+
return URI_REDIRECTION;
85+
}
86+
if (status != null && status.equals(HttpStatus.NOT_FOUND)) {
87+
return URI_NOT_FOUND;
9088
}
9189
String path = exchange.getRequest().getPath().value();
9290
return Tag.of("uri", path.isEmpty() ? "root" : path);

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTagsTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
/**
3232
* Tests for {@link WebFluxTags}.
33+
*
3334
* @author Brian Clozel
3435
*/
3536
public class WebFluxTagsTests {
@@ -40,14 +41,13 @@ public class WebFluxTagsTests {
4041

4142
@Before
4243
public void setup() {
43-
this.exchange = MockServerWebExchange
44-
.from(MockServerHttpRequest.get(""));
44+
this.exchange = MockServerWebExchange.from(MockServerHttpRequest.get(""));
4545
}
4646

4747
@Test
4848
public void uriTagValueIsBestMatchingPatternWhenAvailable() {
49-
this.exchange.getAttributes().put(
50-
HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, this.parser.parse("/spring"));
49+
this.exchange.getAttributes().put(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE,
50+
this.parser.parse("/spring"));
5151
this.exchange.getResponse().setStatusCode(HttpStatus.MOVED_PERMANENTLY);
5252
Tag tag = WebFluxTags.uri(this.exchange);
5353
assertThat(tag.getValue()).isEqualTo("/spring");

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,15 @@ private void logUnconditionalClasses(ConditionEvaluationReport report,
137137

138138
private Map<String, ConditionAndOutcomes> orderByName(
139139
Map<String, ConditionAndOutcomes> outcomes) {
140-
MultiValueMap<String, String> map = mapShortNameToFullyQualifiedNames(outcomes.keySet());
140+
MultiValueMap<String, String> map = mapToFullyQualifiedNames(outcomes.keySet());
141141
List<String> shortNames = new ArrayList<>(map.keySet());
142142
Collections.sort(shortNames);
143143
Map<String, ConditionAndOutcomes> result = new LinkedHashMap<>();
144144
for (String shortName : shortNames) {
145145
List<String> fullyQualifiedNames = map.get(shortName);
146146
if (fullyQualifiedNames.size() > 1) {
147-
fullyQualifiedNames.forEach(k -> result.put(k, outcomes.get(k)));
147+
fullyQualifiedNames.forEach((fullyQualifiedName) -> result
148+
.put(fullyQualifiedName, outcomes.get(fullyQualifiedName)));
148149
}
149150
else {
150151
result.put(shortName, outcomes.get(fullyQualifiedNames.get(0)));
@@ -153,9 +154,10 @@ private Map<String, ConditionAndOutcomes> orderByName(
153154
return result;
154155
}
155156

156-
private MultiValueMap<String, String> mapShortNameToFullyQualifiedNames(Set<String> keySet) {
157+
private MultiValueMap<String, String> mapToFullyQualifiedNames(Set<String> keySet) {
157158
LinkedMultiValueMap<String, String> map = new LinkedMultiValueMap<>();
158-
keySet.forEach(k -> map.add(ClassUtils.getShortName(k), k));
159+
keySet.forEach((fullyQualifiedName) -> map
160+
.add(ClassUtils.getShortName(fullyQualifiedName), fullyQualifiedName));
159161
return map;
160162
}
161163

0 commit comments

Comments
 (0)