diff --git a/pom.xml b/pom.xml index 650827081e..054b687a28 100644 --- a/pom.xml +++ b/pom.xml @@ -841,8 +841,6 @@ spring-webflux-amqp - spring-zuul - static-analysis stripe structurizr @@ -1588,8 +1586,6 @@ spring-webflux-amqp - spring-zuul - static-analysis stripe structurizr diff --git a/spring-cloud/spring-cloud-zuul/README.md b/spring-cloud/spring-cloud-zuul/README.md index 834917f159..b8e1773930 100644 --- a/spring-cloud/spring-cloud-zuul/README.md +++ b/spring-cloud/spring-cloud-zuul/README.md @@ -1,2 +1,7 @@ +## Spring Cloud Zuul + +This module contains articles about Spring with Netflix Zuul + ### Relevant Articles: - [Rate Limiting in Spring Cloud Netflix Zuul](https://www.baeldung.com/spring-cloud-zuul-rate-limit) +- [Spring REST with a Zuul Proxy](https://www.baeldung.com/spring-rest-with-zuul-proxy) diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud/spring-cloud-zuul/pom.xml index 5d44ae9590..fe28dd1299 100644 --- a/spring-cloud/spring-cloud-zuul/pom.xml +++ b/spring-cloud/spring-cloud-zuul/pom.xml @@ -1,77 +1,80 @@ - 4.0.0 - com.baeldung.spring.cloud - spring-cloud-zuul - 0.0.1-SNAPSHOT - spring-cloud-zuul - jar - Demo project for Spring Boot + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung.spring.cloud + spring-cloud-zuul + 0.0.1-SNAPSHOT + spring-cloud-zuul + pom - + parent-boot-2 com.baeldung 0.0.1-SNAPSHOT ../../parent-boot-2 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-netflix-zuul - - - com.marcosbarbero.cloud - spring-cloud-zuul-ratelimit - 2.2.0.RELEASE - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database - h2 - + + spring-zuul-foos-resource + spring-zuul-ui + spring-zuul-rate-limiting + - - org.springframework.boot - spring-boot-starter-test - test - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-netflix-zuul + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-test + test + + - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + + + - - UTF-8 - UTF-8 - Finchley.SR1 + + UTF-8 + UTF-8 + Finchley.SR1 2.0.6.RELEASE - - + + diff --git a/spring-zuul/spring-zuul-foos-resource/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml similarity index 79% rename from spring-zuul/spring-zuul-foos-resource/pom.xml rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml index 4fe4e1dbbc..57e566657b 100644 --- a/spring-zuul/spring-zuul-foos-resource/pom.xml +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml @@ -1,14 +1,14 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-zuul-foos-resource spring-zuul-foos-resource war - com.baeldung - spring-zuul - 1.0.0-SNAPSHOT + com.baeldung.spring.cloud + spring-cloud-zuul + 0.0.1-SNAPSHOT diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java similarity index 93% rename from spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java index 77eabe771b..b1db6db87a 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java similarity index 82% rename from spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java index 1a45d20edb..b3af890d32 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/config/ResourceServerWebConfig.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @EnableWebMvc -@ComponentScan({ "org.baeldung.web.controller" }) +@ComponentScan({ "com.baeldung.web.controller" }) public class ResourceServerWebConfig implements WebMvcConfigurer { } diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/controller/FooController.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java similarity index 94% rename from spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/controller/FooController.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java index 486f858ab5..87f237b75c 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/controller/FooController.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java @@ -1,18 +1,18 @@ -package org.baeldung.web.controller; +package com.baeldung.web.controller; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.baeldung.web.dto.Foo; +import com.baeldung.web.dto.Foo; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; + @Controller public class FooController { diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/dto/Foo.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java similarity index 94% rename from spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/dto/Foo.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java index 9d26618e7f..107f982f98 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/main/java/org/baeldung/web/dto/Foo.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java @@ -1,4 +1,4 @@ -package org.baeldung.web.dto; +package com.baeldung.web.dto; public class Foo { private long id; diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties similarity index 100% rename from spring-zuul/spring-zuul-foos-resource/src/main/resources/application.properties rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties diff --git a/spring-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml similarity index 100% rename from spring-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml diff --git a/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java similarity index 84% rename from spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java index 623966373b..efa29b1431 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.config.ResourceServerApplication; +import com.baeldung.config.ResourceServerApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java similarity index 83% rename from spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java index 2a57d7aa07..5503a5a738 100644 --- a/spring-zuul/spring-zuul-foos-resource/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java @@ -1,6 +1,6 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.config.ResourceServerApplication; +import com.baeldung.config.ResourceServerApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml new file mode 100644 index 0000000000..af961537f9 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml @@ -0,0 +1,58 @@ + + + 4.0.0 + spring-zuul-rate-limiting + 0.0.1-SNAPSHOT + spring-zuul-rate-limiting + jar + + + com.baeldung.spring.cloud + spring-cloud-zuul + 0.0.1-SNAPSHOT + + + + + com.marcosbarbero.cloud + spring-cloud-zuul-ratelimit + ${rate.limit.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + spring-zuul-rate-limiting + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + UTF-8 + UTF-8 + Finchley.SR1 + 2.0.6.RELEASE + 2.2.0.RELEASE + + + diff --git a/spring-cloud/spring-cloud-zuul/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java diff --git a/spring-cloud/spring-cloud-zuul/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/main/resources/application.yml rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerUnitTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerUnitTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerUnitTest.java diff --git a/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java diff --git a/spring-zuul/spring-zuul-ui/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml similarity index 64% rename from spring-zuul/spring-zuul-ui/pom.xml rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml index 619e6c6b78..c5854b5ba5 100644 --- a/spring-zuul/spring-zuul-ui/pom.xml +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml @@ -1,27 +1,17 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-zuul-ui spring-zuul-ui war - com.baeldung - spring-zuul - 1.0.0-SNAPSHOT + com.baeldung.spring.cloud + spring-cloud-zuul + 0.0.1-SNAPSHOT - - org.springframework.cloud - spring-cloud-starter-netflix-zuul - ${spring-cloud.version} - - - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/CustomZuulFilter.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java similarity index 95% rename from spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/CustomZuulFilter.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java index 826ac64e9f..3d22cfa6e3 100644 --- a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/CustomZuulFilter.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.stereotype.Component; diff --git a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java similarity index 94% rename from spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java index d3e13639ef..0772f9cab4 100644 --- a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiApplication.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java similarity index 98% rename from spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java index 7cda1f0e95..1aa4205a77 100644 --- a/spring-zuul/spring-zuul-ui/src/main/java/org/baeldung/config/UiWebConfig.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package com.baeldung.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-zuul/spring-zuul-ui/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml similarity index 100% rename from spring-zuul/spring-zuul-ui/src/main/resources/application.yml rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml diff --git a/spring-zuul/spring-zuul-ui/src/main/resources/logback.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml similarity index 100% rename from spring-zuul/spring-zuul-ui/src/main/resources/logback.xml rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml diff --git a/spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html old mode 100755 new mode 100644 similarity index 100% rename from spring-zuul/spring-zuul-ui/src/main/resources/templates/index.html rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html diff --git a/spring-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js similarity index 100% rename from spring-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java similarity index 85% rename from spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java index a3d49627e5..694708e9f1 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java @@ -1,6 +1,6 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.config.UiApplication; +import com.baeldung.config.UiApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java similarity index 85% rename from spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java index fd35ec0841..322db6b39b 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/SpringContextTest.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java @@ -1,6 +1,6 @@ -package org.baeldung; +package com.baeldung; -import org.baeldung.config.UiApplication; +import com.baeldung.config.UiApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java similarity index 96% rename from spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java index 38563cdbe8..cb7c0e76dc 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java @@ -1,11 +1,10 @@ -package org.baeldung.web; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; +package com.baeldung.web; import io.restassured.RestAssured; import io.restassured.response.Response; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class LiveTest { diff --git a/spring-zuul/spring-zuul-ui/src/test/resources/.gitignore b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore similarity index 100% rename from spring-zuul/spring-zuul-ui/src/test/resources/.gitignore rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore diff --git a/spring-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties similarity index 100% rename from spring-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties rename to spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties diff --git a/spring-zuul/README.md b/spring-zuul/README.md deleted file mode 100644 index e1067ebb9f..0000000000 --- a/spring-zuul/README.md +++ /dev/null @@ -1,6 +0,0 @@ -## Spring Zuul - -This module contains articles about Spring with Netflix Zuul - -### Relevant Articles: -- [Spring REST with a Zuul Proxy](https://www.baeldung.com/spring-rest-with-zuul-proxy) diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml deleted file mode 100644 index a613f51c3f..0000000000 --- a/spring-zuul/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - 4.0.0 - com.baeldung - spring-zuul - 1.0.0-SNAPSHOT - spring-zuul - pom - - - parent-boot-2 - com.baeldung - 0.0.1-SNAPSHOT - ../parent-boot-2 - - - - spring-zuul-foos-resource - spring-zuul-ui - - - - spring-zuul - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - - - - - - - - 2.1.0.RELEASE - - - \ No newline at end of file