Moved spring-4.3 project into spring-all (#500)

* Moved spring-4.3 project into spring-all

* Removed spring-4.3 project

spring-4.3/README.md

@@ -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

spring-4.3/pom.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-4.3</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-
-    <packaging>jar</packaging>
-
-    <name>Spring 4.3 Demo</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>3.4</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.190</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <dependencyManagement>
-
-        <dependencies>
-
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>4.3.1.RELEASE</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-        </dependencies>
-
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

spring-4.3/src/main/java/com/baeldung/spring43/composedmapping/Appointment.java

@@ -1,5 +0,0 @@
-package com.baeldung.spring43.composedmapping;
-
-public class Appointment {
-
-}

spring-4.3/src/main/java/com/baeldung/spring43/ctor/FooRepository.java

@@ -1,5 +0,0 @@
-package com.baeldung.spring43.ctor;
-
-public class FooRepository {
-
-}

spring-4.3/src/test/resources/logback.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss} [%t] %-5p: %c - %m%n</Pattern>
-        </layout>
-    </appender>
-
-    <!-- Application Loggers -->
-    <logger name="com.baeldung">
-        <level value="debug"/>
-    </logger>
-
-    <!-- Spring Loggers -->
-    <logger name="org.springframework.core">
-        <level value="info"/>
-    </logger>
-
-    <logger name="org.springframework.beans">
-        <level value="info"/>
-    </logger>
-
-    <logger name="org.springframework.context">
-        <level value="info"/>
-    </logger>
-
-    <root level="warn">
-        <appender-ref ref="STDOUT"/>
-    </root>
-
-</configuration>

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/)

spring-all/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.6.RELEASE</version>
+        <version>1.3.6.RELEASE</version>
     </parent>
 
     <dependencies>
@@ -147,8 +147,38 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.4</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
+    <dependencyManagement>
+
+        <dependencies>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${org.springframework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${org.springframework.version}</version>
+            </dependency>
+
+        </dependencies>
+
+    </dependencyManagement>
+
     <build>
         <finalName>spring-all</finalName>
         <resources>
@@ -217,7 +247,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+        <org.springframework.version>4.3.1.RELEASE</org.springframework.version>
         <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
         <javassist.version>3.20.0-GA</javassist.version>
         <jstl.version>1.2</jstl.version>

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.*;
 

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;

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;
 

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;

spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java

@@ -0,0 +1,5 @@
+package org.baeldung.spring43.composedmapping;
+
+public class Appointment {
+
+}

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;
 

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;
 

spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java

@@ -0,0 +1,5 @@
+package org.baeldung.spring43.ctor;
+
+public class FooRepository {
+
+}

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 {
 

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;
 

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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">
 
-    <bean id="dateHolder" class="com.baeldung.spring43.defaultmethods.DateHolder">
+    <bean id="dateHolder" class="org.baeldung.spring43.defaultmethods.DateHolder">
         <property name="stringDate" value="15.10.1982"/>
     </bean>
 

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">
 
-    <bean class="com.baeldung.spring43.ctor.FooRepository"/>
+    <bean class="org.baeldung.spring43.ctor.FooRepository"/>
 
-    <bean class="com.baeldung.spring43.ctor.FooService"/>
+    <bean class="org.baeldung.spring43.ctor.FooService"/>
 
 </beans>

spring-all/src/main/resources/springAsync-config.xml

@@ -9,6 +9,6 @@
     <task:annotation-driven executor="myExecutor"/>
     <task:executor id="myExecutor" pool-size="5"/>
 
-    <bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncAnnotationExample"/>
+    <bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncComponent"/>
 
 </beans>

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;

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;

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;
 

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;

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;
     }

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;