diff --git a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
index 2b173a045b..f79c4a240c 100644
--- a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
+++ b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
@@ -1,26 +1,27 @@
 package com.baeldung.dozer;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 import org.dozer.DozerBeanMapper;
 import org.dozer.loader.api.BeanMappingBuilder;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class DozerTest {
+	private final long GMT_DIFFERENCE = 46800000;
 
-	private DozerBeanMapper mapper = new DozerBeanMapper();
+	DozerBeanMapper mapper;
 
 	@Before
 	public void before() throws Exception {
 		mapper = new DozerBeanMapper();
 	}
 
-	private BeanMappingBuilder builder = new BeanMappingBuilder() {
+	BeanMappingBuilder builder = new BeanMappingBuilder() {
 
 		@Override
 		protected void configure() {
@@ -29,7 +30,7 @@ public class DozerTest {
 
 		}
 	};
-	private BeanMappingBuilder builderMinusAge = new BeanMappingBuilder() {
+	BeanMappingBuilder builderMinusAge = new BeanMappingBuilder() {
 
 		@Override
 		protected void configure() {
@@ -41,10 +42,12 @@ public class DozerTest {
 
 	@Test
 	public void givenApiMapper_whenMaps_thenCorrect() {
+		mapper.addMapping(builder);
+
 		Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo",
 				70);
-		mapper.addMapping(builder);
 		Person englishAppPerson = mapper.map(frenchAppPerson, Person.class);
+
 		assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom());
 		assertEquals(englishAppPerson.getNickname(),
 				frenchAppPerson.getSurnom());
@@ -53,9 +56,11 @@ public class DozerTest {
 
 	@Test
 	public void givenApiMapper_whenMapsOnlySpecifiedFields_thenCorrect() {
-		Person englishAppPerson = new Person("Sylvester Stallone", "Rambo", 70);
 		mapper.addMapping(builderMinusAge);
+
+		Person englishAppPerson = new Person("Sylvester Stallone", "Rambo", 70);
 		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
+
 		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
 		assertEquals(frenchAppPerson.getSurnom(),
 				englishAppPerson.getNickname());
@@ -64,9 +69,11 @@ public class DozerTest {
 
 	@Test
 	public void givenApiMapper_whenMapsBidirectionally_thenCorrect() {
-		Person englishAppPerson = new Person("Sylvester Stallone", "Rambo", 70);
 		mapper.addMapping(builder);
+
+		Person englishAppPerson = new Person("Sylvester Stallone", "Rambo", 70);
 		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
+
 		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
 		assertEquals(frenchAppPerson.getSurnom(),
 				englishAppPerson.getNickname());
@@ -100,12 +107,12 @@ public class DozerTest {
 
 	@Test
 	public void givenSrcAndDestWithDifferentFieldNamesWithCustomMapper_whenMaps_thenCorrect() {
-		List<String> mappingFiles = new ArrayList<>();
-		mappingFiles.add("dozer_mapping.xml");
+		configureMapper("dozer_mapping.xml");
+
 		Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo",
 				70);
-		mapper.setMappingFiles(mappingFiles);
 		Person englishAppPerson = mapper.map(frenchAppPerson, Person.class);
+
 		assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom());
 		assertEquals(englishAppPerson.getNickname(),
 				frenchAppPerson.getSurnom());
@@ -114,38 +121,39 @@ public class DozerTest {
 
 	@Test
 	public void givenSrcAndDestWithDifferentFieldNamesWithCustomMapper_whenMapsBidirectionally_thenCorrect() {
-		List<String> mappingFiles = new ArrayList<>();
-		mappingFiles.add("dozer_mapping.xml");
+		configureMapper("dozer_mapping.xml");
+
 		Person englishAppPerson = new Person("Dwayne Johnson", "The Rock", 44);
-		mapper.setMappingFiles(mappingFiles);
 		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
+
 		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
 		assertEquals(frenchAppPerson.getSurnom(),
 				englishAppPerson.getNickname());
 		assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
 	}
 
-//	@Test
-//	public void givenMappingFileOutsideClasspath_whenMaps_thenCorrect() {
-//		List<String> mappingFiles = new ArrayList<>();
-//		mappingFiles.add("file:E:\\dozer_mapping.xml");
-//		Person englishAppPerson = new Person("Marshall Bruce Mathers III",
-//				"Eminem", 43);
-//		mapper.setMappingFiles(mappingFiles);
-//		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
-//		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
-//		assertEquals(frenchAppPerson.getSurnom(),
-//				englishAppPerson.getNickname());
-//		assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
-//	}
+	@Ignore("place dozer_mapping.xml at a location of your choice and copy/paste the path after file: in configureMapper method")
+	@Test
+	public void givenMappingFileOutsideClasspath_whenMaps_thenCorrect() {
+		configureMapper("file:e:/dozer_mapping.xml");
+
+		Person englishAppPerson = new Person("Marshall Bruce Mathers III",
+				"Eminem", 43);
+		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
+
+		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
+		assertEquals(frenchAppPerson.getSurnom(),
+				englishAppPerson.getNickname());
+		assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
+	}
 
 	@Test
 	public void givenSrcAndDest_whenMapsOnlySpecifiedFields_thenCorrect() {
-		List<String> mappingFiles = new ArrayList<>();
-		mappingFiles.add("dozer_mapping2.xml");
+		configureMapper("dozer_mapping2.xml");
+
 		Person englishAppPerson = new Person("Shawn Corey Carter", "Jay Z", 46);
-		mapper.setMappingFiles(mappingFiles);
 		Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
+
 		assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
 		assertEquals(frenchAppPerson.getSurnom(),
 				englishAppPerson.getNickname());
@@ -177,24 +185,35 @@ public class DozerTest {
 
 	@Test
 	public void givenSrcAndDestWithDifferentFieldTypes_whenAbleToCustomConvert_thenCorrect() {
+		configureMapper("dozer_custom_convertor.xml");
+
 		String dateTime = "2007-06-26T21:22:39Z";
 		long timestamp = new Long("1182882159000");
+
 		Person3 person = new Person3("Rich", dateTime);
-		mapper.setMappingFiles(Arrays
-				.asList(new String[] { "dozer_custom_convertor.xml" }));
 		Personne3 person0 = mapper.map(person, Personne3.class);
-		assertEquals(timestamp, person0.getDtob());
+
+		long timestampToTest = person0.getDtob();
+		assertTrue(timestampToTest == timestamp
+				|| timestampToTest >= timestamp - GMT_DIFFERENCE
+				|| timestampToTest <= timestamp + GMT_DIFFERENCE);
 	}
 
 	@Test
 	public void givenSrcAndDestWithDifferentFieldTypes_whenAbleToCustomConvertBidirectionally_thenCorrect() {
-		String dateTime = "2007-06-26T21:22:39Z";
 		long timestamp = new Long("1182882159000");
 		Personne3 person = new Personne3("Rich", timestamp);
-		mapper.setMappingFiles(Arrays
-				.asList(new String[] { "dozer_custom_convertor.xml" }));
+		configureMapper("dozer_custom_convertor.xml");
+
 		Person3 person0 = mapper.map(person, Person3.class);
-		assertEquals(dateTime, person0.getDtob());
+		String timestampTest = person0.getDtob();
+
+		assertTrue(timestampTest.charAt(10) == 'T'
+				&& timestampTest.charAt(19) == 'Z');
+	}
+
+	public void configureMapper(String... mappingFileUrls) {
+		mapper.setMappingFiles(Arrays.asList(mappingFileUrls));
 	}
 
 }
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSet.java b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
index 602205ff9f..1d19423f7e 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSet.java
@@ -11,91 +11,91 @@ import com.google.common.base.Function;
 
 public class GuavaMapFromSet<K, V> extends AbstractMap<K, V> {
 
-	private class SingleEntry implements Entry<K, V> {
-		private  K key;
+    private class SingleEntry implements Entry<K, V> {
+        private K key;
 
-		public SingleEntry( K key) {
-			this.key = key;
-		}
+        public SingleEntry(K key) {
+            this.key = key;
+        }
 
-		@Override
-		public K getKey() {
-			return this.key;
-		}
+        @Override
+        public K getKey() {
+            return this.key;
+        }
 
-		@Override
-		public V getValue() {
-			V value = GuavaMapFromSet.this.cache.get(this.key);
-			if (value == null) {
-				value = GuavaMapFromSet.this.function.apply(this.key);
-				GuavaMapFromSet.this.cache.put(this.key, value);
-			}
-			return value;
-		}
+        @Override
+        public V getValue() {
+            V value = GuavaMapFromSet.this.cache.get(this.key);
+            if (value == null) {
+                value = GuavaMapFromSet.this.function.apply(this.key);
+                GuavaMapFromSet.this.cache.put(this.key, value);
+            }
+            return value;
+        }
 
-		@Override
-		public V setValue( V value) {
-			throw new UnsupportedOperationException();
-		}
-	}
+        @Override
+        public V setValue(V value) {
+            throw new UnsupportedOperationException();
+        }
+    }
 
-	private class MyEntrySet extends AbstractSet<Entry<K, V>> {
+    private class MyEntrySet extends AbstractSet<Entry<K, V>> {
 
-		public class EntryIterator implements Iterator<Entry<K, V>> {
-			private  Iterator<K> inner;
+        public class EntryIterator implements Iterator<Entry<K, V>> {
+            private Iterator<K> inner;
 
-			public EntryIterator() {
-				this.inner = MyEntrySet.this.keys.iterator();
-			}
+            public EntryIterator() {
+                this.inner = MyEntrySet.this.keys.iterator();
+            }
 
-			@Override
-			public boolean hasNext() {
-				return this.inner.hasNext();
-			}
+            @Override
+            public boolean hasNext() {
+                return this.inner.hasNext();
+            }
 
-			@Override
-			public Map.Entry<K, V> next() {
-				 K key = this.inner.next();
-				return new SingleEntry(key);
-			}
+            @Override
+            public Map.Entry<K, V> next() {
+                K key = this.inner.next();
+                return new SingleEntry(key);
+            }
 
-			@Override
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-		}
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        }
 
-		private  Set<K> keys;
+        private Set<K> keys;
 
-		public MyEntrySet( Set<K> keys) {
-			this.keys = keys;
-		}
+        public MyEntrySet(Set<K> keys) {
+            this.keys = keys;
+        }
 
-		@Override
-		public Iterator<Map.Entry<K, V>> iterator() {
-			return new EntryIterator();
-		}
+        @Override
+        public Iterator<Map.Entry<K, V>> iterator() {
+            return new EntryIterator();
+        }
 
-		@Override
-		public int size() {
-			return this.keys.size();
-		}
+        @Override
+        public int size() {
+            return this.keys.size();
+        }
 
-	}
+    }
 
-	private  WeakHashMap<K, V> cache;
-	private  Set<Entry<K, V>> entries;
-	private  Function<? super K, ? extends V> function;
+    private WeakHashMap<K, V> cache;
+    private Set<Entry<K, V>> entries;
+    private Function<? super K, ? extends V> function;
 
-	public GuavaMapFromSet( Set<K> keys, Function<? super K, ? extends V> function) {
-		this.function = function;
-		this.cache = new WeakHashMap<K, V>();
-		this.entries = new MyEntrySet(keys);
-	}
+    public GuavaMapFromSet(Set<K> keys, Function<? super K, ? extends V> function) {
+        this.function = function;
+        this.cache = new WeakHashMap<K, V>();
+        this.entries = new MyEntrySet(keys);
+    }
 
-	@Override
-	public Set<Map.Entry<K, V>> entrySet() {
-		return this.entries;
-	}
+    @Override
+    public Set<Map.Entry<K, V>> entrySet() {
+        return this.entries;
+    }
 
 }
diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java
index 9abb5d14a9..7dc4550c09 100644
--- a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java
+++ b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java
@@ -13,54 +13,52 @@ import com.google.common.base.Function;
 
 public class GuavaMapFromSetTests {
 
-	@Test
-	public void givenStringSet_whenMapsToElementLength_thenCorrect() {
-		Function<Integer, String> function = new Function<Integer, String>() {
+    @Test
+    public void givenStringSet_whenMapsToElementLength_thenCorrect() {
+        Function<Integer, String> function = new Function<Integer, String>() {
+            @Override
+            public String apply(Integer from) {
+                return Integer.toBinaryString(from);
+            }
+        };
+        Set<Integer> set = new TreeSet<>(Arrays.asList(32, 64, 128));
+        Map<Integer, String> map = new GuavaMapFromSet<Integer, String>(set, function);
+        assertTrue(map.get(32).equals("100000")
+                && map.get(64).equals("1000000")
+                && map.get(128).equals("10000000"));
+    }
 
-			@Override
-			public String apply(Integer from) {
-				return Integer.toBinaryString(from.intValue());
-			}
-		};
-		Set<Integer> set = (Set<Integer>) new TreeSet<Integer>(Arrays.asList(
-				32, 64, 128));
-		Map<Integer, String> map = new GuavaMapFromSet<Integer, String>(set,
-				function);
-		assertTrue(map.get(32).equals("100000")
-				&& map.get(64).equals("1000000")
-				&& map.get(128).equals("10000000"));
-	}
+    @Test
+    public void givenIntSet_whenMapsToElementBinaryValue_thenCorrect() {
+        Function<String, Integer> function = new Function<String, Integer>() {
 
-	@Test
-	public void givenIntSet_whenMapsToElementBinaryValue_thenCorrect() {
-		Function<String, Integer> function = new Function<String, Integer>() {
+            @Override
+            public Integer apply(String from) {
+                return from.length();
+            }
+        };
+        Set<String> set = new TreeSet<>(Arrays.asList(
+                "four", "three", "twelve"));
+        Map<String, Integer> map = new GuavaMapFromSet<String, Integer>(set,
+                function);
+        assertTrue(map.get("four") == 4 && map.get("three") == 5
+                && map.get("twelve") == 6);
+    }
 
-			@Override
-			public Integer apply(String from) {
-				return from.length();
-			}
-		};
-		Set<String> set = (Set<String>) new TreeSet<String>(Arrays.asList(
-				"four", "three", "twelve"));
-		Map<String, Integer> map = new GuavaMapFromSet<String, Integer>(set,
-				function);
-		assertTrue(map.get("four") == 4 && map.get("three") == 5
-				&& map.get("twelve") == 6);
-	}
-	@Test
-	public void givenSet_whenNewSetElementAddedAndMappedLive_thenCorrect() {
-		Function<String, Integer> function = new Function<String, Integer>() {
+    @Test
+    public void givenSet_whenNewSetElementAddedAndMappedLive_thenCorrect() {
+        Function<String, Integer> function = new Function<String, Integer>() {
 
-			@Override
-			public Integer apply(String from) {
-				return from.length();
-			}
-		};
-		Set<String> set = (Set<String>) new TreeSet<String>(Arrays.asList(
-				"four", "three", "twelve"));
-		Map<String, Integer> map = new GuavaMapFromSet<String, Integer>(set,
-				function);
-		set.add("one");
-		assertTrue(map.get("one") == 3 && map.size()==4);
-	}
+            @Override
+            public Integer apply(String from) {
+                return from.length();
+            }
+        };
+        Set<String> set = new TreeSet<>(Arrays.asList(
+                "four", "three", "twelve"));
+        Map<String, Integer> map = new GuavaMapFromSet<String, Integer>(set,
+                function);
+        set.add("one");
+        assertTrue(map.get("one") == 3 && map.size() == 4);
+    }
 }
diff --git a/mocks/jmockit/README.md b/mocks/jmockit/README.md
index d04a07fdc5..db78b2a3ac 100644
--- a/mocks/jmockit/README.md
+++ b/mocks/jmockit/README.md
@@ -6,3 +6,4 @@
 ### Relevant Articles: 
 - [JMockit 101](http://www.baeldung.com/jmockit-101)
 - [A Guide to JMockit Expectations](http://www.baeldung.com/jmockit-expectations)
+- [JMockit Advanced Topics](http://www.baeldung.com/jmockit-advanced-topics)
diff --git a/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java b/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
new file mode 100644
index 0000000000..4d25f466a6
--- /dev/null
+++ b/mocks/jmockit/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
@@ -0,0 +1,20 @@
+package org.baeldung.mocks.jmockit;
+
+public class AdvancedCollaborator {
+    int i;
+    private int privateField = 5;
+    public AdvancedCollaborator(){}
+    public AdvancedCollaborator(String string) throws Exception{
+        i = string.length();
+    }
+    public String methodThatCallsPrivateMethod(int i){
+        return privateMethod() + i;
+    }
+    public int methodThatReturnsThePrivateField(){
+        return privateField;
+    }
+    private String privateMethod(){
+        return "default:";
+    }
+    class InnerAdvancedCollaborator{}
+}
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java
new file mode 100644
index 0000000000..aaabe44f66
--- /dev/null
+++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java
@@ -0,0 +1,110 @@
+package org.baeldung.mocks.jmockit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.baeldung.mocks.jmockit.AdvancedCollaborator.InnerAdvancedCollaborator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import mockit.Deencapsulation;
+import mockit.Expectations;
+import mockit.Invocation;
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+import mockit.Tested;
+import mockit.integration.junit4.JMockit;
+
+@RunWith(JMockit.class)
+public class AdvancedCollaboratorTest<MultiMock extends List<String> & Comparable<List<String>>> {
+
+    @Tested
+    private AdvancedCollaborator mock;
+    
+    @Mocked
+    private MultiMock multiMock;
+
+    @Test
+    public void testToMockUpPrivateMethod() {
+        new MockUp<AdvancedCollaborator>() {
+            @Mock
+            private String privateMethod() {
+                return "mocked: ";
+            }
+        };
+        String res = mock.methodThatCallsPrivateMethod(1);
+        assertEquals("mocked: 1", res);
+    }
+
+    @Test
+    public void testToMockUpDifficultConstructor() throws Exception {
+        new MockUp<AdvancedCollaborator>() {
+            @Mock
+            public void $init(Invocation invocation, String string) {
+                ((AdvancedCollaborator) invocation.getInvokedInstance()).i = 1;
+            }
+        };
+        AdvancedCollaborator coll = new AdvancedCollaborator(null);
+        assertEquals(1, coll.i);
+    }
+
+    @Test
+    public void testToCallPrivateMethodsDirectly() {
+        Object value = Deencapsulation.invoke(mock, "privateMethod");
+        assertEquals("default:", value);
+    }
+
+    @Test
+    public void testToSetPrivateFieldDirectly() {
+        Deencapsulation.setField(mock, "privateField", 10);
+        assertEquals(10, mock.methodThatReturnsThePrivateField());
+    }
+
+    @Test
+    public void testToGetPrivateFieldDirectly() {
+        int value = Deencapsulation.getField(mock, "privateField");
+        assertEquals(5, value);
+    }
+
+    @Test
+    public void testToCreateNewInstanceDirectly() {
+        AdvancedCollaborator coll = Deencapsulation.newInstance(AdvancedCollaborator.class, "foo");
+        assertEquals(3, coll.i);
+    }
+
+    @Test
+    public void testToCreateNewInnerClassInstanceDirectly() {
+        InnerAdvancedCollaborator innerCollaborator = Deencapsulation.newInnerInstance(InnerAdvancedCollaborator.class, mock);
+        assertNotNull(innerCollaborator);
+    }
+    
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testMultipleInterfacesWholeTest() {
+        new Expectations() {
+            {
+                multiMock.get(5); result = "foo";
+                multiMock.compareTo((List<String>) any); result = 0;
+            }
+        };
+        assertEquals("foo", multiMock.get(5));
+        assertEquals(0, multiMock.compareTo(new ArrayList<>()));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public <M extends List<String> & Comparable<List<String>>> void testMultipleInterfacesOneMethod(@Mocked M mock) {
+        new Expectations() {
+            {
+                mock.get(5); result = "foo";
+                mock.compareTo((List<String>) any);
+                result = 0; }
+        };
+        assertEquals("foo", mock.get(5));
+        assertEquals(0, mock.compareTo(new ArrayList<>()));
+    }
+}
diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java
new file mode 100644
index 0000000000..729cb30cd2
--- /dev/null
+++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java
@@ -0,0 +1,57 @@
+package org.baeldung.mocks.jmockit;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import mockit.Expectations;
+import mockit.Injectable;
+import mockit.Mocked;
+import mockit.Tested;
+import mockit.Verifications;
+import mockit.integration.junit4.JMockit;
+
+@RunWith(JMockit.class)
+public class ReusingTest {
+
+    @Injectable
+    private Collaborator collaborator;
+    
+    @Mocked
+    private Model model;
+
+    @Tested
+    private Performer performer;
+    
+    @Before
+    public void setup(){
+        new Expectations(){{
+           model.getInfo(); result = "foo"; minTimes = 0;
+           collaborator.collaborate("foo"); result = true; minTimes = 0; 
+        }};
+    }
+
+    @Test
+    public void testWithSetup() {
+        performer.perform(model);
+        verifyTrueCalls(1);
+    }
+    
+    protected void verifyTrueCalls(int calls){
+        new Verifications(){{
+           collaborator.receive(true); times = calls; 
+        }};
+    }
+    
+    final class TrueCallsVerification extends Verifications{
+        public TrueCallsVerification(int calls){
+            collaborator.receive(true); times = calls; 
+        }
+    }
+    
+    @Test
+    public void testWithFinalClass() {
+        performer.perform(model);
+        new TrueCallsVerification(1);
+    }
+}
diff --git a/pom.xml b/pom.xml
index 419916de86..ea1cc21169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <module>assertj</module>
         <module>apache-cxf</module>
         <module>apache-fop</module>
+        <module>autovalue-tutorial</module>
         <module>core-java</module>
         <module>core-java-8</module>
         <module>couchbase-sdk-intro</module>
@@ -52,6 +53,7 @@
 		<module>log4j</module>
 
         <module>spring-all</module>
+        <module>spring-akka</module>
         <module>spring-apache-camel</module>
         <module>spring-autowire</module>
         <module>spring-batch</module>
diff --git a/spring-akka/pom.xml b/spring-akka/pom.xml
new file mode 100644
index 0000000000..6299448ec8
--- /dev/null
+++ b/spring-akka/pom.xml
@@ -0,0 +1,80 @@
+<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-akka</artifactId>
+    <version>0.1-SNAPSHOT</version>
+
+    <name>spring-akka</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-actor_2.11</artifactId>
+            <version>${akka.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+
+        <dependencies>
+
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+
+        <plugins>
+
+            <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>
+        <spring.version>4.3.2.RELEASE</spring.version>
+        <akka.version>2.4.8</akka.version>
+        <junit.version>4.12</junit.version>
+
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-all/src/main/java/org/baeldung/akka/AppConfiguration.java b/spring-akka/src/main/java/org/baeldung/akka/AppConfiguration.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/akka/AppConfiguration.java
rename to spring-akka/src/main/java/org/baeldung/akka/AppConfiguration.java
diff --git a/spring-all/src/main/java/org/baeldung/akka/GreetingActor.java b/spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java
similarity index 88%
rename from spring-all/src/main/java/org/baeldung/akka/GreetingActor.java
rename to spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java
index 1a9386c769..6366c277a4 100644
--- a/spring-all/src/main/java/org/baeldung/akka/GreetingActor.java
+++ b/spring-akka/src/main/java/org/baeldung/akka/GreetingActor.java
@@ -1,13 +1,12 @@
 package org.baeldung.akka;
 
 import akka.actor.UntypedActor;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE;
-
 @Component
-@Scope(SCOPE_PROTOTYPE)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class GreetingActor extends UntypedActor {
 
     private GreetingService greetingService;
diff --git a/spring-all/src/main/java/org/baeldung/akka/GreetingService.java b/spring-akka/src/main/java/org/baeldung/akka/GreetingService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/akka/GreetingService.java
rename to spring-akka/src/main/java/org/baeldung/akka/GreetingService.java
diff --git a/spring-all/src/main/java/org/baeldung/akka/SpringActorProducer.java b/spring-akka/src/main/java/org/baeldung/akka/SpringActorProducer.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/akka/SpringActorProducer.java
rename to spring-akka/src/main/java/org/baeldung/akka/SpringActorProducer.java
diff --git a/spring-all/src/main/java/org/baeldung/akka/SpringExtension.java b/spring-akka/src/main/java/org/baeldung/akka/SpringExtension.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/akka/SpringExtension.java
rename to spring-akka/src/main/java/org/baeldung/akka/SpringExtension.java
diff --git a/spring-all/src/test/java/org/baeldung/akka/SpringAkkaTest.java b/spring-akka/src/test/java/org/baeldung/akka/SpringAkkaTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/akka/SpringAkkaTest.java
rename to spring-akka/src/test/java/org/baeldung/akka/SpringAkkaTest.java
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index b7a8fcc79e..25a45d9bae 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -87,14 +87,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Akka -->
-
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.11</artifactId>
-            <version>2.4.8</version>
-        </dependency>
-
         <!-- util -->
 
         <dependency>
diff --git a/spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java b/spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
new file mode 100644
index 0000000000..2ae28b6b4a
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/controller/config/StudentControllerConfig.java
@@ -0,0 +1,37 @@
+package org.baeldung.controller.config;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+
+import org.springframework.web.WebApplicationInitializer;
+import org.springframework.web.context.ContextLoaderListener;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+public class StudentControllerConfig implements WebApplicationInitializer {
+
+
+		@Override
+		public void onStartup(ServletContext sc) throws ServletException {
+			AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext();
+			root.register(WebConfig.class);
+			
+			root.refresh();
+			root.setServletContext(sc);
+			
+			// Manages the lifecycle of the root application context
+			sc.addListener(new ContextLoaderListener(root));
+			
+			
+			
+			DispatcherServlet dv =new DispatcherServlet(new GenericWebApplicationContext());
+			
+			ServletRegistration.Dynamic appServlet = sc.addServlet("test-mvc",dv ); 
+			appServlet.setLoadOnStartup(1); 
+			appServlet.addMapping("/test/*");
+		}
+
+	}
+
diff --git a/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java b/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
new file mode 100644
index 0000000000..f55af69c88
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/controller/config/WebConfig.java
@@ -0,0 +1,28 @@
+package org.baeldung.controller.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+@EnableWebMvc
+@ComponentScan(basePackages= {"org.baeldung.controller.controller","org.baeldung.controller.config" })
+public class WebConfig extends WebMvcConfigurerAdapter {
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+ 
+    @Bean
+    public ViewResolver viewResolver() {
+        InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        bean.setPrefix("/WEB-INF/");
+        bean.setSuffix(".jsp");
+        return bean;
+    }
+}
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java b/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java
new file mode 100644
index 0000000000..44f1767405
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/controller/ControllerAnnotationTest.java
@@ -0,0 +1,86 @@
+package org.baeldung.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.baeldung.controller.config.WebConfig;
+import org.baeldung.controller.student.Student;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+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.web.AnnotationConfigWebContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes={WebConfig.class}, loader=AnnotationConfigWebContextLoader.class )
+public class ControllerAnnotationTest {
+	
+	private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+    
+    private Student selectedStudent;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+
+        selectedStudent = new Student();
+        selectedStudent.setId(1);
+        selectedStudent.setName("Peter");
+    }
+
+    @Test
+    public void testTestController() throws Exception {
+
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/"))
+          .andReturn()
+          .getModelAndView();
+
+        // validate modal data
+        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
+
+        // validate view name
+        Assert.assertSame(mv.getViewName(), "welcome");
+    }
+
+    @Test
+    public void testRestController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1))
+          .andReturn().getResponse()
+          .getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+
+    }
+
+    @Test
+    public void testRestAnnotatedController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1))
+          .andReturn().getResponse()
+          .getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+    }
+
+}
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 9e3cb81ef2..9ed3285018 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -135,6 +135,27 @@
         	<artifactId>el-api</artifactId>
         	<version>2.2</version>
         </dependency>
+
+        <dependency>
+        	<groupId>org.apache.derby</groupId>
+        	<artifactId>derby</artifactId>
+        	<version>10.12.1.1</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.derby</groupId>
+        	<artifactId>derbyclient</artifactId>
+        	<version>10.12.1.1</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.derby</groupId>
+        	<artifactId>derbynet</artifactId>
+        	<version>10.12.1.1</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.apache.derby</groupId>
+        	<artifactId>derbytools</artifactId>
+        	<version>10.12.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
index 266a04b679..3337e4796d 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
@@ -20,7 +20,7 @@ import com.google.common.base.Preconditions;
 
 @Configuration
 @EnableTransactionManagement
-@PropertySource({ "classpath:persistence-mysql.properties" })
+@PropertySource({ "classpath:persistence-derby.properties" })
 @ComponentScan({ "org.baeldung.persistence" })
 public class Cause1NonTransientConfig {
 
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
index 19e2ceebca..3543526f37 100644
--- a/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/org/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
@@ -20,7 +20,7 @@ import com.google.common.base.Preconditions;
 
 @Configuration
 @EnableTransactionManagement
-@PropertySource({ "classpath:persistence-mysql.properties" })
+@PropertySource({ "classpath:persistence-derby.properties" })
 @ComponentScan({ "org.baeldung.persistence" })
 public class Cause4NonTransientConfig {
 
@@ -72,5 +72,4 @@ public class Cause4NonTransientConfig {
         // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
         return hibernateProperties;
     }
-
 }
diff --git a/spring-exceptions/src/main/resources/persistence-derby.properties b/spring-exceptions/src/main/resources/persistence-derby.properties
new file mode 100644
index 0000000000..49fac9877e
--- /dev/null
+++ b/spring-exceptions/src/main/resources/persistence-derby.properties
@@ -0,0 +1,10 @@
+# jdbc.X
+jdbc.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+jdbc.url=jdbc:derby:memory:spring_exceptions;create=true
+jdbc.user=tutorialuser
+jdbc.pass=tutorialpass
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.DerbyDialect
+hibernate.show_sql=false
+hibernate.hbm2ddl.auto=create
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionTest.java
index 9afe2533de..b3bf0dcdcd 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionTest.java
+++ b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/InvalidResourceUsageExceptionTest.java
@@ -17,22 +17,27 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { Cause1NonTransientConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class InvalidResourceUsageExceptionTest {
-    @Autowired
-    private IFooService fooService;
+	@Autowired
+	private IFooService fooService;
 
-    @Autowired
-    private DataSource restDataSource;
+	@Autowired
+	private DataSource restDataSource;
 
-    @Test(expected = InvalidDataAccessResourceUsageException.class)
-    public void whenRetrievingDataUserNoSelectRights_thenInvalidResourceUsageException() {
-        fooService.findAll();
-    }
+	@Test(expected = InvalidDataAccessResourceUsageException.class)
+	public void whenRetrievingDataUserNoSelectRights_thenInvalidResourceUsageException() {
+		final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource);
+		jdbcTemplate.execute("revoke select from tutorialuser");
 
-    @Test(expected = BadSqlGrammarException.class)
-    public void whenIncorrectSql_thenBadSqlGrammarException() {
-        final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource);
+		fooService.findAll();
 
-        jdbcTemplate.queryForObject("select * fro foo where id=3", Integer.class);
-    }
+		jdbcTemplate.execute("grant select to tutorialuser");
+	}
+
+	@Test(expected = BadSqlGrammarException.class)
+	public void whenIncorrectSql_thenBadSqlGrammarException() {
+		final JdbcTemplate jdbcTemplate = new JdbcTemplate(restDataSource);
+
+		jdbcTemplate.queryForObject("select * fro foo where id=3", Integer.class);
+	}
 
 }
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/PermissionDeniedException.java b/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/PermissionDeniedException.java
deleted file mode 100644
index 7f91b52e00..0000000000
--- a/spring-exceptions/src/test/java/org/baeldung/ex/nontransientdataaccessexception/PermissionDeniedException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.baeldung.ex.nontransientdataaccessexception;
-
-import org.baeldung.ex.nontransientexception.cause.Cause1NonTransientConfig;
-import org.baeldung.persistence.model.Foo;
-import org.baeldung.persistence.service.IFooService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.PermissionDeniedDataAccessException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { Cause1NonTransientConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class PermissionDeniedException {
-
-    @Autowired
-    private IFooService fooService;
-
-    @Test(expected = PermissionDeniedDataAccessException.class)
-    public void whenRetrievingDataUserNoSelectRights_thenPermissionDeniedException() {
-        final Foo foo = new Foo("foo");
-        fooService.create(foo);
-    }
-
-}
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/CompanyController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/CompanyController.java
index 8228eafd5c..8dcfe68a84 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/CompanyController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/CompanyController.java
@@ -1,56 +1,80 @@
 package com.baeldung.web.controller;
 
-import com.baeldung.model.Company;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.MatrixVariable;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.baeldung.model.Company;
+
 @Controller
 public class CompanyController {
 
-    Map<Long, Company> companyMap = new HashMap<>();
+	Map<Long, Company> companyMap = new HashMap<>();
 
-    @RequestMapping(value = "/company", method = RequestMethod.GET)
-    public ModelAndView showForm() {
-        return new ModelAndView("companyHome", "company", new Company());
-    }
+	@RequestMapping(value = "/company", method = RequestMethod.GET)
+	public ModelAndView showForm() {
+		return new ModelAndView("companyHome", "company", new Company());
+	}
 
-    @RequestMapping(value = "/company/{Id}", produces = { "application/json", "application/xml" }, method = RequestMethod.GET)
-    public @ResponseBody Company getCompanyById(@PathVariable final long Id) {
-        return companyMap.get(Id);
-    }
+	@RequestMapping(value = "/company/{Id}", produces = { "application/json",
+	"application/xml" }, method = RequestMethod.GET)
+	public @ResponseBody Company getCompanyById(@PathVariable final long Id) {
+		return companyMap.get(Id);
+	}
 
-    @RequestMapping(value = "/addCompany", method = RequestMethod.POST)
-    public String submit(@ModelAttribute("company") final Company company, final BindingResult result, final ModelMap model) {
-        if (result.hasErrors()) {
-            return "error";
-        }
-        model.addAttribute("name", company.getName());
-        model.addAttribute("id", company.getId());
+	@RequestMapping(value = "/addCompany", method = RequestMethod.POST)
+	public String submit(@ModelAttribute("company") final Company company,
+			final BindingResult result, final ModelMap model) {
+		if (result.hasErrors()) {
+			return "error";
+		}
+		model.addAttribute("name", company.getName());
+		model.addAttribute("id", company.getId());
 
-        companyMap.put(company.getId(), company);
+		companyMap.put(company.getId(), company);
 
-        return "companyView";
-    }
+		return "companyView";
+	}
 
-    @RequestMapping(value = "/companyEmployee/{company}/employeeData/{employee}", method = RequestMethod.GET)
-    @ResponseBody
-    public ResponseEntity<Map<String, String>> getEmployeeDataFromCompany(@MatrixVariable(pathVar = "employee") final Map<String, String> matrixVars) {
-        return new ResponseEntity<>(matrixVars, HttpStatus.OK);
-    }
+	@RequestMapping(value = "/companyEmployee/{company}/employeeData/{employee}", method = RequestMethod.GET)
+	@ResponseBody
+	public ResponseEntity<Map<String, String>> getEmployeeDataFromCompany(
+			@MatrixVariable(pathVar = "employee") final Map<String, String> matrixVars) {
+		return new ResponseEntity<>(matrixVars, HttpStatus.OK);
+	}
 
-    @RequestMapping(value = "/companyData/{company}/employeeData/{employee}", method = RequestMethod.GET)
-    @ResponseBody
-    public ResponseEntity<Map<String, String>> getCompanyName(@MatrixVariable(value = "name", pathVar = "company") final String name) {
-        final Map<String, String> result = new HashMap<String, String>();
-        result.put("name", name);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
+	@RequestMapping(value = "/companyData/{company}/employeeData/{employee}", method = RequestMethod.GET)
+	@ResponseBody
+	public ResponseEntity<Map<String, String>> getCompanyName(
+			@MatrixVariable(value = "name", pathVar = "company") final String name) {
+		final Map<String, String> result = new HashMap<String, String>();
+		result.put("name", name);
+		return new ResponseEntity<>(result, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/companyResponseBody", produces = MediaType.APPLICATION_JSON_VALUE)
+	@ResponseBody
+	public Company getCompanyResponseBody() {
+		final Company company = new Company(2, "ABC");
+		return company;
+	}
+
+	@RequestMapping(value = "/companyResponseEntity", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Company> getCompanyResponseEntity() {
+		final Company company = new Company(3, "123");
+		return new ResponseEntity<Company>(company, HttpStatus.OK);
+	}
 }
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/advice/JsonpControllerAdvice.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/advice/JsonpControllerAdvice.java
new file mode 100644
index 0000000000..8557b15492
--- /dev/null
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/advice/JsonpControllerAdvice.java
@@ -0,0 +1,13 @@
+package com.baeldung.web.controller.advice;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.AbstractJsonpResponseBodyAdvice;
+
+@ControllerAdvice
+public class JsonpControllerAdvice extends AbstractJsonpResponseBodyAdvice {
+
+	public JsonpControllerAdvice() {
+		super("callback");
+	}
+
+}
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/index.jsp b/spring-mvc-java/src/main/webapp/WEB-INF/view/index.jsp
new file mode 100644
index 0000000000..fa5498c966
--- /dev/null
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/view/index.jsp
@@ -0,0 +1,66 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+		 pageEncoding="ISO-8859-1" %>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="ISO-8859-1">
+		<title>Company Data</title>
+		<script src="https://code.jquery.com/jquery-3.1.0.js"
+			integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk="
+			crossorigin="anonymous"></script>
+		<script>
+			$(document).ready(function(){
+				$('#ResponseBody-button').click(function() {
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-mvc-java/companyResponseBody?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoResponseBody').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+				        console.log("sucess");
+				      }
+				   });
+				});
+				$('#ResponseEntity-button').click(function() {
+				console.log("ResponseEntity");
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-mvc-java/companyResponseEntity?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoResponseEntity').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+				        console.log("sucess");
+				      }
+				   });
+				});	
+			});
+		
+		    function getCompanyData(data) {
+				$("#response").append("<b>ID:</b> "+data.id+"<br/>");
+				$("#response").append("<b>NAME:</b> "+data.name+"<br/>");
+				$("#response").append("<br/>");
+		     }
+	     </script>
+	</head>
+	<body>
+	
+		<!--Using @ResponseBody -->
+		<button id="ResponseBody-button">Send AJAX JSON-P request!</button>
+
+		<div id="response"></div>
+	
+
+	</body>
+</html>
\ No newline at end of file
diff --git a/spring-rest/src/main/java/org/baeldung/web/controller/CompanyController.java b/spring-rest/src/main/java/org/baeldung/web/controller/CompanyController.java
new file mode 100644
index 0000000000..d640ac671d
--- /dev/null
+++ b/spring-rest/src/main/java/org/baeldung/web/controller/CompanyController.java
@@ -0,0 +1,16 @@
+package org.baeldung.web.controller;
+
+import org.baeldung.web.dto.Company;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CompanyController {
+
+	@RequestMapping(value = "/companyRest", produces = MediaType.APPLICATION_JSON_VALUE)
+	public Company getCompanyRest() {
+		final Company company = new Company(1, "Xpto");
+		return company;
+	}
+}
diff --git a/spring-rest/src/main/java/org/baeldung/web/controller/advice/JsonpControllerAdvice.java b/spring-rest/src/main/java/org/baeldung/web/controller/advice/JsonpControllerAdvice.java
new file mode 100644
index 0000000000..7d62cc0c66
--- /dev/null
+++ b/spring-rest/src/main/java/org/baeldung/web/controller/advice/JsonpControllerAdvice.java
@@ -0,0 +1,13 @@
+package org.baeldung.web.controller.advice;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.AbstractJsonpResponseBodyAdvice;
+
+@ControllerAdvice
+public class JsonpControllerAdvice extends AbstractJsonpResponseBodyAdvice {
+
+	public JsonpControllerAdvice() {
+		super("callback");
+	}
+
+}
diff --git a/spring-rest/src/main/java/org/baeldung/web/dto/Company.java b/spring-rest/src/main/java/org/baeldung/web/dto/Company.java
new file mode 100644
index 0000000000..c7d0718140
--- /dev/null
+++ b/spring-rest/src/main/java/org/baeldung/web/dto/Company.java
@@ -0,0 +1,38 @@
+package org.baeldung.web.dto;
+
+public class Company {
+
+	private long id;
+	private String name;
+
+	public Company() {
+		super();
+	}
+
+	public Company(final long id, final String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(final String name) {
+		this.name = name;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(final long id) {
+		this.id = id;
+	}
+
+	@Override
+	public String toString() {
+		return "Company [id=" + id + ", name=" + name + "]";
+	}
+
+}
diff --git a/spring-rest/src/main/webapp/WEB-INF/company.html b/spring-rest/src/main/webapp/WEB-INF/company.html
new file mode 100644
index 0000000000..d2072bfd3c
--- /dev/null
+++ b/spring-rest/src/main/webapp/WEB-INF/company.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="ISO-8859-1">
+		<title>Company Data</title>
+		<script src="https://code.jquery.com/jquery-3.1.0.js"
+			integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk="
+			crossorigin="anonymous"></script>
+		<script>
+			$(document).ready(function(){
+				$('#REST-button').click(function() {
+				   $.ajax({
+				      url: 'http://localhost:8080/spring-rest/companyRest?callback=getCompanyData',
+				      data: {
+				         format: 'json'
+				      },
+					  type: 'GET',
+					  jsonpCallback:'getCompanyData',
+					  dataType: 'jsonp',
+				      error: function() {
+				         $('#infoREST').html('<p>An error has occurred</p>');
+				      },
+				      success: function(data) {
+						console.log("sucess");
+				      }
+				   });
+				});
+			});
+		
+		    function getCompanyData(data) { 
+				document.write("<b>ID:</b> "+data.id+"<br/>");	 
+				document.write("<b>NAME:</b> "+data.name+"<br/>");
+				document.write("<br/>");
+		     }
+	     </script>
+	</head>
+	<body>
+	
+		<!-- Using REST URL-->
+		<button id="REST-button">Test REST JSON-P!</button>
+		<div id="infoREST"></div>
+	
+	</body>
+</html>
\ No newline at end of file