Remove deprecated code flagged for removal

Closes gh-27303

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthContributorAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -42,9 +42,7 @@
 @ConditionalOnEnabledHealthIndicator("cassandra")
 @AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
 		CassandraReactiveHealthContributorAutoConfiguration.class })
-@Import({ CassandraDriverConfiguration.class,
-		CassandraHealthContributorConfigurations.CassandraOperationsConfiguration.class })
-@SuppressWarnings("deprecation")
+@Import(CassandraDriverConfiguration.class)
 public class CassandraHealthContributorAutoConfiguration {
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthContributorConfigurations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -27,12 +27,9 @@
 import org.springframework.boot.actuate.health.HealthContributor;
 import org.springframework.boot.actuate.health.ReactiveHealthContributor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.cassandra.core.CassandraOperations;
-import org.springframework.data.cassandra.core.ReactiveCassandraOperations;
 
 /**
  * Health contributor options for Cassandra.
@@ -54,21 +51,6 @@ HealthContributor cassandraHealthContributor(Map<String, CqlSession> sessions) {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(CassandraOperations.class)
-	@ConditionalOnBean(CassandraOperations.class)
-	@Deprecated
-	static class CassandraOperationsConfiguration extends
-			CompositeHealthContributorConfiguration<org.springframework.boot.actuate.cassandra.CassandraHealthIndicator, CassandraOperations> {
-
-		@Bean
-		@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
-		HealthContributor cassandraHealthContributor(Map<String, CassandraOperations> cassandraOperations) {
-			return createContributor(cassandraOperations);
-		}
-
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(CqlSession.class)
 	static class CassandraReactiveDriverConfiguration extends
@@ -82,20 +64,4 @@ ReactiveHealthContributor cassandraHealthContributor(Map<String, CqlSession> ses
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(ReactiveCassandraOperations.class)
-	@ConditionalOnBean(ReactiveCassandraOperations.class)
-	@Deprecated
-	static class CassandraReactiveOperationsConfiguration extends
-			CompositeReactiveHealthContributorConfiguration<org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {
-
-		@Bean
-		@ConditionalOnMissingBean(name = { "cassandraHealthIndicator", "cassandraHealthContributor" })
-		ReactiveHealthContributor cassandraHealthContributor(
-				Map<String, ReactiveCassandraOperations> reactiveCassandraOperations) {
-			return createContributor(reactiveCassandraOperations);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthContributorAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -41,9 +41,7 @@
 @ConditionalOnClass({ CqlSession.class, Flux.class })
 @ConditionalOnEnabledHealthIndicator("cassandra")
 @AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
-@Import({ CassandraReactiveDriverConfiguration.class,
-		CassandraHealthContributorConfigurations.CassandraReactiveOperationsConfiguration.class })
-@SuppressWarnings("deprecation")
+@Import(CassandraReactiveDriverConfiguration.class)
 public class CassandraReactiveHealthContributorAutoConfiguration {
 
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

@@ -20,10 +20,8 @@
 
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.boot.web.server.Ssl;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -56,8 +54,6 @@ public class ManagementServerProperties {
 	 */
 	private String basePath = "";
 
-	private final Servlet servlet = new Servlet();
-
 	@NestedConfigurationProperty
 	private Ssl ssl;
 
@@ -105,10 +101,6 @@ public void setSsl(Ssl ssl) {
 		this.ssl = ssl;
 	}
 
-	public Servlet getServlet() {
-		return this.servlet;
-	}
-
 	private String cleanBasePath(String basePath) {
 		String candidate = StringUtils.trimWhitespace(basePath);
 		if (StringUtils.hasText(candidate)) {
@@ -122,49 +114,4 @@ private String cleanBasePath(String basePath) {
 		return candidate;
 	}
 
-	/**
-	 * Servlet properties.
-	 */
-	public static class Servlet {
-
-		/**
-		 * Management endpoint context-path (for instance, `/management`). Requires a
-		 * custom management.server.port.
-		 */
-		private String contextPath = "";
-
-		/**
-		 * Return the context path with no trailing slash (i.e. the '/' root context is
-		 * represented as the empty string).
-		 * @return the context path (no trailing slash)
-		 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
-		 * {@link ManagementServerProperties#getBasePath()}
-		 */
-		@Deprecated
-		@DeprecatedConfigurationProperty(replacement = "management.server.base-path")
-		public String getContextPath() {
-			return this.contextPath;
-		}
-
-		/**
-		 * Set the context path.
-		 * @param contextPath the context path
-		 * @deprecated since 2.4.0 for removal in 2.6.0 in favor of
-		 * {@link ManagementServerProperties#setBasePath(String)}
-		 */
-		@Deprecated
-		public void setContextPath(String contextPath) {
-			Assert.notNull(contextPath, "ContextPath must not be null");
-			this.contextPath = cleanContextPath(contextPath);
-		}
-
-		private String cleanContextPath(String contextPath) {
-			if (StringUtils.hasText(contextPath) && contextPath.endsWith("/")) {
-				return contextPath.substring(0, contextPath.length() - 1);
-			}
-			return contextPath;
-		}
-
-	}
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -126,10 +126,9 @@ protected void customize(ConfigurableServletWebServerFactory webServerFactory,
 			webServerFactory.setContextPath(getContextPath(managementServerProperties));
 		}
 
-		@SuppressWarnings("deprecation")
 		private String getContextPath(ManagementServerProperties managementServerProperties) {
 			String basePath = managementServerProperties.getBasePath();
-			return StringUtils.hasText(basePath) ? basePath : managementServerProperties.getServlet().getContextPath();
+			return StringUtils.hasText(basePath) ? basePath : "";
 		}
 
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthContributorAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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,7 +35,6 @@
  * @author Phillip Webb
  * @author Stephane Nicoll
  */
-@SuppressWarnings("deprecation")
 class CassandraHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -45,39 +44,20 @@ class CassandraHealthContributorAutoConfigurationTests {
 	@Test
 	void runWithoutCqlSessionOrCassandraOperationsShouldNotCreateIndicator() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean("cassandraHealthContributor")
-				.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class)
 				.doesNotHaveBean(CassandraDriverHealthIndicator.class));
 	}
 
 	@Test
 	void runWithCqlSessionOnlyShouldCreateDriverIndicator() {
 		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
-				.run((context) -> assertThat(context).hasSingleBean(CassandraDriverHealthIndicator.class)
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class));
-	}
-
-	@Test
-	void runWithCassandraOperationsOnlyShouldCreateRegularIndicator() {
-		this.contextRunner.withBean(CassandraOperations.class, () -> mock(CassandraOperations.class))
-				.run((context) -> assertThat(context)
-						.hasSingleBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class)
-						.doesNotHaveBean(CassandraDriverHealthIndicator.class));
-	}
-
-	@Test
-	void runWithCqlSessionAndCassandraOperationsShouldCreateDriverIndicator() {
-		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
-				.withBean(CassandraOperations.class, () -> mock(CassandraOperations.class))
-				.run((context) -> assertThat(context).hasSingleBean(CassandraDriverHealthIndicator.class)
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class));
+				.run((context) -> assertThat(context).hasSingleBean(CassandraDriverHealthIndicator.class));
 	}
 
 	@Test
 	void runWithCqlSessionAndSpringDataAbsentShouldCreateDriverIndicator() {
 		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
 				.withClassLoader(new FilteredClassLoader("org.springframework.data"))
-				.run((context) -> assertThat(context).hasSingleBean(CassandraDriverHealthIndicator.class)
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class));
+				.run((context) -> assertThat(context).hasSingleBean(CassandraDriverHealthIndicator.class));
 	}
 
 	@Test
