samples update for proxy configuration with spring-cloud-gateway

Author: bnasslahsen

springdoc-openapi-microservices/config-service/src/main/resources/config/department-service.yml

@@ -1,5 +1,6 @@
 server:
   port: 8090
+  forward-headers-strategy: framework
 eureka:
   client:
     serviceUrl:
@@ -9,4 +10,8 @@ eureka:
 
 logging:
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+
+springdoc:
+  cache:
+    disabled: true

springdoc-openapi-microservices/config-service/src/main/resources/config/discovery-service.yml

@@ -1,5 +1,6 @@
 server:
   port: 8761
+  forward-headers-strategy: framework
 eureka:
   client:
     serviceUrl:

springdoc-openapi-microservices/config-service/src/main/resources/config/employee-service.yml

@@ -1,5 +1,6 @@
 server:
   port: 8092
+  forward-headers-strategy: framework
 eureka:
   client:
     serviceUrl:
@@ -10,3 +11,7 @@ eureka:
 logging:
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+
+springdoc:
+  cache:
+    disabled: true

springdoc-openapi-microservices/config-service/src/main/resources/config/gateway-service.yml

@@ -1,5 +1,6 @@
 server:
   port: 8060
+  forward-headers-strategy: framework
 
 eureka:
   client:
@@ -11,6 +12,9 @@ eureka:
 logging:
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+  level:
+    org.springframework.cloud.gateway: TRACE
+    org.springframework.http.server.reactive: TRACE
 
 spring:
   cloud:
@@ -22,28 +26,38 @@ spring:
         - id: employee-service
           uri: lb://employee-service
           predicates:
-            - Path=/employee/**
+            - Path=/employee/**, /demo-microservices/employee/**
           filters:
+            - ContextPathRewritePath=/demo-microservices/employee/(?<path>.*), /$\{path}
             - RewritePath=/employee/(?<path>.*), /$\{path}
         - id: department-service
           uri: lb://department-service
           predicates:
-            - Path=/department/**
+            - Path=/department/**, /demo-microservices/department/**
           filters:
+            - ContextPathRewritePath=/demo-microservices/department/(?<path>.*), /$\{path}
             - RewritePath=/department/(?<path>.*), /$\{path}
         - id: organization-service
           uri: lb://organization-service
           predicates:
-            - Path=/organization/**
+            - Path=/organization/**, /demo-microservices/organization/**
           filters:
+            - ContextPathRewritePath=/demo-microservices/organization/(?<path>.*), /$\{path}
             - RewritePath=/organization/(?<path>.*), /$\{path}
+        - id: openapi-proxy
+          uri: https://demos1.springdoc.org
+          predicates:
+            - Path=/demo-microservices/v3/api-docs/**
+          filters:
+            - RewritePath=/demo-microservices/v3/api-docs/(?<path>.*), /demo-microservices/$\{path}/v3/api-docs
         - id: openapi
           uri: http://localhost:${server.port}
           predicates:
             - Path=/v3/api-docs/**
           filters:
             - RewritePath=/v3/api-docs/(?<path>.*), /$\{path}/v3/api-docs
 
+
 springdoc:
   swagger-ui:
     urls:
@@ -52,4 +66,6 @@ springdoc:
       - name: department
         url: /v3/api-docs/department
       - name: organization
-        url: /v3/api-docs/organization
+        url: /v3/api-docs/organization
+  cache:
+    disabled: true

springdoc-openapi-microservices/config-service/src/main/resources/config/organization-service.yml

@@ -11,4 +11,8 @@ eureka:
 
 logging:
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} ${LOG_LEVEL_PATTERN:-%5p} %m%n"
+    
+springdoc:
+  cache:
+    disabled: true

springdoc-openapi-microservices/gateway-service/src/main/java/org/springdoc/demo/services/gateway/ContextPathRewritePathGatewayFilterFactory.java

@@ -0,0 +1,35 @@
+package org.springdoc.demo.services.gateway;
+
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.RewritePathGatewayFilterFactory;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.addOriginalRequestUrl;
+
+/**
+ * @author bnasslahsen
+ */
+@Component
+public class ContextPathRewritePathGatewayFilterFactory extends RewritePathGatewayFilterFactory {
+
+	@Override
+	public GatewayFilter apply(Config config) {
+		String replacement = config.getReplacement().replace("$\\", "$");
+		return (exchange, chain) -> {
+			ServerHttpRequest req = exchange.getRequest();
+
+			addOriginalRequestUrl(exchange, req.getURI());
+			String path = req.getURI().getRawPath();
+
+			String newPath = path.replaceAll(config.getRegexp(), replacement);
+			ServerHttpRequest request = req.mutate().path(newPath).contextPath("/").build();
+
+			exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, request.getURI());
+
+			return chain.filter(exchange.mutate().request(request).build());
+		};
+	}
+
+}

springdoc-openapi-microservices/gateway-service/src/main/resources/application.yml

@@ -1,5 +1,3 @@
-server:
-  forward-headers-strategy: framework
 spring:
   application:
     name: gateway-service
@@ -8,4 +6,4 @@ spring:
 springdoc:
   version: '@springdoc.version@'
   swagger-ui:
-    use-root-path: true
+    use-root-path: true