From a5fa999031f8212a5e8ed061da7a534d46c59eaa Mon Sep 17 00:00:00 2001 From: anuragkumawat Date: Sat, 22 Apr 2023 13:23:07 +0530 Subject: [PATCH] JAVA-19964 Move code from spring-core-5 to spring-core-2 (#13856) * JAVA-19964 Move code from spring-core-5 to spring-core-2 * JAVA-19964 Move code from spring-core-6 to spring-core-2 * JAVA-19964 Move code from spring-core-4 to spring-core-3 --- pom.xml | 4 - spring-core-2/.gitignore | 13 --- spring-core-2/README.md | 5 + spring-core-2/pom.xml | 41 ++++---- .../ApplicationContextProvider.java | 0 .../applicationcontext/ItemService.java | 0 .../baeldung/applicationcontext/MyBean.java | 0 .../component/autoproxying/DataCache.java | 0 ...ligibleForAutoProxyRandomIntProcessor.java | 0 ...ligibleForAutoProxyRandomIntProcessor.java | 0 .../component/autoproxying/RandomInt.java | 0 .../autoproxying/RandomIntGenerator.java | 0 .../ConcurrentRequestApplication.java | 0 .../baeldung/concurrentrequest/Product.java | 0 .../concurrentrequest/ProductController.java | 0 .../concurrentrequest/ProductService.java | 0 .../com/baeldung/concurrentrequest/Stock.java | 0 .../reinitializebean/ReinitializeBeanApp.java | 0 .../reinitializebean/cache/ConfigManager.java | 0 .../controller/ConfigController.java | 0 .../com/baeldung/version/VersionObtainer.java | 40 ++++---- .../src/main/resources/application.properties | 1 + .../src/main/resources/config.properties | 0 .../ApplicationContextProviderUnitTest.java | 0 .../applicationcontext/MyBeanUnitTest.java | 0 .../applicationcontext/TestContextConfig.java | 0 ...ligibleForAutoProxyingIntegrationTest.java | 0 .../autoproxying/MemoryLogAppender.java | 0 ...ligibleForAutoProxyingIntegrationTest.java | 0 .../ConcurrentRequestManualTest.java | 0 .../version/VersionObtainerUnitTest.java | 60 ++++++------ spring-core-3/README.md | 1 + .../applicationcontext/AccountConfig.java | 0 .../applicationcontext/AccountRepository.java | 0 .../applicationcontext/AccountService.java | 0 .../MyWebApplicationInitializer.java | 0 .../MyXmlWebApplicationInitializer.java | 0 .../applicationcontext/UserService.java | 0 .../ApplicationContextUnitTest.java | 0 .../account-bean-config.xml | 0 .../applicationcontext/user-bean-config.xml | 0 .../test/resources/config/messages.properties | 0 spring-core-4/README.md | 3 +- spring-core-5/README.md | 10 -- spring-core-5/pom.xml | 45 --------- .../src/main/resources/application.yml | 0 .../src/test/resources/application.yml | 0 .../src/test/resources/logback-test.xml | 12 --- spring-core-6/README.md | 5 - spring-core-6/pom.xml | 95 ------------------- .../src/main/resources/application.properties | 1 - 51 files changed, 75 insertions(+), 261 deletions(-) delete mode 100644 spring-core-2/.gitignore rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java (100%) rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/applicationcontext/ItemService.java (100%) rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/applicationcontext/MyBean.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/component/autoproxying/DataCache.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/component/autoproxying/RandomInt.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/concurrentrequest/Product.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/concurrentrequest/ProductController.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/concurrentrequest/ProductService.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/concurrentrequest/Stock.java (100%) rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java (100%) rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java (100%) rename {spring-core-6 => spring-core-2}/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java (100%) rename {spring-core-5 => spring-core-2}/src/main/java/com/baeldung/version/VersionObtainer.java (96%) rename {spring-core-6 => spring-core-2}/src/main/resources/config.properties (100%) rename {spring-core-6 => spring-core-2}/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java (100%) rename {spring-core-6 => spring-core-2}/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java (100%) rename {spring-core-6 => spring-core-2}/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java (100%) rename {spring-core-5 => spring-core-2}/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java (100%) rename {spring-core-5 => spring-core-2}/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java (100%) rename {spring-core-5 => spring-core-2}/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java (100%) rename {spring-core-5 => spring-core-2}/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java (100%) rename {spring-core-5 => spring-core-2}/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java (96%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/AccountConfig.java (100%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/AccountRepository.java (100%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/AccountService.java (100%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java (100%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java (100%) rename {spring-core-4 => spring-core-3}/src/main/java/com/baeldung/applicationcontext/UserService.java (100%) rename {spring-core-4 => spring-core-3}/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java (100%) rename {spring-core-4 => spring-core-3}/src/test/resources/applicationcontext/account-bean-config.xml (100%) rename {spring-core-4 => spring-core-3}/src/test/resources/applicationcontext/user-bean-config.xml (100%) rename {spring-core-4 => spring-core-3}/src/test/resources/config/messages.properties (100%) delete mode 100644 spring-core-5/README.md delete mode 100644 spring-core-5/pom.xml delete mode 100644 spring-core-5/src/main/resources/application.yml delete mode 100644 spring-core-5/src/test/resources/application.yml delete mode 100644 spring-core-5/src/test/resources/logback-test.xml delete mode 100644 spring-core-6/README.md delete mode 100644 spring-core-6/pom.xml delete mode 100644 spring-core-6/src/main/resources/application.properties diff --git a/pom.xml b/pom.xml index 9cab85f40b..bef7603cff 100644 --- a/pom.xml +++ b/pom.xml @@ -796,7 +796,6 @@ custom-pmd - spring-core-6 data-structures ddd-contexts jackson-modules @@ -919,7 +918,6 @@ spring-activiti spring-core-2 spring-core-3 - spring-core-5 spring-di-3 spring-cucumber @@ -1049,7 +1047,6 @@ spring-aop spring-aop-2 custom-pmd - spring-core-6 data-structures ddd-contexts jackson-modules @@ -1175,7 +1172,6 @@ spring-activiti spring-core-2 spring-core-3 - spring-core-5 spring-di-3 spring-cucumber diff --git a/spring-core-2/.gitignore b/spring-core-2/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/spring-core-2/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file diff --git a/spring-core-2/README.md b/spring-core-2/README.md index 18e4e32d1f..80ae54b2a4 100644 --- a/spring-core-2/README.md +++ b/spring-core-2/README.md @@ -6,4 +6,9 @@ This module contains articles about core Spring functionality - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes) - [Spring Events](https://www.baeldung.com/spring-events) +- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying) +- [Finding the Spring Version](https://www.baeldung.com/spring-find-version) +- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests) +- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean) +- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext) - More articles: [[<-- prev]](/spring-core)[[next -->]](/spring-core-3) diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml index d05090fa6b..bab47cb70c 100644 --- a/spring-core-2/pom.xml +++ b/spring-core-2/pom.xml @@ -15,29 +15,15 @@ ../parent-boot-2 - - - - org.springframework - spring-framework-bom - ${org.springframework.version} - pom - import - - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework.boot - spring-boot-starter-thymeleaf - ${org.springframework.version} - - - - + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + com.fasterxml.jackson.core jackson-databind @@ -129,6 +115,11 @@ spring-test test + + org.springframework.boot + spring-boot-starter-test + test + net.javacrumbs.shedlock @@ -140,6 +131,10 @@ shedlock-provider-jdbc-template ${shedlock.version} + + org.projectlombok + lombok + @@ -164,8 +159,6 @@ com.baeldung.sample.App - - 5.3.0 1.3.2 5.2.5.Final diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/ApplicationContextProvider.java diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/ItemService.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/ItemService.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/ItemService.java rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/ItemService.java diff --git a/spring-core-6/src/main/java/com/baeldung/applicationcontext/MyBean.java b/spring-core-2/src/main/java/com/baeldung/applicationcontext/MyBean.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/applicationcontext/MyBean.java rename to spring-core-2/src/main/java/com/baeldung/applicationcontext/MyBean.java diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/DataCache.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/DataCache.java rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/DataCache.java diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/EligibleForAutoProxyRandomIntProcessor.java diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyRandomIntProcessor.java diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomInt.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomInt.java rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomInt.java diff --git a/spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java b/spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java rename to spring-core-2/src/main/java/com/baeldung/component/autoproxying/RandomIntGenerator.java diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/Product.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/Product.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/Product.java rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/Product.java diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductController.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductController.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductController.java rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductController.java diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductService.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductService.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/ProductService.java rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/ProductService.java diff --git a/spring-core-5/src/main/java/com/baeldung/concurrentrequest/Stock.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/Stock.java similarity index 100% rename from spring-core-5/src/main/java/com/baeldung/concurrentrequest/Stock.java rename to spring-core-2/src/main/java/com/baeldung/concurrentrequest/Stock.java diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/ReinitializeBeanApp.java diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/cache/ConfigManager.java diff --git a/spring-core-6/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java b/spring-core-2/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java similarity index 100% rename from spring-core-6/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java rename to spring-core-2/src/main/java/com/baeldung/reinitializebean/controller/ConfigController.java diff --git a/spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java b/spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java similarity index 96% rename from spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java rename to spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java index 392cc44a72..e0e28c6181 100644 --- a/spring-core-5/src/main/java/com/baeldung/version/VersionObtainer.java +++ b/spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java @@ -1,20 +1,20 @@ -package com.baeldung.version; - -import org.springframework.boot.system.JavaVersion; -import org.springframework.boot.system.SystemProperties; -import org.springframework.core.SpringVersion; - -public class VersionObtainer { - - public String getSpringVersion() { - return SpringVersion.getVersion(); - } - - public String getJavaVersion() { - return JavaVersion.getJavaVersion().toString(); - } - - public String getJdkVersion() { - return SystemProperties.get("java.version"); - } -} +package com.baeldung.version; + +import org.springframework.boot.system.JavaVersion; +import org.springframework.boot.system.SystemProperties; +import org.springframework.core.SpringVersion; + +public class VersionObtainer { + + public String getSpringVersion() { + return SpringVersion.getVersion(); + } + + public String getJavaVersion() { + return JavaVersion.getJavaVersion().toString(); + } + + public String getJdkVersion() { + return SystemProperties.get("java.version"); + } +} diff --git a/spring-core-2/src/main/resources/application.properties b/spring-core-2/src/main/resources/application.properties index e69de29bb2..97916eec19 100644 --- a/spring-core-2/src/main/resources/application.properties +++ b/spring-core-2/src/main/resources/application.properties @@ -0,0 +1 @@ +config.file.path=./spring-core-2/src/main/resources/config.properties \ No newline at end of file diff --git a/spring-core-6/src/main/resources/config.properties b/spring-core-2/src/main/resources/config.properties similarity index 100% rename from spring-core-6/src/main/resources/config.properties rename to spring-core-2/src/main/resources/config.properties diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java similarity index 100% rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/ApplicationContextProviderUnitTest.java diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java similarity index 100% rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/MyBeanUnitTest.java diff --git a/spring-core-6/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java b/spring-core-2/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java similarity index 100% rename from spring-core-6/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java rename to spring-core-2/src/test/java/com/baeldung/applicationcontext/TestContextConfig.java diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java similarity index 100% rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/EligibleForAutoProxyingIntegrationTest.java diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java similarity index 100% rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/MemoryLogAppender.java diff --git a/spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java b/spring-core-2/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java similarity index 100% rename from spring-core-5/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java rename to spring-core-2/src/test/java/com/baeldung/component/autoproxying/NotEligibleForAutoProxyingIntegrationTest.java diff --git a/spring-core-5/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java b/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java similarity index 100% rename from spring-core-5/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java rename to spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java diff --git a/spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java similarity index 96% rename from spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java rename to spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java index 6d77cd1403..af074d5783 100644 --- a/spring-core-5/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java +++ b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java @@ -1,30 +1,30 @@ -package com.baeldung.version; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest(classes = VersionObtainer.class) -public class VersionObtainerUnitTest { - - public VersionObtainer version = new VersionObtainer(); - - @Test - public void testGetSpringVersion() { - String res = version.getSpringVersion(); - assertThat(res).isNotEmpty(); - } - - @Test - public void testGetJdkVersion() { - String res = version.getJdkVersion(); - assertThat(res).isNotEmpty(); - } - - @Test - public void testGetJavaVersion() { - String res = version.getJavaVersion(); - assertThat(res).isNotEmpty(); - } -} +package com.baeldung.version; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest(classes = VersionObtainer.class) +public class VersionObtainerUnitTest { + + public VersionObtainer version = new VersionObtainer(); + + @Test + public void testGetSpringVersion() { + String res = version.getSpringVersion(); + assertThat(res).isNotEmpty(); + } + + @Test + public void testGetJdkVersion() { + String res = version.getJdkVersion(); + assertThat(res).isNotEmpty(); + } + + @Test + public void testGetJavaVersion() { + String res = version.getJavaVersion(); + assertThat(res).isNotEmpty(); + } +} diff --git a/spring-core-3/README.md b/spring-core-3/README.md index 394f6e1857..ed88561e10 100644 --- a/spring-core-3/README.md +++ b/spring-core-3/README.md @@ -10,4 +10,5 @@ This module contains articles about core Spring functionality - [Design Patterns in the Spring Framework](https://www.baeldung.com/spring-framework-design-patterns) - [Difference Between BeanFactory and ApplicationContext](https://www.baeldung.com/spring-beanfactory-vs-applicationcontext) - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope) +- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context) - More articles: [[<-- prev]](/spring-core-2) [[next -->]](/spring-core-4) diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountConfig.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountConfig.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountRepository.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountRepository.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountRepository.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountRepository.java diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountService.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/AccountService.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/AccountService.java diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/MyWebApplicationInitializer.java diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/MyXmlWebApplicationInitializer.java diff --git a/spring-core-4/src/main/java/com/baeldung/applicationcontext/UserService.java b/spring-core-3/src/main/java/com/baeldung/applicationcontext/UserService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/applicationcontext/UserService.java rename to spring-core-3/src/main/java/com/baeldung/applicationcontext/UserService.java diff --git a/spring-core-4/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java b/spring-core-3/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java rename to spring-core-3/src/test/java/com/baeldung/applicationcontext/ApplicationContextUnitTest.java diff --git a/spring-core-4/src/test/resources/applicationcontext/account-bean-config.xml b/spring-core-3/src/test/resources/applicationcontext/account-bean-config.xml similarity index 100% rename from spring-core-4/src/test/resources/applicationcontext/account-bean-config.xml rename to spring-core-3/src/test/resources/applicationcontext/account-bean-config.xml diff --git a/spring-core-4/src/test/resources/applicationcontext/user-bean-config.xml b/spring-core-3/src/test/resources/applicationcontext/user-bean-config.xml similarity index 100% rename from spring-core-4/src/test/resources/applicationcontext/user-bean-config.xml rename to spring-core-3/src/test/resources/applicationcontext/user-bean-config.xml diff --git a/spring-core-4/src/test/resources/config/messages.properties b/spring-core-3/src/test/resources/config/messages.properties similarity index 100% rename from spring-core-4/src/test/resources/config/messages.properties rename to spring-core-3/src/test/resources/config/messages.properties diff --git a/spring-core-4/README.md b/spring-core-4/README.md index 6ade284e2e..a0f5ac97f9 100644 --- a/spring-core-4/README.md +++ b/spring-core-4/README.md @@ -6,5 +6,4 @@ This module contains articles about core Spring functionality - [Creating Spring Beans Through Factory Methods](https://www.baeldung.com/spring-beans-factory-methods) - [Spring BeanPostProcessor](https://www.baeldung.com/spring-beanpostprocessor) -- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context) -- More articles: [[<-- prev]](/spring-core-3) [[next -->]](/spring-core-5) +- More articles: [[<-- prev]](/spring-core-3) diff --git a/spring-core-5/README.md b/spring-core-5/README.md deleted file mode 100644 index cfcbf5380a..0000000000 --- a/spring-core-5/README.md +++ /dev/null @@ -1,10 +0,0 @@ -## Spring Core - -This module contains articles about core Spring functionality. - -## Relevant Articles: - -- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying) -- [Finding the Spring Version](https://www.baeldung.com/spring-find-version) -- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests) -- More articles: [[<-- prev]](../spring-core-4) diff --git a/spring-core-5/pom.xml b/spring-core-5/pom.xml deleted file mode 100644 index 1c2e80be44..0000000000 --- a/spring-core-5/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - spring-core-5 - spring-core-5 - - - com.baeldung - parent-spring-5 - 0.0.1-SNAPSHOT - ../parent-spring-5 - - - - - org.springframework.boot - spring-boot-starter - ${spring-boot-starter.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot-starter.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot-starter.version} - test - - - org.projectlombok - lombok - ${lombok.version} - - - - - 5.3.3 - 2.4.2 - - - \ No newline at end of file diff --git a/spring-core-5/src/main/resources/application.yml b/spring-core-5/src/main/resources/application.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-core-5/src/test/resources/application.yml b/spring-core-5/src/test/resources/application.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-core-5/src/test/resources/logback-test.xml b/spring-core-5/src/test/resources/logback-test.xml deleted file mode 100644 index 8d4771e308..0000000000 --- a/spring-core-5/src/test/resources/logback-test.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n - - - - - - - \ No newline at end of file diff --git a/spring-core-6/README.md b/spring-core-6/README.md deleted file mode 100644 index 1879ff9a68..0000000000 --- a/spring-core-6/README.md +++ /dev/null @@ -1,5 +0,0 @@ - -### Relevant Articles: -- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean) -- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext) -- More articles: [[<-- prev]](../spring-core-5) \ No newline at end of file diff --git a/spring-core-6/pom.xml b/spring-core-6/pom.xml deleted file mode 100644 index 736fa283e7..0000000000 --- a/spring-core-6/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-core-6 - 0.0.1-SNAPSHOT - spring-core-6 - http://www.baeldung.com - - - com.baeldung - parent-boot-3 - 0.0.1-SNAPSHOT - ../parent-boot-3 - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - io.projectreactor - reactor-test - test - - - - - - - - maven-clean-plugin - 3.1.0 - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - maven-site-plugin - 3.7.1 - - - maven-project-info-reports-plugin - 3.0.0 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - - - - - - UTF-8 - 17 - 17 - - - \ No newline at end of file diff --git a/spring-core-6/src/main/resources/application.properties b/spring-core-6/src/main/resources/application.properties deleted file mode 100644 index 6545cd1097..0000000000 --- a/spring-core-6/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -config.file.path=./spring-core-6/src/main/resources/config.properties \ No newline at end of file