@@ -86,7 +66,6 @@ void runWhenDisabledShouldNotCreateIndicator() {
 				.withBean(CassandraOperations.class, () -> mock(CassandraOperations.class))
 				.withPropertyValues("management.health.cassandra.enabled:false")
 				.run((context) -> assertThat(context).doesNotHaveBean("cassandraHealthContributor")
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class)
 						.doesNotHaveBean(CassandraDriverHealthIndicator.class));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthContributorAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -37,7 +37,6 @@
  * @author Artsiom Yudovin
  * @author Stephane Nicoll
  */
-@SuppressWarnings("deprecation")
 class CassandraReactiveHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
@@ -47,28 +46,13 @@ class CassandraReactiveHealthContributorAutoConfigurationTests {
 	@Test
 	void runWithoutCqlSessionOrReactiveCassandraOperationsShouldNotCreateIndicator() {
 		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean("cassandraHealthContributor")
-				.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class)
 				.doesNotHaveBean(CassandraDriverReactiveHealthIndicator.class));
 	}
 
 	@Test
 	void runWithCqlSessionOnlyShouldCreateDriverIndicator() {
-		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
-				.run((context) -> assertThat(context).hasBean("cassandraHealthContributor")
-						.hasSingleBean(CassandraDriverReactiveHealthIndicator.class).doesNotHaveBean(
-								org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class));
-	}
-
-	@Test
-	void runWithReactiveCassandraOperationsOnlyShouldCreateReactiveIndicator() {
-		this.contextRunner.withBean(ReactiveCassandraOperations.class, () -> mock(ReactiveCassandraOperations.class))
-				.withBean(CassandraOperations.class, () -> mock(CassandraOperations.class))
-				.run((context) -> assertThat(context).hasBean("cassandraHealthContributor")
-						.hasSingleBean(
-								org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class)
-						.doesNotHaveBean(CassandraDriverReactiveHealthIndicator.class)
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class)
-						.doesNotHaveBean(CassandraDriverHealthIndicator.class));
+		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class)).run((context) -> assertThat(context)
+				.hasBean("cassandraHealthContributor").hasSingleBean(CassandraDriverReactiveHealthIndicator.class));
 	}
 
 	@Test
@@ -78,9 +62,6 @@ void runWithCqlSessionAndReactiveCassandraOperationsShouldCreateDriverIndicator(
 				.withBean(CassandraOperations.class, () -> mock(CassandraOperations.class))
 				.run((context) -> assertThat(context).hasBean("cassandraHealthContributor")
 						.hasSingleBean(CassandraDriverReactiveHealthIndicator.class)
-						.doesNotHaveBean(
-								org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class)
-						.doesNotHaveBean(org.springframework.boot.actuate.cassandra.CassandraHealthIndicator.class)
 						.doesNotHaveBean(CassandraDriverHealthIndicator.class));
 	}
 
@@ -89,17 +70,15 @@ void runWithCqlSessionAndSpringDataAbsentShouldCreateDriverIndicator() {
 		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
 				.withClassLoader(new FilteredClassLoader("org.springframework.data"))
 				.run((context) -> assertThat(context).hasBean("cassandraHealthContributor")
-						.hasSingleBean(CassandraDriverReactiveHealthIndicator.class).doesNotHaveBean(
-								org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class));
+						.hasSingleBean(CassandraDriverReactiveHealthIndicator.class));
 	}
 
 	@Test
 	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withBean(CqlSession.class, () -> mock(CqlSession.class))
 				.withBean(ReactiveCassandraOperations.class, () -> mock(ReactiveCassandraOperations.class))
 				.withPropertyValues("management.health.cassandra.enabled:false")
-				.run((context) -> assertThat(context).doesNotHaveBean("cassandraHealthContributor").doesNotHaveBean(
-						org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator.class));
+				.run((context) -> assertThat(context).doesNotHaveBean("cassandraHealthContributor"));
 	}
 
 }

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

@@ -59,7 +59,7 @@ void configProps() throws Exception {
 
 	@Test
 	void configPropsFilterByPrefix() throws Exception {
-		this.mockMvc.perform(get("/actuator/configprops/spring.resources")).andExpect(status().isOk())
+		this.mockMvc.perform(get("/actuator/configprops/spring.jackson")).andExpect(status().isOk())
 				.andDo(MockMvcRestDocumentation.document("configprops/prefixed",
 						preprocessResponse(limit("contexts", getApplicationContext().getId(), "beans")),
 						responseFields(fieldWithPath("contexts").description("Application contexts keyed by id."),