From 82b0125fa411539bdb048f6cbd765e8f072abe22 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 2 Jun 2022 17:08:37 +0530 Subject: [PATCH 1/3] JAVA-12418 Moved pending files to spring-cloud-modules --- .../docker-compose-restart-policy-swarm-mode.yml | 0 .../docker-compose-restart-policy.yml | 0 .../spring-cloud-netflix-sidecar/README.md | 0 .../spring-cloud-netflix-sidecar/echo-demo/pom.xml | 0 .../java/com/baeldung/cloud/echo/EchoApplication.java | 0 .../echo-demo/src/main/resources/application.yml | 0 .../java/com/baeldung/cloud/echo/SpringContextTest.java | 0 .../spring-cloud-netflix-sidecar/pom.xml | 0 .../sidecar-demo/nodejs/hello.js | 0 .../spring-cloud-netflix-sidecar/sidecar-demo/pom.xml | 0 .../com/baeldung/cloud/sidecar/SidecarApplication.java | 0 .../sidecar-demo/src/main/resources/application.yml | 0 .../com/baeldung/cloud/sidecar/SpringContextTest.java | 0 spring-cloud-modules/spring-cloud-openfeign/README.md | 9 ++------- spring-cloud/spring-cloud-openfeign/README.md | 3 --- 15 files changed, 2 insertions(+), 10 deletions(-) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose-restart-policy-swarm-mode.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose-restart-policy.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/echo-demo/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java (100%) delete mode 100644 spring-cloud/spring-cloud-openfeign/README.md diff --git a/spring-cloud/spring-cloud-docker/docker-compose-restart-policy-swarm-mode.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose-restart-policy-swarm-mode.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose-restart-policy-swarm-mode.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose-restart-policy-swarm-mode.yml diff --git a/spring-cloud/spring-cloud-docker/docker-compose-restart-policy.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose-restart-policy.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose-restart-policy.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose-restart-policy.yml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/README.md b/spring-cloud-modules/spring-cloud-netflix-sidecar/README.md similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/README.md rename to spring-cloud-modules/spring-cloud-netflix-sidecar/README.md diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/pom.xml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js b/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js rename to spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md index c1bd5ad43e..3aa8c20b24 100644 --- a/spring-cloud-modules/spring-cloud-openfeign/README.md +++ b/spring-cloud-modules/spring-cloud-openfeign/README.md @@ -1,8 +1,3 @@ -### Relevant Articles: -- [Introduction to Spring Cloud OpenFeign](https://www.baeldung.com/spring-cloud-openfeign) -- [Differences Between Netflix Feign and OpenFeign](https://www.baeldung.com/netflix-feign-vs-openfeign) -- [File Upload With Open Feign](https://www.baeldung.com/java-feign-file-upload) -- [Feign Logging Configuration](https://www.baeldung.com/java-feign-logging) -- [Provide an OAuth2 Token to a Feign Client](https://www.baeldung.com/spring-cloud-feign-oauth-token) -- [Retrieve Original Message From Feign ErrorDecoder](https://www.baeldung.com/feign-retrieve-original-message) +### Relevant Articles: +- [RequestLine with Feign Client](https://www.baeldung.com/feign-requestline) diff --git a/spring-cloud/spring-cloud-openfeign/README.md b/spring-cloud/spring-cloud-openfeign/README.md deleted file mode 100644 index 3aa8c20b24..0000000000 --- a/spring-cloud/spring-cloud-openfeign/README.md +++ /dev/null @@ -1,3 +0,0 @@ - -### Relevant Articles: -- [RequestLine with Feign Client](https://www.baeldung.com/feign-requestline) From d2e07395392d12e749b91e6e59301759ff2fa2bd Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 2 Jun 2022 17:11:50 +0530 Subject: [PATCH 2/3] Added missing articles --- spring-cloud-modules/spring-cloud-openfeign/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-cloud-modules/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md index 3aa8c20b24..77cd6d9f81 100644 --- a/spring-cloud-modules/spring-cloud-openfeign/README.md +++ b/spring-cloud-modules/spring-cloud-openfeign/README.md @@ -1,3 +1,10 @@ ### Relevant Articles: + +- [Introduction to Spring Cloud OpenFeign](https://www.baeldung.com/spring-cloud-openfeign) +- [Differences Between Netflix Feign and OpenFeign](https://www.baeldung.com/netflix-feign-vs-openfeign) +- [File Upload With Open Feign](https://www.baeldung.com/java-feign-file-upload) +- [Feign Logging Configuration](https://www.baeldung.com/java-feign-logging) +- [Provide an OAuth2 Token to a Feign Client](https://www.baeldung.com/spring-cloud-feign-oauth-token) +- [Retrieve Original Message From Feign ErrorDecoder](https://www.baeldung.com/feign-retrieve-original-message) - [RequestLine with Feign Client](https://www.baeldung.com/feign-requestline) From 5e168afb6948ca53ab1add14a3c0acbf38b4597d Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 2 Jun 2022 17:12:33 +0530 Subject: [PATCH 3/3] Update README.md --- spring-cloud-modules/spring-cloud-openfeign/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-modules/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md index 77cd6d9f81..a369da96da 100644 --- a/spring-cloud-modules/spring-cloud-openfeign/README.md +++ b/spring-cloud-modules/spring-cloud-openfeign/README.md @@ -1,4 +1,3 @@ - ### Relevant Articles: - [Introduction to Spring Cloud OpenFeign](https://www.baeldung.com/spring-cloud-openfeign)