Polish

buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java

@@ -25,7 +25,6 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.PathSensitivity;
@@ -145,7 +144,7 @@ private void registerCheckMetadataTask(Project project) {
 		TaskProvider<CheckSpringConfigurationMetadata> checkConfigurationMetadata = project.getTasks()
 				.register(CHECK_SPRING_CONFIGURATION_METADATA_TASK_NAME, CheckSpringConfigurationMetadata.class);
 		checkConfigurationMetadata.configure((check) -> {
-			SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
+			SourceSet mainSourceSet = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets()
 					.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
 			Provider<RegularFile> metadataLocation = project.getTasks()
 					.named(mainSourceSet.getCompileJavaTaskName(), JavaCompile.class)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/ServerRequestObservationConventionAdapter.java

@@ -34,6 +34,7 @@
  * @author Brian Clozel
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class ServerRequestObservationConventionAdapter implements ServerRequestObservationConvention {
 
 	private final String name;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ServerRequestObservationConventionAdapter.java

@@ -36,7 +36,8 @@
  *
  * @author Brian Clozel
  */
-@SuppressWarnings({ "deprecation", "removal" })
+@SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class ServerRequestObservationConventionAdapter implements ServerRequestObservationConvention {
 
 	private final String observationName;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointAutoConfigurationTests.java

@@ -77,7 +77,6 @@ void rolesCanBeConfiguredViaTheEnvironment() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void showValuesCanBeConfiguredViaTheEnvironment() {
 		this.contextRunner.withUserConfiguration(Config.class)
 				.withPropertyValues("management.endpoint.configprops.show-values: WHEN_AUTHORIZED")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointAutoConfigurationTests.java

@@ -97,7 +97,6 @@ void rolesCanBeConfiguredViaTheEnvironment() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void showValuesCanBeConfiguredViaTheEnvironment() {
 		this.contextRunner.withPropertyValues("management.endpoint.env.show-values: WHEN_AUTHORIZED")
 				.withPropertyValues("management.endpoints.web.exposure.include=env")
@@ -107,10 +106,8 @@ void showValuesCanBeConfiguredViaTheEnvironment() {
 					EnvironmentEndpointWebExtension webExtension = context
 							.getBean(EnvironmentEndpointWebExtension.class);
 					EnvironmentEndpoint endpoint = context.getBean(EnvironmentEndpoint.class);
-					Show showValuesWebExtension = (Show) ReflectionTestUtils.getField(webExtension, "showValues");
-					assertThat(showValuesWebExtension).isEqualTo(Show.WHEN_AUTHORIZED);
-					Show showValues = (Show) ReflectionTestUtils.getField(endpoint, "showValues");
-					assertThat(showValues).isEqualTo(Show.WHEN_AUTHORIZED);
+					assertThat(webExtension).extracting("showValues").isEqualTo(Show.WHEN_AUTHORIZED);
+					assertThat(endpoint).extracting("showValues").isEqualTo(Show.WHEN_AUTHORIZED);
 				});
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/RestTemplateObservationConfigurationTests.java

@@ -54,7 +54,7 @@
  * @author Brian Clozel
  */
 @ExtendWith(OutputCaptureExtension.class)
-@SuppressWarnings({ "deprecation", "removal" })
+@SuppressWarnings("removal")
 class RestTemplateObservationConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/WebClientObservationConfigurationTests.java

@@ -55,7 +55,7 @@
  * @author Stephane Nicoll
  */
 @ExtendWith(OutputCaptureExtension.class)
-@SuppressWarnings({ "deprecation", "removal" })
+@SuppressWarnings("removal")
 class WebClientObservationConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/ServerRequestObservationConventionAdapterTests.java

@@ -34,6 +34,7 @@
  * @author Brian Clozel
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class ServerRequestObservationConventionAdapterTests {
 
 	private static final String TEST_METRIC_NAME = "test.metric.name";

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/WebFluxObservationAutoConfigurationTests.java

@@ -76,6 +76,7 @@ void shouldUseConventionAdapterWhenCustomTagsContributor() {
 		});
 	}
 
+	@Deprecated(since = "3.0.0", forRemoval = true)
 	@Configuration(proxyBeanMethods = false)
 	static class CustomTagsProviderConfiguration {
 
@@ -96,6 +97,7 @@ WebFluxTagsContributor tagsContributor() {
 
 	}
 
+	@Deprecated(since = "3.0.0", forRemoval = true)
 	static class CustomTagsContributor implements WebFluxTagsContributor {
 
 		@Override

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

@@ -41,6 +41,7 @@
  * @author Brian Clozel
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class ServerRequestObservationConventionAdapterTests {
 
 	private static final String TEST_METRIC_NAME = "test.metric.name";

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

@@ -210,6 +210,7 @@ WebMvcTagsContributor tagContributorTwo() {
 
 	}
 
+	@Deprecated(since = "3.0.0", forRemoval = true)
 	private static final class TestWebMvcTagsProvider implements WebMvcTagsProvider {
 
 		@Override

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfigurationTests.java

@@ -101,16 +101,14 @@ void rolesCanBeConfiguredViaTheEnvironment() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void showValuesCanBeConfiguredViaTheEnvironment() {
 		this.contextRunner.withBean(Scheduler.class, () -> mock(Scheduler.class))
 				.withPropertyValues("management.endpoint.quartz.show-values: WHEN_AUTHORIZED")
 				.withPropertyValues("management.endpoints.web.exposure.include=quartz")
 				.withSystemProperties("dbPassword=123456", "apiKey=123456").run((context) -> {
 					assertThat(context).hasSingleBean(QuartzEndpointWebExtension.class);
-					QuartzEndpointWebExtension webExtension = context.getBean(QuartzEndpointWebExtension.class);
-					Show showValuesWebExtension = (Show) ReflectionTestUtils.getField(webExtension, "showValues");
-					assertThat(showValuesWebExtension).isEqualTo(Show.WHEN_AUTHORIZED);
+					assertThat(context.getBean(QuartzEndpointWebExtension.class)).extracting("showValues")
+							.isEqualTo(Show.WHEN_AUTHORIZED);
 				});
 	}
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/jersey/JerseyEndpointResourceFactory.java

@@ -239,21 +239,16 @@ private Response convertToJaxRsResponse(Object response, String httpMethod) {
 				Status status = isGet ? Status.NOT_FOUND : Status.NO_CONTENT;
 				return Response.status(status).build();
 			}
-			try {
-				if (!(response instanceof WebEndpointResponse)) {
-					return Response.status(Status.OK).entity(convertIfNecessary(response)).build();
-				}
-				WebEndpointResponse<?> webEndpointResponse = (WebEndpointResponse<?>) response;
-				return Response.status(webEndpointResponse.getStatus())
-						.header("Content-Type", webEndpointResponse.getContentType())
-						.entity(convertIfNecessary(webEndpointResponse.getBody())).build();
-			}
-			catch (IOException ex) {
-				return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+			if (!(response instanceof WebEndpointResponse)) {
+				return Response.status(Status.OK).entity(convertIfNecessary(response)).build();
 			}
+			WebEndpointResponse<?> webEndpointResponse = (WebEndpointResponse<?>) response;
+			return Response.status(webEndpointResponse.getStatus())
+					.header("Content-Type", webEndpointResponse.getContentType())
+					.entity(convertIfNecessary(webEndpointResponse.getBody())).build();
 		}
 
-		private Object convertIfNecessary(Object body) throws IOException {
+		private Object convertIfNecessary(Object body) {
 			for (Function<Object, Object> converter : BODY_CONVERTERS) {
 				body = converter.apply(body);
 			}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java

@@ -140,7 +140,6 @@ public AbstractWebMvcEndpointHandlerMapping(EndpointMapping endpointMapping,
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void afterPropertiesSet() {
 		this.builderConfig = new RequestMappingInfo.BuilderConfiguration();
 		this.builderConfig.setPatternParser(getPatternParser());

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMapping.java

@@ -58,7 +58,6 @@ public class ControllerEndpointHandlerMapping extends RequestMappingHandlerMappi
 	 * @param endpoints the web endpoints
 	 * @param corsConfiguration the CORS configuration for the endpoints or {@code null}
 	 */
-	@SuppressWarnings("deprecation")
 	public ControllerEndpointHandlerMapping(EndpointMapping endpointMapping,
 			Collection<ExposableControllerEndpoint> endpoints, CorsConfiguration corsConfiguration) {
 		Assert.notNull(endpointMapping, "EndpointMapping must not be null");

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/DefaultRestTemplateExchangeTagsProvider.java

@@ -34,7 +34,7 @@
  * {@link org.springframework.http.client.observation.DefaultClientRequestObservationConvention}
  */
 @Deprecated(since = "3.0.0", forRemoval = true)
-@SuppressWarnings({ "deprecation", "removal" })
+@SuppressWarnings("removal")
 public class DefaultRestTemplateExchangeTagsProvider implements RestTemplateExchangeTagsProvider {
 
 	@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProvider.java

@@ -33,7 +33,7 @@
  * {@link org.springframework.web.reactive.function.client.ClientRequestObservationConvention}
  */
 @Deprecated(since = "3.0.0", forRemoval = true)
-@SuppressWarnings({ "deprecation", "removal" })
+@SuppressWarnings("removal")
 public class DefaultWebClientExchangeTagsProvider implements WebClientExchangeTagsProvider {
 
 	@Override

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/DefaultWebMvcTagsProviderTests.java

@@ -41,6 +41,7 @@
  * @author Andy Wilkinson
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class DefaultWebMvcTagsProviderTests {
 
 	@Test

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/WebMvcTagsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
  * @author Michael McFadyen
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class WebMvcTagsTests {
 
 	private final MockHttpServletRequest request = new MockHttpServletRequest();

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/reactive/client/ObservationWebClientCustomizerTests.java

@@ -30,7 +30,6 @@
  *
  * @author Brian Clozel
  */
-@SuppressWarnings("deprecation")
 class ObservationWebClientCustomizerTests {
 
 	private static final String TEST_METRIC_NAME = "http.test.metric.name";

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

@@ -38,6 +38,7 @@
  * @author Andy Wilkinson
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class DefaultWebFluxTagsProviderTests {
 
 	@Test

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

@@ -45,6 +45,7 @@
  * @author Stephane Nicoll
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class WebFluxTagsTests {
 
 	private MockServerWebExchange exchange;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java

@@ -180,7 +180,6 @@ private GenericHttpMessageConverter<Object> asGenericHttpMessageConverter(HttpMe
 		}
 
 		@Bean
-		@SuppressWarnings("deprecation")
 		public HandlerMapping graphQlWebSocketMapping(GraphQlWebSocketHandler handler, GraphQlProperties properties) {
 			String path = properties.getWebsocket().getPath();
 			logger.info(LogMessage.format("GraphQL endpoint WebSocket %s", path));

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java

@@ -423,7 +423,6 @@ void autoConfigurationWhenIntrospectionUriAvailableShouldBeConditionalOnClass()
 				.run((context) -> assertThat(context).doesNotHaveBean(OpaqueTokenIntrospector.class));
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	void autoConfigurationShouldConfigureResourceServerUsingJwkSetUriAndIssuerUri() throws Exception {
 		this.server = new MockWebServer();
@@ -445,7 +444,6 @@ void autoConfigurationShouldConfigureResourceServerUsingJwkSetUriAndIssuerUri()
 				});
 	}
 
-	@SuppressWarnings("unchecked")
 	@Test
 	void autoConfigurationShouldNotConfigureIssuerUriAndAudienceJwtValidatorIfPropertyNotConfigured() throws Exception {
 		this.server = new MockWebServer();
@@ -523,7 +521,6 @@ private void validate(String issuerUri, JwtDecoder jwtDecoder) throws MalformedU
 		validateDelegates(issuerUri, delegates);
 	}
 
-	@SuppressWarnings("unchecked")
 	private void validateDelegates(String issuerUri, Collection<OAuth2TokenValidator<Jwt>> delegates) {
 		assertThat(delegates).hasAtLeastOneElementOfType(JwtClaimValidator.class);
 		OAuth2TokenValidator<Jwt> delegatingValidator = delegates.stream()

spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java

@@ -99,8 +99,6 @@ LiveReloadServerEventListener liveReloadServerEventListener(OptionalLiveReloadSe
 	@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
 	static class RestartConfiguration {
 
-		private static final Log restarterLogger = LogFactory.getLog(Restarter.class);
-
 		private final DevToolsProperties properties;
 
 		RestartConfiguration(DevToolsProperties properties) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/SpringBootDependencyInjectionTestExecutionListenerTests.java

@@ -53,7 +53,7 @@ void orderShouldBeSameAsDependencyInjectionTestExecutionListener() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	void prepareFailingTestInstanceShouldPrintReport(CapturedOutput output) throws Exception {
 		TestContext testContext = mock(TestContext.class);
 		given(testContext.getTestClass()).willReturn((Class) Config.class);
@@ -73,7 +73,7 @@ void prepareFailingTestInstanceShouldPrintReport(CapturedOutput output) throws E
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	void originalFailureIsThrownWhenReportGenerationFails() {
 		TestContext testContext = mock(TestContext.class);
 		given(testContext.getTestClass()).willReturn((Class) Config.class);

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/ExampleProperties.java

@@ -17,7 +17,7 @@
 package org.springframework.boot.test.autoconfigure.web.client;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
+import org.springframework.boot.context.properties.bind.ConstructorBinding;
 import org.springframework.boot.context.properties.bind.DefaultValue;
 
 /**

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java

@@ -39,7 +39,7 @@
 class AutoConfigureAnnotationProcessorTests {
 
 	@Test
-	void annotatedClass() throws Exception {
+	void annotatedClass() {
 		compile(TestClassConfiguration.class, (properties) -> {
 			assertThat(properties).hasSize(7);
 			assertThat(properties).containsEntry(
@@ -108,7 +108,7 @@ void annotatedClassWithOrder() {
 	}
 
 	@Test
-	void annotatedClassWithAutoConfiguration() throws Exception {
+	void annotatedClassWithAutoConfiguration() {
 		compile(TestAutoConfigurationConfiguration.class, (properties) -> {
 			assertThat(properties).containsEntry(
 					"org.springframework.boot.autoconfigureprocessor.TestAutoConfigurationConfiguration", "");
@@ -122,7 +122,7 @@ void annotatedClassWithAutoConfiguration() throws Exception {
 	}
 
 	@Test
-	void annotatedClassWithAutoConfigurationMerged() throws Exception {
+	void annotatedClassWithAutoConfigurationMerged() {
 		compile(TestMergedAutoConfigurationConfiguration.class, (properties) -> {
 			assertThat(properties).containsEntry(
 					"org.springframework.boot.autoconfigureprocessor.TestMergedAutoConfigurationConfiguration", "");
@@ -136,7 +136,7 @@ void annotatedClassWithAutoConfigurationMerged() throws Exception {
 	}
 
 	@Test // gh-19370
-	void propertiesAreFullRepeatable() throws Exception {
+	void propertiesAreFullRepeatable() {
 		process(TestOrderedClassConfiguration.class, (firstFile) -> {
 			String first = getFileContents(firstFile);
 			process(TestOrderedClassConfiguration.class, (secondFile) -> {

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java

@@ -76,7 +76,7 @@ public ConfigurationMetadata readAdditionalMetadata() throws IOException {
 		return readMetadata(getAdditionalMetadataStream());
 	}
 
-	private ConfigurationMetadata readMetadata(InputStream in) throws IOException {
+	private ConfigurationMetadata readMetadata(InputStream in) {
 		try (in) {
 			return new JsonMarshaller().read(in);
 		}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.configurationprocessor;
 
-import java.io.IOException;
-
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata;
@@ -414,7 +412,7 @@ void recursivePropertiesDoNotCauseAStackOverflow() {
 	}
 
 	@Test
-	void recordProperties() throws IOException {
+	void recordProperties() {
 		String source = """
 				@org.springframework.boot.configurationsample.ConfigurationProperties("implicit")
 				public record ExampleRecord(String someString, Integer someInteger) {
@@ -426,7 +424,7 @@ public record ExampleRecord(String someString, Integer someInteger) {
 	}
 
 	@Test
-	void recordPropertiesWithDefaultValues() throws IOException {
+	void recordPropertiesWithDefaultValues() {
 		String source = """
 				@org.springframework.boot.configurationsample.ConfigurationProperties("record.defaults")
 				public record ExampleRecord(
@@ -442,7 +440,7 @@ public record ExampleRecord(
 	}
 
 	@Test
-	void multiConstructorRecordProperties() throws IOException {
+	void multiConstructorRecordProperties() {
 		String source = """
 				@org.springframework.boot.configurationsample.ConfigurationProperties("multi")
 				public record ExampleRecord(String someString, Integer someInteger) {