diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java index e9678e49e9..3b43c9c466 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryWebEndpointDiscovererTests.java @@ -80,7 +80,7 @@ public class CloudFoundryWebEndpointDiscovererTests { private void load(Class configuration, Consumer consumer) { - this.load((id) -> null, (id) -> id.toString(), configuration, consumer); + this.load((id) -> null, EndpointId::toString, configuration, consumer); } private void load(Function timeToLive, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/TokenTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/TokenTests.java index 1274caa9aa..92f39aa16e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/TokenTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/TokenTests.java @@ -92,7 +92,7 @@ public class TokenTests { String claims = "{\"exp\": 2147483647, \"iss\": \"http://localhost:8080/uaa/oauth/token\"}"; Token token = createToken(header, claims); assertThatExceptionOfType(CloudFoundryAuthorizationException.class) - .isThrownBy(() -> token.getSignatureAlgorithm()) + .isThrownBy(token::getSignatureAlgorithm) .satisfies(reasonRequirement(Reason.INVALID_TOKEN)); } @@ -102,7 +102,7 @@ public class TokenTests { String claims = "{\"exp\": 2147483647}"; Token token = createToken(header, claims); assertThatExceptionOfType(CloudFoundryAuthorizationException.class) - .isThrownBy(() -> token.getIssuer()) + .isThrownBy(token::getIssuer) .satisfies(reasonRequirement(Reason.INVALID_TOKEN)); } @@ -112,7 +112,7 @@ public class TokenTests { String claims = "{\"exp\": 2147483647}"; Token token = createToken(header, claims); assertThatExceptionOfType(CloudFoundryAuthorizationException.class) - .isThrownBy(() -> token.getKeyId()) + .isThrownBy(token::getKeyId) .satisfies(reasonRequirement(Reason.INVALID_TOKEN)); } @@ -122,7 +122,7 @@ public class TokenTests { String claims = "{\"iss\": \"http://localhost:8080/uaa/oauth/token\"" + "}"; Token token = createToken(header, claims); assertThatExceptionOfType(CloudFoundryAuthorizationException.class) - .isThrownBy(() -> token.getExpiry()) + .isThrownBy(token::getExpiry) .satisfies(reasonRequirement(Reason.INVALID_TOKEN)); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java index a9ace6b942..87363b9200 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfigurationTests.java @@ -84,7 +84,7 @@ public class ServletEndpointManagementContextConfigurationTests { @Bean public ServletEndpointsSupplier servletEndpointsSupplier() { - return () -> Collections.emptyList(); + return Collections::emptyList; } @Bean diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java index a8f3142048..5396ab8bf6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointManagementContextConfigurationTests.java @@ -61,7 +61,7 @@ public class JerseyWebEndpointManagementContextConfigurationTests { @Bean public WebEndpointsSupplier webEndpointsSupplier() { - return () -> Collections.emptyList(); + return Collections::emptyList; } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java index a2be83d673..422da8d403 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/JerseyEndpointRequestIntegrationTests.java @@ -26,6 +26,7 @@ import org.glassfish.jersey.server.model.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.endpoint.EndpointId; import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType; import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper; import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver; @@ -142,7 +143,7 @@ public class JerseyEndpointRequestIntegrationTests mediaTypes); WebEndpointDiscoverer discoverer = new WebEndpointDiscoverer( this.applicationContext, new ConversionServiceParameterValueMapper(), - endpointMediaTypes, Arrays.asList((id) -> id.toString()), + endpointMediaTypes, Arrays.asList(EndpointId::toString), Collections.emptyList(), Collections.emptyList()); Collection resources = new JerseyEndpointResourceFactory() .createEndpointResources(new EndpointMapping("/actuator"), diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java index 3b0d524a3a..1602513304 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/MvcEndpointRequestIntegrationTests.java @@ -22,6 +22,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; +import org.springframework.boot.actuate.endpoint.EndpointId; import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType; import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper; import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver; @@ -130,7 +131,7 @@ public class MvcEndpointRequestIntegrationTests mediaTypes); WebEndpointDiscoverer discoverer = new WebEndpointDiscoverer( this.applicationContext, new ConversionServiceParameterValueMapper(), - endpointMediaTypes, Arrays.asList((id) -> id.toString()), + endpointMediaTypes, Arrays.asList(EndpointId::toString), Collections.emptyList(), Collections.emptyList()); return new WebMvcEndpointHandlerMapping(new EndpointMapping("/actuator"), discoverer.getEndpoints(), endpointMediaTypes, diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java index f55711327c..8ca57e42c8 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/WebEndpointDiscovererTests.java @@ -182,7 +182,7 @@ public class WebEndpointDiscovererTests { @Test public void getEndpointsWhenHasCacheWithTtlShouldCacheReadOperationWithTtlValue() { - load((id) -> 500L, (id) -> id.toString(), TestEndpointConfiguration.class, + load((id) -> 500L, EndpointId::toString, TestEndpointConfiguration.class, (discoverer) -> { Map endpoints = mapEndpoints( discoverer.getEndpoints()); @@ -246,7 +246,7 @@ public class WebEndpointDiscovererTests { } private void load(Class configuration, Consumer consumer) { - this.load((id) -> null, (id) -> id.toString(), configuration, consumer); + this.load((id) -> null, EndpointId::toString, configuration, consumer); } private void load(Function timeToLive, diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java index 19cb2092b2..23cfc4b358 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java @@ -260,7 +260,7 @@ public class HttpExchangeTracerTests { public void principalIsNotIncludedByDefault() { HttpTrace trace = new HttpTrace(createRequest()); new HttpExchangeTracer(EnumSet.noneOf(Include.class)).sendingResponse(trace, - createResponse(), () -> createPrincipal(), null); + createResponse(), this::createPrincipal, null); assertThat(trace.getPrincipal()).isNull(); } @@ -268,7 +268,7 @@ public class HttpExchangeTracerTests { public void principalCanBeIncluded() { HttpTrace trace = new HttpTrace(createRequest()); new HttpExchangeTracer(EnumSet.of(Include.PRINCIPAL)).sendingResponse(trace, - createResponse(), () -> createPrincipal(), null); + createResponse(), this::createPrincipal, null); assertThat(trace.getPrincipal()).isNotNull(); assertThat(trace.getPrincipal().getName()).isEqualTo("alice"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index c0bebee9ef..ab29f182eb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java @@ -72,8 +72,7 @@ public final class OAuth2ClientPropertiesRegistrationAdapter { map.from(properties::getAuthorizationGrantType).as(AuthorizationGrantType::new) .to(builder::authorizationGrantType); map.from(properties::getRedirectUri).to(builder::redirectUriTemplate); - map.from(properties::getScope).as((scope) -> StringUtils.toStringArray(scope)) - .to(builder::scope); + map.from(properties::getScope).as(StringUtils::toStringArray).to(builder::scope); map.from(properties::getClientName).to(builder::clientName); return builder.build(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index e7997c113f..dce7fb60cb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -794,7 +794,7 @@ public class WebMvcAutoConfigurationTests { @Test public void cachePeriod() { this.contextRunner.withPropertyValues("spring.resources.cache.period:5") - .run((context) -> assertCachePeriod(context)); + .run(this::assertCachePeriod); } private void assertCachePeriod(AssertableWebApplicationContext context) { @@ -817,7 +817,7 @@ public class WebMvcAutoConfigurationTests { this.contextRunner .withPropertyValues("spring.resources.cache.cachecontrol.max-age:5", "spring.resources.cache.cachecontrol.proxy-revalidate:true") - .run((context) -> assertCacheControl(context)); + .run(this::assertCacheControl); } @Test diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java index 7d9c2750c0..43537b3849 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java @@ -44,7 +44,7 @@ public class RemoteUrlPropertyExtractorTests { @Test public void missingUrl() { - assertThatIllegalStateException().isThrownBy(() -> doTest()) + assertThatIllegalStateException().isThrownBy(this::doTest) .withMessageContaining("No remote URL specified"); } diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProviderTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProviderTests.java index d77c6df3ac..7cf8cba6a2 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProviderTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProviderTests.java @@ -131,8 +131,7 @@ public class ApplicationContextAssertProviderTests { public void getSourceContextWhenContextFailsShouldThrowException() { ApplicationContextAssertProvider context = get( this.startupFailureSupplier); - assertThatIllegalStateException() - .isThrownBy(() -> context.getSourceApplicationContext()) + assertThatIllegalStateException().isThrownBy(context::getSourceApplicationContext) .withCause(this.startupFailure).withMessageContaining("failed to start"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java index 5b142c38b4..44e9e63dee 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindResultTests.java @@ -66,8 +66,8 @@ public class BindResultTests { @Test public void getWhenHasNoValueShouldThrowException() { BindResult result = BindResult.of(null); - assertThatExceptionOfType(NoSuchElementException.class) - .isThrownBy(() -> result.get()).withMessageContaining("No value bound"); + assertThatExceptionOfType(NoSuchElementException.class).isThrownBy(result::get) + .withMessageContaining("No value bound"); } @Test