spring-cloud · spencergibb · Jul 5, 2023 · May 5, 2023 · May 5, 2023 · May 9, 2023
diff --git a/pom.xml b/pom.xml
@@ -51,6 +51,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<bucket4j.version>8.3.0</bucket4j.version>
 		<blockhound.version>1.0.6.RELEASE</blockhound.version>
 		<java.version>17</java.version>
 		<junit-pioneer.version>1.6.1</junit-pioneer.version>
@@ -97,6 +98,16 @@
 				<artifactId>spring-boot-devtools</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.bucket4j</groupId>
+				<artifactId>bucket4j-core</artifactId>
+				<version>${bucket4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.bucket4j</groupId>
+				<artifactId>bucket4j-caffeine</artifactId>
+				<version>${bucket4j.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>io.projectreactor.tools</groupId>
 				<artifactId>blockhound</artifactId>
@@ -127,6 +138,7 @@
 		<module>spring-cloud-gateway-mvc</module>
 		<module>spring-cloud-gateway-webflux</module>
 		<module>spring-cloud-gateway-server</module>
+		<module>spring-cloud-gateway-server-mvc</module>
 		<module>spring-cloud-starter-gateway</module>
 		<module>spring-cloud-gateway-sample</module>
 		<module>spring-cloud-gateway-integration-tests</module>

diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml
@@ -37,6 +37,11 @@
 				<artifactId>spring-cloud-gateway-server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-gateway-server-mvc</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-gateway</artifactId>

diff --git a/spring-cloud-gateway-server-mvc/pom.xml b/spring-cloud-gateway-server-mvc/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2023 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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-gateway</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath> <!-- lookup parent from repository -->
+    </parent>
+    <artifactId>spring-cloud-gateway-server-mvc</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring Cloud Gateway Server MVC</name>
+    <description>Spring Cloud Gateway Server MVC</description>
+    <properties>
+        <main.basedir>${basedir}/..</main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.bucket4j</groupId>
+            <artifactId>bucket4j-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.bucket4j</groupId>
+            <artifactId>bucket4j-caffeine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../java/org/springframework/cloud/gateway/server/mvc/GatewayServerMvcAutoConfiguration.java b/.../java/org/springframework/cloud/gateway/server/mvc/GatewayServerMvcAutoConfiguration.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2013-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.gateway.server.mvc;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
+import org.springframework.boot.web.client.RestClientCustomizer;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.gateway.server.mvc.config.GatewayMvcProperties;
+import org.springframework.cloud.gateway.server.mvc.config.GatewayMvcPropertiesBeanDefinitionRegistrar;
+import org.springframework.cloud.gateway.server.mvc.filter.ForwardedRequestHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.filter.HttpHeadersFilter.RequestHttpHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.filter.HttpHeadersFilter.ResponseHttpHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.filter.RemoveHopByHopRequestHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.filter.RemoveHopByHopResponseHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.filter.XForwardedRequestHeadersFilter;
+import org.springframework.cloud.gateway.server.mvc.handler.ClientHttpRequestFactoryProxyExchange;
+import org.springframework.cloud.gateway.server.mvc.handler.ProxyExchange;
+import org.springframework.cloud.gateway.server.mvc.handler.ProxyExchangeHandlerFunction;
+import org.springframework.cloud.gateway.server.mvc.handler.RestClientProxyExchange;
+import org.springframework.cloud.gateway.server.mvc.predicate.PredicateDiscoverer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestClient;
+
+@AutoConfiguration(after = { RestTemplateAutoConfiguration.class, RestClientAutoConfiguration.class })
+@Import(GatewayMvcPropertiesBeanDefinitionRegistrar.class)
+public class GatewayServerMvcAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean(ProxyExchange.class)
+	public ClientHttpRequestFactoryProxyExchange clientHttpRequestFactoryProxyExchange(
+			ClientHttpRequestFactory requestFactory) {
+		return new ClientHttpRequestFactoryProxyExchange(requestFactory);
+	}
+
+	@Bean
+	public RestClientCustomizer gatewayRestClientCustomizer(ClientHttpRequestFactory requestFactory) {
+		return restClientBuilder -> restClientBuilder.requestFactory(requestFactory);
+	}
+
+	// Make default when reflection is no longer needed to function
+	// @Bean
+	@ConditionalOnMissingBean(ProxyExchange.class)
+	public RestClientProxyExchange restClientProxyExchange(RestClient.Builder restClientBuilder) {
+		return new RestClientProxyExchange(restClientBuilder.build());
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ForwardedRequestHeadersFilter forwardedRequestHeadersFilter() {
+		return new ForwardedRequestHeadersFilter();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ClientHttpRequestFactory gatewayClientHttpRequestFactory(RestTemplateBuilder restTemplateBuilder) {
+		// TODO: set property if jdk HttpClient
+		// TODO: temporarily force Jdk HttpClient, copied from
+		// https://github.com/spring-projects/spring-boot/pull/36118
+		String restrictedHeaders = System.getProperty("jdk.httpclient.allowRestrictedHeaders");
+		if (!StringUtils.hasText(restrictedHeaders)) {
+			System.setProperty("jdk.httpclient.allowRestrictedHeaders", "host");
+		}
+		else if (StringUtils.hasText(restrictedHeaders) && !restrictedHeaders.contains("host")) {
+			System.setProperty("jdk.httpclient.allowRestrictedHeaders", restrictedHeaders + ",host");
+		}
+		return restTemplateBuilder.requestFactory(settings -> {
+			java.net.http.HttpClient.Builder builder = java.net.http.HttpClient.newBuilder();
+			if (settings.connectTimeout() != null) {
+				builder.connectTimeout(settings.connectTimeout());
+			}
+			if (settings.sslBundle() != null) {
+				builder.sslContext(settings.sslBundle().createSslContext());
+			}
+			java.net.http.HttpClient httpClient = builder.build();
+			JdkClientHttpRequestFactory requestFactory = new JdkClientHttpRequestFactory(httpClient);
+			if (settings.readTimeout() != null) {
+				requestFactory.setReadTimeout(settings.readTimeout());
+			}
+			return requestFactory;
+		}).buildRequestFactory();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public GatewayMvcProperties gatewayMvcProperties() {
+		return new GatewayMvcProperties();
+	}
+
+	@Bean
+	public PredicateDiscoverer predicateDiscoverer() {
+		return new PredicateDiscoverer();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ProxyExchangeHandlerFunction proxyExchangeHandlerFunction(ProxyExchange proxyExchange,
+			ObjectProvider<RequestHttpHeadersFilter> requestHttpHeadersFilters,
+			ObjectProvider<ResponseHttpHeadersFilter> responseHttpHeadersFilters) {
+		return new ProxyExchangeHandlerFunction(proxyExchange, requestHttpHeadersFilters, responseHttpHeadersFilters);
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public RemoveHopByHopRequestHeadersFilter removeHopByHopRequestHeadersFilter() {
+		return new RemoveHopByHopRequestHeadersFilter();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public RemoveHopByHopResponseHeadersFilter removeHopByHopResponseHeadersFilter() {
+		return new RemoveHopByHopResponseHeadersFilter();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public XForwardedRequestHeadersFilter xForwardedRequestHeadersFilter() {
+		return new XForwardedRequestHeadersFilter();
+	}
+
+}
diff --git a/...n/java/org/springframework/cloud/gateway/server/mvc/common/AbstractGatewayDiscoverer.java b/...n/java/org/springframework/cloud/gateway/server/mvc/common/AbstractGatewayDiscoverer.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.gateway.server.mvc.common;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cloud.gateway.server.mvc.invoke.reflect.DefaultOperationMethod;
+import org.springframework.cloud.gateway.server.mvc.invoke.reflect.OperationMethod;
+import org.springframework.core.io.support.SpringFactoriesLoader;
+import org.springframework.core.log.LogMessage;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+public abstract class AbstractGatewayDiscoverer {
+
+	protected final Log log = LogFactory.getLog(getClass());
+
+	protected volatile MultiValueMap<String, OperationMethod> operations = new LinkedMultiValueMap<>();
+
+	public <T extends Supplier<Collection<Method>>, R> void doDiscover(Class<T> supplierClass, Class<R> returnType) {
+		List<T> suppliers = loadSuppliers(supplierClass);
+
+		List<Method> methods = new ArrayList<>();
+		for (Supplier<Collection<Method>> supplier : suppliers) {
+			methods.addAll(supplier.get());
+		}
+
+		for (Method method : methods) {
+			// TODO: replace with a BiPredicate of some kind
+			if (returnType.isAssignableFrom(method.getReturnType())) {
+				addOperationMethod(method);
+			}
+		}
+	}
+
+	protected void addOperationMethod(Method method) {
+		OperationMethod operationMethod = new DefaultOperationMethod(method);
+		String key = method.getName();
+		operations.add(key, operationMethod);
+		log.trace(LogMessage.format("Discovered %s", operationMethod));
+	}
+
+	public abstract void discover();
+
+	protected <T> List<T> loadSuppliers(Class<T> supplierClass) {
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+		List<T> suppliers = SpringFactoriesLoader.loadFactories(supplierClass, classLoader);
+		return suppliers;
+	}
+
+	public MultiValueMap<String, OperationMethod> getOperations() {
+		if (operations == null || operations.isEmpty()) {
+			discover();
+		}
+		return operations;
+	}
+
+}