From 46007cd5155c0a3e0d130210fa95f000c930839e Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Sun, 12 Dec 2021 17:21:57 +0530 Subject: [PATCH] JAVA-8366: Split or move spring-boot-annotations module --- spring-boot-modules/pom.xml | 1 + .../spring-boot-annotations-2/README.md | 8 +++++ .../spring-boot-annotations-2/pom.xml | 33 +++++++++++++++++++ .../AdditionalWebConfiguration.java | 0 .../conditional/ConditionalUtils.java | 0 .../DevEnvLoggingConfiguration.java | 0 .../conditional/IsDevEnvCondition.java | 0 .../conditional/IsWindowsCondition.java | 0 .../conditional/Java8Condition.java | 0 .../conditional/Java8DependedService.java | 0 .../annotations/conditional/Java8OrJava9.java | 0 .../conditional/Java9Condition.java | 0 .../conditional/LoggingService.java | 0 .../ConditionalTestConfiguration.java | 0 .../DevEnvLoggingConfigurationUnitTest.java | 0 .../IsDevEnvConditionUnitTest.java | 0 .../IsWindowsConditionUnitTest.java | 0 .../conditional/Java8ConditionUnitTest.java | 0 .../conditional/Java9ConditionUnitTest.java | 0 .../spring-boot-annotations/README.md | 2 +- .../EmployeeApplicationUnitTest.java | 0 .../service/AuthApplicationUnitTest.java | 0 .../AbstractsAnnotatedTestConfiguration.java | 0 ...reteClassesAnnotatedTestConfiguration.java | 0 .../InterfacesAnnotatedTestConfiguration.java | 0 25 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 spring-boot-modules/spring-boot-annotations-2/README.md create mode 100644 spring-boot-modules/spring-boot-annotations-2/pom.xml rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/AdditionalWebConfiguration.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/ConditionalUtils.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/main/java/com/baeldung/annotations/conditional/LoggingService.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/ConditionalTestConfiguration.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/DevEnvLoggingConfigurationUnitTest.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/IsDevEnvConditionUnitTest.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/IsWindowsConditionUnitTest.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/Java8ConditionUnitTest.java (100%) rename spring-boot-modules/{spring-boot-annotations => spring-boot-annotations-2}/src/test/java/com/baeldung/annotations/conditional/Java9ConditionUnitTest.java (100%) rename spring-boot-modules/spring-boot-annotations/src/test/java/{com.baeldung.annotations => com/baeldung/annotations}/EmployeeApplicationUnitTest.java (100%) rename spring-boot-modules/spring-boot-annotations/src/test/java/{com.baeldung.annotations => com/baeldung/annotations}/service/AuthApplicationUnitTest.java (100%) rename spring-boot-modules/spring-boot-annotations/src/test/java/{com.baeldung.annotations => com/baeldung/annotations}/service/config/AbstractsAnnotatedTestConfiguration.java (100%) rename spring-boot-modules/spring-boot-annotations/src/test/java/{com.baeldung.annotations => com/baeldung/annotations}/service/config/ConcreteClassesAnnotatedTestConfiguration.java (100%) rename spring-boot-modules/spring-boot-annotations/src/test/java/{com.baeldung.annotations => com/baeldung/annotations}/service/config/InterfacesAnnotatedTestConfiguration.java (100%) diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 9e0c49a12d..b0a9f41acc 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -22,6 +22,7 @@ spring-boot-admin spring-boot-angular spring-boot-annotations + spring-boot-annotations-2 spring-boot-artifacts spring-boot-artifacts-2 spring-boot-autoconfiguration diff --git a/spring-boot-modules/spring-boot-annotations-2/README.md b/spring-boot-modules/spring-boot-annotations-2/README.md new file mode 100644 index 0000000000..991c771986 --- /dev/null +++ b/spring-boot-modules/spring-boot-annotations-2/README.md @@ -0,0 +1,8 @@ +## Spring Boot Annotations + +This module contains articles about Spring Boot annotations + +### Relevant Articles: + +- [Spring Conditional Annotations](https://www.baeldung.com/spring-conditional-annotations) +- More articles: [[<-- prev]](/spring-boot-modules/spring-boot-annotations) diff --git a/spring-boot-modules/spring-boot-annotations-2/pom.xml b/spring-boot-modules/spring-boot-annotations-2/pom.xml new file mode 100644 index 0000000000..db70dcd6d2 --- /dev/null +++ b/spring-boot-modules/spring-boot-annotations-2/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + spring-boot-annotations-2 + war + spring-boot-annotations-2 + + + com.baeldung.spring-boot-modules + spring-boot-modules + 1.0.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-autoconfigure + + + + org.mockito + mockito-inline + test + + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/AdditionalWebConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/AdditionalWebConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/AdditionalWebConfiguration.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/AdditionalWebConfiguration.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/ConditionalUtils.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/ConditionalUtils.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/ConditionalUtils.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/ConditionalUtils.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/DevEnvLoggingConfiguration.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/IsDevEnvCondition.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/IsWindowsCondition.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8Condition.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8DependedService.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java8OrJava9.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/Java9Condition.java diff --git a/spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java b/spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/LoggingService.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/conditional/LoggingService.java rename to spring-boot-modules/spring-boot-annotations-2/src/main/java/com/baeldung/annotations/conditional/LoggingService.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/ConditionalTestConfiguration.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/ConditionalTestConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/ConditionalTestConfiguration.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/ConditionalTestConfiguration.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/DevEnvLoggingConfigurationUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/DevEnvLoggingConfigurationUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/DevEnvLoggingConfigurationUnitTest.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/DevEnvLoggingConfigurationUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/IsDevEnvConditionUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/IsDevEnvConditionUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/IsDevEnvConditionUnitTest.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/IsDevEnvConditionUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/IsWindowsConditionUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/IsWindowsConditionUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/IsWindowsConditionUnitTest.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/IsWindowsConditionUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/Java8ConditionUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/Java8ConditionUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/Java8ConditionUnitTest.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/Java8ConditionUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/Java9ConditionUnitTest.java b/spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/Java9ConditionUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/conditional/Java9ConditionUnitTest.java rename to spring-boot-modules/spring-boot-annotations-2/src/test/java/com/baeldung/annotations/conditional/Java9ConditionUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/README.md b/spring-boot-modules/spring-boot-annotations/README.md index 9742661f30..34d0283b48 100644 --- a/spring-boot-modules/spring-boot-annotations/README.md +++ b/spring-boot-modules/spring-boot-annotations/README.md @@ -11,4 +11,4 @@ This module contains articles about Spring Boot annotations - [Spring Bean Annotations](https://www.baeldung.com/spring-bean-annotations) - [Difference Between @ComponentScan and @EnableAutoConfiguration in Spring Boot](https://www.baeldung.com/spring-componentscan-vs-enableautoconfiguration) - [Where Should the Spring @Service Annotation Be Kept?](https://www.baeldung.com/spring-service-annotation-placement) -- [Spring Conditional Annotations](https://www.baeldung.com/spring-conditional-annotations) +- More articles: [[next -->]](/spring-boot-modules/spring-boot-annotations-2) diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/EmployeeApplicationUnitTest.java b/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/EmployeeApplicationUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/EmployeeApplicationUnitTest.java rename to spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/EmployeeApplicationUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/AuthApplicationUnitTest.java b/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/AuthApplicationUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/AuthApplicationUnitTest.java rename to spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/AuthApplicationUnitTest.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/AbstractsAnnotatedTestConfiguration.java b/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/AbstractsAnnotatedTestConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/AbstractsAnnotatedTestConfiguration.java rename to spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/AbstractsAnnotatedTestConfiguration.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/ConcreteClassesAnnotatedTestConfiguration.java b/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/ConcreteClassesAnnotatedTestConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/ConcreteClassesAnnotatedTestConfiguration.java rename to spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/ConcreteClassesAnnotatedTestConfiguration.java diff --git a/spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/InterfacesAnnotatedTestConfiguration.java b/spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/InterfacesAnnotatedTestConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-annotations/src/test/java/com.baeldung.annotations/service/config/InterfacesAnnotatedTestConfiguration.java rename to spring-boot-modules/spring-boot-annotations/src/test/java/com/baeldung/annotations/service/config/InterfacesAnnotatedTestConfiguration.java