diff --git a/spring-4.3/README.md b/spring-4.3/README.md deleted file mode 100644 index df7a07959d..0000000000 --- a/spring-4.3/README.md +++ /dev/null @@ -1,9 +0,0 @@ -In this tutorial we cover few of the new features of Spring 4.3: - - - Implicit Constructor Injection - Improved Resolution of Dependency - Cache Abstraction Refinements - Composed @RequestMapping Variants - @RequestScope, @SessionScope, @ApplicationScope annotations - Libraries/Application Servers Versions Support \ No newline at end of file diff --git a/spring-4.3/pom.xml b/spring-4.3/pom.xml deleted file mode 100644 index 940bd92f68..0000000000 --- a/spring-4.3/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - 4.0.0 - - com.baeldung - spring-4.3 - 0.0.1-SNAPSHOT - - jar - - Spring 4.3 Demo - - - UTF-8 - 1.8 - - - - - - org.springframework - spring-core - - - - org.springframework - spring-context - - - - org.springframework - spring-webmvc - - - - org.springframework - spring-tx - - - - org.springframework - spring-jdbc - - - - javax.validation - validation-api - 1.1.0.Final - - - - ch.qos.logback - logback-classic - 1.1.3 - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - - org.springframework - spring-test - test - - - - org.easymock - easymock - 3.4 - test - - - - junit - junit - 4.12 - test - - - - com.h2database - h2 - 1.4.190 - test - - - - - - - - - - org.springframework - spring-framework-bom - 4.3.1.RELEASE - pom - import - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - - diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java b/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java deleted file mode 100644 index 4d8ba86f4b..0000000000 --- a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.spring43.composedmapping; - -public class Appointment { - -} diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooRepository.java b/spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooRepository.java deleted file mode 100644 index f1d8425682..0000000000 --- a/spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.spring43.ctor; - -public class FooRepository { - -} diff --git a/spring-4.3/src/test/resources/logback.xml b/spring-4.3/src/test/resources/logback.xml deleted file mode 100644 index 68ea00fb54..0000000000 --- a/spring-4.3/src/test/resources/logback.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss} [%t] %-5p: %c - %m%n - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-all/README.md b/spring-all/README.md index 47c947a414..0bbb600860 100644 --- a/spring-all/README.md +++ b/spring-all/README.md @@ -11,3 +11,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Properties with Spring](http://www.baeldung.com/2012/02/06/properties-with-spring) - checkout the `org.baeldung.properties` package for all scenarios of properties injection and usage - [Spring Profiles](http://www.baeldung.com/spring-profiles) - [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor) +- [What's New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3/) diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 8ff09e5e17..5f14d32121 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 1.2.6.RELEASE + 1.3.6.RELEASE @@ -147,8 +147,38 @@ mockito-core test + + + org.easymock + easymock + 3.4 + test + + + + + + + + org.springframework + spring-framework-bom + ${org.springframework.version} + pom + import + + + + org.springframework + spring-core + ${org.springframework.version} + + + + + + spring-all @@ -217,7 +247,7 @@ - 4.2.5.RELEASE + 4.3.1.RELEASE 4.0.4.RELEASE 3.20.0-GA 1.2 diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java b/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java similarity index 85% rename from spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java rename to spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java index d11ca10873..df1d173bd2 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java +++ b/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.attributeannotations; +package org.baeldung.spring43.attributeannotations; import org.springframework.web.bind.annotation.*; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java b/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java similarity index 91% rename from spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java rename to spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java index 3d6e0ad8b9..9cf6020a93 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/attributeannotations/ParamInterceptor.java +++ b/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.attributeannotations; +package org.baeldung.spring43.attributeannotations; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/cache/Foo.java b/spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java similarity index 94% rename from spring-4.3/src/main/java/com/baeldung/spring43/cache/Foo.java rename to spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java index 8a26d2164c..4abd3cc813 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/cache/Foo.java +++ b/spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.cache; +package org.baeldung.spring43.cache; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/cache/FooService.java b/spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java similarity index 87% rename from spring-4.3/src/main/java/com/baeldung/spring43/cache/FooService.java rename to spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java index 9c0aa583c5..ad4c8b395f 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/cache/FooService.java +++ b/spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.cache; +package org.baeldung.spring43.cache; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java new file mode 100644 index 0000000000..af06249768 --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java @@ -0,0 +1,5 @@ +package org.baeldung.spring43.composedmapping; + +public class Appointment { + +} diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java similarity index 72% rename from spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java rename to spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java index 1ca389e16b..c4c5e82f65 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentService.java +++ b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.composedmapping; +package org.baeldung.spring43.composedmapping; import java.util.Map; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java similarity index 93% rename from spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java rename to spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java index 756766e1a7..9f3c8729d8 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/AppointmentsController.java +++ b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.composedmapping; +package org.baeldung.spring43.composedmapping; import java.util.Map; diff --git a/spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java b/spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java new file mode 100644 index 0000000000..96dbeb8642 --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java @@ -0,0 +1,5 @@ +package org.baeldung.spring43.ctor; + +public class FooRepository { + +} diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooService.java b/spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java similarity index 86% rename from spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooService.java rename to spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java index cb481f99b2..bf92d1bd32 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooService.java +++ b/spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.ctor; +package org.baeldung.spring43.ctor; public class FooService { diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java b/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java similarity index 87% rename from spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java rename to spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java index a5307ec37c..9ae62cf484 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/DateHolder.java +++ b/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import java.time.LocalDate; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java b/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java similarity index 87% rename from spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java rename to spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java index 66eca031c0..e37d27f9fc 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/defaultmethods/IDateHolder.java +++ b/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import java.time.LocalDate; import java.time.format.DateTimeFormatter; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java b/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java similarity index 68% rename from spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java rename to spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java index 281a4f29fd..313f6fc8c5 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooRepository.java +++ b/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.depresolution; +package org.baeldung.spring43.depresolution; import org.springframework.stereotype.Repository; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooService.java b/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java similarity index 90% rename from spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooService.java rename to spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java index 1a6b13dc23..b76fa84749 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/depresolution/FooService.java +++ b/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.depresolution; +package org.baeldung.spring43.depresolution; import org.springframework.beans.factory.ObjectProvider; import org.springframework.stereotype.Service; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java similarity index 81% rename from spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java rename to spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java index ede2849a51..45b90c4609 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/AppPreferences.java +++ b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.springframework.stereotype.Component; import org.springframework.web.context.annotation.ApplicationScope; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java similarity index 86% rename from spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java rename to spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java index e6879e0544..4fb90566d8 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/InstanceCountingService.java +++ b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java similarity index 80% rename from spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java rename to spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java index 132e701b5a..60017b4b94 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/LoginAction.java +++ b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.springframework.stereotype.Component; import org.springframework.web.context.annotation.RequestScope; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java similarity index 95% rename from spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java rename to spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java index bd3e3e9b92..8f4390dfc0 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/ScopeTestController.java +++ b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java similarity index 81% rename from spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java rename to spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java index 27f313b2cb..ce49c4b1fe 100644 --- a/spring-4.3/src/main/java/com/baeldung/spring43/scopeannotations/UserPreferences.java +++ b/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.springframework.stereotype.Component; import org.springframework.web.context.annotation.SessionScope; diff --git a/spring-4.3/src/test/resources/defaultmethods-context.xml b/spring-all/src/main/resources/defaultmethods-context.xml similarity index 84% rename from spring-4.3/src/test/resources/defaultmethods-context.xml rename to spring-all/src/main/resources/defaultmethods-context.xml index 5725d0cabf..2b55037405 100644 --- a/spring-4.3/src/test/resources/defaultmethods-context.xml +++ b/spring-all/src/main/resources/defaultmethods-context.xml @@ -3,7 +3,7 @@ xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/spring-4.3/src/test/resources/implicit-ctor-context.xml b/spring-all/src/main/resources/implicit-ctor-context.xml similarity index 71% rename from spring-4.3/src/test/resources/implicit-ctor-context.xml rename to spring-all/src/main/resources/implicit-ctor-context.xml index 3dc0058f94..c978ca17bd 100644 --- a/spring-4.3/src/test/resources/implicit-ctor-context.xml +++ b/spring-all/src/main/resources/implicit-ctor-context.xml @@ -3,8 +3,8 @@ xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + diff --git a/spring-all/src/main/resources/springAsync-config.xml b/spring-all/src/main/resources/springAsync-config.xml index 8ed5f1319d..34e8b33f45 100644 --- a/spring-all/src/main/resources/springAsync-config.xml +++ b/spring-all/src/main/resources/springAsync-config.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java similarity index 95% rename from spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java index 97b92a943c..97ae651473 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.attributeannotations; +package org.baeldung.spring43.attributeannotations; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java b/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java similarity index 96% rename from spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java rename to spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java index f368fd4818..aa3acb113f 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.attributeannotations; +package org.baeldung.spring43.attributeannotations; import org.junit.Assert; import org.junit.Before; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java similarity index 95% rename from spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java index 45acb11f72..e4610e5a83 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.cache; +package org.baeldung.spring43.cache; import java.util.Collections; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsTest.java b/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsTest.java similarity index 96% rename from spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsTest.java rename to spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsTest.java index 3f06465c34..bfd6e5047c 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/cache/CacheRefinementsTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.cache; +package org.baeldung.spring43.cache; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java similarity index 79% rename from spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java index 7d92d4cecf..46bf3d8847 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java @@ -1,7 +1,8 @@ -package com.baeldung.spring43.composedmapping; +package org.baeldung.spring43.composedmapping; import java.util.Collections; +import org.easymock.EasyMock; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -26,8 +27,8 @@ public class ComposedMappingConfiguration { @Bean public AppointmentService appointmentBook() { - AppointmentService book = mock(AppointmentService.class); - expect(book.getAppointmentsForToday()).andReturn(Collections.emptyMap()); + AppointmentService book = EasyMock.mock(AppointmentService.class); + EasyMock.expect(book.getAppointmentsForToday()).andReturn(Collections.emptyMap()); replay(book); return book; } diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingTest.java b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingTest.java similarity index 96% rename from spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingTest.java rename to spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingTest.java index a3c4f818a5..04fabbc834 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/composedmapping/ComposedMappingTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.composedmapping; +package org.baeldung.spring43.composedmapping; import org.junit.Before; import org.junit.Test; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java b/spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java similarity index 94% rename from spring-4.3/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java rename to spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java index 3d001cdb78..82caae15fe 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.ctor; +package org.baeldung.spring43.ctor; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java similarity index 88% rename from spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java index fb33942844..a05a36529f 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooRepositoryConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.ctor; +package org.baeldung.spring43.ctor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java similarity index 92% rename from spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java index 5ab09e37ec..41f1719320 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/FooServiceConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.ctor; +package org.baeldung.spring43.ctor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorTest.java b/spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorTest.java similarity index 94% rename from spring-4.3/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorTest.java rename to spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorTest.java index 62c3eed091..be0cf77a62 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/ctor/ImplicitConstructorTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.ctor; +package org.baeldung.spring43.ctor; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java similarity index 93% rename from spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java rename to spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java index 8c4fa580d7..e29d89a679 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import java.time.LocalDate; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalTest.java b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalTest.java similarity index 91% rename from spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalTest.java rename to spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalTest.java index b3cca5f21f..c7b95bced4 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/ITransactionalTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTest.java b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTest.java similarity index 91% rename from spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTest.java rename to spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTest.java index a7a693102c..89c96ba1d4 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java similarity index 81% rename from spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java index c5b5a6574f..946b19d00d 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.defaultmethods; +package org.baeldung.spring43.defaultmethods; import javax.sql.DataSource; @@ -15,8 +15,8 @@ public class TransactionalTestConfiguration { @Bean public DataSource getDataSource() { SimpleDriverDataSource simpleDriverDataSource = new SimpleDriverDataSource(); - simpleDriverDataSource.setDriverClass(org.h2.Driver.class); - simpleDriverDataSource.setUrl("jdbc:h2:mem:~test"); + simpleDriverDataSource.setDriverClass(org.hsqldb.jdbcDriver.class); + simpleDriverDataSource.setUrl("jdbc:hsqldb:mem:app-db"); simpleDriverDataSource.setUsername("sa"); simpleDriverDataSource.setPassword(""); return simpleDriverDataSource; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java similarity index 81% rename from spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java index 020b50ceb2..530c4d9f4a 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.depresolution; +package org.baeldung.spring43.depresolution; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderTest.java b/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderTest.java similarity index 93% rename from spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderTest.java rename to spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderTest.java index 6ae6b1eda3..eeeb005f81 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/depresolution/ObjectProviderTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.depresolution; +package org.baeldung.spring43.depresolution; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java similarity index 93% rename from spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java rename to spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java index a7d9c16721..24c1ec2f34 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java b/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java similarity index 98% rename from spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java rename to spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java index 5bd07437c1..b696760f68 100644 --- a/spring-4.3/src/test/java/com/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java +++ b/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring43.scopeannotations; +package org.baeldung.spring43.scopeannotations; import org.junit.Before; import org.junit.Test;