From da96bb6ed8379a5733f17a307a7f29154e8d0b76 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:10:37 +0200
Subject: [PATCH] [JAVA-29182] Upgrade
 spring-cloud-modules/spring-cloud-gateway-2 to Spring Boot 3 (#16027)

---
 spring-cloud-modules/spring-cloud-gateway-2/pom.xml  | 12 +++++-------
 ...Resolver.java => ProxyClientAddressResolver.java} |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/{ProxiedClientAddressResolver.java => ProxyClientAddressResolver.java} (92%)

diff --git a/spring-cloud-modules/spring-cloud-gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
index 4228c72d37..006b46d069 100644
--- a/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
+++ b/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
@@ -8,9 +8,10 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung.spring.cloud</groupId>
-        <artifactId>spring-cloud-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <relativePath>../../parent-boot-3</relativePath>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
@@ -61,10 +62,6 @@
             <artifactId>hibernate-validator-cdi</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
@@ -119,6 +116,7 @@
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <redis.version>0.7.2</redis.version>
         <oauth2-oidc-sdk.version>9.19</oauth2-oidc-sdk.version>
+        <spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxyClientAddressResolver.java
similarity index 92%
rename from spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java
rename to spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxyClientAddressResolver.java
index 25b1fbcf1f..1abdeb3275 100644
--- a/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java
+++ b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxyClientAddressResolver.java
@@ -11,7 +11,7 @@ import java.net.InetSocketAddress;
 
 @Primary
 @Component
-public class ProxiedClientAddressResolver implements KeyResolver {
+public class ProxyClientAddressResolver implements KeyResolver {
     @Override
     public Mono<String> resolve(ServerWebExchange exchange) {
         XForwardedRemoteAddressResolver resolver = XForwardedRemoteAddressResolver.maxTrustedIndex(1);