Polish

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

@@ -239,21 +239,16 @@ public class JerseyEndpointResourceFactory {
 				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 abstract class AbstractWebMvcEndpointHandlerMapping extends RequestMappin
 	}
 
 	@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 @@ import org.springframework.util.StringUtils;
  * {@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 @@ import org.springframework.web.reactive.function.client.ClientResponse;
  * {@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 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @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 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @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 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @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 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @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 @@ import static org.mockito.Mockito.mock;
  * @author Stephane Nicoll
  */
 @SuppressWarnings("removal")
+@Deprecated(since = "3.0.0", forRemoval = true)
 class WebFluxTagsTests {
 
 	private MockServerWebExchange exchange;