diff --git a/spring-core-2/README.md b/spring-core-2/README.md index 2dae67ff49..735fd8aed5 100644 --- a/spring-core-2/README.md +++ b/spring-core-2/README.md @@ -4,10 +4,8 @@ This module contains articles about core Spring functionality ## Relevant Articles: -- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire) - [Spring Profiles](http://www.baeldung.com/spring-profiles) - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes) -- [@Order in Spring](http://www.baeldung.com/spring-order) - [Spring Events](https://www.baeldung.com/spring-events) - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations) - More articles: [[<-- prev]](/spring-core)[[next -->]](/spring-core-3) diff --git a/spring-core-4/README.md b/spring-core-4/README.md index 3b2c3d4764..45011d15a9 100644 --- a/spring-core-4/README.md +++ b/spring-core-4/README.md @@ -5,8 +5,6 @@ This module contains articles about core Spring functionality ## Relevant Articles: - [Creating Spring Beans Through Factory Methods](https://www.baeldung.com/spring-beans-factory-methods) -- [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire) -- [Spring @Import Annotation](https://www.baeldung.com/spring-import-annotation) - [Spring BeanPostProcessor](https://www.baeldung.com/spring-beanpostprocessor) - [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class) - [Constructor Injection in Spring with Lombok](https://www.baeldung.com/spring-injection-lombok) diff --git a/spring-di-3/README.md b/spring-di-3/README.md index 3ddd720af5..1ac280fef2 100644 --- a/spring-di-3/README.md +++ b/spring-di-3/README.md @@ -7,4 +7,8 @@ This module contains articles about dependency injection with Spring - [@Lookup Annotation in Spring](https://www.baeldung.com/spring-lookup) - [Spring @Autowired Field Null – Common Causes and Solutions](https://www.baeldung.com/spring-autowired-field-null) - [Finding All Beans with a Custom Annotation](https://www.baeldung.com/spring-injecting-all-annotated-beans) +- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire) +- [@Order in Spring](http://www.baeldung.com/spring-order) +- [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire) +- [Spring @Import Annotation](https://www.baeldung.com/spring-import-annotation) - More articles: [[<-- prev]](../spring-di-2) diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/App.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/App.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/App.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/AppConfig.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/AppConfig.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/AppConfig.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/BarFormatter.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/BarFormatter.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/BarFormatter.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooDAO.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooDAO.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooDAO.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooFormatter.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooFormatter.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooFormatter.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FooService.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FooService.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FooService.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/Formatter.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/Formatter.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/Formatter.java diff --git a/spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java b/spring-di-3/src/main/java/com/baeldung/autowire/sample/FormatterType.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/autowire/sample/FormatterType.java rename to spring-di-3/src/main/java/com/baeldung/autowire/sample/FormatterType.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/BeanFactoryDynamicAutowireService.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/CustomMapFromListDynamicAutowireService.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/DynamicAutowireConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/GBRegionService.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/RegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/RegionService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/RegionService.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/RegionService.java diff --git a/spring-core-4/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java b/spring-di-3/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java rename to spring-di-3/src/main/java/com/baeldung/dynamic/autowire/USRegionService.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalConfiguration.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/AnimalScanConfiguration.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bird.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bird.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bird.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bird.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/BirdConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bug.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bug.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Bug.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Bug.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/BugConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/BugConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/BugConfig.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/BugConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Cat.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Cat.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Cat.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Cat.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/CatConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/CatConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/CatConfig.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/CatConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/Dog.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/Dog.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/Dog.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/Dog.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/DogConfig.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/DogConfig.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/DogConfig.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/DogConfig.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java b/spring-di-3/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/animal/MammalConfiguration.java diff --git a/spring-core-4/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java b/spring-di-3/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java similarity index 100% rename from spring-core-4/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java rename to spring-di-3/src/main/java/com/baeldung/importannotation/zoo/ZooApplication.java diff --git a/spring-core-2/src/main/java/com/baeldung/order/Average.java b/spring-di-3/src/main/java/com/baeldung/order/Average.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/order/Average.java rename to spring-di-3/src/main/java/com/baeldung/order/Average.java diff --git a/spring-core-2/src/main/java/com/baeldung/order/Excellent.java b/spring-di-3/src/main/java/com/baeldung/order/Excellent.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/order/Excellent.java rename to spring-di-3/src/main/java/com/baeldung/order/Excellent.java diff --git a/spring-core-2/src/main/java/com/baeldung/order/Good.java b/spring-di-3/src/main/java/com/baeldung/order/Good.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/order/Good.java rename to spring-di-3/src/main/java/com/baeldung/order/Good.java diff --git a/spring-core-2/src/main/java/com/baeldung/order/Rating.java b/spring-di-3/src/main/java/com/baeldung/order/Rating.java similarity index 100% rename from spring-core-2/src/main/java/com/baeldung/order/Rating.java rename to spring-di-3/src/main/java/com/baeldung/order/Rating.java diff --git a/spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java similarity index 100% rename from spring-core-2/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java rename to spring-di-3/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java b/spring-di-3/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java rename to spring-di-3/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/AnimalConfigUnitTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/BugConfigUnitTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/ConfigUnitTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/importannotation/animal/MammalConfigUnitTest.java diff --git a/spring-core-4/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java b/spring-di-3/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java similarity index 100% rename from spring-core-4/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/importannotation/zoo/ZooApplicationUnitTest.java diff --git a/spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java b/spring-di-3/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java similarity index 100% rename from spring-core-2/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java rename to spring-di-3/src/test/java/com/baeldung/order/RatingRetrieverUnitTest.java