eugenp · anastasiosioannidis · Apr 5, 2025 · Apr 3, 2025 · Apr 3, 2025 · Apr 3, 2025
diff --git a/pom.xml b/pom.xml
@@ -777,6 +777,8 @@
                 <module>spring-cloud-modules/spring-cloud-security</module>
                 <module>spring-cloud-modules/spring-cloud-task</module>
                 <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
+                <module>spring-cloud-modules/spring-cloud-gateway-2</module>
+                <module>spring-cloud-modules/spring-cloud-gateway</module>
                 <module>spring-core</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
@@ -1165,6 +1167,8 @@
                 <module>spring-cloud-modules/spring-cloud-security</module>
                 <module>spring-cloud-modules/spring-cloud-task</module>
                 <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
+                <module>spring-cloud-modules/spring-cloud-gateway-2</module>
+                <module>spring-cloud-modules/spring-cloud-gateway</module>
                 <module>spring-core</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>

diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
@@ -27,8 +27,8 @@
         <!--<module>spring-cloud-bootstrap</module> -->
         <module>spring-cloud-ribbon-client</module>
         <module>spring-cloud-zookeeper</module>
-        <module>spring-cloud-gateway</module>
-        <module>spring-cloud-gateway-2</module>
+        <!--<module>spring-cloud-gateway</module>-->
+        <!--<module>spring-cloud-gateway-2</module>-->
         <module>spring-cloud-gateway-3</module>
         <module>spring-cloud-stream</module>
         <!--        <module>spring-cloud-stream-starters</module>-->

diff --git a/spring-cloud-modules/spring-cloud-gateway-2/README.md b/spring-cloud-modules/spring-cloud-gateway-2/README.md
@@ -5,3 +5,6 @@ This module contains additional articles about Spring Cloud Gateway.
 ### Relevant Articles:
 
 - [Rate Limiting With Client IP in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-rate-limit-by-client-ip)
+- [Spring Cloud Gateway Routing Predicate Factories](https://www.baeldung.com/spring-cloud-gateway-routing-predicate-factories)
+- [Spring Cloud Gateway WebFilter Factories](https://www.baeldung.com/spring-cloud-gateway-webfilter-factories)
+- [Processing the Response Body in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-response-body)
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
@@ -45,6 +45,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
+        <!-- Circuit Breaker -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-circuitbreaker-reactor-resilience4j</artifactId>
+        </dependency>
         <!-- Redis -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,6 +67,19 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>${jakarta.validation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -101,6 +119,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
+                    <mainClass>com.baeldung.springcloudgateway.ipaddress.IpAddressApplication</mainClass>
                     <excludes>
                         <exclude>
                             <groupId>org.projectlombok</groupId>
@@ -113,9 +132,11 @@
     </build>
 
     <properties>
+        <spring-boot.version>3.2.3</spring-boot.version>
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <redis.version>0.7.2</redis.version>
-        <spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
+        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
     </properties>
 
 </project>
diff --git a/...baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java b/...baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java
@@ -0,0 +1,13 @@
+package com.baeldung.springcloudgateway.customfilters.gatewayapp;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CustomFiltersGatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CustomFiltersGatewayApplication.class, args);
+    }
+
+}
diff --git a/...es/ScrubResponseGatewayFilterFactory.java → ...es/ScrubResponseGatewayFilterFactory.java b/...es/ScrubResponseGatewayFilterFactory.java → ...es/ScrubResponseGatewayFilterFactory.java
@@ -14,7 +14,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 
-import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;

