From 49b973566c2a9236dd0acfe62230558e6e6d44c1 Mon Sep 17 00:00:00 2001 From: DOHA Date: Sun, 29 Jan 2017 17:19:25 +0200 Subject: [PATCH] rename resource services --- spring-cloud/spring-cloud-rest/pom.xml | 4 ++-- .../pom.xml | 6 +++--- .../src/main/java/org/baeldung/BooksApiApplication.java} | 4 ++-- .../src/main/java/org/baeldung/SessionConfig.java | 0 .../java/org/baeldung/persistence/dao/BookRepository.java | 0 .../src/main/java/org/baeldung/persistence/model/Book.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/test/java/org/baeldung/RestApiLiveTest.java | 2 +- .../src/test/java/org/baeldung/SessionLiveTest.java | 2 +- .../org/baeldung/SpringCloudRestClientApplicationTests.java | 0 .../src/test/resources/application.properties | 0 .../pom.xml | 6 +++--- .../main/java/org/baeldung/BookReviewsApiApplication.java} | 4 ++-- .../src/main/java/org/baeldung/SessionConfig.java | 0 .../org/baeldung/persistence/dao/BookReviewRepository.java | 0 .../java/org/baeldung/persistence/model/BookReview.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/test/java/org/baeldung/RestApiLiveTest.java | 2 +- .../org/baeldung/SpringCloudRestClientApplicationTests.java | 0 .../src/test/resources/application.properties | 0 20 files changed, 15 insertions(+), 15 deletions(-) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/pom.xml (95%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2/src/main/java/org/baeldung/SpringCloudRestClientApplication.java => spring-cloud-rest-books-api/src/main/java/org/baeldung/BooksApiApplication.java} (71%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/main/java/org/baeldung/SessionConfig.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/main/java/org/baeldung/persistence/dao/BookRepository.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/main/java/org/baeldung/persistence/model/Book.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/main/resources/bootstrap.properties (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/test/java/org/baeldung/RestApiLiveTest.java (97%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/test/java/org/baeldung/SessionLiveTest.java (94%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1 => spring-cloud-rest-books-api}/src/test/resources/application.properties (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/pom.xml (95%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-1/src/main/java/org/baeldung/SpringCloudRestClientApplication.java => spring-cloud-rest-reviews-api/src/main/java/org/baeldung/BookReviewsApiApplication.java} (71%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/main/java/org/baeldung/SessionConfig.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/main/java/org/baeldung/persistence/dao/BookReviewRepository.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/main/java/org/baeldung/persistence/model/BookReview.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/main/resources/bootstrap.properties (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/test/java/org/baeldung/RestApiLiveTest.java (97%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java (100%) rename spring-cloud/spring-cloud-rest/{spring-cloud-rest-client-2 => spring-cloud-rest-reviews-api}/src/test/resources/application.properties (100%) diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud/spring-cloud-rest/pom.xml index 376ce96b95..70d9c8e4c7 100644 --- a/spring-cloud/spring-cloud-rest/pom.xml +++ b/spring-cloud/spring-cloud-rest/pom.xml @@ -9,8 +9,8 @@ spring-cloud-rest-config spring-cloud-rest-server - spring-cloud-rest-client-1 - spring-cloud-rest-client-2 + spring-cloud-rest-books-api + spring-cloud-rest-reviews-api pom diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml index ac878d1652..c0555842f4 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml @@ -4,12 +4,12 @@ 4.0.0 org.baeldung - spring-cloud-rest-client-1 + spring-cloud-rest-books-api 0.0.1-SNAPSHOT jar - spring-cloud-rest-client-1 - Client Service for books + spring-cloud-rest-books-api + Simple books API org.springframework.boot diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/SpringCloudRestClientApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/BooksApiApplication.java similarity index 71% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/SpringCloudRestClientApplication.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/BooksApiApplication.java index a13aaa54bc..3a843ba3fb 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/SpringCloudRestClientApplication.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/BooksApiApplication.java @@ -6,9 +6,9 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; @SpringBootApplication @EnableEurekaClient -public class SpringCloudRestClientApplication { +public class BooksApiApplication { public static void main(String[] args) { - SpringApplication.run(SpringCloudRestClientApplication.class, args); + SpringApplication.run(BooksApiApplication.class, args); } } diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/SessionConfig.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/SessionConfig.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/persistence/dao/BookRepository.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/persistence/dao/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/persistence/dao/BookRepository.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/persistence/dao/BookRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/persistence/model/Book.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/persistence/model/Book.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/persistence/model/Book.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/org/baeldung/persistence/model/Book.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/RestApiLiveTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/RestApiLiveTest.java similarity index 97% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/RestApiLiveTest.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/RestApiLiveTest.java index 87d57fc62e..830ec96e08 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/RestApiLiveTest.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/RestApiLiveTest.java @@ -19,7 +19,7 @@ import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { SpringCloudRestClientApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) +@SpringBootTest(classes = { BooksApiApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) public class RestApiLiveTest { private static final String API_URI = "http://localhost:8084/books"; diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/SessionLiveTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/SessionLiveTest.java similarity index 94% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/SessionLiveTest.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/SessionLiveTest.java index 8ec941046b..3e5fa4f046 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/SessionLiveTest.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/SessionLiveTest.java @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringRunner; import redis.clients.jedis.Jedis; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { SpringCloudRestClientApplication.class, SessionConfig.class }, webEnvironment = WebEnvironment.DEFINED_PORT) +@SpringBootTest(classes = { BooksApiApplication.class, SessionConfig.class }, webEnvironment = WebEnvironment.DEFINED_PORT) public class SessionLiveTest { private Jedis jedis; diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/test/resources/application.properties rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml index 6645e1382c..47958569c6 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml @@ -4,12 +4,12 @@ 4.0.0 org.baeldung - spring-cloud-rest-client-2 + spring-cloud-rest-reviews-api 0.0.1-SNAPSHOT jar - spring-cloud-rest-client-2 - Client Service for book reviews + spring-cloud-rest-reviews-api + Simple reviews API org.springframework.boot diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/SpringCloudRestClientApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/BookReviewsApiApplication.java similarity index 71% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/SpringCloudRestClientApplication.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/BookReviewsApiApplication.java index a13aaa54bc..f3b05e95b1 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/java/org/baeldung/SpringCloudRestClientApplication.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/BookReviewsApiApplication.java @@ -6,9 +6,9 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; @SpringBootApplication @EnableEurekaClient -public class SpringCloudRestClientApplication { +public class BookReviewsApiApplication { public static void main(String[] args) { - SpringApplication.run(SpringCloudRestClientApplication.class, args); + SpringApplication.run(BookReviewsApiApplication.class, args); } } diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/SessionConfig.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/SessionConfig.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/persistence/dao/BookReviewRepository.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/persistence/dao/BookReviewRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/persistence/dao/BookReviewRepository.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/persistence/dao/BookReviewRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/persistence/model/BookReview.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/persistence/model/BookReview.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/java/org/baeldung/persistence/model/BookReview.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/org/baeldung/persistence/model/BookReview.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/java/org/baeldung/RestApiLiveTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/RestApiLiveTest.java similarity index 97% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/java/org/baeldung/RestApiLiveTest.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/RestApiLiveTest.java index d130552316..91f76d386a 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/java/org/baeldung/RestApiLiveTest.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/RestApiLiveTest.java @@ -19,7 +19,7 @@ import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { SpringCloudRestClientApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) +@SpringBootTest(classes = { BookReviewsApiApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) public class RestApiLiveTest { private static final String API_URI = "http://localhost:8085/reviews"; diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/SpringCloudRestClientApplicationTests.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/test/resources/application.properties rename to spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties