Replace anonymous inner class with lambda

igor-suhorukov · snicoll · commit e578d3072245 · 2018-12-20T17:47:29.000+01:00
See gh-15438
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/PrometheusScrapeEndpointDocumentationTests.java
@@ -18,7 +18,6 @@
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
-import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.prometheus.client.CollectorRegistry;
 import org.junit.Test;
@@ -54,14 +53,7 @@ static class TestConfiguration {
 		public PrometheusScrapeEndpoint endpoint() {
 			CollectorRegistry collectorRegistry = new CollectorRegistry(true);
 			PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(
-					new PrometheusConfig() {
-
-						@Override
-						public String get(String key) {
-							return null;
-						}
-
-					}, collectorRegistry, Clock.SYSTEM);
+					(key) -> null, collectorRegistry, Clock.SYSTEM);
 			new JvmMemoryMetrics().bindTo(meterRegistry);
 			return new PrometheusScrapeEndpoint(collectorRegistry);
 		}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MissingRequiredConfigurationFailureAnalyzerTests.java
@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.autoconfigure.metrics;
 
 import io.micrometer.core.instrument.Clock;
-import io.micrometer.newrelic.NewRelicConfig;
 import io.micrometer.newrelic.NewRelicMeterRegistry;
 import org.junit.Test;
 
@@ -64,14 +63,7 @@ static class MissingAccountIdConfiguration {
 
 		@Bean
 		public NewRelicMeterRegistry meterRegistry() {
-			return new NewRelicMeterRegistry(new NewRelicConfig() {
-
-				@Override
-				public String get(String key) {
-					return null;
-				}
-
-			}, Clock.SYSTEM);
+			return new NewRelicMeterRegistry((key) -> null, Clock.SYSTEM);
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasMetricsExportAutoConfigurationTests.java
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public AtlasConfig customConfig() {
-			return new AtlasConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogMetricsExportAutoConfigurationTests.java
@@ -116,16 +116,11 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public DatadogConfig customConfig() {
-			return new DatadogConfig() {
-
-				@Override
-				public String get(String k) {
-					if ("datadog.apiKey".equals(k)) {
-						return "12345";
-					}
-					return null;
+			return (k) -> {
+				if ("datadog.apiKey".equals(k)) {
+					return "12345";
 				}
-
+				return null;
 			};
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaMetricsExportAutoConfigurationTests.java
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public GangliaConfig customConfig() {
-			return new GangliaConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteMetricsExportAutoConfigurationTests.java
@@ -124,16 +124,11 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public GraphiteConfig customConfig() {
-			return new GraphiteConfig() {
-
-				@Override
-				public String get(String k) {
-					if ("Graphite.apiKey".equals(k)) {
-						return "12345";
-					}
-					return null;
+			return (k) -> {
+				if ("Graphite.apiKey".equals(k)) {
+					return "12345";
 				}
-
+				return null;
 			};
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioMetricsExportAutoConfigurationTests.java
@@ -109,14 +109,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public HumioConfig customConfig() {
-			return new HumioConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxMetricsExportAutoConfigurationTests.java
@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public InfluxConfig customConfig() {
-			return new InfluxConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicMetricsExportAutoConfigurationTests.java
@@ -129,19 +129,14 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public NewRelicConfig customConfig() {
-			return new NewRelicConfig() {
-
-				@Override
-				public String get(String k) {
-					if ("newrelic.accountId".equals(k)) {
-						return "abcde";
-					}
-					if ("newrelic.apiKey".equals(k)) {
-						return "12345";
-					}
-					return null;
+			return (k) -> {
+				if ("newrelic.accountId".equals(k)) {
+					return "abcde";
 				}
-
+				if ("newrelic.apiKey".equals(k)) {
+					return "12345";
+				}
+				return null;
 			};
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfigurationTests.java
@@ -157,14 +157,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public PrometheusConfig customConfig() {
-			return new PrometheusConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxMetricsExportAutoConfigurationTests.java
@@ -124,16 +124,11 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public SignalFxConfig customConfig() {
-			return new SignalFxConfig() {
-
-				@Override
-				public String get(String k) {
-					if ("signalfx.accessToken".equals(k)) {
-						return "abcde";
-					}
-					return null;
+			return (k) -> {
+				if ("signalfx.accessToken".equals(k)) {
+					return "abcde";
 				}
-
+				return null;
 			};
 		}
 
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleMetricsExportAutoConfigurationTests.java
@@ -90,14 +90,7 @@ static class CustomConfigConfiguration {
 
 		@Bean
 		public SimpleConfig customConfig() {
-			return new SimpleConfig() {
-
-				@Override
-				public String get(String k) {
-					return null;
-				}
-
-			};
+			return (k) -> null;
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointIntegrationTests.java
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 
 import org.junit.Test;
-import reactor.core.publisher.Mono;
 
 import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
 import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
@@ -44,9 +43,7 @@
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.reactive.config.EnableWebFlux;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -148,20 +145,11 @@ static class AuthenticatedConfiguration {
 
 		@Bean
 		public WebFilter webFilter() {
-			return new WebFilter() {
-
-				@Override
-				public Mono<Void> filter(ServerWebExchange exchange,
-						WebFilterChain chain) {
-					return chain.filter(exchange).subscriberContext(
-							ReactiveSecurityContextHolder.withAuthentication(
-									new UsernamePasswordAuthenticationToken("Alice",
-											"secret",
-											Arrays.asList(new SimpleGrantedAuthority(
-													"ROLE_ACTUATOR")))));
-				}
-
-			};
+			return (exchange, chain) -> chain.filter(exchange)
+					.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(
+							new UsernamePasswordAuthenticationToken("Alice", "secret",
+									Arrays.asList(new SimpleGrantedAuthority(
+											"ROLE_ACTUATOR")))));
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/reactive/HttpTraceWebFilterTests.java
@@ -33,9 +33,7 @@
 import org.springframework.boot.actuate.web.trace.reactive.HttpTraceWebFilter;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
 import org.springframework.mock.web.server.MockServerWebExchange;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebExchangeDecorator;
-import org.springframework.web.server.WebFilterChain;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -62,14 +60,7 @@ public void filterTracesExchange() throws ServletException, IOException {
 		this.filter.filter(
 				MockServerWebExchange
 						.from(MockServerHttpRequest.get("https://api.example.com")),
-				new WebFilterChain() {
-
-					@Override
-					public Mono<Void> filter(ServerWebExchange exchange) {
-						return Mono.empty();
-					}
-
-				}).block(Duration.ofSeconds(30));
+				(exchange) -> Mono.empty()).block(Duration.ofSeconds(30));
 		assertThat(this.repository.findAll()).hasSize(1);
 	}
 
@@ -79,15 +70,10 @@ public void filterCapturesSessionIdWhenSessionIsUsed()
 		this.filter.filter(
 				MockServerWebExchange
 						.from(MockServerHttpRequest.get("https://api.example.com")),
-				new WebFilterChain() {
-
-					@Override
-					public Mono<Void> filter(ServerWebExchange exchange) {
-						exchange.getSession().block(Duration.ofSeconds(30))
+				(exchange) -> {
+					exchange.getSession().block(Duration.ofSeconds(30))
 								.getAttributes().put("a", "alpha");
-						return Mono.empty();
-					}
-
+					return Mono.empty();
 				}).block(Duration.ofSeconds(30));
 		assertThat(this.repository.findAll()).hasSize(1);
 		Session session = this.repository.findAll().get(0).getSession();
@@ -101,14 +87,9 @@ public void filterDoesNotCaptureIdOfUnusedSession()
 		this.filter.filter(
 				MockServerWebExchange
 						.from(MockServerHttpRequest.get("https://api.example.com")),
-				new WebFilterChain() {
-
-					@Override
-					public Mono<Void> filter(ServerWebExchange exchange) {
-						exchange.getSession().block(Duration.ofSeconds(30));
-						return Mono.empty();
-					}
-
+				(exchange) -> {
+					exchange.getSession().block(Duration.ofSeconds(30));
+					return Mono.empty();
 				}).block(Duration.ofSeconds(30));
 		assertThat(this.repository.findAll()).hasSize(1);
 		Session session = this.repository.findAll().get(0).getSession();
@@ -127,15 +108,10 @@ public Mono<Principal> getPrincipal() {
 				return Mono.just(principal);
 			}
 
-		}, new WebFilterChain() {
-
-			@Override
-			public Mono<Void> filter(ServerWebExchange exchange) {
-				exchange.getSession().block(Duration.ofSeconds(30)).getAttributes()
+		}, (exchange) -> {
+			exchange.getSession().block(Duration.ofSeconds(30)).getAttributes()
 						.put("a", "alpha");
-				return Mono.empty();
-			}
-
+			return Mono.empty();
 		}).block(Duration.ofSeconds(30));
 		assertThat(this.repository.findAll()).hasSize(1);
 		org.springframework.boot.actuate.trace.http.HttpTrace.Principal tracedPrincipal = this.repository
@@ -151,14 +127,7 @@ public void statusIsAssumedToBe500WhenChainFails()
 			this.filter.filter(
 					MockServerWebExchange
 							.from(MockServerHttpRequest.get("https://api.example.com")),
-					new WebFilterChain() {
-
-						@Override
-						public Mono<Void> filter(ServerWebExchange exchange) {
-							return Mono.error(new RuntimeException());
-						}
-
-					}).block(Duration.ofSeconds(30));
+					(exchange) -> Mono.error(new RuntimeException())).block(Duration.ofSeconds(30));
 			fail();
 		}
 		catch (Exception ex) {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,7 @@ static class CustomConfigConfiguration {`
`107`	`107`
`108`	`108`	`@Bean`
`109`	`109`	`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;`
`118`	`111`	`}`
`119`	`112`
`120`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,7 @@ static class CustomConfigConfiguration {`
`109`	`109`
`110`	`110`	`@Bean`
`111`	`111`	`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;`
`120`	`113`	`}`
`121`	`114`
`122`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,14 +157,7 @@ static class CustomConfigConfiguration {`
`157`	`157`
`158`	`158`	`@Bean`
`159`	`159`	`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;`
`168`	`161`	`}`
`169`	`162`
`170`	`163`	`}`