Removes most deprecated items.

Author: spencergibb

spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java

@@ -46,7 +46,6 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponseWrapper;
 
-import org.springframework.cloud.gateway.mvc.config.ProxyProperties;
 import org.springframework.core.Conventions;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterizedTypeReference;
@@ -139,12 +138,6 @@
  */
 public class ProxyExchange<T> {
 
-	/**
-	 * Contains headers that are considered case-sensitive by default.
-	 * @deprecated {@link ProxyProperties#DEFAULT_SENSITIVE}
-	 */
-	public static Set<String> DEFAULT_SENSITIVE = ProxyProperties.DEFAULT_SENSITIVE;
-
 	private URI uri;
 
 	private RestTemplate rest;
@@ -211,17 +204,6 @@ public ProxyExchange<T> headers(HttpHeaders headers) {
 		return this;
 	}
 
-	/**
-	 * Sets the names of sensitive headers that are not passed downstream to the backend
-	 * service.
-	 * @param names the names of sensitive headers
-	 * @return this for convenience
-	 * @deprecated {@link #excluded(String...)}
-	 */
-	public ProxyExchange<T> sensitive(String... names) {
-		return excluded(names);
-	}
-
 	/**
 	 * Sets the names of excluded headers that are not passed downstream to the backend
 	 * service.

spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolver.java

@@ -64,11 +64,6 @@ public void setAutoForwardedHeaders(Set<String> autoForwardedHeaders) {
 				: autoForwardedHeaders.stream().map(String::toLowerCase).collect(toSet());
 	}
 
-	@Deprecated
-	public void setSensitive(Set<String> excluded) {
-		setExcluded(excluded);
-	}
-
 	public void setExcluded(Set<String> excluded) {
 		this.excluded = excluded;
 	}

spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyProperties.java

@@ -58,7 +58,7 @@
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnWebApplication
 @ConditionalOnClass({ HandlerMethodReturnValueHandler.class })
-@EnableConfigurationProperties({ ProxyExchangeWebMvcProperties.class, ProxyProperties.class })
+@EnableConfigurationProperties({ ProxyExchangeWebMvcProperties.class })
 public class ProxyResponseAutoConfiguration implements WebMvcConfigurer {
 
 	@Autowired

spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java

@@ -33,7 +33,7 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.gateway.mvc.GetWithBodyRequestTests.TestApplication.Foo;
 import org.springframework.cloud.gateway.mvc.config.ProxyExchangeArgumentResolver;
-import org.springframework.cloud.gateway.mvc.config.ProxyProperties;
+import org.springframework.cloud.gateway.mvc.config.ProxyExchangeWebMvcProperties;
 import org.springframework.cloud.gateway.mvc.http.GetWithBodyRequestClientHttpRequestFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpEntity;
@@ -108,7 +108,7 @@ public void setHome(URI home) {
 		}
 
 		@Bean
-		public ProxyExchangeArgumentResolver proxyExchangeArgumentResolver(final ProxyProperties proxy) {
+		public ProxyExchangeArgumentResolver proxyExchangeArgumentResolver(final ProxyExchangeWebMvcProperties proxy) {
 			ProxyExchangeArgumentResolver resolver = new ProxyExchangeArgumentResolver(
 					generateConfiguredRestTemplate());
 			resolver.setHeaders(proxy.convertHeaders());

spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/GetWithBodyRequestTests.java

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.gateway.server.mvc.config;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -26,7 +25,6 @@
 import jakarta.validation.constraints.NotNull;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.http.MediaType;
 
@@ -52,8 +50,6 @@ public class GatewayMvcProperties {
 	@Valid
 	private LinkedHashMap<String, RouteProperties> routesMap = new LinkedHashMap<>();
 
-	private HttpClient httpClient = new HttpClient();
-
 	/**
 	 * Mime-types that are streaming.
 	 */
@@ -88,10 +84,6 @@ public void setRoutesMap(LinkedHashMap<String, RouteProperties> routesMap) {
 		this.routesMap = routesMap;
 	}
 
-	public HttpClient getHttpClient() {
-		return httpClient;
-	}
-
 	public List<MediaType> getStreamingMediaTypes() {
 		return streamingMediaTypes;
 	}
@@ -118,95 +110,12 @@ public void setTrustedProxies(String trustedProxies) {
 
 	@Override
 	public String toString() {
-		return new ToStringCreator(this).append("httpClient", httpClient)
-			.append("routes", routes)
+		return new ToStringCreator(this).append("routes", routes)
 			.append("routesMap", routesMap)
 			.append("streamingMediaTypes", streamingMediaTypes)
 			.append("streamingBufferSize", streamingBufferSize)
 			.append("trustedProxies", trustedProxies)
 			.toString();
 	}
 
-	/**
-	 * @deprecated in favor of spring.http.client.
-	 */
-	@Deprecated
-	public static class HttpClient {
-
-		/** The HttpClient connect timeout. */
-		private Duration connectTimeout;
-
-		/** The HttpClient read timeout. */
-		private Duration readTimeout;
-
-		/** The name of the SSL bundle to use. */
-		private String sslBundle;
-
-		/** The HttpClient type. Defaults to JDK. */
-		private HttpClientType type = HttpClientType.JDK;
-
-		@Deprecated
-		@DeprecatedConfigurationProperty(replacement = "spring.http.client.connect-timeout", since = "4.2.0")
-		public Duration getConnectTimeout() {
-			return connectTimeout;
-		}
-
-		public void setConnectTimeout(Duration connectTimeout) {
-			this.connectTimeout = connectTimeout;
-		}
-
-		@Deprecated
-		@DeprecatedConfigurationProperty(replacement = "spring.http.client.read-timeout", since = "4.2.0")
-		public Duration getReadTimeout() {
-			return readTimeout;
-		}
-
-		public void setReadTimeout(Duration readTimeout) {
-			this.readTimeout = readTimeout;
-		}
-
-		@Deprecated
-		@DeprecatedConfigurationProperty(replacement = "spring.http.client.ssl.bundle", since = "4.2.0")
-		public String getSslBundle() {
-			return sslBundle;
-		}
-
-		public void setSslBundle(String sslBundle) {
-			this.sslBundle = sslBundle;
-		}
-
-		@Deprecated
-		public HttpClientType getType() {
-			return type;
-		}
-
-		public void setType(HttpClientType type) {
-			this.type = type;
-		}
-
-		@Override
-		public String toString() {
-			return new ToStringCreator(this).append("connectTimeout", connectTimeout)
-				.append("readTimeout", readTimeout)
-				.append("sslBundle", sslBundle)
-				.append("type", type)
-				.toString();
-		}
-
-	}
-
-	public enum HttpClientType {
-
-		/**
-		 * Use JDK HttpClient.
-		 */
-		JDK,
-
-		/**
-		 * Auto-detect the HttpClient.
-		 */
-		AUTODETECT
-
-	}
-
 }