diff --git a/settings.gradle b/settings.gradle index 8d20f20..e96ee16 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,6 @@ include 'spring-data-rest-springfox' // pact-feign-consumer must run before pact-spring-data-rest-provider because it creates a shared pact file include 'pact-feign-consumer' include 'pact-spring-data-rest-provider' -include 'sleuth-primary-service' -include 'sleuth-secondary-service' +include 'sleuth-downstream-service' +include 'sleuth-upstream-service' diff --git a/sleuth-primary-service/.gitignore b/sleuth-downstream-service/.gitignore similarity index 100% rename from sleuth-primary-service/.gitignore rename to sleuth-downstream-service/.gitignore diff --git a/sleuth-primary-service/README.md b/sleuth-downstream-service/README.md similarity index 100% rename from sleuth-primary-service/README.md rename to sleuth-downstream-service/README.md diff --git a/sleuth-primary-service/build.gradle b/sleuth-downstream-service/build.gradle similarity index 100% rename from sleuth-primary-service/build.gradle rename to sleuth-downstream-service/build.gradle diff --git a/sleuth-primary-service/gradle/wrapper/gradle-wrapper.jar b/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from sleuth-primary-service/gradle/wrapper/gradle-wrapper.jar rename to sleuth-downstream-service/gradle/wrapper/gradle-wrapper.jar diff --git a/sleuth-primary-service/gradle/wrapper/gradle-wrapper.properties b/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from sleuth-primary-service/gradle/wrapper/gradle-wrapper.properties rename to sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties diff --git a/sleuth-primary-service/gradlew b/sleuth-downstream-service/gradlew similarity index 100% rename from sleuth-primary-service/gradlew rename to sleuth-downstream-service/gradlew diff --git a/sleuth-primary-service/gradlew.bat b/sleuth-downstream-service/gradlew.bat similarity index 100% rename from sleuth-primary-service/gradlew.bat rename to sleuth-downstream-service/gradlew.bat diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/Address.java b/sleuth-downstream-service/src/main/java/com/example/demo/Address.java similarity index 100% rename from sleuth-secondary-service/src/main/java/com/example/demo/Address.java rename to sleuth-downstream-service/src/main/java/com/example/demo/Address.java diff --git a/sleuth-primary-service/src/main/java/com/example/demo/AddressClient.java b/sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java similarity index 100% rename from sleuth-primary-service/src/main/java/com/example/demo/AddressClient.java rename to sleuth-downstream-service/src/main/java/com/example/demo/AddressClient.java diff --git a/sleuth-primary-service/src/main/java/com/example/demo/Controller.java b/sleuth-downstream-service/src/main/java/com/example/demo/Controller.java similarity index 100% rename from sleuth-primary-service/src/main/java/com/example/demo/Controller.java rename to sleuth-downstream-service/src/main/java/com/example/demo/Controller.java diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/Customer.java b/sleuth-downstream-service/src/main/java/com/example/demo/Customer.java similarity index 100% rename from sleuth-secondary-service/src/main/java/com/example/demo/Customer.java rename to sleuth-downstream-service/src/main/java/com/example/demo/Customer.java diff --git a/sleuth-primary-service/src/main/java/com/example/demo/CustomerAndAddress.java b/sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java similarity index 100% rename from sleuth-primary-service/src/main/java/com/example/demo/CustomerAndAddress.java rename to sleuth-downstream-service/src/main/java/com/example/demo/CustomerAndAddress.java diff --git a/sleuth-primary-service/src/main/java/com/example/demo/CustomerClient.java b/sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java similarity index 100% rename from sleuth-primary-service/src/main/java/com/example/demo/CustomerClient.java rename to sleuth-downstream-service/src/main/java/com/example/demo/CustomerClient.java diff --git a/sleuth-primary-service/src/main/java/com/example/demo/DemoApplication.java b/sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from sleuth-primary-service/src/main/java/com/example/demo/DemoApplication.java rename to sleuth-downstream-service/src/main/java/com/example/demo/DemoApplication.java diff --git a/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java b/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java new file mode 100644 index 0000000..07e62bd --- /dev/null +++ b/sleuth-downstream-service/src/main/java/com/example/demo/FeignConfiguration.java @@ -0,0 +1,15 @@ +package com.example.demo; + +import feign.Logger; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignConfiguration { + + @Bean + public Logger.Level logLevel(){ + return Logger.Level.FULL; + } + +} diff --git a/sleuth-primary-service/src/main/resources/application.yml b/sleuth-downstream-service/src/main/resources/application.yml similarity index 100% rename from sleuth-primary-service/src/main/resources/application.yml rename to sleuth-downstream-service/src/main/resources/application.yml diff --git a/sleuth-primary-service/src/main/resources/bootstrap.properties b/sleuth-downstream-service/src/main/resources/bootstrap.properties similarity index 100% rename from sleuth-primary-service/src/main/resources/bootstrap.properties rename to sleuth-downstream-service/src/main/resources/bootstrap.properties diff --git a/sleuth-primary-service/src/main/resources/logback-spring.xml b/sleuth-downstream-service/src/main/resources/logback-spring.xml similarity index 100% rename from sleuth-primary-service/src/main/resources/logback-spring.xml rename to sleuth-downstream-service/src/main/resources/logback-spring.xml diff --git a/sleuth-secondary-service/.gitignore b/sleuth-upstream-service/.gitignore similarity index 100% rename from sleuth-secondary-service/.gitignore rename to sleuth-upstream-service/.gitignore diff --git a/sleuth-secondary-service/README.md b/sleuth-upstream-service/README.md similarity index 100% rename from sleuth-secondary-service/README.md rename to sleuth-upstream-service/README.md diff --git a/sleuth-secondary-service/build.gradle b/sleuth-upstream-service/build.gradle similarity index 100% rename from sleuth-secondary-service/build.gradle rename to sleuth-upstream-service/build.gradle diff --git a/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.jar b/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from sleuth-secondary-service/gradle/wrapper/gradle-wrapper.jar rename to sleuth-upstream-service/gradle/wrapper/gradle-wrapper.jar diff --git a/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.properties b/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from sleuth-secondary-service/gradle/wrapper/gradle-wrapper.properties rename to sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties diff --git a/sleuth-secondary-service/gradlew b/sleuth-upstream-service/gradlew similarity index 100% rename from sleuth-secondary-service/gradlew rename to sleuth-upstream-service/gradlew diff --git a/sleuth-secondary-service/gradlew.bat b/sleuth-upstream-service/gradlew.bat similarity index 100% rename from sleuth-secondary-service/gradlew.bat rename to sleuth-upstream-service/gradlew.bat diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/Address.java b/sleuth-upstream-service/src/main/java/com/example/demo/Address.java new file mode 100644 index 0000000..523f539 --- /dev/null +++ b/sleuth-upstream-service/src/main/java/com/example/demo/Address.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Address { + + private long id; + + private String street; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } +} diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/Controller.java b/sleuth-upstream-service/src/main/java/com/example/demo/Controller.java similarity index 100% rename from sleuth-secondary-service/src/main/java/com/example/demo/Controller.java rename to sleuth-upstream-service/src/main/java/com/example/demo/Controller.java diff --git a/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java b/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java new file mode 100644 index 0000000..7142577 --- /dev/null +++ b/sleuth-upstream-service/src/main/java/com/example/demo/Customer.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Customer { + + private long id; + + private String name; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/DemoApplication.java b/sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from sleuth-secondary-service/src/main/java/com/example/demo/DemoApplication.java rename to sleuth-upstream-service/src/main/java/com/example/demo/DemoApplication.java diff --git a/sleuth-secondary-service/src/main/resources/application.yml b/sleuth-upstream-service/src/main/resources/application.yml similarity index 100% rename from sleuth-secondary-service/src/main/resources/application.yml rename to sleuth-upstream-service/src/main/resources/application.yml diff --git a/sleuth-secondary-service/src/main/resources/bootstrap.properties b/sleuth-upstream-service/src/main/resources/bootstrap.properties similarity index 100% rename from sleuth-secondary-service/src/main/resources/bootstrap.properties rename to sleuth-upstream-service/src/main/resources/bootstrap.properties diff --git a/sleuth-secondary-service/src/main/resources/logback-spring.xml b/sleuth-upstream-service/src/main/resources/logback-spring.xml similarity index 100% rename from sleuth-secondary-service/src/main/resources/logback-spring.xml rename to sleuth-upstream-service/src/main/resources/logback-spring.xml