Merge branch 'master' of https://github.com/eugenp/tutorials into bdragan-master

README.md

@@ -1,7 +1,7 @@
 
 The "REST with Spring" Classes
 ==============================
-After 5 months of work, here's the Master Class: <br/>
+After 5 months of work, here's the Master Class of REST With Spring: <br/>
 **[>> THE REST WITH SPRING MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**
 
 
@@ -19,3 +19,8 @@ Any IDE can be used to work with the projects, but if you're using Eclipse, cons
 
 - import the included **formatter** in Eclipse: 
 `https://github.com/eugenp/tutorials/tree/master/eclipse`
+
+
+CI - Jenkins
+================================
+This tutorials project is being built **[>> HERE](https://rest-security.ci.cloudbees.com/job/tutorials/)**

assertj/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>assertj</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.4.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

assertj/src/main/java/com/baeldung/assertj/introduction/domain/Dog.java

@@ -0,0 +1,19 @@
+package com.baeldung.assertj.introduction.domain;
+
+public class Dog {
+    private String name;
+    private Float weight;
+
+    public Dog(String name, Float weight) {
+        this.name = name;
+        this.weight = weight;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Float getWeight() {
+        return weight;
+    }
+}

assertj/src/main/java/com/baeldung/assertj/introduction/domain/Person.java

@@ -0,0 +1,19 @@
+package com.baeldung.assertj.introduction.domain;
+
+public class Person {
+    private String name;
+    private Integer age;
+
+    public Person(String name, Integer age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+}

assertj/src/test/java/com/baeldung/assertj/introduction/AssertJCoreTest.java

@@ -0,0 +1,143 @@
+package com.baeldung.assertj.introduction;
+
+import com.baeldung.assertj.introduction.domain.Dog;
+import com.baeldung.assertj.introduction.domain.Person;
+import org.assertj.core.util.Maps;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.entry;
+import static org.assertj.core.api.Assertions.withPrecision;
+
+public class AssertJCoreTest {
+
+    @Test
+    public void whenComparingReferences_thenNotEqual() throws Exception {
+        Dog fido = new Dog("Fido", 5.15f);
+        Dog fidosClone = new Dog("Fido", 5.15f);
+
+        assertThat(fido).isNotEqualTo(fidosClone);
+    }
+
+    @Test
+    public void whenComparingFields_thenEqual() throws Exception {
+        Dog fido = new Dog("Fido", 5.15f);
+        Dog fidosClone = new Dog("Fido", 5.15f);
+
+        assertThat(fido).isEqualToComparingFieldByFieldRecursively(fidosClone);
+    }
+
+    @Test
+    public void whenCheckingForElement_thenContains() throws Exception {
+        List<String> list = Arrays.asList("1", "2", "3");
+
+        assertThat(list)
+                .contains("1");
+    }
+
+    @Test
+    public void whenCheckingForElement_thenMultipleAssertions() throws Exception {
+        List<String> list = Arrays.asList("1", "2", "3");
+
+        assertThat(list).isNotEmpty();
+        assertThat(list).startsWith("1");
+        assertThat(list).doesNotContainNull();
+
+        assertThat(list)
+                .isNotEmpty()
+                .contains("1")
+                .startsWith("1")
+                .doesNotContainNull()
+                .containsSequence("2", "3");
+    }
+
+    @Test
+    public void whenCheckingRunnable_thenIsInterface() throws Exception {
+        assertThat(Runnable.class).isInterface();
+    }
+
+    @Test
+    public void whenCheckingCharacter_thenIsUnicode() throws Exception {
+        char someCharacter = 'c';
+
+        assertThat(someCharacter)
+                .isNotEqualTo('a')
+                .inUnicode()
+                .isGreaterThanOrEqualTo('b')
+                .isLowerCase();
+    }
+
+    @Test
+    public void whenAssigningNSEExToException_thenIsAssignable() throws Exception {
+        assertThat(Exception.class).isAssignableFrom(NoSuchElementException.class);
+    }
+
+    @Test
+    public void whenComparingWithOffset_thenEquals() throws Exception {
+        assertThat(5.1).isEqualTo(5, withPrecision(1d));
+    }
+
+    @Test
+    public void whenCheckingString_then() throws Exception {
+        assertThat("".isEmpty()).isTrue();
+    }
+
+    @Test
+    public void whenCheckingFile_then() throws Exception {
+        final File someFile = File.createTempFile("aaa", "bbb");
+        someFile.deleteOnExit();
+
+        assertThat(someFile)
+                .exists()
+                .isFile()
+                .canRead()
+                .canWrite();
+    }
+
+    @Test
+    public void whenCheckingIS_then() throws Exception {
+        InputStream given = new ByteArrayInputStream("foo".getBytes());
+        InputStream expected = new ByteArrayInputStream("foo".getBytes());
+
+        assertThat(given).hasSameContentAs(expected);
+    }
+
+    @Test
+    public void whenGivenMap_then() throws Exception {
+        Map<Integer, String> map = Maps.newHashMap(2, "a");
+
+        assertThat(map)
+                .isNotEmpty()
+                .containsKey(2)
+                .doesNotContainKeys(10)
+                .contains(entry(2, "a"));
+    }
+
+    @Test
+    public void whenGivenException_then() throws Exception {
+        Exception ex = new Exception("abc");
+
+        assertThat(ex)
+                .hasNoCause()
+                .hasMessageEndingWith("c");
+    }
+
+    @Ignore // IN ORDER TO TEST, REMOVE THIS LINE
+    @Test
+    public void whenRunningAssertion_thenDescribed() throws Exception {
+        Person person = new Person("Alex", 34);
+
+        assertThat(person.getAge())
+                .as("%s's age should be equal to 100")
+                .isEqualTo(100);
+    }
+}

core-java-8/pom.xml

@@ -63,6 +63,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

core-java-8/src/test/java/com/baeldung/dateapi/ConversionExample.java

@@ -0,0 +1,19 @@
+package com.baeldung.dateapi;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+public class ConversionExample {
+    public static void main(String[] args) {
+        Instant instantFromCalendar = GregorianCalendar.getInstance().toInstant();
+        ZonedDateTime zonedDateTimeFromCalendar = new GregorianCalendar().toZonedDateTime();
+        Date dateFromInstant = Date.from(Instant.now());
+        GregorianCalendar calendarFromZonedDateTime = GregorianCalendar.from(ZonedDateTime.now());
+        Instant instantFromDate = new Date().toInstant();
+        ZoneId zoneIdFromTimeZone = TimeZone.getTimeZone("PST").toZoneId();
+    }
+}

core-java-8/src/test/java/com/baeldung/dateapi/JavaUtilTimeTest.java

@@ -0,0 +1,89 @@
+package com.baeldung.dateapi;
+
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class JavaUtilTimeTest {
+
+    @Test
+    public void currentTime() {
+        final LocalDate now = LocalDate.now();
+
+        System.out.println(now);
+        // there is not much to test here
+    }
+
+    @Test
+    public void specificTime() {
+        LocalDate birthDay = LocalDate.of(1990, Month.DECEMBER, 15);
+
+        System.out.println(birthDay);
+        // there is not much to test here
+    }
+
+    @Test
+    public void extractMonth() {
+        Month month = LocalDate.of(1990, Month.DECEMBER, 15).getMonth();
+
+        assertThat(month).isEqualTo(Month.DECEMBER);
+    }
+
+    @Test
+    public void subtractTime() {
+        LocalDateTime fiveHoursBefore = LocalDateTime.of(1990, Month.DECEMBER, 15, 15, 0).minusHours(5);
+
+        assertThat(fiveHoursBefore.getHour()).isEqualTo(10);
+    }
+
+    @Test
+    public void alterField() {
+        LocalDateTime inJune = LocalDateTime.of(1990, Month.DECEMBER, 15, 15, 0).with(Month.JUNE);
+
+        assertThat(inJune.getMonth()).isEqualTo(Month.JUNE);
+    }
+
+    @Test
+    public void truncate() {
+        LocalTime truncated = LocalTime.of(15, 12, 34).truncatedTo(ChronoUnit.HOURS);
+
+        assertThat(truncated).isEqualTo(LocalTime.of(15, 0, 0));
+    }
+
+    @Test
+    public void getTimeSpan() {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime hourLater = now.plusHours(1);
+        Duration span = Duration.between(now, hourLater);
+
+        assertThat(span).isEqualTo(Duration.ofHours(1));
+    }
+
+    @Test
+    public void formatAndParse() throws ParseException {
+        LocalDate someDate = LocalDate.of(2016, 12, 7);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String formattedDate = someDate.format(formatter);
+        LocalDate parsedDate = LocalDate.parse(formattedDate, formatter);
+
+        assertThat(formattedDate).isEqualTo("2016-12-07");
+        assertThat(parsedDate).isEqualTo(someDate);
+    }
+
+    @Test
+    public void daysInMonth() {
+        int daysInMonth = YearMonth.of(1990, 2).lengthOfMonth();
+
+        assertThat(daysInMonth).isEqualTo(28);
+    }
+}

core-java/.classpath

@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

core-java/.settings/org.eclipse.jdt.core.prefs

@@ -6,8 +6,13 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -92,4 +97,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

core-java/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.7"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>

core-java/src/test/java/org/baeldung/java/collections/JavaCollectionConversionUnitTest.java

@@ -31,7 +31,7 @@ public class JavaCollectionConversionUnitTest {
 
     @Test
     public final void givenUsingCoreJava_whenListConvertedToArray_thenCorrect() {
-        final List<Integer> sourceList = Lists.<Integer> newArrayList(0, 1, 2, 3, 4, 5);
+        final List<Integer> sourceList = Arrays.asList(0, 1, 2, 3, 4, 5);
         final Integer[] targetArray = sourceList.toArray(new Integer[sourceList.size()]);
     }
 

dependency-injection/docs/autowired-type-demo-classdiagram.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>7Vjvb+I4EP1rkO4+7KkhhW0/8qt3J3V1Velq7z5VbmKIb50M55hS9q/fGXtMEgLXrprthwqEEH6ZOJ5573nAvXiSP/1uxCr7BKnUvf5Z+tSLp71+/6If4ycBWw8MBpceWBqVeiiqgLn6Jhk8Y3StUlk2Ai2AtmrVBBMoCpnYBiaMgU0zbAG6+dSVWIYnVsA8EbqNflGpzUJawwr/Q6plFp4cDTm/B5F8XRpYF/y8Xj9euJe/nIswFydaZiKFTQ2KZ1hWA4Az07f8aSI1lTaUzd93deTqbt1GFry2Z24I67DbkLtMsRQ8BGMzWEIh9KxCxy4/STOc4SizucavEX7Fh5rt34y7wT80+G3ghumImKFZV7K4y1Th0SuFK/K3/Cut3bIaxNoCQtUKrgFW/By/Zlro0bQZKmFtEo7CsROSMEvJUR93JUclS8glLhlDjNTCqsfm7II1tdzF8a2YlqC7QsAKVGHL2sw3BGAAuyO6HPgZ2Rz9yC0jcIRf/IxhVFtaBTkeD3PKeT4KveYMrpTU6QgLulFGplOZQ4v1cqNyLQqit0boAgobtEBjodUSaZsmWGdpEHiUxir0zYgvWOJonGRKp9diC2uqc2nRFGE0zsCobzitCM/Ay8Yy6WiwesSc7mRtGFlizE2gmO700LUoCaCYBLQWq1I97BacI9mqGIO1kHNQyJR0NwENmAYWINg0iIsSk4GwI/JqC4dvCO5mgmNmZFNtJfGAQ7LaNnJ5cVxpNXX8L/m88dbI/0AbIAlgKtF3qSwSXNYIwZF5UNYIs61d2JcF1sCRVkmitAa+ylC4ApxkFrVaMhSkouWCZjgslHIlElUsr13M9LxCbrkqBG0yZeUccVrTBvsNbQs430K73SRTKa7dbUtWWOG5J6LZh5jHYIxvLPiEtqIB5jXBMVIYxvimcGMnUGB+guwaTyUKayNJXC/ThGO5rYngcu4dz4kgxL1GBOctEbSI1Wrf657Y0O6c+3+Y1Ry5cC2CabxzW/YHN32D6rhNNUH7FGrxIPUNlMoqoPmNj92j9g3YG7zQwh04mJtDgzxMYd/D958+z+/ux7P70ee7v778eTub3k/AGPw1pNnfj4BTngz9syQxZPrfwtA8RU0TL9m8Tz29w54+PG829egje73GfxQ00ejqjL2Gf/8Dcb+ru93Re31uDZrs5PZXuN157Efa90G2u3A7C+vUvjtj70D7PsheB+2bDwJa7duC9+gvv54c+yacH+jPP82xEa+uxvqt/G+N/7bdOcAzDLued7SOVCo6DKG+uNeyX0I1e5h47aALRhfNLrj7q1ur8sEid9AEo/bBRjjleSfVHfJJ0O43xiWPa9UNley8uu2Tg3dW3eiCBRSqG/Nfre6ri8PqDNcf4VXn5PHsOw==</diagram></mxfile>

dependency-injection/docs/inject-field-demo-classdiagram.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>7Vhdb9s4EPw1fuwhtqK0eYw/ctdDeijqHO7uyWAkWmJLcX0UFcf99d2llpZkKUiKOHkobBiGOVx+zcxybY2iWfHwuxWb/BOkUo8mZ+nDKJqPJpMPkwg/CdjVQBxf1kBmVVpD4wZYqu+SwTNGK5XKshPoALRTmy6YgDEycR1MWAvbbtgadHfVjcjCig2wTITuo/+o1OXhWBcN/odUWR5WHl/w+e5E8i2zUBlebzSJ1v5VdxcizMUHLXORwrYFRQuk1QLgzPSteJhJTdQG2upx14/07vdtpeG9PTEg7MPtwtllilRwE6zLIQMj9KJBp/58kmY4w1buCo1fx/gVF7W7fxn3jf+o8Vvsm+kVKUOzbqS5zZWp0WuFO6qHfJXO7dgNonKAULODG4ANr1PvmTb66LEZKqGyCUdh2xtJ2Exy1Ps95ehkCYXELWOIlVo4dd+dXbCnsn1cwyt+YWqHaeal74WueNJrJXX60XxF985lAT0Vyq0qtDBEd4vgNRgXtKG20CpDGucJnltaBO6ldQp9fMUdjjibJrnS6Y3YQUXnLh2aNLSmOVj1HacVYQ3sto5FQMO3I5Y0krWyssSYz4FyGllDN6IkgGIS0FpsSnW333CB5CszBeeg4KBwUvLBDDTgMZCAkDZBbDqY5OvlMbn7QoYB7HK+jUJz26R2FDOWt9P6gsGXSM83YUv6d9TrlR/PJaZCKk2CO7tC+MreKWeF3bU6Dp2BNHjdGleUzsI3Gbgz4F2zbtHJUHCLlmuaYdgr5UYkymQ3PmZ+3iBfmBiCtrlycok47WmLJYAyFedba5/guUpx7/6mcMKJWn7SegPKOE9mPMU30juj2yHGc82wjSqGNr4p3LoZGDyfwHE4TKK3tpL89Txb+Lzr24J9EK7zp3wQ4l5ig/OeDXrCanWY7rWwoQL5C+CnVS1QC39rs4y3/hZ956fvSB31pSboUEIt7qT+DKVyCmh+W8ceSPsG6sXM4FPqfXi5ePGAeHiEszVd4k2qrj79vbxdTRerj3/9uZjdLuarZZUksizXldac4feAk55S+rVMEW7st0hpnqLliudc36fCfsTCHr/vVvaIk70l/76It+W/PEJh978de4XdX491qi+dxRw7JfsLkt2n2M/U70G1j5HsbKxT/T6aegP1e1C9I9Rv/nPeq98OOEdP+foWig8U51fL1zHvrqX5F/l/pbCUPUNhX/Ae5ZGooscTVBQP6vVzpOYMJl2PUALPw88bJvmS/3C2SB7k+AgVcNx/rBEeu/wi5EYHvy8u+hUnEHl0cvsPDn4xcuMD58avRi42m0eqvq/12Dpa/AA=</diagram></mxfile>

dependency-injection/docs/inject-name-demo-classdiagram.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>7VhZbxs3EP41AtqHFDqydvOoy20KJwgiF2meDHp3pGXC5ahcyrLy6zPkDrWnYQVe5yGQIAjit8Njvm8OiYPJPHv4y4ht+g4TUIPxMHkYTBaD8fjP8YQ+HXAogCh6UwAbI5MCGpXASn4DBoeM7mQCec3QIiort3UwRq0htjVMGIP7utkaVX3XrdiEHUtgFQvVRj/JxKbBrYsS/xvkJg07jy7YvzsRf90Y3GnebzCerP2reJyJsBY7mqciwX0FmiyJVoNIK7tv2cMclKM20FbMu3rk6fHcBjSf7YkJ4Rz2EHyHhKjgIRqb4ga1UMsSnXn/wK0wpFFqM0VfR/SVNjWH/xj3g89u8Efkh8nUKeNW3YK+SaUu0CtJJyqmfAFrDxwNYmeRoPIE14hb3qc4szvoo24zlOPOxGxFYx9IwmyArS6PlFMkA2ZARyYTA0pYeV9fXXBMbY52Ja/0hantppm3vhdqx4teSVDJ7PBeZPBWf6EYXkCGLS3yvcyU0I70Cs1r1DYo5MZCyQ2RuYjJezAE3IOxkqJ5yg+sY24Wp1Il1+KAO+d9bilUw2iWopHfaFkR9qDHxrIUFPZVi5WbyYoZyMnmQyDezSyga5E7wNnEqJTY5vLueOCMJJB6htZixkbBUxcNc1RIbhABIXmC5M4x4CLzmOhtOUNVKiZwSQqRvy/ze3LJOqWV3H7Dds+Rn6thRf5XNNSkfbIASoYEdEzHmhI4NXfSGmEOlQfNqCAKvGZlROTW4FcIvGn0EbOuUMlQiBQFa7dCd5zkWxFLvbn2NovXJfKRWXHQPpUWVoS7M+2pCbhcpfXWyqd4KhM6u68VVlhRSO903qLU1lMZzehN5M5dfYjIrzmNScEwprczN3aOmvwTNI+mAcXVHlxsnRYSXtF2SHAQhIL+VBAEu+cEwetWELSEVbKZ6oWwoQf55P9hVTPSwtdtlvHG19FXfvma1JO21A5qSqjEHagPmEsr0a1vCtuGtD9BvYgZfEo9TvzniBd1iEcuNHP49t2/q5vb2fL27ft/lvOb5eJ2jsZQdVec3itriN1zRr9YTFycWNb7yGheohIUn8FONdoUzCl1/Nzde+zuUWjUob+P2rX9+LO71uC5Oz8nEvzvyFaD94XynPc95b2X80c6eafafeQ995NzJ+9NvY5O3qleD52c/6i3OrnFIkd/+/2csT9F845O/WIZO+LTVVT/CP/vJHWzExT2Pe9RHh1V7rLC9cVGyz5Fas5hp2sPXXDU7IIRp0yF5UB8jeQe/uWO2rcc4RbmF2E3umywe9FRt16K3fYlwi/G7njYYHfY0dP7YZeG5R2rf1a5x54svwM=</diagram></mxfile>

dependency-injection/docs/inject-qualifier-demo-classdiagram.xml

@@ -1 +1 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>7Vptb+I4EP41le4+bEUIUPZjeenenrqn3tLT3X6qTGIS7zox5zil7K/fcTLTvHbhFOAkBEKAx87EM88zL7G4cqfRywfN1uEn5XN51e/5L1fu7KrfH/dd+LSCbS4Y9VAQaOHnIqcQLMR3jsIeSlPh86Sy0CgljVhXhZ6KY+6ZioxprTbVZSslq3dds4DuWAgWHpNN6d/CNyGZNSrkv3ERhHRnZ/Q+n1ky71ugVRrj/a767ip75dMRI11oaBIyX21KIncObtVKgWb7K3qZcmldS27Lr7t7Y/Z135rHuLcdF9A+zJZs5z64AodKm1AFKmZyXkgnmX3caujBKDSRhJ8O/ISb6u0/KM8GX+zgepgN/VuLjNW65vFjKOJceidgR/klX7kxW2QDS40CUbGDe6XWeJ+mlWh4olLtoR0wznjDdMBx1U0ushaWLkPPfOAq4rBlWKC5ZEY8V8nAkFPB67rCr/ADXdvuZtzLM5MpKr0TXPp/pkyKleD6Y/wVaDzjkWrAkWxEJFls/V7y9ErFhkCyY9ATgD9nHniEaxA8c20EEPoWJ4x13sQLhfTv2Val1iOJAbbSaBIqLb6DWkb3gGltEA1gfnnFwl6JoGmewJoHAsNemYvuWWIFdo2npGTrRCxfNxwBLCKeKGNUhIvIUkuIqZIKzAAHUPz8BHVrK8fU8waiNIt0x7REw00R4+4NysJKfKOwCwcwA5Y48M5mSL5iqQToISZ8Hnuws1sQ3+qlMJrpbWmiP5IWJ188w8/A/gQFIxZZYONlkn2xiPs1XdUVP1EMBpR0N4gILs5oUpAwMVp94wRVrDKSrkrooYjIKfnKaminZrJmnoiD+2zNbFBIPiMOVrQJheELkNs9baD02AwB+lYySyyh8MGiLEMZZljONkuttRKxybAbTuANaE5tVhqCXVMYA2loDG+7XJupisE+BtfBZRyovOGWzi0spODezUKkHZWRXbQbDLqzDlWUWNcAVop6dsmBpcqX5Zv/jGoEWGTVAmF8zLL3u0x9BWq3CbUV1SGUbMnlg0qEEcrq1/naGrQnQI+Q2oXeuDt4DhLlDKvzsFmdHYTi9OUZN1MJEjCjB6VZltLp06e/Fo9Pk/nTxz9+n08f57OnRep5PElWqZTbX37NU/ezArWX5Lln+HUt4WPs6XZFo4vltwtNMBpLNGmtppcG7ngN3IgenKiDQ1hL8DujFvjfH6CBQ6bVGrisLuWRvzAaQu4S+/vGPsVTl8apFW1a1wVtLN+Xxulg6A3Rg7vQO0DjhKcxjYJuVB6jVKsvEXtkzAnfU0Ssg23cobvl6xuoMqWO2bnuuWMSPHAtYKe2ZGNf/dpIL6WyNfaYXbRDh6OlNhq5f/oumjZT7o9iZUKuL23Siduk4bjaJrmDZhz2e20nXSTsRITmceelU+r2lLQ/A95ulVoBP0jibR5tXnqljvi1NEut+B3ilKntjPDSLf0fUdvSLh0vapvPs5/5v6mAorYHxFnpe9OR1le2ubHlsVa598Eaw9gCe4BiOKgXw2Zotbakh6iEzafIM/XxsObj8Qmd3Hzao1b5TLzr0vEVpYnmoSc58tDOJR3n69xhzbkt6eFozm0+MZ0bc2u516FgPYV3m48h50ZdSqlE3eHRvAvD4l9J2Vzpn1/u/Ac=</diagram></mxfile>
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36" version="5.5.2.3" editor="www.draw.io" type="device"><diagram>7VptbyI3EP41SO2Hi1iWl+RjAuSuUpqml6jX+xQZ1uz6zrumXhPC/fqb8Y7ZV0IaXqpGICTWw3hsz/N4Zmxo+cP4+aNm8+h3FXDZ6rSD55Y/anU6XrvvwwdKVpmk3yZBqEVASrngXvzgridJFyLgaUnRKCWNmJeFU5UkfGpKMqa1WpbVZkqWR52z0I2YC+6nTNalX0Rgokx63unn8k9chJEb2etfZN9M2PR7qNUiofFaHX9mX9nXMXO2aKFpxAK1LIj8MfhVKwWW8Sl+HnKJvnVuy/pdb/h2PW/NE5rblg5uHmbl1s4DcAU1lTaRClXC5DiXXtn1cbTQhlZkYgmPHjzCoHr1N8lt4ys2znq2GVwiMmh1zpOHSCSZ9FrAjLIu37gxK2IDWxgFonwGN0rNaZz6KmnhqVroKa0D2pY3TIectAaZCFdY6Eae+chVzGHKoKC5ZEY8lcnAiFPhWi/3KzyQa5vdTHN5YnJBRq8Fl8GfCybFTHD9W/INaDzisarBkS5FLFmCfi94eqYS40DCNtgJwZ+jKXiEaxA8cW0EEPqSvjDovKtpJGRww1ZqgR5JDbDVta4ipcUPMMvcGPC1NoQGML+ocY89CTTNU9C5c2Bgz0x0w1IUoM5UScnmqZisJxwDLCK5UsaomJTcSpEQQyUVLAMc4PbPC6jjWrmLPc2IUhwaEAOW+abuuq0YFTd0h+LVLqCTiQLoH1qdPosRiGSS4ge0Jfo+nbMEnkN8Bj7IYMRhjwQ8ma5gQZkODFdUa/mXYPxST4TRTK/yDk4/EE9O9y3jwtQ3j1u29sIkoHNhHjVyA2yWejmxU6PVd+7gT5Ql/qzACBI5wks+QwvNdId5T0US3lidUTeXfCaoUbSMhOH3IMc5LSGfYdQBezNpg1UkAliRjXqGGZYxGOk6VyIxlh69K3gDi4YY6XqwriG0ATfXhjeqazNUCayPQT/oxmF7LDlukQZmu4Dxama71LSN2d3u7sQmEwVi14CVohqxMmBdNrUx7F+jGgMWNgMRjA82I3yw5ktQ+3WoUVSFULIJl3cqFUYotK8z3Qq0R0BvQEhtQ+98d/B6DeA1xoMQEmByCVl4KTTPU9UfiU1djw+fxrePo/Hd+HY0vh1+9R7/AoVgU9BosP/Lry9GtieVWyuFkD1MtvOmyQJjqhPb0PMU9Y4U9Qa0IbZGvT2kc48i7P+rVObPwthhzroX1MSBvLP2gJp3XAtwBlaN1vKrimuKIsXi2iP09lddU9c7pByoOEacE8Au8/nUdiayeVKvHF9wKcPhnRoxeeM4nXZlnHY21fVRaot+t505KadXNoOcbGufvIp/RL9C4G6su07HhwMcH+jbfq8MsTs9F8KP128IPxcVhr4l/NDJpXyaaNsKJstL90ZDjD8lm9cmG7efdimxG9F2erugTXntVGLvDb0eeXAbensosekusFpiwxVmtkehmDzt2GNg7vA9xo71qCTad3l4NvBwX61LRKjc/HMnqNZuhcpxIhXm2EPesHruar5QBRL3j3/F6iZTrI8SZSKuT2XSscskVxfRNvT79cy5rpZL165OuBMR6pftp0ppp7i73lq7lEqNgO8l8Nbv2U+10o74NRRLjfjtoVjymm6TT9XSf7FrG8qlw+3a+nn2M/9nAbe39kpmC8Q29W10JPoKixtMj5XM/RqsaRsjsHtIht3KdZVf31qNJek+MmH9FPlOfVy5l/HPj+jk+mnPlcrvxLveBR1tXkoOh3Gus/F+ndt3t9euciI6HcO59RPTO3Nu/Qq/KcMdyLv1Y8g7827PXWu7qDs4GHehmf8nLvvtJP/joT/+CQ==</diagram></mxfile>

dependency-injection/docs/resource-field-demo-classdiagram.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>7Vhtb+I4EP41SHcftgICtP1YoN1bqXtalZ7u7lPlJiZx1/HkHANlf/3OOGOSEPpyonfaOxUhFD8ejz3zzItDL5rljx+tKLLPkEjdG/aTx1407w2HZ8MIfwnYVsB4fF4BqVVJBQ1qYKG+SQb7jK5UIsuWoAPQThVtMAZjZOxamLAWNm2xJej2roVIw441sIiF7qK/q8RlwaxJjf8iVZqFnQcTtu9exF9TCyvD+/WG0dJ/qulcBF1saJmJBDYNKLpEt1oA1ExP+eNManJtcFu17uqJ2d25rTR8tucX4BQtWAu9YtN7w4nGpdMCH1J6uFJSJzeyhJWN5SfzgP5WYOYyhyCK6nfSbJbbBleWG5VrYXA0zVyuERzg4xKMW7AQjYVWqcHnGM8tLQJraZ1CQi54wkGBaJwpnVyLLazIutKht8NomoFV31CtCHvgtHUcW6PzlsSCViLcR9TKEmW+BJfRygq6FiUBJBOD1qIo1f3uwLmwqTJTcA5yFgqWXimtZ6ABzUAHBP6Da5rcMF1kq+TU8RBz9VFCLp3dokiY5bDhtBpxmm3qGI1GLJI14/OUBQXnRbrTXMcGPnB4HA4VVtEIlQ+U4XIpVtqhzQheIPAg1uJEwYlH9oMBzfRU1YFQOgtfZXCXAR8oy4YHGQoBouWSNBwOj7IQsTLptZeZj2rkhn1B0CZTTi4QpzNtsHwhBqhvqX0iZipJJKqcWnDCiYpxorcAZZz333iKX3TzrH8y7o3RrhmOkbgwxi+JWzcDg/YJXIfLJIbTRlJIHYiEkIcvR0KgngvOS9RHXLKOYX50oEjsEavVfoZXxIbq6XP+b7OaIxe0Q6Dxllief/DqW1RHXaoJ2qdQi3upv0CpqIIhZivZPWr/BfbOxq9j7+x48ninFnloQr/QaFko6xfGkKvQK3eff1vc3l19+nV+N69T+6efq+ReA6p9T+p/KizOX1nPx4wdExennbh4tnL/GG0cL2A/SBvvkHqgsz/Zxk/77T4+CNfBBvGDyaF6wCF1DPHcON6reTNtX6DTJ8uTaRteC15ib8SN9KhbGJ+uwZZM8N2Fh2hoBikYoS9rFD2HLySSNJDfGrSigXb7B+N+8CcNsOLRMLmgVynSWkhzmykqoIhSYvCSB+nclnNTrBxQ1d2d4Bo8wbRPdWY66PMZg3b5ftS6cWL+p/J5IqzU2L3Wbe1Hubn7YnQj/1opLCmv6H++8DzZZSgiyVlUnPbq5msaIacNdb03KEXjvVeKwaQbzIdiOVSso5zcfaXoRvd/2rtR6NTh3te9tQdHvrlzu7f2/5lzJ6fszRC6I1bx9t7FYf2fjJ9r/O8VXX4H</diagram></mxfile>

dependency-injection/docs/resource-method-demo-classdiagram.xml

@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36" version="5.5.1.6" editor="www.draw.io" type="device"><diagram>3Vhbb+I6EP41SN0HECGQbh8boNuutkerltXZ84QMcRL3OHFqHAr99R0749y4qCpdqV0eQvx5PJ755mJDxx0nm2+SZPGtCCjvDPrBpuNOOoPB14ELTw1sC2A0uiiASLKggJwKuGfPFME+ojkL6KohqITgimVNcCnSlC5VAyNSiqemWCh4c9eMRHbHCrhfEr6L/ssCFVu3vAq/piyK7c6Oh/4tyPL/SIo8xf06Azc0n2I6IVYXOrqKSSCeapA7BVqlEKBZvyWbMeWaWktbse7qwGxpt6Qp2nZ8ATq0UlvrOg2ACRwKqWIRiZTwaYX6xj2qFfRhFKuEw6sDr7Cn3P5G3Az+04PeyAyDSx0YrTWj6SxmaYFeMTCoWPJAldpiMpBcCYAqC34IkeE+hc3a0INeI7QSuVyiFKakIjKiKDUqGYdEpiKhYDKISMqJYuumdoIpFZVyFa3wgsweCAtGe014jlrv6GPOJOR4m39FN2BdnVaQYs9kYQQ0TZlgqTLWjPzOaAII4SwCOidL8J9KANZUKgbpfIkTCQsCEztOFpT7ZZKOBRcgD/vaNLXsag0Uy7lZbGhJlcN13k0+7TKKivo9DAK2he6wGL6acNT8UzNQqe2CeE2r01IgwnAFEW/HqzTvVSFEw2sR7Aw8riOVNeLnPea6dv0E0kyn+CXM9rMNPA210AE03lU6mfXcsDanQ9/FWOo5DGepE94i/DY7LyxwS6FKgjtapPtN+gBhYiKd0ERYWfCvFC/Xa90NBKTAnSYWg1QfMrDpH3B8yKw3EcJpCFIlI23dXX2Y0JDkXEHDAM1a8oGsSY+JnkHe2QMLaIwkECw/Xaz0l5VZZSTd6yhnKe3GeDpoM52ezpXWVjVn5re/7mdzfzq/+ef7dDybTuZjISWEkEPOl14V+zXtPNGGsy/F5FpAlh/faR+tO8CJ5hwh+6j/BQYlPqk4PavnxlvdbHXmdlM1NVz23iKBfQFSITfnXGhONj8UqcJDzYEOZsZXJGEQXXdyTfmaaq3Nln+wB++ccQd7rWPbM3ZFF4dP1X3G7SNmQ2PWnSN4yoFnDtaP2i0PtI2d9vhhm+En7N+vNflTl5xna8xeRIa7Ned4e2ru4h1K7nyn5Owd+MS7JVzEMXv0ghb3+wMErXXJ0mhmbuxwyXsXdodavsbuBTaZGrm25dW5tdgp3OKPu7+XW8/emW3men+MXBhWP2+Li3j1F4I7fQE=</diagram></mxfile>

dependency-injection/pom.xml

@@ -65,7 +65,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	            <artifactId>maven-surefire-plugin</artifactId>
 	            <configuration>
 	                <includes>
-	                    <include>**/*Demo.java</include>
+	                    <include>**/*Test.java</include>
 	                </includes>
 	            </configuration>
         	</plugin>

dependency-injection/src/test/java/com/baeldung/autowired/FieldAutowiredNameTest.java

@@ -8,20 +8,24 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.configuration.ApplicationContextTestAutowiredName;
 import com.baeldung.dependency.ArbitraryDependency;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Autowired-Name.xml"})
-public class FieldAutowiredNameDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestAutowiredName.class)
+public class FieldAutowiredNameTest {
 
     @Autowired
     private ArbitraryDependency autowiredFieldDependency;
 
     @Test
-    public void autowiredFieldDependency_MUST_BE_AUTOWIRED_Correctly() {
+    public void givenAutowiredAnnotation_WhenOnField_ThenDependencyValid(){
         assertNotNull(autowiredFieldDependency);
-        assertEquals("Arbitrary Dependency", autowiredFieldDependency.toString());
+        assertEquals("Arbitrary Dependency",
+                        autowiredFieldDependency.toString());
 	}
 }

dependency-injection/src/test/java/com/baeldung/autowired/FieldAutowiredTest.java

@@ -8,19 +8,22 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.configuration.ApplicationContextTestAutowiredType;
 import com.baeldung.dependency.ArbitraryDependency;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Autowired-Type.xml"})
-public class FieldAutowiredDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestAutowiredType.class)
+public class FieldAutowiredTest {
 
     @Autowired
     private ArbitraryDependency fieldDependency;
 
     @Test
-    public void fieldDependency_MUST_BE_AUTOWIRED_Correctly() {
+    public void givenAutowired_WhenSetOnField_ThenDependencyResolved() {
         assertNotNull(fieldDependency);
         assertEquals("Arbitrary Dependency", fieldDependency.toString());
     }

dependency-injection/src/test/java/com/baeldung/autowired/FieldQualifierAutowiredTest.java

@@ -9,13 +9,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.configuration.ApplicationContextTestAutowiredQualifier;
 import com.baeldung.dependency.ArbitraryDependency;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Autowired-Qualifier.xml"})
-public class FieldQualifierAutowiredDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestAutowiredQualifier.class)
+public class FieldQualifierAutowiredTest {
 
     @Autowired
     @Qualifier("autowiredFieldDependency")
@@ -26,14 +29,15 @@ public class FieldQualifierAutowiredDemo {
     private ArbitraryDependency fieldDependency2;
 
     @Test
-    public void fieldDependency1_MUST_BE_AUTOWIRED_Correctly() {
+    public void givenAutowiredQualifier_WhenOnField_ThenDep1Valid(){
         assertNotNull(fieldDependency1);
         assertEquals("Arbitrary Dependency", fieldDependency1.toString());
     }
 
     @Test
-    public void fieldDependency2_MUST_BE_AUTOWIRED_Correctly() {
+    public void givenAutowiredQualifier_WhenOnField_ThenDep2Valid(){
         assertNotNull(fieldDependency2);
-        assertEquals("Another Arbitrary Dependency", fieldDependency2.toString());
+        assertEquals("Another Arbitrary Dependency",
+                        fieldDependency2.toString());
     }
 }

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestAutowiredName.java

@@ -0,0 +1,9 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackages={"com.baeldung.dependency"})
+public class ApplicationContextTestAutowiredName {
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestAutowiredQualifier.java

@@ -0,0 +1,25 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.dependency.AnotherArbitraryDependency;
+import com.baeldung.dependency.ArbitraryDependency;
+
+@Configuration
+public class ApplicationContextTestAutowiredQualifier {
+
+	@Bean
+	public ArbitraryDependency autowiredFieldDependency() {
+		ArbitraryDependency autowiredFieldDependency = new ArbitraryDependency();
+
+		return autowiredFieldDependency;
+	}
+
+	@Bean
+	public ArbitraryDependency anotherAutowiredFieldDependency() {
+		ArbitraryDependency anotherAutowiredFieldDependency = new AnotherArbitraryDependency();
+
+		return anotherAutowiredFieldDependency;
+	}
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestAutowiredType.java

@@ -0,0 +1,16 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.dependency.ArbitraryDependency;
+
+@Configuration
+public class ApplicationContextTestAutowiredType {
+
+    @Bean
+    public ArbitraryDependency autowiredFieldDependency() {
+        ArbitraryDependency autowiredFieldDependency = new ArbitraryDependency();
+        return autowiredFieldDependency;
+    }
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestInjectName.java

@@ -0,0 +1,17 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.dependency.YetAnotherArbitraryDependency;
+
+@Configuration
+public class ApplicationContextTestInjectName {
+
+    @Bean
+    public ArbitraryDependency yetAnotherFieldInjectDependency() {
+        ArbitraryDependency yetAnotherFieldInjectDependency = new YetAnotherArbitraryDependency();
+        return yetAnotherFieldInjectDependency;
+    }
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestInjectQualifier.java

@@ -0,0 +1,23 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.dependency.AnotherArbitraryDependency;
+import com.baeldung.dependency.ArbitraryDependency;
+
+@Configuration
+public class ApplicationContextTestInjectQualifier {
+
+	@Bean
+	public ArbitraryDependency defaultFile() {
+		ArbitraryDependency defaultFile = new ArbitraryDependency();
+		return defaultFile;
+	}
+
+	@Bean
+	public ArbitraryDependency namedFile() {
+		ArbitraryDependency namedFile = new AnotherArbitraryDependency();
+		return namedFile;
+	}
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestInjectType.java

@@ -0,0 +1,16 @@
+package com.baeldung.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.baeldung.dependency.ArbitraryDependency;
+
+@Configuration
+public class ApplicationContextTestInjectType {
+
+	@Bean
+	public ArbitraryDependency injectDependency() {
+		ArbitraryDependency injectDependency = new ArbitraryDependency();
+		return injectDependency;
+	}
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestResourceNameType.java

@@ -0,0 +1,16 @@
+package com.baeldung.configuration;
+
+import java.io.File;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ApplicationContextTestResourceNameType {
+
+    @Bean(name="namedFile")
+    public File namedFile() {
+        File namedFile = new File("namedFile.txt");
+        return namedFile;
+    }
+}

dependency-injection/src/test/java/com/baeldung/configuration/ApplicationContextTestResourceQualifier.java

@@ -0,0 +1,22 @@
+package com.baeldung.configuration;
+
+import java.io.File;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ApplicationContextTestResourceQualifier {
+
+    @Bean(name="defaultFile")
+    public File defaultFile() {
+        File defaultFile = new File("defaultFile.txt");
+        return defaultFile;
+    }
+
+    @Bean(name="namedFile")
+    public File namedFile() {
+        File namedFile = new File("namedFile.txt");
+        return namedFile;
+    }
+}

dependency-injection/src/test/java/com/baeldung/dependency/AnotherArbitraryDependency.java

@@ -1,5 +1,8 @@
 package com.baeldung.dependency;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class AnotherArbitraryDependency extends ArbitraryDependency {
 
     private final String label = "Another Arbitrary Dependency";

dependency-injection/src/test/java/com/baeldung/dependency/ArbitraryDependency.java

@@ -1,5 +1,8 @@
 package com.baeldung.dependency;
 
+import org.springframework.stereotype.Component;
+
+@Component(value="autowiredFieldDependency")
 public class ArbitraryDependency {
 
     private final String label = "Arbitrary Dependency";

dependency-injection/src/test/java/com/baeldung/dependency/YetAnotherArbitraryDependency.java

@@ -1,5 +1,8 @@
 package com.baeldung.dependency;
 
+import org.springframework.stereotype.Component;
+
+@Component
 public class YetAnotherArbitraryDependency extends ArbitraryDependency {
 
     private final String label = "Yet Another Arbitrary Dependency";

dependency-injection/src/test/java/com/baeldung/inject/FieldByNameInjectTest.java

@@ -10,21 +10,25 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.configuration.ApplicationContextTestInjectName;
 import com.baeldung.dependency.ArbitraryDependency;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Inject-Name.xml"})
-public class FieldByNameInjectDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestInjectName.class)
+public class FieldByNameInjectTest {
 
     @Inject
     @Named("yetAnotherFieldInjectDependency")
     private ArbitraryDependency yetAnotherFieldInjectDependency;
 
     @Test
-    public void yetAnotherFieldInjectDependency_MUST_BE_INJECTED_Correctly() {
+    public void givenInjectQualifier_WhenSetOnField_ThenDependencyValid() {
         assertNotNull(yetAnotherFieldInjectDependency);
-        assertEquals("Yet Another Arbitrary Dependency", yetAnotherFieldInjectDependency.toString());
+        assertEquals("Yet Another Arbitrary Dependency",
+        		       yetAnotherFieldInjectDependency.toString());
     }
 }

dependency-injection/src/test/java/com/baeldung/inject/FieldInjectDemo.java

@@ -1,27 +0,0 @@
-package com.baeldung.inject;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.inject.Inject;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.baeldung.dependency.ArbitraryDependency;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Inject-Type.xml"})
-public class FieldInjectDemo {
-
-    @Inject
-    private ArbitraryDependency inject1Dependency;
-
-    @Test
-    public void fieldDependency_MUST_BE_INJECTED_Successfully() {
-        assertNotNull(inject1Dependency);
-        assertEquals("Arbitrary Dependency", inject1Dependency.toString());
-    }
-}

dependency-injection/src/test/java/com/baeldung/inject/FieldInjectTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.inject;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.inject.Inject;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestInjectType;
+import com.baeldung.dependency.ArbitraryDependency;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestInjectType.class)
+public class FieldInjectTest {
+
+    @Inject
+    private ArbitraryDependency fieldInjectDependency;
+
+    @Test
+    public void givenInjectAnnotation_WhenOnField_ThenValidDependency(){
+        assertNotNull(fieldInjectDependency);
+        assertEquals("Arbitrary Dependency",
+                        fieldInjectDependency.toString());
+    }
+}

dependency-injection/src/test/java/com/baeldung/inject/FieldQualifierInjectTest.java

@@ -10,13 +10,15 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.configuration.ApplicationContextTestInjectQualifier;
 import com.baeldung.dependency.ArbitraryDependency;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Inject-Qualifier.xml"})
-public class FieldQualifierInjectDemo {
+@ContextConfiguration(loader=AnnotationConfigContextLoader.class,
+                      classes=ApplicationContextTestInjectQualifier.class)
+public class FieldQualifierInjectTest {
 
     @Inject
     @Qualifier("defaultFile")
@@ -27,14 +29,16 @@ public class FieldQualifierInjectDemo {
     private ArbitraryDependency namedDependency;
 
     @Test
-    public void defaultDependency_MUST_BE_INJECTED_Successfully() {
+    public void givenInjectQualifier_WhenOnField_ThenDefaultFileValid(){
         assertNotNull(defaultDependency);
-        assertEquals("Arbitrary Dependency", defaultDependency.toString());
+        assertEquals("Arbitrary Dependency",
+                        defaultDependency.toString());
     }
 
     @Test
-    public void namedDependency_MUST_BE_INJECTED_Correctly() {
+    public void givenInjectQualifier_WhenOnField_ThenNamedFileValid(){
         assertNotNull(defaultDependency);
-        assertEquals("Another Arbitrary Dependency", namedDependency.toString());
+        assertEquals("Another Arbitrary Dependency",
+                        namedDependency.toString());
     }
 }

dependency-injection/src/test/java/com/baeldung/resource/FieldResourceInjectionDemo.java

@@ -1,25 +0,0 @@
-package com.baeldung.resource;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-
-import javax.annotation.Resource;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-NameType.xml"})
-public class FieldResourceInjectionDemo {
-
-    @Resource(name="namedFile")
-    private File defaultFile;
-
-    @Test
-    public void plainResourceAnnotation_MUST_FIND_DefaultFile() {
-        assertNotNull(defaultFile);
-    }
-}

dependency-injection/src/test/java/com/baeldung/resource/FieldResourceInjectionTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.resource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceNameType;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestResourceNameType.class)
+public class FieldResourceInjectionTest {
+
+    @Resource(name="namedFile")
+    private File defaultFile;
+
+    @Test
+    public void givenResourceAnnotation_WhenOnField_ThenDependencyValid(){
+        assertNotNull(defaultFile);
+        assertEquals("namedFile.txt", defaultFile.getName());
+    }
+}

dependency-injection/src/test/java/com/baeldung/resource/MethodByQualifierResourceTest.java

@@ -12,17 +12,21 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceQualifier;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-Qualifier.xml"})
-public class MethodByQualifierResourceDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestResourceQualifier.class)
+public class MethodByQualifierResourceTest {
 
 	private File arbDependency;
 	private File anotherArbDependency;
 
 	@Test
-	public void dependencies_MUST_BE_INJECTED_Correctly() {
+	public void givenResourceQualifier_WhenSetter_ThenValidDependencies(){
 		assertNotNull(arbDependency);
 		assertEquals("namedFile.txt", arbDependency.getName());
 		assertNotNull(anotherArbDependency);

dependency-injection/src/test/java/com/baeldung/resource/MethodByTypeResourceTest.java

@@ -1,5 +1,6 @@
 package com.baeldung.resource;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -10,11 +11,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-NameType.xml"})
-public class MethodByTypeResourceDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestResourceNameType.class)
+public class MethodByTypeResourceTest {
 
     private File defaultFile;
 
@@ -24,7 +29,8 @@ public class MethodByTypeResourceDemo {
     }
 
     @Test
-    public void defaultFile_MUST_BE_INJECTED_Correctly() {
+    public void givenResourceAnnotation_WhenSetter_ThenValidDependency(){
         assertNotNull(defaultFile);
+        assertEquals("namedFile.txt", defaultFile.getName());
     }
 }

dependency-injection/src/test/java/com/baeldung/resource/MethodResourceInjectionTest.java

@@ -1,4 +1,6 @@
 package com.baeldung.resource;
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -9,11 +11,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-NameType.xml"})
-public class MethodResourceInjectionDemo {
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestResourceNameType.class)
+public class MethodResourceInjectionTest {
 
     private File defaultFile;
 
@@ -23,7 +29,8 @@ public class MethodResourceInjectionDemo {
     }
 
     @Test
-    public void defaultFile_MUST_BE_INJECTED_Correctly() {
+    public void givenResourceAnnotation_WhenSetter_ThenDependencyValid(){
         assertNotNull(defaultFile);
+        assertEquals("namedFile.txt", defaultFile.getName());
     }
 }

dependency-injection/src/test/java/com/baeldung/resource/NamedResourceTest.java

@@ -1,6 +1,6 @@
 package com.baeldung.resource;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 
@@ -10,18 +10,21 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-NameType.xml"})
+@ContextConfiguration(loader=AnnotationConfigContextLoader.class,
+                      classes=ApplicationContextTestResourceNameType.class)
 public class NamedResourceTest {
 
     @Resource(name="namedFile")
     private File testFile;
 
     @Test
-    public void namedResource_MUST_FIND_SPECIFIED_File() {
+    public void givenResourceAnnotation_WhenOnField_THEN_DEPENDENCY_Found() {
         assertNotNull(testFile);
-        assertTrue(testFile.getName().equals("namedFile.txt"));
+        assertEquals("namedFile.txt", testFile.getName());
     }
 }

dependency-injection/src/test/java/com/baeldung/resource/QualifierResourceInjectionDemo.java

@@ -1,35 +0,0 @@
-package com.baeldung.resource;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-
-import javax.annotation.Resource;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-Qualifier.xml"})
-public class QualifierResourceInjectionDemo {
-
-    @Resource
-    private File defaultFile;
-	
-    @Resource
-    @Qualifier("namedFile")
-    private File namedFile;
-
-    @Test
-    public void defaultFile_MUST_BE_Valid() {
-        assertNotNull(defaultFile);
-    }
-
-    @Test
-    public void namedFile_MUST_BE_Valid() {
-        assertNotNull(namedFile);
-    }
-}

dependency-injection/src/test/java/com/baeldung/resource/QualifierResourceInjectionTest.java

@@ -0,0 +1,43 @@
+package com.baeldung.resource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceQualifier;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(
+    loader=AnnotationConfigContextLoader.class,
+    classes=ApplicationContextTestResourceQualifier.class)
+public class QualifierResourceInjectionTest {
+
+    @Resource
+    @Qualifier("defaultFile")
+    private File dependency1;
+	
+    @Resource
+    @Qualifier("namedFile")
+    private File dependency2;
+
+    @Test
+    public void givenResourceAnnotation_WhenField_ThenDependency1Valid(){
+        assertNotNull(dependency1);
+        assertEquals("defaultFile.txt", dependency1.getName());
+    }
+
+    @Test
+    public void givenResourceQualifier_WhenField_ThenDependency2Valid(){
+        assertNotNull(dependency2);
+        assertEquals("namedFile.txt", dependency2.getName());
+    }
+}

dependency-injection/src/test/java/com/baeldung/resource/SetterResourceInjectionTest.java

@@ -1,4 +1,6 @@
 package com.baeldung.resource;
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -9,11 +11,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
-		"/applicationContextTest-@Resource-NameType.xml"})
-public class SetterResourceInjectionDemo {
+@ContextConfiguration(loader=AnnotationConfigContextLoader.class,
+                      classes=ApplicationContextTestResourceNameType.class)
+public class SetterResourceInjectionTest {
 
     private File defaultFile;
 
@@ -23,7 +28,8 @@ public class SetterResourceInjectionDemo {
     }
 
     @Test
-    public void setter_MUST_INJECT_Resource() {
+    public void givenResourceAnnotation_WhenOnSetter_THEN_MUST_INJECT_Dependency() {
         assertNotNull(defaultFile);
+        assertEquals("namedFile.txt", defaultFile.getName());
     }
 }

httpclient/README.md

@@ -1,7 +1,9 @@
 =========
-
 ## HttpClient 4.x Cookbooks and Examples
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
 
 ### Relevant Articles: 
 

jackson/README.md

@@ -2,6 +2,9 @@
 
 ## Jackson Cookbooks and Examples
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
 ### Relevant Articles: 
 - [Jackson Ignore Properties on Marshalling](http://www.baeldung.com/jackson-ignore-properties-on-serialization)
 - [Jackson – Unmarshall to Collection/Array](http://www.baeldung.com/jackson-collection-array)

jooq-spring/pom.xml

@@ -5,22 +5,13 @@
 	<artifactId>jooq-spring</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
-	<properties>
-		<org.jooq.version>3.7.3</org.jooq.version>
-		<com.h2database.version>1.4.191</com.h2database.version>
-		<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
-		<org.slf4j.version>1.7.18</org.slf4j.version>
-		<ch.qos.logback.version>1.1.3</ch.qos.logback.version>
-		<junit.version>4.12</junit.version>
-	</properties>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<!-- Import dependency management from Spring Boot -->
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>1.3.3.RELEASE</version>
+				<version>1.3.5.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -46,30 +37,25 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jooq</artifactId>
-			<version>1.3.3.RELEASE</version>
 		</dependency>
 
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>${ch.qos.logback.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -77,15 +63,13 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${org.springframework.version}</version>
 			<scope>test</scope>
-		</dependency> 
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -166,6 +150,29 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
+
+	<properties>
+		<org.jooq.version>3.7.3</org.jooq.version>
+		<com.h2database.version>1.4.191</com.h2database.version>
+		<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+		<org.slf4j.version>1.7.18</org.slf4j.version>
+		<ch.qos.logback.version>1.1.3</ch.qos.logback.version>
+		<junit.version>4.12</junit.version>
+		
+		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+	</properties>
+
 </project>

mock-comparisons/pom.xml

@@ -12,6 +12,8 @@
 		<mockito.version>1.10.19</mockito.version>
 		<easymock.version>3.4</easymock.version>
 		<jmockit.version>1.24</jmockit.version>
+        
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- maven plugins -->
 		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>

pom.xml

@@ -9,6 +9,8 @@
 
     <modules>
         <module>apache-fop</module>
+        <module>assertj</module>
+
         <module>core-java</module>
         <module>core-java-8</module>
         <module>gson</module>

raml/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring

rest-testing/README.md

@@ -2,6 +2,8 @@
 
 ## REST Testing and Examples
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Test a REST API with Java](http://www.baeldung.com/2011/10/13/integration-testing-a-rest-api/)

spring-all/README.md

@@ -4,6 +4,8 @@
 
 This project is used to replicate Spring Exceptions only.
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
  
 ### Relevant articles: 
 - [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-boot/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring

spring-data-neo4j/README.md

@@ -0,0 +1,15 @@
+## Spring Data Neo4j
+
+### Relevant Articles:
+- [Introduction to Spring Data Neo4j](http://www.baeldung.com/spring-data-neo4j-tutorial)
+
+### Build the Project with Tests Running
+```
+mvn clean install
+```
+
+### Run Tests Directly
+```
+mvn test
+```
+

spring-data-neo4j/pom.xml

@@ -0,0 +1,93 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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-data-neo4j</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <neo4j.version>3.0.1</neo4j.version>
+        <spring-data-neo4j.version>4.1.1.RELEASE</spring-data-neo4j.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-neo4j</artifactId>
+            <version>${spring-data-neo4j.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.voodoodyne.jackson.jsog</groupId>
+            <artifactId>jackson-jsog</artifactId>
+            <version>1.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-neo4j</artifactId>
+            <version>${spring-data-neo4j.version}</version>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-kernel</artifactId>
+            <version>${neo4j.version}</version>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.neo4j.app</groupId>
+            <artifactId>neo4j-server</artifactId>
+            <version>${neo4j.version}</version>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-ogm-test</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.neo4j.test</groupId>
+            <artifactId>neo4j-harness</artifactId>
+            <version>${neo4j.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>4.2.3.RELEASE</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/config/MovieDatabaseNeo4jConfiguration.java

@@ -0,0 +1,34 @@
+package com.baeldung.spring.data.neo4j.config;
+
+import org.neo4j.ogm.session.SessionFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.neo4j.config.Neo4jConfiguration;
+import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+
+@ComponentScan(basePackages = {"com.baeldung.spring.data.neo4j.services"})
+@Configuration
+@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repostory")
+public class MovieDatabaseNeo4jConfiguration extends Neo4jConfiguration {
+
+    public static final String URL = System.getenv("NEO4J_URL") != null ? System.getenv("NEO4J_URL") : "http://neo4j:movies@localhost:7474";
+
+    @Bean
+    public org.neo4j.ogm.config.Configuration getConfiguration() {
+        org.neo4j.ogm.config.Configuration config = new org.neo4j.ogm.config.Configuration();
+        config
+                .driverConfiguration()
+                .setDriverClassName("org.neo4j.ogm.drivers.http.driver.HttpDriver")
+                .setURI(URL);
+        return config;
+    }
+
+    @Override
+    public SessionFactory getSessionFactory() {
+        return new SessionFactory(getConfiguration(), "com.baeldung.spring.data.neo4j.domain");
+    }
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/config/MovieDatabaseNeo4jTestConfiguration.java

@@ -0,0 +1,34 @@
+package com.baeldung.spring.data.neo4j.config;
+
+import org.neo4j.ogm.session.SessionFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.neo4j.config.Neo4jConfiguration;
+import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
+import org.springframework.data.neo4j.server.Neo4jServer;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+
+@EnableTransactionManagement
+@ComponentScan(basePackages = {"com.baeldung.spring.data.neo4j.services"})
+@Configuration
+@EnableNeo4jRepositories(basePackages = "com.baeldung.spring.data.neo4j.repostory")
+@Profile({"embedded", "test"})
+public class MovieDatabaseNeo4jTestConfiguration extends Neo4jConfiguration {
+
+    @Bean
+    public org.neo4j.ogm.config.Configuration getConfiguration() {
+        org.neo4j.ogm.config.Configuration config = new org.neo4j.ogm.config.Configuration();
+        config
+                .driverConfiguration()
+                .setDriverClassName("org.neo4j.ogm.drivers.embedded.driver.EmbeddedDriver");
+        return config;
+    }
+
+    @Override
+    public SessionFactory getSessionFactory() {
+        return new SessionFactory(getConfiguration(), "com.baeldung.spring.data.neo4j.domain");
+    }
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Movie.java

@@ -0,0 +1,61 @@
+package com.baeldung.spring.data.neo4j.domain;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
+import org.neo4j.ogm.annotation.GraphId;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.Collection;
+import java.util.List;
+
+@JsonIdentityInfo(generator=JSOGGenerator.class)
+
+@NodeEntity
+public class Movie {
+    @GraphId
+    Long id;
+
+    private String title;
+
+    private int released;
+    private String tagline;
+
+    @Relationship(type="ACTED_IN", direction = Relationship.INCOMING) private List<Role> roles;
+
+    public Movie() { }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public int getReleased() {
+        return released;
+    }
+
+    public String getTagline() {
+        return tagline;
+    }
+
+    public Collection<Role> getRoles() {
+        return roles;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setReleased(int released) {
+        this.released = released;
+    }
+
+    public void setTagline(String tagline) {
+        this.tagline = tagline;
+    }
+
+    public void setRoles(List<Role> roles) {
+        this.roles = roles;
+    }
+    
+    
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Person.java

@@ -0,0 +1,50 @@
+package com.baeldung.spring.data.neo4j.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
+import org.neo4j.ogm.annotation.GraphId;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.List;
+
+@JsonIdentityInfo(generator=JSOGGenerator.class)
+@NodeEntity
+public class Person {
+    @GraphId
+    Long id;
+
+    private String name;
+    private int born;
+
+    @Relationship(type = "ACTED_IN")
+    private List<Movie> movies;
+
+    public Person() { }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getBorn() {
+        return born;
+    }
+
+    public List<Movie> getMovies() {
+        return movies;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setBorn(int born) {
+        this.born = born;
+    }
+
+    public void setMovies(List<Movie> movies) {
+        this.movies = movies;
+    }
+    
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/domain/Role.java

@@ -0,0 +1,50 @@
+package com.baeldung.spring.data.neo4j.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
+import org.neo4j.ogm.annotation.EndNode;
+import org.neo4j.ogm.annotation.GraphId;
+import org.neo4j.ogm.annotation.RelationshipEntity;
+import org.neo4j.ogm.annotation.StartNode;
+
+import java.util.Collection;
+
+@JsonIdentityInfo(generator=JSOGGenerator.class)
+@RelationshipEntity(type = "ACTED_IN")
+public class Role {
+    @GraphId
+    Long id;
+    private Collection<String> roles;
+    @StartNode
+    private Person person;
+    @EndNode
+    private Movie movie;
+
+    public Role() {
+    }
+
+    public Collection<String> getRoles() {
+        return roles;
+    }
+
+    public Person getPerson() {
+        return person;
+    }
+
+    public Movie getMovie() {
+        return movie;
+    }
+
+    public void setRoles(Collection<String> roles) {
+        this.roles = roles;
+    }
+
+    public void setPerson(Person person) {
+        this.person = person;
+    }
+
+    public void setMovie(Movie movie) {
+        this.movie = movie;
+    }
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/repostory/MovieRepository.java

@@ -0,0 +1,24 @@
+package com.baeldung.spring.data.neo4j.repostory;
+
+import com.baeldung.spring.data.neo4j.domain.Movie;
+import org.springframework.data.neo4j.annotation.Query;
+import org.springframework.data.neo4j.repository.GraphRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface MovieRepository extends GraphRepository<Movie> {
+    Movie findByTitle(@Param("title") String title);
+
+    @Query("MATCH (m:Movie) WHERE m.title =~ ('(?i).*'+{title}+'.*') RETURN m")
+    Collection<Movie> findByTitleContaining(@Param("title") String title);
+
+    @Query("MATCH (m:Movie)<-[:ACTED_IN]-(a:Person) RETURN m.title as movie, collect(a.name) as cast LIMIT {limit}")
+    List<Map<String,Object>> graph(@Param("limit") int limit);
+}
+
+

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/repostory/PersonRepository.java

@@ -0,0 +1,11 @@
+package com.baeldung.spring.data.neo4j.repostory;
+
+import com.baeldung.spring.data.neo4j.domain.Person;
+import org.springframework.data.neo4j.repository.GraphRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface PersonRepository extends GraphRepository<Person> {
+    
+}

spring-data-neo4j/src/main/java/com/baeldung/spring/data/neo4j/services/MovieService.java

@@ -0,0 +1,50 @@
+package com.baeldung.spring.data.neo4j.services;
+
+import com.baeldung.spring.data.neo4j.repostory.MovieRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+@Service
+@Transactional
+public class MovieService {
+
+    @Autowired
+    MovieRepository movieRepository;
+
+    private Map<String, Object> toD3Format(Iterator<Map<String, Object>> result) {
+        List<Map<String,Object>> nodes = new ArrayList<Map<String,Object>>();
+        List<Map<String,Object>> rels= new ArrayList<Map<String,Object>>();
+        int i=0;
+        while (result.hasNext()) {
+            Map<String, Object> row = result.next();
+            nodes.add(map("title",row.get("movie"),"label","movie"));
+            int target=i;
+            i++;
+            for (Object name : (Collection) row.get("cast")) {
+                Map<String, Object> actor = map("title", name,"label","actor");
+                int source = nodes.indexOf(actor);
+                if (source == -1) {
+                    nodes.add(actor);
+                    source = i++;
+                }
+                rels.add(map("source",source,"target",target));
+            }
+        }
+        return map("nodes", nodes, "links", rels);
+    }
+
+    private Map<String, Object> map(String key1, Object value1, String key2, Object value2) {
+        Map<String, Object> result = new HashMap<String,Object>(2);
+        result.put(key1,value1);
+        result.put(key2,value2);
+        return result;
+    }
+
+    public Map<String, Object> graph(int limit) {
+        Iterator<Map<String, Object>> result = movieRepository.graph(limit).iterator();
+        return toD3Format(result);
+    }
+}

spring-data-neo4j/src/main/resources/logback.xml

@@ -0,0 +1,20 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>

spring-data-neo4j/src/test/java/com/baeldung/spring/data/neo4j/MovieRepositoryTest.java

@@ -0,0 +1,133 @@
+package com.baeldung.spring.data.neo4j;
+
+import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration;
+import com.baeldung.spring.data.neo4j.domain.Movie;
+import com.baeldung.spring.data.neo4j.domain.Person;
+import com.baeldung.spring.data.neo4j.domain.Role;
+import com.baeldung.spring.data.neo4j.repostory.MovieRepository;
+import com.baeldung.spring.data.neo4j.repostory.PersonRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.*;
+
+import static junit.framework.TestCase.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class)
+@ActiveProfiles(profiles = "test")
+public class MovieRepositoryTest {
+
+    @Autowired
+    private MovieRepository movieRepository;
+
+    @Autowired
+    private PersonRepository personRepository;
+
+    public MovieRepositoryTest() {
+    }
+
+    @Before
+    public void initializeDatabase() {
+        System.out.println("seeding embedded database");
+        Movie italianJob = new Movie();
+        italianJob.setTitle("The Italian Job");
+        italianJob.setReleased(1999);
+        movieRepository.save(italianJob);
+
+        Person mark = new Person();
+        mark.setName("Mark Wahlberg");
+        personRepository.save(mark);
+
+        Role charlie = new Role();
+        charlie.setMovie(italianJob);
+        charlie.setPerson(mark);
+        Collection<String> roleNames = new HashSet();
+        roleNames.add("Charlie Croker");
+        charlie.setRoles(roleNames);
+        List<Role> roles = new ArrayList();
+        roles.add(charlie);
+        italianJob.setRoles(roles);
+        movieRepository.save(italianJob);
+    }
+
+    @Test
+    @DirtiesContext
+    public void testFindByTitle() {
+        System.out.println("findByTitle");
+        String title = "The Italian Job";
+        Movie result = movieRepository.findByTitle(title);
+        assertNotNull(result);
+        assertEquals(1999, result.getReleased());
+    }
+
+    @Test
+    @DirtiesContext
+    public void testCount() {
+        System.out.println("count");
+        long movieCount = movieRepository.count();
+        assertNotNull(movieCount);
+        assertEquals(1, movieCount);
+    }
+
+    @Test
+    @DirtiesContext
+    public void testFindAll() {
+        System.out.println("findAll");
+        Collection<Movie> result =
+                (Collection<Movie>) movieRepository.findAll();
+        assertNotNull(result);
+        assertEquals(1, result.size());
+    }
+
+    @Test
+    @DirtiesContext
+    public void testFindByTitleContaining() {
+        System.out.println("findByTitleContaining");
+        String title = "Italian";
+        Collection<Movie> result =
+                movieRepository.findByTitleContaining(title);
+        assertNotNull(result);
+        assertEquals(1, result.size());
+    }
+
+    @Test
+    @DirtiesContext
+    public void testGraph() {
+        System.out.println("graph");
+        List<Map<String, Object>> graph = movieRepository.graph(5);
+        assertEquals(1, graph.size());
+        Map<String, Object> map = graph.get(0);
+        assertEquals(2, map.size());
+        String[] cast = (String[]) map.get("cast");
+        String movie = (String) map.get("movie");
+        assertEquals("The Italian Job", movie);
+        assertEquals("Mark Wahlberg", cast[0]);
+    }
+
+    @Test
+    @DirtiesContext
+    public void testDeleteMovie() {
+        System.out.println("deleteMovie");
+        movieRepository.delete(movieRepository.findByTitle("The Italian Job"));
+        assertNull(movieRepository.findByTitle("The Italian Job"));
+    }
+
+    @Test
+    @DirtiesContext
+    public void testDeleteAll() {
+        System.out.println("deleteAll");
+        movieRepository.deleteAll();
+        Collection<Movie> result =
+                (Collection<Movie>) movieRepository.findAll();
+        assertEquals(0, result.size());
+    }
+}

spring-data-rest/README.md

@@ -1,3 +1,6 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
 # About this project
 This project contains examples from the [Introduction to Spring Data REST](http://www.baeldung.com/spring-data-rest-intro) article from Baeldung.
 

spring-katharsis/README.md

@@ -2,5 +2,8 @@
 
 ## Java Web Application
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
 ### Relevant Articles: 
 - [JSON API in a Java Web Application](http://www.baeldung.com/json-api-java-spring-web-app)

spring-mvc-java/README.md

@@ -2,6 +2,8 @@
 
 ## Spring MVC with Java Configuration Example Project
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Spring Bean Annotations](http://www.baeldung.com/spring-bean-annotations)

spring-mvc-no-xml/README.md

@@ -2,6 +2,8 @@
 
 ## Spring MVC with NO XML Configuration Example Project
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
-- 
+- 

spring-mvc-xml/README.md

@@ -1,5 +1,8 @@
 =========
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
 ## Spring MVC with XML Configuration Example Project
 - access a sample jsp page at: `http://localhost:8080/spring-mvc-xml/sample.html`
 

spring-rest-docs/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring

spring-rest/.project

@@ -15,11 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.springframework.ide.eclipse.core.springbuilder</name>
 			<arguments>
@@ -38,6 +33,5 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>

spring-rest/.settings/.jsdtscope

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

spring-rest/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="cloudfoundry.standalone.app" version="1.0"/>
   <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="3.1"/>
 </faceted-project>

spring-rest/README.md

@@ -2,6 +2,8 @@
 
 ## Spring REST Example Project
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Spring @RequestMapping](http://www.baeldung.com/spring-requestmapping)

spring-rest/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.4.RELEASE</version>
+        <version>1.3.5.RELEASE</version>
     </parent>
 
     <dependencies>
@@ -59,7 +59,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -101,24 +100,20 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${org.slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
             <!-- <scope>runtime</scope> -->
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
             <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
         </dependency>
         <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
-            <version>${org.slf4j.version}</version>
         </dependency>
 
         <!-- test scoped -->
@@ -126,34 +121,29 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
         </dependency>
 		<dependency>
     		<groupId>com.google.protobuf</groupId>
@@ -235,11 +225,10 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
         <hibernate.version>4.3.11.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+        <mysql-connector-java.version>5.1.39</mysql-connector-java.version>
 
         <!-- marshalling -->
 

spring-scurity-custom-permission/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity

spring-security-basic-auth/README.md

@@ -2,6 +2,8 @@
 
 ## Spring Security with Basic Authentication Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Article: 
 - [Spring Security - security none, filters none, access permitAll](http://www.baeldung.com/security-none-filters-none-access-permitAll)
@@ -9,4 +11,4 @@
 
 
 ### Notes
-- the project includes both views as well as a REST layer
+- the project includes both views as well as a REST layer

spring-security-client/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring

spring-security-custom-permission/README.MD

@@ -0,0 +1,2 @@
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring

spring-security-mvc-custom/README.md

@@ -2,6 +2,8 @@
 
 ## Spring Security Login Example Project
 
+###The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
 - [Spring Security Remember Me](http://www.baeldung.com/spring-security-remember-me)

spring-security-mvc-digest-auth/README.md

@@ -2,6 +2,8 @@
 
 ##  Spring Security with Digest Authentication Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Article: 
 - [Spring Security Digest Authentication](http://www.baeldung.com/spring-security-digest-authentication)

spring-security-mvc-ldap/README.md

@@ -1,6 +1,8 @@
 
 ## Spring Security with LDAP Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Article: 
 - [Spring Security - security none, filters none, access permitAll](http://www.baeldung.com/security-none-filters-none-access-permitAll)

spring-security-mvc-login/README.md

@@ -2,11 +2,13 @@
 
 ## Spring Security Login Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Articles: 
 - [Spring Security Form Login](http://www.baeldung.com/spring-security-login)
 - [Spring Security Logout](http://www.baeldung.com/spring-security-logout)
-- [Spring Security Expressions – hasRole Example](http://www.baeldung.com/spring-security-expressions-basic)
+- [Spring Security Expressions – hasRole Example](http://www.baeldung.com/spring-security-expressions-basic)
 
 
 ### Build the Project

spring-security-mvc-persisted-remember-me/README.md

@@ -2,6 +2,8 @@
 
 ## Spring Security Persisted Remember Me Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Articles: 
 - [Spring Security Persisted Remember Me](http://www.baeldung.com/spring-security-persistent-remember-me)

spring-security-mvc-session/README.md

@@ -2,9 +2,11 @@
 
 ## Spring Security Login Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Articles: 
-- [HttpSessionListener Example – Monitoring](http://www.baeldung.com/httpsessionlistener_with_metrics)
+- [HttpSessionListener Example – Monitoring](http://www.baeldung.com/httpsessionlistener_with_metrics)
 - [Spring Security Session Management](http://www.baeldung.com/spring-security-session)
 
 

spring-security-rest-basic-auth/README.md

@@ -2,6 +2,8 @@
 
 ## REST API with Basic Authentication - Example Project
 
+###The Course
+The "Learn Spring Security" Classes: http://bit.ly/learnspringsecurity
 
 ### Relevant Articles: 
 - [RestTemplate with Basic Authentication in Spring](http://www.baeldung.com/2012/04/16/how-to-use-resttemplate-with-basic-authentication-in-spring-3-1)