diff --git a/...global/LoggingGlobalFilterProperties.java → ...global/LoggingGlobalFilterProperties.java b/...global/LoggingGlobalFilterProperties.java → ...global/LoggingGlobalFilterProperties.java
diff --git a/...edicates/CustomPredicatesApplication.java → ...edicates/CustomPredicatesApplication.java b/...edicates/CustomPredicatesApplication.java → ...edicates/CustomPredicatesApplication.java
diff --git a/...icates/config/CustomPredicatesConfig.java → ...icates/config/CustomPredicatesConfig.java b/...icates/config/CustomPredicatesConfig.java → ...icates/config/CustomPredicatesConfig.java
diff --git a/.../GoldenCustomerRoutePredicateFactory.java → .../GoldenCustomerRoutePredicateFactory.java b/.../GoldenCustomerRoutePredicateFactory.java → .../GoldenCustomerRoutePredicateFactory.java
diff --git a/...icates/service/GoldenCustomerService.java → ...icates/service/GoldenCustomerService.java b/...icates/service/GoldenCustomerService.java → ...icates/service/GoldenCustomerService.java
diff --git a/...way/webfilters/CacheEvaluationFilter.java → ...way/webfilters/CacheEvaluationFilter.java b/...way/webfilters/CacheEvaluationFilter.java → ...way/webfilters/CacheEvaluationFilter.java
diff --git a/...bfilters/WebFilterGatewayApplication.java → ...bfilters/WebFilterGatewayApplication.java b/...bfilters/WebFilterGatewayApplication.java → ...bfilters/WebFilterGatewayApplication.java
diff --git a/...filters/config/ModifyBodyRouteConfig.java → ...filters/config/ModifyBodyRouteConfig.java b/...filters/config/ModifyBodyRouteConfig.java → ...filters/config/ModifyBodyRouteConfig.java
diff --git a/...fig/RequestRateLimiterResolverConfig.java → ...fig/RequestRateLimiterResolverConfig.java b/...fig/RequestRateLimiterResolverConfig.java → ...fig/RequestRateLimiterResolverConfig.java
diff --git a/...in/resources/application-customroutes.yml → ...in/resources/application-customroutes.yml b/...in/resources/application-customroutes.yml → ...in/resources/application-customroutes.yml
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/application-nosecurity.yml b/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/application-nosecurity.yml
@@ -0,0 +1,8 @@
+# Enable this profile to disable security
+spring:
+  autoconfigure:
+    exclude:
+     - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
+     - org.springframework.boot.actuate.autoconfigure.ManagementSecurityAutoConfiguration
+     - org.springframework.boot.autoconfigure.security.reactive.ReactiveSecurityAutoConfiguration
+     - org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
diff --git a/.../src/main/resources/application-scrub.yml → .../src/main/resources/application-scrub.yml b/.../src/main/resources/application-scrub.yml → .../src/main/resources/application-scrub.yml
diff --git a/...main/resources/application-webfilters.yml → ...main/resources/application-webfilters.yml b/...main/resources/application-webfilters.yml → ...main/resources/application-webfilters.yml
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+logging:
+  level:
+    org.springframework.cloud.gateway: DEBUG
+    reactor.netty.http.client: DEBUG
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/...ResponseGatewayFilterFactoryUnitTest.java → ...ResponseGatewayFilterFactoryUnitTest.java b/...ResponseGatewayFilterFactoryUnitTest.java → ...ResponseGatewayFilterFactoryUnitTest.java
@@ -1,15 +1,15 @@
 package com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.junit.jupiter.api.Test;
 
 import com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories.ScrubResponseGatewayFilterFactory.Config;
 import com.baeldung.springcloudgateway.customfilters.gatewayapp.filters.factories.ScrubResponseGatewayFilterFactory.Scrubber;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

diff --git a/...s/ScrubResponseGatewayFilterLiveTest.java → ...s/ScrubResponseGatewayFilterLiveTest.java b/...s/ScrubResponseGatewayFilterLiveTest.java → ...s/ScrubResponseGatewayFilterLiveTest.java
@@ -2,15 +2,11 @@
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.Collections;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -19,17 +15,13 @@
 import org.springframework.cloud.gateway.route.RouteLocator;
 import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 import com.sun.net.httpserver.HttpServer;
 
-import reactor.netty.http.client.HttpClient;
-
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class ScrubResponseGatewayFilterLiveTest {
 

diff --git a/.../CustomPredicatesApplicationLiveTest.java → .../CustomPredicatesApplicationLiveTest.java b/.../CustomPredicatesApplicationLiveTest.java → .../CustomPredicatesApplicationLiveTest.java
@@ -24,7 +24,7 @@
  * This test requires
  */
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("customroutes")
+@ActiveProfiles({ "nosecurity","customroutes"})
 public class CustomPredicatesApplicationLiveTest {
 
     @LocalServerPort

diff --git a/...ters/RedisWebFilterFactoriesLiveTest.java → ...ters/RedisWebFilterFactoriesLiveTest.java b/...ters/RedisWebFilterFactoriesLiveTest.java → ...ters/RedisWebFilterFactoriesLiveTest.java
diff --git a/...ebfilters/WebFilterFactoriesLiveTest.java → ...ebfilters/WebFilterFactoriesLiveTest.java b/...ebfilters/WebFilterFactoriesLiveTest.java → ...ebfilters/WebFilterFactoriesLiveTest.java
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-gateway-2/src/test/resources/logback-test.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="info">
+        <appender-ref ref="LISTAPPENDER" />
+    </root>
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration> 
diff --git a/spring-cloud-modules/spring-cloud-gateway/README.md b/spring-cloud-modules/spring-cloud-gateway/README.md
@@ -6,8 +6,5 @@ This module contains articles about Spring Cloud Gateway
 
 - [Exploring the New Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
 - [Writing Custom Spring Cloud Gateway Filters](https://www.baeldung.com/spring-cloud-custom-gateway-filters)
-- [Spring Cloud Gateway Routing Predicate Factories](https://www.baeldung.com/spring-cloud-gateway-routing-predicate-factories)
-- [Spring Cloud Gateway WebFilter Factories](https://www.baeldung.com/spring-cloud-gateway-webfilter-factories)
 - [Using Spring Cloud Gateway with OAuth 2.0 Patterns](https://www.baeldung.com/spring-cloud-gateway-oauth2)
 - [URL Rewriting With Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-url-rewriting)
-- [Processing the Response Body in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-response-body)