From de3aeccfe61f9aa5d51c215c2baf9a28b41f1ca2 Mon Sep 17 00:00:00 2001 From: timis1 <12120641+timis1@users.noreply.github.com> Date: Sat, 24 Feb 2024 16:04:01 +0200 Subject: [PATCH] JAVA-30669 Upgrade spring-cloud-bootstrap/gateway-2 to latest versions (#15898) --- .../spring-cloud-bootstrap/gateway-2/pom.xml | 36 ++++--------------- .../GoldenCustomerRoutePredicateFactory.java | 8 +---- .../CustomPredicatesApplicationLiveTest.java | 7 ++-- .../introduction/SpringContextTest.java | 3 -- 4 files changed, 10 insertions(+), 44 deletions(-) diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml index 3d64edc338..122b7c180d 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml +++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/pom.xml @@ -9,46 +9,24 @@ com.baeldung - parent-boot-2 + parent-boot-3 0.0.1-SNAPSHOT - ../../../parent-boot-2 + ../../../parent-boot-3 - - - - org.junit - junit-bom - ${junit-jupiter.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-dependencies.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - org.springframework.cloud spring-cloud-starter-gateway + ${spring-cloud-starter-gateway.version} - 2021.0.3 + 3.2.2 + 5.10.2 + 4.1.1 + com.baeldung.springcloudgateway.introduction.IntroductionGatewayApplication \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java index cb5c3a0b50..0134a02f75 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java +++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Predicate; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory; import org.springframework.http.HttpCookie; @@ -29,13 +29,11 @@ public class GoldenCustomerRoutePredicateFactory extends AbstractRoutePredicateF this.goldenCustomerService = goldenCustomerService; } - @Override public List shortcutFieldOrder() { return Arrays.asList("isGolden","customerIdCookie"); } - @Override public Predicate apply(Config config) { @@ -94,9 +92,5 @@ public class GoldenCustomerRoutePredicateFactory extends AbstractRoutePredicateF public void setCustomerIdCookie(String customerIdCookie) { this.customerIdCookie = customerIdCookie; } - - - } - } diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java index d9988ceb5e..526c6dac44 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java +++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java @@ -1,20 +1,17 @@ package com.baeldung.springcloudgateway.custompredicates; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; import java.net.URI; import org.json.JSONException; import org.json.JSONObject; -import org.json.JSONTokener; -import org.junit.Before; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; @@ -29,7 +26,7 @@ public class CustomPredicatesApplicationLiveTest { @LocalServerPort String serverPort; - + @Autowired private TestRestTemplate restTemplate; diff --git a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java index 1550265f22..74ea969d40 100644 --- a/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java +++ b/spring-cloud-modules/spring-cloud-bootstrap/gateway-2/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java @@ -3,9 +3,6 @@ package com.baeldung.springcloudgateway.introduction; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import com.baeldung.springcloudgateway.introduction.IntroductionGatewayApplication; - - @SpringBootTest(classes = IntroductionGatewayApplication.class) public class SpringContextTest {