diff --git a/pact/pact-feign-consumer/.gitignore b/deprecated/pact-feign-consumer/.gitignore similarity index 100% rename from pact/pact-feign-consumer/.gitignore rename to deprecated/pact-feign-consumer/.gitignore diff --git a/pact/pact-feign-consumer/README.md b/deprecated/pact-feign-consumer/README.md similarity index 100% rename from pact/pact-feign-consumer/README.md rename to deprecated/pact-feign-consumer/README.md diff --git a/pact/pact-feign-consumer/build.gradle b/deprecated/pact-feign-consumer/build.gradle similarity index 100% rename from pact/pact-feign-consumer/build.gradle rename to deprecated/pact-feign-consumer/build.gradle diff --git a/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar b/deprecated/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar rename to deprecated/pact-feign-consumer/gradle/wrapper/gradle-wrapper.jar diff --git a/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties b/deprecated/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties rename to deprecated/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties diff --git a/pact/pact-feign-consumer/gradlew b/deprecated/pact-feign-consumer/gradlew similarity index 100% rename from pact/pact-feign-consumer/gradlew rename to deprecated/pact-feign-consumer/gradlew diff --git a/pact/pact-feign-consumer/gradlew.bat b/deprecated/pact-feign-consumer/gradlew.bat similarity index 100% rename from pact/pact-feign-consumer/gradlew.bat rename to deprecated/pact-feign-consumer/gradlew.bat diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/Address.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/Address.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/Address.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/Address.java diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/Customer.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/Customer.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/Customer.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/Customer.java diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/CustomerClient.java diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/DemoApplication.java diff --git a/pact/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java b/deprecated/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java similarity index 100% rename from pact/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java rename to deprecated/pact-feign-consumer/src/main/java/com/example/demo/FeignConfiguration.java diff --git a/pact/pact-feign-consumer/src/main/resources/application.yml b/deprecated/pact-feign-consumer/src/main/resources/application.yml similarity index 100% rename from pact/pact-feign-consumer/src/main/resources/application.yml rename to deprecated/pact-feign-consumer/src/main/resources/application.yml diff --git a/pact/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java b/deprecated/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java similarity index 100% rename from pact/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java rename to deprecated/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java diff --git a/pact/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java b/deprecated/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java similarity index 100% rename from pact/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java rename to deprecated/pact-feign-consumer/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/pact/pact-spring-data-rest-provider/.gitignore b/deprecated/pact-spring-data-rest-provider/.gitignore similarity index 100% rename from pact/pact-spring-data-rest-provider/.gitignore rename to deprecated/pact-spring-data-rest-provider/.gitignore diff --git a/pact/pact-spring-data-rest-provider/README.md b/deprecated/pact-spring-data-rest-provider/README.md similarity index 100% rename from pact/pact-spring-data-rest-provider/README.md rename to deprecated/pact-spring-data-rest-provider/README.md diff --git a/pact/pact-spring-data-rest-provider/build.gradle b/deprecated/pact-spring-data-rest-provider/build.gradle similarity index 100% rename from pact/pact-spring-data-rest-provider/build.gradle rename to deprecated/pact-spring-data-rest-provider/build.gradle diff --git a/pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar b/deprecated/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar rename to deprecated/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.jar diff --git a/pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties b/deprecated/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from pact/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties rename to deprecated/pact-spring-data-rest-provider/gradle/wrapper/gradle-wrapper.properties diff --git a/pact/pact-spring-data-rest-provider/gradlew b/deprecated/pact-spring-data-rest-provider/gradlew similarity index 100% rename from pact/pact-spring-data-rest-provider/gradlew rename to deprecated/pact-spring-data-rest-provider/gradlew diff --git a/pact/pact-spring-data-rest-provider/gradlew.bat b/deprecated/pact-spring-data-rest-provider/gradlew.bat similarity index 100% rename from pact/pact-spring-data-rest-provider/gradlew.bat rename to deprecated/pact-spring-data-rest-provider/gradlew.bat diff --git a/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java b/deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java rename to deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/Address.java diff --git a/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java b/deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java rename to deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/AddressRepository.java diff --git a/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java b/deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java rename to deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/Customer.java diff --git a/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java b/deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java rename to deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/CustomerRepository.java diff --git a/pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java b/deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java rename to deprecated/pact-spring-data-rest-provider/src/main/java/com/example/demo/DemoApplication.java diff --git a/pact/pact-spring-data-rest-provider/src/main/resources/application.properties b/deprecated/pact-spring-data-rest-provider/src/main/resources/application.properties similarity index 100% rename from pact/pact-spring-data-rest-provider/src/main/resources/application.properties rename to deprecated/pact-spring-data-rest-provider/src/main/resources/application.properties diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseState.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStateHolder.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/DatabaseStatesInitializer.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactDatabaseStatesAutoConfiguration.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/PactProperties.java diff --git a/pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java b/deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java rename to deprecated/pact-spring-data-rest-provider/src/test/java/com/example/framework/SpringBootStarter.java diff --git a/pact/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories b/deprecated/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories rename to deprecated/pact-spring-data-rest-provider/src/test/resources/META-INF/spring.factories diff --git a/pact/pact-spring-data-rest-provider/src/test/resources/address-collection.sql b/deprecated/pact-spring-data-rest-provider/src/test/resources/address-collection.sql similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/resources/address-collection.sql rename to deprecated/pact-spring-data-rest-provider/src/test/resources/address-collection.sql diff --git a/pact/pact-spring-data-rest-provider/src/test/resources/application-pact.properties b/deprecated/pact-spring-data-rest-provider/src/test/resources/application-pact.properties similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/resources/application-pact.properties rename to deprecated/pact-spring-data-rest-provider/src/test/resources/application-pact.properties diff --git a/pact/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql b/deprecated/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql rename to deprecated/pact-spring-data-rest-provider/src/test/resources/initial-schema.sql diff --git a/pact/pact-spring-data-rest-provider/src/test/resources/single-address.sql b/deprecated/pact-spring-data-rest-provider/src/test/resources/single-address.sql similarity index 100% rename from pact/pact-spring-data-rest-provider/src/test/resources/single-address.sql rename to deprecated/pact-spring-data-rest-provider/src/test/resources/single-address.sql diff --git a/settings.gradle b/settings.gradle index 9119678..0548f2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,8 +7,8 @@ include 'spring-cloud:sleuth-upstream-service' include 'spring-cloud:spring-cloud-contract-provider' include 'spring-cloud:spring-cloud-contract-consumer' -include 'pact:pact-feign-consumer' // must run before pact-spring-data-rest-provider -include 'pact:pact-spring-data-rest-provider' +include 'deprecated:pact-feign-consumer' // must run before pact-spring-data-rest-provider +include 'deprecated:pact-spring-data-rest-provider' include 'pact:pact-spring-provider' diff --git a/spring-boot/modular/application/src/main/java/io/reflectoring/application/ModularApplication.java b/spring-boot/modular/application/src/main/java/io/reflectoring/application/ModularApplication.java index 4644b6b..575ddb8 100644 --- a/spring-boot/modular/application/src/main/java/io/reflectoring/application/ModularApplication.java +++ b/spring-boot/modular/application/src/main/java/io/reflectoring/application/ModularApplication.java @@ -1,12 +1,11 @@ package io.reflectoring.application; -import io.reflectoring.booking.BookingModuleConfiguration; +import io.reflectoring.booking.EnableBookingModule; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; @SpringBootApplication -@Import(BookingModuleConfiguration.class) +@EnableBookingModule public class ModularApplication { public static void main(String[] args) { diff --git a/spring-boot/modular/booking-module/src/main/java/io/reflectoring/booking/EnableBookingModule.java b/spring-boot/modular/booking-module/src/main/java/io/reflectoring/booking/EnableBookingModule.java new file mode 100644 index 0000000..5be94a2 --- /dev/null +++ b/spring-boot/modular/booking-module/src/main/java/io/reflectoring/booking/EnableBookingModule.java @@ -0,0 +1,14 @@ +package io.reflectoring.booking; + +import java.lang.annotation.*; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +@Import(BookingModuleConfiguration.class) +@Configuration +public @interface EnableBookingModule { +} diff --git a/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.jar b/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.jar differ diff --git a/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..52dd1f0 --- /dev/null +++ b/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip