Skip to content

Commit 210d1f6

Browse files
snicollsnicoll
committed
Merge pull request #15438 from igor-suhorukov
* pr/15438: Polish "Fix StringSequence.equals() for different lengths" Replace anonymous inner class with lambda
2 parents 3a7406f + 06989d8 commit 210d1f6

File tree

19 files changed

+80
-236
lines changed

19 files changed

+80
-236
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java

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

1919
import io.micrometer.core.instrument.Clock;
2020
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
21-
import io.micrometer.prometheus.PrometheusConfig;
2221
import io.micrometer.prometheus.PrometheusMeterRegistry;
2322
import io.prometheus.client.CollectorRegistry;
2423
import org.junit.Test;
@@ -54,14 +53,7 @@ static class TestConfiguration {
5453
public PrometheusScrapeEndpoint endpoint() {
5554
CollectorRegistry collectorRegistry = new CollectorRegistry(true);
5655
PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(
57-
new PrometheusConfig() {
58-
59-
@Override
60-
public String get(String key) {
61-
return null;
62-
}
63-
64-
}, collectorRegistry, Clock.SYSTEM);
56+
(key) -> null, collectorRegistry, Clock.SYSTEM);
6557
new JvmMemoryMetrics().bindTo(meterRegistry);
6658
return new PrometheusScrapeEndpoint(collectorRegistry);
6759
}

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

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

1919
import io.micrometer.core.instrument.Clock;
20-
import io.micrometer.newrelic.NewRelicConfig;
2120
import io.micrometer.newrelic.NewRelicMeterRegistry;
2221
import org.junit.Test;
2322

@@ -64,14 +63,7 @@ static class MissingAccountIdConfiguration {
6463

6564
@Bean
6665
public NewRelicMeterRegistry meterRegistry() {
67-
return new NewRelicMeterRegistry(new NewRelicConfig() {
68-
69-
@Override
70-
public String get(String key) {
71-
return null;
72-
}
73-
74-
}, Clock.SYSTEM);
66+
return new NewRelicMeterRegistry((key) -> null, Clock.SYSTEM);
7567
}
7668

7769
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
107107

108108
@Bean
109109
public AtlasConfig customConfig() {
110-
return new AtlasConfig() {
111-
112-
@Override
113-
public String get(String k) {
114-
return null;
115-
}
116-
117-
};
110+
return (k) -> null;
118111
}
119112

120113
}

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,11 @@ static class CustomConfigConfiguration {
116116

117117
@Bean
118118
public DatadogConfig customConfig() {
119-
return new DatadogConfig() {
120-
121-
@Override
122-
public String get(String k) {
123-
if ("datadog.apiKey".equals(k)) {
124-
return "12345";
125-
}
126-
return null;
119+
return (k) -> {
120+
if ("datadog.apiKey".equals(k)) {
121+
return "12345";
127122
}
128-
123+
return null;
129124
};
130125
}
131126

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
107107

108108
@Bean
109109
public GangliaConfig customConfig() {
110-
return new GangliaConfig() {
111-
112-
@Override
113-
public String get(String k) {
114-
return null;
115-
}
116-
117-
};
110+
return (k) -> null;
118111
}
119112

120113
}

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,11 @@ static class CustomConfigConfiguration {
124124

125125
@Bean
126126
public GraphiteConfig customConfig() {
127-
return new GraphiteConfig() {
128-
129-
@Override
130-
public String get(String k) {
131-
if ("Graphite.apiKey".equals(k)) {
132-
return "12345";
133-
}
134-
return null;
127+
return (k) -> {
128+
if ("Graphite.apiKey".equals(k)) {
129+
return "12345";
135130
}
136-
131+
return null;
137132
};
138133
}
139134

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,7 @@ static class CustomConfigConfiguration {
109109

110110
@Bean
111111
public HumioConfig customConfig() {
112-
return new HumioConfig() {
113-
114-
@Override
115-
public String get(String k) {
116-
return null;
117-
}
118-
119-
};
112+
return (k) -> null;
120113
}
121114

122115
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
107107

108108
@Bean
109109
public InfluxConfig customConfig() {
110-
return new InfluxConfig() {
111-
112-
@Override
113-
public String get(String k) {
114-
return null;
115-
}
116-
117-
};
110+
return (k) -> null;
118111
}
119112

120113
}

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,14 @@ static class CustomConfigConfiguration {
129129

130130
@Bean
131131
public NewRelicConfig customConfig() {
132-
return new NewRelicConfig() {
133-
134-
@Override
135-
public String get(String k) {
136-
if ("newrelic.accountId".equals(k)) {
137-
return "abcde";
138-
}
139-
if ("newrelic.apiKey".equals(k)) {
140-
return "12345";
141-
}
142-
return null;
132+
return (k) -> {
133+
if ("newrelic.accountId".equals(k)) {
134+
return "abcde";
143135
}
144-
136+
if ("newrelic.apiKey".equals(k)) {
137+
return "12345";
138+
}
139+
return null;
145140
};
146141
}
147142

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,7 @@ static class CustomConfigConfiguration {
157157

158158
@Bean
159159
public PrometheusConfig customConfig() {
160-
return new PrometheusConfig() {
161-
162-
@Override
163-
public String get(String k) {
164-
return null;
165-
}
166-
167-
};
160+
return (k) -> null;
168161
}
169162

170163
}

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,11 @@ static class CustomConfigConfiguration {
124124

125125
@Bean
126126
public SignalFxConfig customConfig() {
127-
return new SignalFxConfig() {
128-
129-
@Override
130-
public String get(String k) {
131-
if ("signalfx.accessToken".equals(k)) {
132-
return "abcde";
133-
}
134-
return null;
127+
return (k) -> {
128+
if ("signalfx.accessToken".equals(k)) {
129+
return "abcde";
135130
}
136-
131+
return null;
137132
};
138133
}
139134

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,7 @@ static class CustomConfigConfiguration {
9090

9191
@Bean
9292
public SimpleConfig customConfig() {
93-
return new SimpleConfig() {
94-
95-
@Override
96-
public String get(String k) {
97-
return null;
98-
}
99-
100-
};
93+
return (k) -> null;
10194
}
10295

10396
}

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Arrays;
2020

2121
import org.junit.Test;
22-
import reactor.core.publisher.Mono;
2322

2423
import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
2524
import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
@@ -44,9 +43,7 @@
4443
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
4544
import org.springframework.web.cors.CorsConfiguration;
4645
import org.springframework.web.reactive.config.EnableWebFlux;
47-
import org.springframework.web.server.ServerWebExchange;
4846
import org.springframework.web.server.WebFilter;
49-
import org.springframework.web.server.WebFilterChain;
5047
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
5148

5249
import static org.assertj.core.api.Assertions.assertThat;
@@ -148,20 +145,11 @@ static class AuthenticatedConfiguration {
148145

149146
@Bean
150147
public WebFilter webFilter() {
151-
return new WebFilter() {
152-
153-
@Override
154-
public Mono<Void> filter(ServerWebExchange exchange,
155-
WebFilterChain chain) {
156-
return chain.filter(exchange).subscriberContext(
157-
ReactiveSecurityContextHolder.withAuthentication(
158-
new UsernamePasswordAuthenticationToken("Alice",
159-
"secret",
160-
Arrays.asList(new SimpleGrantedAuthority(
161-
"ROLE_ACTUATOR")))));
162-
}
163-
164-
};
148+
return (exchange, chain) -> chain.filter(exchange)
149+
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(
150+
new UsernamePasswordAuthenticationToken("Alice", "secret",
151+
Arrays.asList(new SimpleGrantedAuthority(
152+
"ROLE_ACTUATOR")))));
165153
}
166154

167155
}

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterTests.java

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
import org.springframework.boot.actuate.web.trace.reactive.HttpTraceWebFilter;
3434
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
3535
import org.springframework.mock.web.server.MockServerWebExchange;
36-
import org.springframework.web.server.ServerWebExchange;
3736
import org.springframework.web.server.ServerWebExchangeDecorator;
38-
import org.springframework.web.server.WebFilterChain;
3937

4038
import static org.assertj.core.api.Assertions.assertThat;
4139
import static org.junit.Assert.fail;
@@ -62,14 +60,7 @@ public void filterTracesExchange() throws ServletException, IOException {
6260
this.filter.filter(
6361
MockServerWebExchange
6462
.from(MockServerHttpRequest.get("https://api.example.com")),
65-
new WebFilterChain() {
66-
67-
@Override
68-
public Mono<Void> filter(ServerWebExchange exchange) {
69-
return Mono.empty();
70-
}
71-
72-
}).block(Duration.ofSeconds(30));
63+
(exchange) -> Mono.empty()).block(Duration.ofSeconds(30));
7364
assertThat(this.repository.findAll()).hasSize(1);
7465
}
7566

@@ -79,15 +70,10 @@ public void filterCapturesSessionIdWhenSessionIsUsed()
7970
this.filter.filter(
8071
MockServerWebExchange
8172
.from(MockServerHttpRequest.get("https://api.example.com")),
82-
new WebFilterChain() {
83-
84-
@Override
85-
public Mono<Void> filter(ServerWebExchange exchange) {
86-
exchange.getSession().block(Duration.ofSeconds(30))
87-
.getAttributes().put("a", "alpha");
88-
return Mono.empty();
89-
}
90-
73+
(exchange) -> {
74+
exchange.getSession().block(Duration.ofSeconds(30)).getAttributes()
75+
.put("a", "alpha");
76+
return Mono.empty();
9177
}).block(Duration.ofSeconds(30));
9278
assertThat(this.repository.findAll()).hasSize(1);
9379
Session session = this.repository.findAll().get(0).getSession();
@@ -101,14 +87,9 @@ public void filterDoesNotCaptureIdOfUnusedSession()
10187
this.filter.filter(
10288
MockServerWebExchange
10389
.from(MockServerHttpRequest.get("https://api.example.com")),
104-
new WebFilterChain() {
105-
106-
@Override
107-
public Mono<Void> filter(ServerWebExchange exchange) {
108-
exchange.getSession().block(Duration.ofSeconds(30));
109-
return Mono.empty();
110-
}
111-
90+
(exchange) -> {
91+
exchange.getSession().block(Duration.ofSeconds(30));
92+
return Mono.empty();
11293
}).block(Duration.ofSeconds(30));
11394
assertThat(this.repository.findAll()).hasSize(1);
11495
Session session = this.repository.findAll().get(0).getSession();
@@ -127,15 +108,10 @@ public Mono<Principal> getPrincipal() {
127108
return Mono.just(principal);
128109
}
129110

130-
}, new WebFilterChain() {
131-
132-
@Override
133-
public Mono<Void> filter(ServerWebExchange exchange) {
134-
exchange.getSession().block(Duration.ofSeconds(30)).getAttributes()
135-
.put("a", "alpha");
136-
return Mono.empty();
137-
}
138-
111+
}, (exchange) -> {
112+
exchange.getSession().block(Duration.ofSeconds(30)).getAttributes().put("a",
113+
"alpha");
114+
return Mono.empty();
139115
}).block(Duration.ofSeconds(30));
140116
assertThat(this.repository.findAll()).hasSize(1);
141117
org.springframework.boot.actuate.trace.http.HttpTrace.Principal tracedPrincipal = this.repository
@@ -148,17 +124,11 @@ public Mono<Void> filter(ServerWebExchange exchange) {
148124
public void statusIsAssumedToBe500WhenChainFails()
149125
throws ServletException, IOException {
150126
try {
151-
this.filter.filter(
152-
MockServerWebExchange
127+
this.filter
128+
.filter(MockServerWebExchange
153129
.from(MockServerHttpRequest.get("https://api.example.com")),
154-
new WebFilterChain() {
155-
156-
@Override
157-
public Mono<Void> filter(ServerWebExchange exchange) {
158-
return Mono.error(new RuntimeException());
159-
}
160-
161-
}).block(Duration.ofSeconds(30));
130+
(exchange) -> Mono.error(new RuntimeException()))
131+
.block(Duration.ofSeconds(30));
162132
fail();
163133
}
164134
catch (Exception ex) {

0 commit comments

Comments
 (0)