From c3abba5f2abe5dbdfa08ce5f6cbbb1546458ccf9 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Wed, 27 Apr 2016 08:33:56 +0300
Subject: [PATCH 1/9] scopes examples

---
 .../scopes/HelloMessageGenerator.java         | 15 ++++++
 .../main/java/org/baeldung/scopes/Person.java | 37 +++++++++++++
 .../org/baeldung/scopes/ScopesController.java | 46 ++++++++++++++++
 .../baeldung/spring/config/ScopesConfig.java  | 39 ++++++++++++++
 spring-all/src/main/resources/scopes.xml      | 10 ++++
 .../webapp/WEB-INF/view/scopesExample.jsp     | 10 ++++
 .../WEB-INF/view/scopesFirstRequest.jsp       | 11 ++++
 .../WEB-INF/view/scopesSecondRequest.jsp      | 10 ++++
 .../java/org/baeldung/scopes/ScopesTest.java  | 52 +++++++++++++++++++
 9 files changed, 230 insertions(+)
 create mode 100644 spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
 create mode 100644 spring-all/src/main/java/org/baeldung/scopes/Person.java
 create mode 100644 spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
 create mode 100644 spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
 create mode 100644 spring-all/src/main/resources/scopes.xml
 create mode 100644 spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
 create mode 100644 spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
 create mode 100644 spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp
 create mode 100644 spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java

diff --git a/spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java b/spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
new file mode 100644
index 0000000000..ae1c6157db
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/scopes/HelloMessageGenerator.java
@@ -0,0 +1,15 @@
+package org.baeldung.scopes;
+
+public class HelloMessageGenerator {
+
+	private String message;
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(final String message) {
+		this.message = message;
+	}
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/scopes/Person.java b/spring-all/src/main/java/org/baeldung/scopes/Person.java
new file mode 100644
index 0000000000..993921abff
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/scopes/Person.java
@@ -0,0 +1,37 @@
+package org.baeldung.scopes;
+
+public class Person {
+	private String name;
+	private int age;
+
+	public Person() {
+	}
+
+	public Person(final String name, final int age) {
+		super();
+		this.name = name;
+		this.age = age;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(final String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(final int age) {
+		this.age = age;
+	}
+
+	@Override
+	public String toString() {
+		return "Person [name=" + name + ", age=" + age + "]";
+	}
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
new file mode 100644
index 0000000000..5f29d0333f
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -0,0 +1,46 @@
+package org.baeldung.scopes;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class ScopesController {
+
+	@Resource(name = "requestMessage")
+	HelloMessageGenerator firstRequestMessage;
+
+	@Resource(name = "requestMessage")
+	HelloMessageGenerator secondRequestMessage;
+
+	@Resource(name = "sessionMessage")
+	HelloMessageGenerator firstSessionMessage;
+
+	@Resource(name = "sessionMessage")
+	HelloMessageGenerator secondSessionMessage;
+
+	@RequestMapping("/scopes")
+	public String getScopes() {
+		return "scopesExample";
+	}
+
+	@RequestMapping("/scopes/firstRequest")
+	public String getFirstRequest(final Model model) {
+		firstRequestMessage.setMessage("Good morning!");
+		firstSessionMessage.setMessage("Good afternoon!");
+		model.addAttribute("requestMessage", firstRequestMessage.getMessage());
+		model.addAttribute("sessionMessage", firstSessionMessage.getMessage());
+		return "scopesFirstRequest";
+	}
+
+	@RequestMapping("/scopes/secondRequest")
+	public String getSecondRequest(final Model model) {
+		secondRequestMessage.setMessage("Good evening!");
+		model.addAttribute("requestMessage", secondRequestMessage.getMessage());
+		model.addAttribute("sessionMessage", secondSessionMessage.getMessage());
+		return "scopesSecondRequest";
+	}
+
+}
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
new file mode 100644
index 0000000000..48820636dd
--- /dev/null
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -0,0 +1,39 @@
+package org.baeldung.spring.config;
+
+import org.baeldung.scopes.HelloMessageGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.view.JstlView;
+import org.springframework.web.servlet.view.UrlBasedViewResolver;
+
+@Configuration
+@ComponentScan("org.baeldung.scopes")
+@EnableWebMvc
+public class ScopesConfig {
+	@Bean
+	public UrlBasedViewResolver setupViewResolver() {
+		final UrlBasedViewResolver resolver = new UrlBasedViewResolver();
+		resolver.setPrefix("/WEB-INF/view/");
+		resolver.setSuffix(".jsp");
+		resolver.setViewClass(JstlView.class);
+		return resolver;
+	}
+
+	@Bean
+	@Scope(value = WebApplicationContext.SCOPE_REQUEST, proxyMode = ScopedProxyMode.TARGET_CLASS)
+	public HelloMessageGenerator requestMessage() {
+		return new HelloMessageGenerator();
+	}
+
+	@Bean
+	@Scope(value = WebApplicationContext.SCOPE_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
+	public HelloMessageGenerator sessionMessage() {
+		return new HelloMessageGenerator();
+	}
+
+}
diff --git a/spring-all/src/main/resources/scopes.xml b/spring-all/src/main/resources/scopes.xml
new file mode 100644
index 0000000000..faecd727fa
--- /dev/null
+++ b/spring-all/src/main/resources/scopes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="personSingleton" class="org.baeldung.scopes.Person" scope="singleton"/>
+    
+    <bean id="personPrototype" class="org.baeldung.scopes.Person" scope="prototype"/>
+    
+</beans>
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
new file mode 100644
index 0000000000..624ff46d5c
--- /dev/null
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -0,0 +1,10 @@
+<html>
+<head></head>
+
+<body>
+    <h1>Bean Scopes Examples</h1>
+    <br>
+   <a href="${pageContext.request.contextPath}/scopes/firstRequest">First Request</a><br><br>
+    <a href="${pageContext.request.contextPath}/scopes/secondRequest">Second Request</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
new file mode 100644
index 0000000000..3804dfd1c6
--- /dev/null
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+
+<body>
+    <h1>Bean Scopes First Request</h1>
+    
+    Request bean message: ${requestMessage }
+    Session bean message: ${sessionMessage }
+    
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp
new file mode 100644
index 0000000000..8e9d727661
--- /dev/null
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp
@@ -0,0 +1,10 @@
+<html>
+<head></head>
+
+<body>
+    <h1>Bean Scopes Second Request</h1>
+    
+    Request bean message: ${requestMessage }
+    Session bean message: ${sessionMessage }
+</body>
+</html>
\ No newline at end of file
diff --git a/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java b/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java
new file mode 100644
index 0000000000..f86fda66ba
--- /dev/null
+++ b/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java
@@ -0,0 +1,52 @@
+package org.baeldung.scopes;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class ScopesTest {
+
+	private static final String NAME = "John Smith";
+	private static final int AGE = 30;
+
+	private static final String NAME_OTHER = "Anna Jones";
+	private static final int AGE_OTHER = 40;
+
+	@Test
+	public void testScopeSingleton() {
+		final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("scopes.xml");
+
+		final Person personSingletonA = (Person) applicationContext.getBean("personSingleton");
+		final Person personSingletonB = (Person) applicationContext.getBean("personSingleton");
+
+		personSingletonA.setName(NAME);
+		personSingletonB.setAge(AGE);
+
+		Assert.assertEquals(NAME, personSingletonB.getName());
+		Assert.assertEquals(AGE, personSingletonB.getAge());
+
+		((AbstractApplicationContext) applicationContext).close();
+	}
+
+	@Test
+	public void testScopePrototype() {
+		final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("scopes.xml");
+
+		final Person personPrototypeA = (Person) applicationContext.getBean("personPrototype");
+		final Person personPrototypeB = (Person) applicationContext.getBean("personPrototype");
+
+		personPrototypeA.setName(NAME);
+		personPrototypeA.setAge(AGE);
+
+		personPrototypeB.setName(NAME_OTHER);
+		personPrototypeB.setAge(AGE_OTHER);
+
+		Assert.assertEquals(NAME, personPrototypeA.getName());
+		Assert.assertEquals(NAME_OTHER, personPrototypeB.getName());
+
+		((AbstractApplicationContext) applicationContext).close();
+	}
+
+}

From e792db4d6d890fbf56ca74024c8d811433020d05 Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Thu, 5 May 2016 20:19:48 +0300
Subject: [PATCH 2/9] revised bean scopes examples

---
 .../src/main/java/org/baeldung/scopes/Person.java    | 12 +-----------
 .../org/baeldung/spring/config/ScopesConfig.java     |  6 ++++++
 .../test/java/org/baeldung/scopes/ScopesTest.java    |  9 ---------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/spring-all/src/main/java/org/baeldung/scopes/Person.java b/spring-all/src/main/java/org/baeldung/scopes/Person.java
index 993921abff..e6139c31dd 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/Person.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/Person.java
@@ -8,9 +8,7 @@ public class Person {
 	}
 
 	public Person(final String name, final int age) {
-		super();
 		this.name = name;
-		this.age = age;
 	}
 
 	public String getName() {
@@ -21,17 +19,9 @@ public class Person {
 		this.name = name;
 	}
 
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(final int age) {
-		this.age = age;
-	}
-
 	@Override
 	public String toString() {
-		return "Person [name=" + name + ", age=" + age + "]";
+		return "Person [name=" + name + "]";
 	}
 
 }
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
index 48820636dd..1de7b32720 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -36,4 +36,10 @@ public class ScopesConfig {
 		return new HelloMessageGenerator();
 	}
 
+	@Bean
+	@Scope(value = WebApplicationContext.SCOPE_GLOBAL_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
+	public HelloMessageGenerator globalSessionMessage() {
+		return new HelloMessageGenerator();
+	}
+
 }
diff --git a/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java b/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java
index f86fda66ba..b1dd248c26 100644
--- a/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java
+++ b/spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java
@@ -9,10 +9,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class ScopesTest {
 
 	private static final String NAME = "John Smith";
-	private static final int AGE = 30;
-
 	private static final String NAME_OTHER = "Anna Jones";
-	private static final int AGE_OTHER = 40;
 
 	@Test
 	public void testScopeSingleton() {
@@ -22,10 +19,7 @@ public class ScopesTest {
 		final Person personSingletonB = (Person) applicationContext.getBean("personSingleton");
 
 		personSingletonA.setName(NAME);
-		personSingletonB.setAge(AGE);
-
 		Assert.assertEquals(NAME, personSingletonB.getName());
-		Assert.assertEquals(AGE, personSingletonB.getAge());
 
 		((AbstractApplicationContext) applicationContext).close();
 	}
@@ -38,10 +32,7 @@ public class ScopesTest {
 		final Person personPrototypeB = (Person) applicationContext.getBean("personPrototype");
 
 		personPrototypeA.setName(NAME);
-		personPrototypeA.setAge(AGE);
-
 		personPrototypeB.setName(NAME_OTHER);
-		personPrototypeB.setAge(AGE_OTHER);
 
 		Assert.assertEquals(NAME, personPrototypeA.getName());
 		Assert.assertEquals(NAME_OTHER, personPrototypeB.getName());

From c8121c168d60caf2da7c790f1a0ee065817b62c9 Mon Sep 17 00:00:00 2001
From: Gachchinamat <D-YW44CN@europe.intranet>
Date: Mon, 30 May 2016 16:42:22 +0200
Subject: [PATCH 3/9] Core java enum examples

---
 core-java/pom.xml                             |   6 +-
 .../main/java/com/baeldung/enums/Pizza.java   | 117 ++++++++++++++++++
 .../baeldung/enums/PizzaDeliveryStrategy.java |  18 +++
 .../PizzaDeliverySystemConfiguration.java     |  20 +++
 .../org/baeldung/java/enums/PizzaTest.java    |  80 ++++++++++++
 5 files changed, 240 insertions(+), 1 deletion(-)
 create mode 100644 core-java/src/main/java/com/baeldung/enums/Pizza.java
 create mode 100644 core-java/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
 create mode 100644 core-java/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
 create mode 100644 core-java/src/test/java/org/baeldung/java/enums/PizzaTest.java

diff --git a/core-java/pom.xml b/core-java/pom.xml
index e3a9043b09..39cb79a86a 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -9,7 +9,11 @@
     <dependencies>
 
         <!-- utils -->
-
+        <dependency>
+            <groupId>net.sourceforge.collections</groupId>
+            <artifactId>collections-generic</artifactId>
+            <version>4.01</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/core-java/src/main/java/com/baeldung/enums/Pizza.java b/core-java/src/main/java/com/baeldung/enums/Pizza.java
new file mode 100644
index 0000000000..b1c90b42cf
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/enums/Pizza.java
@@ -0,0 +1,117 @@
+package com.baeldung.enums;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections15.CollectionUtils;
+import org.apache.commons.collections15.Predicate;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+
+public class Pizza {
+
+    private static EnumSet<PizzaStatusEnum> undeliveredPizzaStatuses =
+      EnumSet.of(PizzaStatusEnum.ORDERED, PizzaStatusEnum.READY);
+
+    private PizzaStatusEnum status;
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PizzaStatusEnum {
+        ORDERED (5){
+            @Override
+            public boolean isOrdered() {
+                return true;
+            }
+        },
+        READY (2){
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+        },
+        DELIVERED (0){
+            @Override
+            public boolean isDelivered() {
+                return true;
+            }
+        };
+
+        private int timeToDelivery;
+
+        public boolean isOrdered() {return false;}
+
+        public boolean isReady() {return false;}
+
+        public boolean isDelivered(){return  false;}
+        @JsonProperty("timeToDelivery")
+        public int getTimeToDelivery() {
+            return timeToDelivery;
+        }
+
+        private PizzaStatusEnum (int timeToDelivery) {
+            this.timeToDelivery = timeToDelivery;
+        }
+    }
+
+    public PizzaStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PizzaStatusEnum status) {
+        this.status = status;
+    }
+
+    public boolean isDeliverable() {
+        return this.status.isReady();
+    }
+
+    public void printTimeToDeliver() {
+        System.out.println("Time to delivery is " + this.getStatus().getTimeToDelivery() + " days");
+    }
+
+    public static List<Pizza> getAllUndeliveredPizza(List<Pizza> input) {
+        List<Pizza> undelivered = input;
+        CollectionUtils.filter(undelivered, thatAreNotDelivered());
+        return undelivered;
+    }
+
+    public static EnumMap<PizzaStatusEnum, List<Pizza>> groupPizzaByStatus(List<Pizza> pizzaList) {
+        EnumMap<PizzaStatusEnum, List<Pizza>> pzByStatus = new EnumMap<PizzaStatusEnum, List<Pizza>>(PizzaStatusEnum.class);
+        for (Pizza pz : pizzaList) {
+            PizzaStatusEnum status = pz.getStatus();
+
+            if (pzByStatus.containsKey(status)) {
+                pzByStatus.get(status).add(pz);
+            } else {
+                List<Pizza> newPzList = new ArrayList<Pizza>();
+                newPzList.add(pz);
+                pzByStatus.put(status, newPzList);
+            }
+        }
+        return pzByStatus;
+    }
+
+    public void deliver() {
+        if (isDeliverable()) {
+            PizzaDeliverySystemConfiguration.getInstance().getDeliveryStrategy().deliver(this);
+            this.setStatus(PizzaStatusEnum.DELIVERED);
+        }
+    }
+
+    public static String getJsonString(Pizza pz) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(pz);
+    }
+
+    private static Predicate<Pizza> thatAreNotDelivered() {
+        return new Predicate<Pizza>() {
+            public boolean evaluate(Pizza entry) {
+                return undeliveredPizzaStatuses.contains(entry.getStatus());
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java b/core-java/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
new file mode 100644
index 0000000000..ed65919387
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
@@ -0,0 +1,18 @@
+package com.baeldung.enums;
+
+public enum PizzaDeliveryStrategy {
+    EXPRESS {
+        @Override
+        public void deliver(Pizza pz) {
+            System.out.println("Pizza will be delivered in express mode");
+        }
+    },
+    NORMAL {
+        @Override
+        public void deliver(Pizza pz) {
+            System.out.println("Pizza will be delivered in normal mode");
+        }
+    };
+
+    public abstract void deliver(Pizza pz);
+}
diff --git a/core-java/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java b/core-java/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
new file mode 100644
index 0000000000..9210945783
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
@@ -0,0 +1,20 @@
+package com.baeldung.enums;
+
+public enum PizzaDeliverySystemConfiguration {
+    INSTANCE ;
+    private PizzaDeliverySystemConfiguration() {
+        //Do the configuration initialization which
+        // involves overriding defaults like delivery strategy
+    }
+
+    private PizzaDeliveryStrategy deliveryStrategy = PizzaDeliveryStrategy.NORMAL;
+
+    public static PizzaDeliverySystemConfiguration getInstance() {
+        return INSTANCE;
+    }
+
+    public PizzaDeliveryStrategy getDeliveryStrategy() {
+        return deliveryStrategy;
+    }
+
+}
diff --git a/core-java/src/test/java/org/baeldung/java/enums/PizzaTest.java b/core-java/src/test/java/org/baeldung/java/enums/PizzaTest.java
new file mode 100644
index 0000000000..9f6a8feae5
--- /dev/null
+++ b/core-java/src/test/java/org/baeldung/java/enums/PizzaTest.java
@@ -0,0 +1,80 @@
+package org.baeldung.java.enums;
+
+
+import com.baeldung.enums.Pizza;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+
+
+public class PizzaTest {
+    @Test
+    public void givenPizaOrder_whenReady_thenDeliverable() {
+        Pizza testPz = new Pizza();
+        testPz.setStatus(Pizza.PizzaStatusEnum.READY);
+        assertTrue(testPz.isDeliverable());
+    }
+
+    @Test
+    public void givenPizaOrders_whenRetrievingUnDeliveredPzs_thenCorrectlyRetrieved() {
+        List<Pizza> pzList = new ArrayList<Pizza>();
+        Pizza pz1 = new Pizza();
+        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
+
+        Pizza pz2 = new Pizza();
+        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz3 = new Pizza();
+        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz4 = new Pizza();
+        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
+
+        pzList.add(pz1);
+        pzList.add(pz2);
+        pzList.add(pz3);
+        pzList.add(pz4);
+
+        List<Pizza> undeliveredPzs = Pizza.getAllUndeliveredPizza(pzList);
+        assertTrue(undeliveredPzs.size() == 3);
+    }
+
+    @Test
+    public void givenPizaOrders_whenGroupByStatusCalled_thenCorrectlyGrouped() {
+
+        List<Pizza> pzList = new ArrayList<Pizza>();
+        Pizza pz1 = new Pizza();
+        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
+
+        Pizza pz2 = new Pizza();
+        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz3 = new Pizza();
+        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz4 = new Pizza();
+        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
+
+        pzList.add(pz1);
+        pzList.add(pz2);
+        pzList.add(pz3);
+        pzList.add(pz4);
+
+        EnumMap<Pizza.PizzaStatusEnum, List<Pizza>> map = Pizza.groupPizzaByStatus(pzList);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.DELIVERED).size() == 1);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.ORDERED).size() == 2);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.READY).size() == 1);
+    }
+
+    @Test
+    public void givenPizaOrder_whenDelivered_thenPizzaGetsDeliveredAndStatusChanges() {
+        Pizza pz = new Pizza();
+        pz.setStatus(Pizza.PizzaStatusEnum.READY);
+        pz.deliver();
+        assertTrue(pz.getStatus() == Pizza.PizzaStatusEnum.DELIVERED);
+    }
+}

From 14012a0ca2e8e300b44261b2e4d42ab9dc790e81 Mon Sep 17 00:00:00 2001
From: Gachchinamat <D-YW44CN@europe.intranet>
Date: Mon, 30 May 2016 16:48:18 +0200
Subject: [PATCH 4/9] Enum examples for java8

---
 .../main/java/com/baeldung/enums/Pizza.java   | 84 +++++++++++++++++++
 .../baeldung/enums/PizzaDeliveryStrategy.java | 18 ++++
 .../PizzaDeliverySystemConfiguration.java     | 21 +++++
 .../java/com/baeldung/enums/PizzaTest.java    | 78 +++++++++++++++++
 4 files changed, 201 insertions(+)
 create mode 100644 core-java-8/src/main/java/com/baeldung/enums/Pizza.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
 create mode 100644 core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
 create mode 100644 core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java

diff --git a/core-java-8/src/main/java/com/baeldung/enums/Pizza.java b/core-java-8/src/main/java/com/baeldung/enums/Pizza.java
new file mode 100644
index 0000000000..0599aea457
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/enums/Pizza.java
@@ -0,0 +1,84 @@
+package com.baeldung.enums;
+
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Pizza {
+
+    private static EnumSet<PizzaStatusEnum> deliveredPizzaStatuses =
+      EnumSet.of(PizzaStatusEnum.DELIVERED);
+
+    private PizzaStatusEnum status;
+
+    public enum PizzaStatusEnum {
+        ORDERED (5){
+            @Override
+            public boolean isOrdered() {
+                return true;
+            }
+        },
+        READY (2){
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+        },
+        DELIVERED (0){
+            @Override
+            public boolean isDelivered() {
+                return true;
+            }
+        };
+
+        private int timeToDelivery;
+
+        public boolean isOrdered() {return false;}
+
+        public boolean isReady() {return false;}
+
+        public boolean isDelivered(){return  false;}
+        public int getTimeToDelivery() {
+            return timeToDelivery;
+        }
+
+        private PizzaStatusEnum (int timeToDelivery) {
+            this.timeToDelivery = timeToDelivery;
+        }
+    }
+
+    public PizzaStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PizzaStatusEnum status) {
+        this.status = status;
+    }
+
+    public boolean isDeliverable() {
+        return this.status.isReady();
+    }
+
+    public void printTimeToDeliver() {
+        System.out.println("Time to delivery is " + this.getStatus().getTimeToDelivery() + " days");
+    }
+
+    public static List<Pizza> getAllUndeliveredPizzas(List<Pizza> input) {
+        return input.stream().filter((s) -> !deliveredPizzaStatuses.contains(s.getStatus())).collect(Collectors.toList());
+    }
+
+    public static EnumMap<PizzaStatusEnum, List<Pizza>> groupPizzaByStatus(List<Pizza> pzList) {
+        EnumMap<PizzaStatusEnum, List<Pizza>> map = pzList.stream().collect(
+          Collectors.groupingBy(Pizza::getStatus,
+          () -> new EnumMap<PizzaStatusEnum, List<Pizza>>(PizzaStatusEnum.class), Collectors.toList()));
+        return map;
+    }
+
+    public void deliver() {
+        if (isDeliverable()) {
+            PizzaDeliverySystemConfiguration.getInstance().getDeliveryStrategy().deliver(this);
+            this.setStatus(PizzaStatusEnum.DELIVERED);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
new file mode 100644
index 0000000000..ed65919387
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliveryStrategy.java
@@ -0,0 +1,18 @@
+package com.baeldung.enums;
+
+public enum PizzaDeliveryStrategy {
+    EXPRESS {
+        @Override
+        public void deliver(Pizza pz) {
+            System.out.println("Pizza will be delivered in express mode");
+        }
+    },
+    NORMAL {
+        @Override
+        public void deliver(Pizza pz) {
+            System.out.println("Pizza will be delivered in normal mode");
+        }
+    };
+
+    public abstract void deliver(Pizza pz);
+}
diff --git a/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
new file mode 100644
index 0000000000..96b6314574
--- /dev/null
+++ b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
@@ -0,0 +1,21 @@
+package com.baeldung.enums;
+
+
+public enum PizzaDeliverySystemConfiguration {
+    INSTANCE ;
+    private PizzaDeliverySystemConfiguration() {
+        //Do the configuration initialization which
+        // involves overriding defaults like delivery strategy
+    }
+
+    private PizzaDeliveryStrategy deliveryStrategy = PizzaDeliveryStrategy.NORMAL;
+
+    public static PizzaDeliverySystemConfiguration getInstance() {
+        return INSTANCE;
+    }
+
+    public PizzaDeliveryStrategy getDeliveryStrategy() {
+        return deliveryStrategy;
+    }
+
+}
diff --git a/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java b/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java
new file mode 100644
index 0000000000..ca1c71043e
--- /dev/null
+++ b/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java
@@ -0,0 +1,78 @@
+package com.baeldung.enums;
+
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+
+public class PizzaTest {
+    @Test
+    public void givenPizaOrder_whenReady_thenDeliverable() {
+        Pizza testPz = new Pizza();
+        testPz.setStatus(Pizza.PizzaStatusEnum.READY);
+        assertTrue(testPz.isDeliverable());
+    }
+
+    @Test
+    public void givenPizaOrders_whenRetrievingUnDeliveredPzs_thenCorrectlyRetrieved() {
+        List<Pizza> pzList = new ArrayList<Pizza>();
+        Pizza pz1 = new Pizza();
+        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
+
+        Pizza pz2 = new Pizza();
+        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz3 = new Pizza();
+        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz4 = new Pizza();
+        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
+
+        pzList.add(pz1);
+        pzList.add(pz2);
+        pzList.add(pz3);
+        pzList.add(pz4);
+
+        List<Pizza> undeliveredPzs = Pizza.getAllUndeliveredPizzas(pzList);
+        assertTrue(undeliveredPzs.size() == 3);
+    }
+
+    @Test
+    public void givenPizaOrders_whenGroupByStatusCalled_thenCorrectlyGrouped() {
+
+        List<Pizza> pzList = new ArrayList<Pizza>();
+        Pizza pz1 = new Pizza();
+        pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
+
+        Pizza pz2 = new Pizza();
+        pz2.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz3 = new Pizza();
+        pz3.setStatus(Pizza.PizzaStatusEnum.ORDERED);
+
+        Pizza pz4 = new Pizza();
+        pz4.setStatus(Pizza.PizzaStatusEnum.READY);
+
+        pzList.add(pz1);
+        pzList.add(pz2);
+        pzList.add(pz3);
+        pzList.add(pz4);
+
+        EnumMap<Pizza.PizzaStatusEnum, List<Pizza>> map = Pizza.groupPizzaByStatus(pzList);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.DELIVERED).size() == 1);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.ORDERED).size() == 2);
+        assertTrue(map.get(Pizza.PizzaStatusEnum.READY).size() == 1);
+    }
+
+    @Test
+    public void givenPizaOrder_whenDelivered_thenPizzaGetsDeliveredAndStatusChanges() {
+        Pizza pz = new Pizza();
+        pz.setStatus(Pizza.PizzaStatusEnum.READY);
+        pz.deliver();
+        assertTrue(pz.getStatus() == Pizza.PizzaStatusEnum.DELIVERED);
+    }
+}

From abb64b29a75656cd620ad99926e257d2d12a66ff Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Tue, 31 May 2016 21:50:25 +0300
Subject: [PATCH 5/9] modifications to request and session scopes examples

---
 .../org/baeldung/scopes/ScopesController.java | 37 ++++++-------------
 .../baeldung/spring/config/ScopesConfig.java  | 12 ++++++
 .../webapp/WEB-INF/view/scopesExample.jsp     |  4 +-
 .../WEB-INF/view/scopesFirstRequest.jsp       | 11 ------
 .../WEB-INF/view/scopesSecondRequest.jsp      | 10 -----
 5 files changed, 25 insertions(+), 49 deletions(-)
 delete mode 100644 spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
 delete mode 100644 spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp

diff --git a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
index 5f29d0333f..bf733b75f9 100644
--- a/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
+++ b/spring-all/src/main/java/org/baeldung/scopes/ScopesController.java
@@ -2,45 +2,30 @@ package org.baeldung.scopes;
 
 import javax.annotation.Resource;
 
+import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 public class ScopesController {
+	public static final Logger LOG = Logger.getLogger(ScopesController.class);
 
 	@Resource(name = "requestMessage")
-	HelloMessageGenerator firstRequestMessage;
-
-	@Resource(name = "requestMessage")
-	HelloMessageGenerator secondRequestMessage;
+	HelloMessageGenerator requestMessage;
 
 	@Resource(name = "sessionMessage")
-	HelloMessageGenerator firstSessionMessage;
-
-	@Resource(name = "sessionMessage")
-	HelloMessageGenerator secondSessionMessage;
+	HelloMessageGenerator sessionMessage;
 
 	@RequestMapping("/scopes")
-	public String getScopes() {
+	public String getScopes(final Model model) {
+		LOG.info("Request Message:" + requestMessage.getMessage());
+		LOG.info("Session Message" + sessionMessage.getMessage());
+		requestMessage.setMessage("Good morning!");
+		sessionMessage.setMessage("Good afternoon!");
+		model.addAttribute("requestMessage", requestMessage.getMessage());
+		model.addAttribute("sessionMessage", sessionMessage.getMessage());
 		return "scopesExample";
 	}
 
-	@RequestMapping("/scopes/firstRequest")
-	public String getFirstRequest(final Model model) {
-		firstRequestMessage.setMessage("Good morning!");
-		firstSessionMessage.setMessage("Good afternoon!");
-		model.addAttribute("requestMessage", firstRequestMessage.getMessage());
-		model.addAttribute("sessionMessage", firstSessionMessage.getMessage());
-		return "scopesFirstRequest";
-	}
-
-	@RequestMapping("/scopes/secondRequest")
-	public String getSecondRequest(final Model model) {
-		secondRequestMessage.setMessage("Good evening!");
-		model.addAttribute("requestMessage", secondRequestMessage.getMessage());
-		model.addAttribute("sessionMessage", secondSessionMessage.getMessage());
-		return "scopesSecondRequest";
-	}
-
 }
diff --git a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
index 1de7b32720..5a9b266388 100644
--- a/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
+++ b/spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java
@@ -1,6 +1,7 @@
 package org.baeldung.spring.config;
 
 import org.baeldung.scopes.HelloMessageGenerator;
+import org.baeldung.scopes.Person;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -42,4 +43,15 @@ public class ScopesConfig {
 		return new HelloMessageGenerator();
 	}
 
+	@Bean
+	@Scope("prototype")
+	public Person personPrototype() {
+		return new Person();
+	}
+
+	@Bean
+	@Scope("singleton")
+	public Person personSingleton() {
+		return new Person();
+	}
 }
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
index 624ff46d5c..7974cf0220 100644
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
+++ b/spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp
@@ -4,7 +4,7 @@
 <body>
     <h1>Bean Scopes Examples</h1>
     <br>
-   <a href="${pageContext.request.contextPath}/scopes/firstRequest">First Request</a><br><br>
-    <a href="${pageContext.request.contextPath}/scopes/secondRequest">Second Request</a>
+ Request Message: ${requestMessage }<br>
+ Session Message: ${sessionMessage }
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
deleted file mode 100644
index 3804dfd1c6..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesFirstRequest.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head></head>
-
-<body>
-    <h1>Bean Scopes First Request</h1>
-    
-    Request bean message: ${requestMessage }
-    Session bean message: ${sessionMessage }
-    
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp b/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp
deleted file mode 100644
index 8e9d727661..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/view/scopesSecondRequest.jsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head></head>
-
-<body>
-    <h1>Bean Scopes Second Request</h1>
-    
-    Request bean message: ${requestMessage }
-    Session bean message: ${sessionMessage }
-</body>
-</html>
\ No newline at end of file

From 2f5f965ff210831bf9dd49cc58131bc3b28f156c Mon Sep 17 00:00:00 2001
From: Alex Theedom <alex.theedom@gmail.com>
Date: Tue, 31 May 2016 22:02:45 +0100
Subject: [PATCH 6/9] Some minor changes to style and to sync with article code

---
 .../main/java/com/baeldung/enums/Pizza.java   | 31 ++++++++++++-------
 .../PizzaDeliverySystemConfiguration.java     |  7 +++--
 .../java/com/baeldung/enums/PizzaTest.java    |  6 ++--
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/core-java-8/src/main/java/com/baeldung/enums/Pizza.java b/core-java-8/src/main/java/com/baeldung/enums/Pizza.java
index 0599aea457..5bc2d9a9eb 100644
--- a/core-java-8/src/main/java/com/baeldung/enums/Pizza.java
+++ b/core-java-8/src/main/java/com/baeldung/enums/Pizza.java
@@ -8,24 +8,24 @@ import java.util.stream.Collectors;
 public class Pizza {
 
     private static EnumSet<PizzaStatusEnum> deliveredPizzaStatuses =
-      EnumSet.of(PizzaStatusEnum.DELIVERED);
+            EnumSet.of(PizzaStatusEnum.DELIVERED);
 
     private PizzaStatusEnum status;
 
     public enum PizzaStatusEnum {
-        ORDERED (5){
+        ORDERED(5) {
             @Override
             public boolean isOrdered() {
                 return true;
             }
         },
-        READY (2){
+        READY(2) {
             @Override
             public boolean isReady() {
                 return true;
             }
         },
-        DELIVERED (0){
+        DELIVERED(0) {
             @Override
             public boolean isDelivered() {
                 return true;
@@ -34,16 +34,23 @@ public class Pizza {
 
         private int timeToDelivery;
 
-        public boolean isOrdered() {return false;}
+        public boolean isOrdered() {
+            return false;
+        }
 
-        public boolean isReady() {return false;}
+        public boolean isReady() {
+            return false;
+        }
+
+        public boolean isDelivered() {
+            return false;
+        }
 
-        public boolean isDelivered(){return  false;}
         public int getTimeToDelivery() {
             return timeToDelivery;
         }
 
-        private PizzaStatusEnum (int timeToDelivery) {
+        PizzaStatusEnum(int timeToDelivery) {
             this.timeToDelivery = timeToDelivery;
         }
     }
@@ -69,10 +76,9 @@ public class Pizza {
     }
 
     public static EnumMap<PizzaStatusEnum, List<Pizza>> groupPizzaByStatus(List<Pizza> pzList) {
-        EnumMap<PizzaStatusEnum, List<Pizza>> map = pzList.stream().collect(
-          Collectors.groupingBy(Pizza::getStatus,
-          () -> new EnumMap<PizzaStatusEnum, List<Pizza>>(PizzaStatusEnum.class), Collectors.toList()));
-        return map;
+        return pzList.stream().collect(
+                Collectors.groupingBy(Pizza::getStatus,
+                        () -> new EnumMap<>(PizzaStatusEnum.class), Collectors.toList()));
     }
 
     public void deliver() {
@@ -81,4 +87,5 @@ public class Pizza {
             this.setStatus(PizzaStatusEnum.DELIVERED);
         }
     }
+
 }
\ No newline at end of file
diff --git a/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
index 96b6314574..5ccff5e959 100644
--- a/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
+++ b/core-java-8/src/main/java/com/baeldung/enums/PizzaDeliverySystemConfiguration.java
@@ -2,9 +2,10 @@ package com.baeldung.enums;
 
 
 public enum PizzaDeliverySystemConfiguration {
-    INSTANCE ;
-    private PizzaDeliverySystemConfiguration() {
-        //Do the configuration initialization which
+    INSTANCE;
+
+    PizzaDeliverySystemConfiguration() {
+        // Do the configuration initialization which
         // involves overriding defaults like delivery strategy
     }
 
diff --git a/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java b/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java
index ca1c71043e..deeebaa240 100644
--- a/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java
+++ b/core-java-8/src/test/java/com/baeldung/enums/PizzaTest.java
@@ -10,6 +10,7 @@ import java.util.List;
 import static junit.framework.TestCase.assertTrue;
 
 public class PizzaTest {
+
     @Test
     public void givenPizaOrder_whenReady_thenDeliverable() {
         Pizza testPz = new Pizza();
@@ -19,7 +20,7 @@ public class PizzaTest {
 
     @Test
     public void givenPizaOrders_whenRetrievingUnDeliveredPzs_thenCorrectlyRetrieved() {
-        List<Pizza> pzList = new ArrayList<Pizza>();
+        List<Pizza> pzList = new ArrayList<>();
         Pizza pz1 = new Pizza();
         pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
 
@@ -44,7 +45,7 @@ public class PizzaTest {
     @Test
     public void givenPizaOrders_whenGroupByStatusCalled_thenCorrectlyGrouped() {
 
-        List<Pizza> pzList = new ArrayList<Pizza>();
+        List<Pizza> pzList = new ArrayList<>();
         Pizza pz1 = new Pizza();
         pz1.setStatus(Pizza.PizzaStatusEnum.DELIVERED);
 
@@ -75,4 +76,5 @@ public class PizzaTest {
         pz.deliver();
         assertTrue(pz.getStatus() == Pizza.PizzaStatusEnum.DELIVERED);
     }
+
 }

From 882a9b5d5078241dfd506b9a3562048f03b85179 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Jun 2016 19:57:34 +0200
Subject: [PATCH 7/9] cleanup format

---
 .../couchbase/service/PersonServiceTest.java  | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java b/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
index bedae26e00..c3bf9f2138 100644
--- a/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
+++ b/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
@@ -27,28 +27,20 @@ public abstract class PersonServiceTest extends IntegrationTest {
     static final String smith = "Smith";
     static final String johnSmithId = "person:" + john + ":" + smith;
     static final Person johnSmith = new Person(johnSmithId, john, smith);
-    static final JsonObject jsonJohnSmith = JsonObject.empty()
-            .put(typeField, Person.class.getName())
-            .put("firstName", john)
-            .put("lastName", smith)
-            .put("created", DateTime.now().getMillis());
+    static final JsonObject jsonJohnSmith = JsonObject.empty().put(typeField, Person.class.getName()).put("firstName", john).put("lastName", smith).put("created", DateTime.now().getMillis());
 
     static final String foo = "Foo";
     static final String bar = "Bar";
     static final String foobarId = "person:" + foo + ":" + bar;
     static final Person foobar = new Person(foobarId, foo, bar);
-    static final JsonObject jsonFooBar = JsonObject.empty()
-            .put(typeField, Person.class.getName())
-            .put("firstName", foo)
-            .put("lastName", bar)
-            .put("created", DateTime.now().getMillis());
-    
+    static final JsonObject jsonFooBar = JsonObject.empty().put(typeField, Person.class.getName()).put("firstName", foo).put("lastName", bar).put("created", DateTime.now().getMillis());
+
     PersonService personService;
-    
+
     @BeforeClass
     public static void setupBeforeClass() {
-        Cluster cluster = CouchbaseCluster.create(MyCouchbaseConfig.NODE_LIST);
-        Bucket bucket = cluster.openBucket(MyCouchbaseConfig.BUCKET_NAME, MyCouchbaseConfig.BUCKET_PASSWORD);
+        final Cluster cluster = CouchbaseCluster.create(MyCouchbaseConfig.NODE_LIST);
+        final Bucket bucket = cluster.openBucket(MyCouchbaseConfig.BUCKET_NAME, MyCouchbaseConfig.BUCKET_PASSWORD);
         bucket.upsert(JsonDocument.create(johnSmithId, jsonJohnSmith));
         bucket.upsert(JsonDocument.create(foobarId, jsonFooBar));
         bucket.close();
@@ -57,7 +49,7 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     @Test
     public void whenFindingPersonByJohnSmithId_thenReturnsJohnSmith() {
-        Person actualPerson = personService.findOne(johnSmithId);
+        final Person actualPerson = personService.findOne(johnSmithId);
         assertNotNull(actualPerson);
         assertNotNull(actualPerson.getCreated());
         assertEquals(johnSmith, actualPerson);
@@ -65,7 +57,7 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     @Test
     public void whenFindingAllPersons_thenReturnsTwoOrMorePersonsIncludingJohnSmithAndFooBar() {
-        List<Person> resultList = personService.findAll();
+        final List<Person> resultList = personService.findAll();
         assertNotNull(resultList);
         assertFalse(resultList.isEmpty());
         assertTrue(resultContains(resultList, johnSmith));
@@ -75,8 +67,8 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     @Test
     public void whenFindingByFirstNameJohn_thenReturnsOnlyPersonsNamedJohn() {
-        String expectedFirstName = john;
-        List<Person> resultList = personService.findByFirstName(expectedFirstName);
+        final String expectedFirstName = john;
+        final List<Person> resultList = personService.findByFirstName(expectedFirstName);
         assertNotNull(resultList);
         assertFalse(resultList.isEmpty());
         assertTrue(allResultsContainExpectedFirstName(resultList, expectedFirstName));
@@ -84,17 +76,17 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     @Test
     public void whenFindingByLastNameSmith_thenReturnsOnlyPersonsNamedSmith() {
-        String expectedLastName = smith;
-        List<Person> resultList = personService.findByLastName(expectedLastName);
+        final String expectedLastName = smith;
+        final List<Person> resultList = personService.findByLastName(expectedLastName);
         assertNotNull(resultList);
         assertFalse(resultList.isEmpty());
         assertTrue(allResultsContainExpectedLastName(resultList, expectedLastName));
     }
-    
+
     private boolean resultContains(List<Person> resultList, Person person) {
         boolean found = false;
-        for(Person p : resultList) {
-            if(p.equals(person)) {
+        for (final Person p : resultList) {
+            if (p.equals(person)) {
                 found = true;
                 break;
             }
@@ -104,8 +96,8 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     private boolean allResultsContainExpectedFirstName(List<Person> resultList, String firstName) {
         boolean found = false;
-        for(Person p : resultList) {
-            if(p.getFirstName().equals(firstName)) {
+        for (final Person p : resultList) {
+            if (p.getFirstName().equals(firstName)) {
                 found = true;
                 break;
             }
@@ -115,8 +107,8 @@ public abstract class PersonServiceTest extends IntegrationTest {
 
     private boolean allResultsContainExpectedLastName(List<Person> resultList, String lastName) {
         boolean found = false;
-        for(Person p : resultList) {
-            if(p.getLastName().equals(lastName)) {
+        for (final Person p : resultList) {
+            if (p.getLastName().equals(lastName)) {
                 found = true;
                 break;
             }

From a75cad61f39fc82ffdd44944e10069d843183095 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 1 Jun 2016 19:59:06 +0200
Subject: [PATCH 8/9] upgrade and add test

---
 spring-data-couchbase-2/pom.xml                            | 2 +-
 .../spring/data/couchbase/service/PersonServiceTest.java   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/spring-data-couchbase-2/pom.xml b/spring-data-couchbase-2/pom.xml
index 93b3dbddb4..d24ef4aeaa 100644
--- a/spring-data-couchbase-2/pom.xml
+++ b/spring-data-couchbase-2/pom.xml
@@ -93,7 +93,7 @@
 		<java.version>1.7</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
-		<spring-data-couchbase.version>2.0.0.RELEASE</spring-data-couchbase.version>
+		<spring-data-couchbase.version>2.1.1.RELEASE</spring-data-couchbase.version>
 		<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
 		<joda-time.version>2.9.2</joda-time.version>
 		<logback.version>1.1.3</logback.version>
diff --git a/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java b/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
index c3bf9f2138..3fabf7a11e 100644
--- a/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
+++ b/spring-data-couchbase-2/src/test/java/org/baeldung/spring/data/couchbase/service/PersonServiceTest.java
@@ -83,6 +83,13 @@ public abstract class PersonServiceTest extends IntegrationTest {
         assertTrue(allResultsContainExpectedLastName(resultList, expectedLastName));
     }
 
+    @Test
+    public void whenFindingByFirstNameJohn_thenReturnsOnePersonNamedJohn() {
+        final String expectedFirstName = john;
+        final List<Person> resultList = personService.findByFirstName(expectedFirstName);
+        assertTrue(resultList.size() == 1);
+    }
+
     private boolean resultContains(List<Person> resultList, Person person) {
         boolean found = false;
         for (final Person p : resultList) {

From 2e9efa16bc8dea7a6e798a3dbcbd077c2f0afa9e Mon Sep 17 00:00:00 2001
From: Kevin Gilmore <kpg102@gmail.com>
Date: Fri, 3 Jun 2016 07:26:42 -0500
Subject: [PATCH 9/9] Spring Data Couchbase tutorial: multiple buckets and
 spatial queries

---
 spring-data-couchbase-2/README.md             |  10 +-
 spring-data-couchbase-2b/.classpath           |  36 ++++
 spring-data-couchbase-2b/.project             |  30 ++++
 spring-data-couchbase-2b/.springBeans         |  20 +++
 spring-data-couchbase-2b/README.md            |  36 ++++
 spring-data-couchbase-2b/pom.xml              | 105 +++++++++++
 .../data/couchbase/MyCouchbaseConfig.java     |  79 ++++++++
 .../spring/data/couchbase/model/Campus.java   | 102 +++++++++++
 .../spring/data/couchbase/model/Person.java   |  87 +++++++++
 .../spring/data/couchbase/model/Student.java  | 113 ++++++++++++
 .../couchbase/repos/CampusRepository.java     |  19 ++
 .../couchbase/repos/PersonRepository.java     |  11 ++
 .../couchbase/repos/StudentRepository.java    |  11 ++
 .../service/CampusRepositoryService.java      |  54 ++++++
 .../data/couchbase/service/CampusService.java |  20 +++
 .../service/PersonRepositoryService.java      |  58 ++++++
 .../data/couchbase/service/PersonService.java |  22 +++
 .../service/StudentRepositoryService.java     |  58 ++++++
 .../couchbase/service/StudentService.java     |  22 +++
 .../src/main/resources/logback.xml            |  17 ++
 spring-data-couchbase-2b/src/site/site.xml    |  25 +++
 .../data/couchbase/IntegrationTest.java       |  13 ++
 .../data/couchbase/IntegrationTestConfig.java |   9 +
 .../data/couchbase/TestCouchbaseConfig.java   |  17 ++
 .../service/CampusRepositoryServiceTest.java  | 135 ++++++++++++++
 .../service/PersonRepositoryServiceTest.java  | 130 ++++++++++++++
 .../service/StudentRepositoryServiceTest.java | 170 ++++++++++++++++++
 .../src/test/resources/logback.xml            |  17 ++
 28 files changed, 1423 insertions(+), 3 deletions(-)
 create mode 100644 spring-data-couchbase-2b/.classpath
 create mode 100644 spring-data-couchbase-2b/.project
 create mode 100644 spring-data-couchbase-2b/.springBeans
 create mode 100644 spring-data-couchbase-2b/README.md
 create mode 100644 spring-data-couchbase-2b/pom.xml
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/MyCouchbaseConfig.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Campus.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Person.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Student.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/CampusRepository.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/PersonRepository.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/StudentRepository.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryService.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusService.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryService.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonService.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryService.java
 create mode 100644 spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentService.java
 create mode 100644 spring-data-couchbase-2b/src/main/resources/logback.xml
 create mode 100644 spring-data-couchbase-2b/src/site/site.xml
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTest.java
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTestConfig.java
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/TestCouchbaseConfig.java
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryServiceTest.java
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryServiceTest.java
 create mode 100644 spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryServiceTest.java
 create mode 100644 spring-data-couchbase-2b/src/test/resources/logback.xml

diff --git a/spring-data-couchbase-2/README.md b/spring-data-couchbase-2/README.md
index e58e37e090..3ed226fb33 100644
--- a/spring-data-couchbase-2/README.md
+++ b/spring-data-couchbase-2/README.md
@@ -2,11 +2,12 @@
 
 ### Relevant Articles:
 - [Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase)
+- [Entity Validation, Query Consistency, and Optimistic Locking in Spring Data Couchbase](http://www.baeldung.com/entity-validation-locking-and-query-consistency-in-spring-data-couchbase)
 
 ### Overview
 This Maven project contains the Java code for Spring Data Couchbase
 entities, repositories, and template-based services
-as described in the tutorial, as well as a unit test
+as described in the tutorials, as well as a unit/integration test
 for each service implementation.
 
 ### Working with the Code
@@ -22,13 +23,16 @@ mvn clean install
 ```
 
 ### Running the tests
-There are three test classes in src/test/java in the package
+The following test classes are in src/test/java in the package
 org.baeldung.spring.data.couchbase.service:
 - PersonServiceTest (abstract)
 - PersonRepositoryTest (concrete)
 - PersonTemplateServiceTest (concrete)
+- StudentServiceTest (abstract)
+- StudentRepositoryTest (concrete)
+- StudentTemplateServiceTest (concrete)
 
-The latter two may be run as JUnit tests from your IDE
+The concrete test classes may be run as JUnit tests from your IDE
 or using the Maven command line:
 ```
 mvn test
diff --git a/spring-data-couchbase-2b/.classpath b/spring-data-couchbase-2b/.classpath
new file mode 100644
index 0000000000..450036fc00
--- /dev/null
+++ b/spring-data-couchbase-2b/.classpath
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<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">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-data-couchbase-2b/.project b/spring-data-couchbase-2b/.project
new file mode 100644
index 0000000000..1690ad8ce2
--- /dev/null
+++ b/spring-data-couchbase-2b/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>spring-data-couchbase-2</name>
+	<comment>This project is a simple template for a jar utility using Spring.
+  </comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/spring-data-couchbase-2b/.springBeans b/spring-data-couchbase-2b/.springBeans
new file mode 100644
index 0000000000..0c014a97b6
--- /dev/null
+++ b/spring-data-couchbase-2b/.springBeans
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.2.7.200909012107-CI-R3397-B453]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[true]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+		<configSet>
+			<name><![CDATA[test]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+			</configs>
+		</configSet>
+	</configSets>
+</beansProjectDescription>
diff --git a/spring-data-couchbase-2b/README.md b/spring-data-couchbase-2b/README.md
new file mode 100644
index 0000000000..262962f58a
--- /dev/null
+++ b/spring-data-couchbase-2b/README.md
@@ -0,0 +1,36 @@
+## Spring Data Couchbase Tutorial Project
+
+### Relevant Articles:
+- [Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase)
+- [Entity Validation, Query Consistency, and Optimistic Locking in Spring Data Couchbase](http://www.baeldung.com/entity-validation-locking-and-query-consistency-in-spring-data-couchbase)
+
+### Overview
+This Maven project contains the Java code for Spring Data Couchbase
+entities, repositories, and repository-based services
+as described in the tutorials, as well as a unit/integration test
+for each service implementation.
+
+### Working with the Code
+The project was developed and tested using Java 7 and 8 in the Eclipse-based
+Spring Source Toolkit (STS) and therefore should run fine in any
+recent version of Eclipse or another IDE of your choice
+that supports Java 7 or later.
+
+### Building the Project
+You can also build the project using Maven outside of any IDE:
+```
+mvn clean install
+```
+
+### Running the tests
+The following test classes are in src/test/java in the package
+org.baeldung.spring.data.couchbase.service:
+- CampusRepositoryServiceTest
+- PersonRepositoryServiceTest
+- StudentRepositoryServiceTest
+
+These may be run as JUnit tests from your IDE
+or using the Maven command line:
+```
+mvn test
+```
diff --git a/spring-data-couchbase-2b/pom.xml b/spring-data-couchbase-2b/pom.xml
new file mode 100644
index 0000000000..7d58f78ce5
--- /dev/null
+++ b/spring-data-couchbase-2b/pom.xml
@@ -0,0 +1,105 @@
+<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>org.baeldung</groupId>
+	<artifactId>spring-data-couchbase-2b</artifactId>
+	<version>0.1-SNAPSHOT</version>
+	<name>spring-data-couchbase-2b</name>
+	<packaging>jar</packaging>
+  
+	<dependencies>
+	
+		<!-- Spring Context and Couchbase Peristence -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${spring-framework.version}</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.springframework.data</groupId>
+		    <artifactId>spring-data-couchbase</artifactId>
+		    <version>${spring-data-couchbase.version}</version>
+		</dependency>
+
+		<!-- Hibernate JSR-303 Bean Validation -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>${hibernate-validator.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${joda-time.version}</version>
+		</dependency>
+
+		<!-- Logging with SLF4J & LogBack -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${org.slf4j.version}</version>
+			<scope>compile</scope>
+		</dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+
+		<!-- Test-Scoped Dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring-framework.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>	
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<properties>
+		<java.version>1.7</java.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring-framework.version>4.2.4.RELEASE</spring-framework.version>
+		<spring-data-couchbase.version>2.1.1.RELEASE</spring-data-couchbase.version>
+		<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
+		<joda-time.version>2.9.2</joda-time.version>
+		<logback.version>1.1.3</logback.version>
+		<org.slf4j.version>1.7.12</org.slf4j.version>
+		<junit.version>4.11</junit.version>
+
+	</properties>
+	
+</project>
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/MyCouchbaseConfig.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/MyCouchbaseConfig.java
new file mode 100644
index 0000000000..8eeda08455
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/MyCouchbaseConfig.java
@@ -0,0 +1,79 @@
+package org.baeldung.spring.data.couchbase;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Campus;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
+import org.springframework.data.couchbase.core.CouchbaseTemplate;
+import org.springframework.data.couchbase.core.mapping.event.ValidatingCouchbaseEventListener;
+import org.springframework.data.couchbase.core.query.Consistency;
+import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories;
+import org.springframework.data.couchbase.repository.config.RepositoryOperationsMapping;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+
+import com.couchbase.client.java.Bucket;
+
+@Configuration
+@EnableCouchbaseRepositories(basePackages={"org.baeldung.spring.data.couchbase"})
+public class MyCouchbaseConfig extends AbstractCouchbaseConfiguration {
+    
+    public static final List<String> NODE_LIST = Arrays.asList("localhost");
+    public static final String DEFAULT_BUCKET_NAME = "baeldung";
+    public static final String DEFAULT_BUCKET_PASSWORD = "";
+
+    @Override
+    protected List<String> getBootstrapHosts() {
+        return NODE_LIST;
+    }
+
+    @Override
+    protected String getBucketName() {
+        return DEFAULT_BUCKET_NAME;
+    }
+
+    @Override
+    protected String getBucketPassword() {
+        return DEFAULT_BUCKET_PASSWORD;
+    }
+    
+    @Bean
+    public Bucket campusBucket() throws Exception {
+        return couchbaseCluster().openBucket("baeldung2", "");
+    }
+    
+    @Bean
+    public CouchbaseTemplate campusTemplate() throws Exception {
+        CouchbaseTemplate template = new CouchbaseTemplate(
+          couchbaseClusterInfo(), campusBucket(),
+          mappingCouchbaseConverter(), translationService());
+        template.setDefaultConsistency(getDefaultConsistency());
+        return template;
+    }
+    
+    @Override
+    public void configureRepositoryOperationsMapping(RepositoryOperationsMapping baseMapping) {
+        try {
+            baseMapping.mapEntity(Campus.class, campusTemplate());
+        } catch (Exception e) {
+            //custom Exception handling
+        }
+    }
+
+    @Override
+    protected Consistency getDefaultConsistency() {
+        return Consistency.READ_YOUR_OWN_WRITES;
+    }
+
+    @Bean
+    public LocalValidatorFactoryBean localValidatorFactoryBean() {
+        return new LocalValidatorFactoryBean();
+    }
+
+    @Bean
+    public ValidatingCouchbaseEventListener validatingCouchbaseEventListener() {
+        return new ValidatingCouchbaseEventListener(localValidatorFactoryBean());
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Campus.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Campus.java
new file mode 100644
index 0000000000..201b14cf0b
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Campus.java
@@ -0,0 +1,102 @@
+package org.baeldung.spring.data.couchbase.model;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.geo.Point;
+
+import com.couchbase.client.java.repository.annotation.Field;
+
+@Document
+public class Campus {
+
+    @Id
+    private String id;
+    @Field
+    @NotNull
+    private String name;
+    @Field
+    @NotNull
+    private Point location;
+    
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Point getLocation() {
+        return location;
+    }
+    public void setLocation(Point location) {
+        this.location = location;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        if(id != null) {
+            hash = hash * 31 + id.hashCode();
+        }
+        if(name != null) {
+            hash = hash * 31 + name.hashCode();
+        }
+        if(location != null) {
+            hash = hash * 31 + location.hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if((obj == null) || (obj.getClass() != this.getClass())) return false;
+        if(obj == this) return true;
+        Campus other = (Campus) obj;
+        return this.hashCode() == other.hashCode();
+    }
+    
+    @SuppressWarnings("unused")
+    private Campus() {}
+    
+    public Campus(Builder b) {
+        this.id = b.id;
+        this.name = b.name;
+        this.location = b.location;
+    }
+    
+    public static class Builder {
+        private String id;
+        private String name;
+        private Point location;
+        
+        public static Builder newInstance() {
+            return new Builder();
+        }
+        
+        public Campus build() {
+            return new Campus(this);
+        }
+
+        public Builder id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+        
+        public Builder location(Point location) {
+            this.location = location;
+            return this;
+        }
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Person.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Person.java
new file mode 100644
index 0000000000..9220e157ed
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Person.java
@@ -0,0 +1,87 @@
+package org.baeldung.spring.data.couchbase.model;
+
+import javax.validation.constraints.NotNull;
+
+import org.joda.time.DateTime;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.couchbase.core.mapping.Document;
+
+import com.couchbase.client.java.repository.annotation.Field;
+
+@Document
+public class Person {
+
+    @Id
+    private String id;
+    @Field
+    @NotNull
+    private String firstName;
+    @Field
+    @NotNull
+    private String lastName;
+    @Field
+    @NotNull
+    private DateTime created;
+    @Field
+    private DateTime updated;
+    
+    public Person(String id, String firstName, String lastName) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getFirstName() {
+        return firstName;
+    }
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+    public DateTime getCreated() {
+        return created;
+    }
+    public void setCreated(DateTime created) {
+        this.created = created;
+    }
+    public DateTime getUpdated() {
+        return updated;
+    }
+    public void setUpdated(DateTime updated) {
+        this.updated = updated;
+    }
+    
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        if(id != null) {
+            hash = hash * 31 + id.hashCode();
+        }
+        if(firstName != null) {
+            hash = hash * 31 + firstName.hashCode();
+        }
+        if(lastName != null) {
+            hash = hash * 31 + lastName.hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if((obj == null) || (obj.getClass() != this.getClass())) return false;
+        if(obj == this) return true;
+        Person other = (Person) obj;
+        return this.hashCode() == other.hashCode();
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Student.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Student.java
new file mode 100644
index 0000000000..9c266c2c62
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/model/Student.java
@@ -0,0 +1,113 @@
+package org.baeldung.spring.data.couchbase.model;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Past;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import org.joda.time.DateTime;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Version;
+import org.springframework.data.couchbase.core.mapping.Document;
+
+import com.couchbase.client.java.repository.annotation.Field;
+
+@Document
+public class Student {
+    private static final String NAME_REGEX = "^[a-zA-Z .'-]+$";
+
+    @Id
+    private String id;
+    @Field
+    @NotNull
+    @Size(min=1, max=20)
+    @Pattern(regexp=NAME_REGEX)
+    private String firstName;
+    @Field
+    @NotNull
+    @Size(min=1, max=20)
+    @Pattern(regexp=NAME_REGEX)
+    private String lastName;
+    @Field
+    @Past
+    private DateTime dateOfBirth;
+    @Field
+    @NotNull
+    private DateTime created;
+    @Field
+    private DateTime updated;
+    @Version
+    private long version;
+    
+    public Student() {}
+
+    public Student(String id, String firstName, String lastName, DateTime dateOfBirth) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getFirstName() {
+        return firstName;
+    }
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+    public String getLastName() {
+        return lastName;
+    }
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+    public DateTime getDateOfBirth() {
+        return dateOfBirth;
+    }
+    public void setDateOfBirth(DateTime dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+    public DateTime getCreated() {
+        return created;
+    }
+    public void setCreated(DateTime created) {
+        this.created = created;
+    }
+    public DateTime getUpdated() {
+        return updated;
+    }
+    public void setUpdated(DateTime updated) {
+        this.updated = updated;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        if(id != null) {
+            hash = hash * 31 + id.hashCode();
+        }
+        if(firstName != null) {
+            hash = hash * 31 + firstName.hashCode();
+        }
+        if(lastName != null) {
+            hash = hash * 31 + lastName.hashCode();
+        }
+        if(dateOfBirth != null) {
+            hash = hash * 31 + dateOfBirth.hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if((obj == null) || (obj.getClass() != this.getClass())) return false;
+        if(obj == this) return true;
+        Student other = (Student) obj;
+        return this.hashCode() == other.hashCode();
+    }
+}
\ No newline at end of file
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/CampusRepository.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/CampusRepository.java
new file mode 100644
index 0000000000..22b2fb2735
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/CampusRepository.java
@@ -0,0 +1,19 @@
+package org.baeldung.spring.data.couchbase.repos;
+
+import java.util.Set;
+
+import org.baeldung.spring.data.couchbase.model.Campus;
+import org.springframework.data.couchbase.core.query.Dimensional;
+import org.springframework.data.couchbase.core.query.View;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+import org.springframework.data.repository.CrudRepository;
+
+public interface CampusRepository extends CrudRepository<Campus, String> {
+
+    @View(designDocument="campus", viewName="byName")
+    Set<Campus> findByName(String name);
+
+    @Dimensional(dimensions=2, designDocument="campus_spatial", spatialViewName="byLocation")
+    Set<Campus> findByLocationNear(Point point, Distance distance);
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/PersonRepository.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/PersonRepository.java
new file mode 100644
index 0000000000..14b77759e3
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/PersonRepository.java
@@ -0,0 +1,11 @@
+package org.baeldung.spring.data.couchbase.repos;
+
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Person;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PersonRepository extends CrudRepository<Person, String> {
+    List<Person> findByFirstName(String firstName);
+    List<Person> findByLastName(String lastName);
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/StudentRepository.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/StudentRepository.java
new file mode 100644
index 0000000000..433964c872
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/repos/StudentRepository.java
@@ -0,0 +1,11 @@
+package org.baeldung.spring.data.couchbase.repos;
+
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Student;
+import org.springframework.data.repository.CrudRepository;
+
+public interface StudentRepository extends CrudRepository<Student, String> {
+    List<Student> findByFirstName(String firstName);
+    List<Student> findByLastName(String lastName);
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryService.java
new file mode 100644
index 0000000000..d12e59ba1f
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryService.java
@@ -0,0 +1,54 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.baeldung.spring.data.couchbase.model.Campus;
+import org.baeldung.spring.data.couchbase.repos.CampusRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+import org.springframework.stereotype.Service;
+
+@Service
+@Qualifier("CampusRepositoryService")
+public class CampusRepositoryService implements CampusService {
+
+    private CampusRepository repo;
+    @Autowired
+    public void setCampusRepository(CampusRepository repo) {
+        this.repo = repo;
+    }
+    
+    @Override
+    public Campus find(String id) {
+        return repo.findOne(id);
+    }
+    
+    @Override
+    public Set<Campus> findByName(String name) {
+        return repo.findByName(name);
+    }
+    
+    @Override
+    public Set<Campus> findByLocationNear(Point point, Distance distance) {
+        return repo.findByLocationNear(point, distance);
+    }
+
+    @Override
+    public Set<Campus> findAll() {
+        Set<Campus> campuses = new HashSet<>();
+        Iterator<Campus> it = repo.findAll().iterator();
+        while(it.hasNext()) {
+            campuses.add(it.next());
+        }
+        return campuses;
+    }
+
+    @Override
+    public void save(Campus campus) {
+        repo.save(campus);
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusService.java
new file mode 100644
index 0000000000..e82c14cb87
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/CampusService.java
@@ -0,0 +1,20 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.Set;
+
+import org.baeldung.spring.data.couchbase.model.Campus;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+
+public interface CampusService {
+    
+    Campus find(String id);
+
+    Set<Campus> findByName(String name);
+
+    Set<Campus> findByLocationNear(Point point, Distance distance);
+    
+    Set<Campus> findAll();
+    
+    void save(Campus campus);
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryService.java
new file mode 100644
index 0000000000..90cc36780a
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryService.java
@@ -0,0 +1,58 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Person;
+import org.baeldung.spring.data.couchbase.repos.PersonRepository;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+@Service
+@Qualifier("PersonRepositoryService")
+public class PersonRepositoryService implements PersonService {
+    
+    private PersonRepository repo;
+    @Autowired
+    public void setPersonRepository(PersonRepository repo) {
+        this.repo = repo;
+    }
+
+    public Person findOne(String id) {
+        return repo.findOne(id);
+    }
+
+    public List<Person> findAll() {
+        List<Person> people = new ArrayList<Person>();
+        Iterator<Person> it = repo.findAll().iterator();
+        while(it.hasNext()) {
+            people.add(it.next());
+        }
+        return people;
+    }
+
+    public List<Person> findByFirstName(String firstName) {
+        return repo.findByFirstName(firstName);
+    }
+
+    public List<Person> findByLastName(String lastName) {
+        return repo.findByLastName(lastName);
+    }
+
+    public void create(Person person) {
+        person.setCreated(DateTime.now());
+        repo.save(person);
+    }
+
+    public void update(Person person) {
+        person.setUpdated(DateTime.now());
+        repo.save(person);
+    }
+
+    public void delete(Person person) {
+        repo.delete(person);
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonService.java
new file mode 100644
index 0000000000..a823908b01
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/PersonService.java
@@ -0,0 +1,22 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Person;
+
+public interface PersonService {
+
+    Person findOne(String id);
+
+    List<Person> findAll();
+
+    List<Person> findByFirstName(String firstName);
+
+    List<Person> findByLastName(String lastName);
+
+    void create(Person person);
+
+    void update(Person person);
+
+    void delete(Person person);
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryService.java
new file mode 100644
index 0000000000..58304afc1c
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryService.java
@@ -0,0 +1,58 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Student;
+import org.baeldung.spring.data.couchbase.repos.StudentRepository;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+@Service
+@Qualifier("StudentRepositoryService")
+public class StudentRepositoryService implements StudentService {
+    
+    private StudentRepository repo;
+    @Autowired
+    public void setStudentRepository(StudentRepository repo) {
+        this.repo = repo;
+    }
+
+    public Student findOne(String id) {
+        return repo.findOne(id);
+    }
+
+    public List<Student> findAll() {
+        List<Student> people = new ArrayList<Student>();
+        Iterator<Student> it = repo.findAll().iterator();
+        while(it.hasNext()) {
+            people.add(it.next());
+        }
+        return people;
+    }
+
+    public List<Student> findByFirstName(String firstName) {
+        return repo.findByFirstName(firstName);
+    }
+
+    public List<Student> findByLastName(String lastName) {
+        return repo.findByLastName(lastName);
+    }
+
+    public void create(Student student) {
+        student.setCreated(DateTime.now());
+        repo.save(student);
+    }
+
+    public void update(Student student) {
+        student.setUpdated(DateTime.now());
+        repo.save(student);
+    }
+
+    public void delete(Student student) {
+        repo.delete(student);
+    }
+}
diff --git a/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentService.java b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentService.java
new file mode 100644
index 0000000000..f483ef0fb6
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/java/org/baeldung/spring/data/couchbase/service/StudentService.java
@@ -0,0 +1,22 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.model.Student;
+
+public interface StudentService {
+
+    Student findOne(String id);
+
+    List<Student> findAll();
+
+    List<Student> findByFirstName(String firstName);
+
+    List<Student> findByLastName(String lastName);
+
+    void create(Student student);
+
+    void update(Student student);
+
+    void delete(Student student);
+}
diff --git a/spring-data-couchbase-2b/src/main/resources/logback.xml b/spring-data-couchbase-2b/src/main/resources/logback.xml
new file mode 100644
index 0000000000..d9067fd1da
--- /dev/null
+++ b/spring-data-couchbase-2b/src/main/resources/logback.xml
@@ -0,0 +1,17 @@
+<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.baeldung" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
\ No newline at end of file
diff --git a/spring-data-couchbase-2b/src/site/site.xml b/spring-data-couchbase-2b/src/site/site.xml
new file mode 100644
index 0000000000..dda96feecd
--- /dev/null
+++ b/spring-data-couchbase-2b/src/site/site.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Spring Batch: ${project.name}">
+
+	<bannerLeft>
+		<name>Spring Sample: ${project.name}</name>
+    	<href>index.html</href>
+	</bannerLeft>
+
+  <skin>
+    <groupId>org.springframework.maven.skins</groupId>
+    <artifactId>maven-spring-skin</artifactId>
+    <version>1.0.5</version>
+  </skin>
+
+	<body>
+
+		<links>
+			<item name="${project.name}" href="index.html"/>
+		</links>
+		
+		<menu ref="reports"/>
+	
+	</body>
+
+</project>
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTest.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTest.java
new file mode 100644
index 0000000000..ce2daa92cd
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTest.java
@@ -0,0 +1,13 @@
+package org.baeldung.spring.data.couchbase;
+
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { MyCouchbaseConfig.class, IntegrationTestConfig.class })
+@TestExecutionListeners(listeners = { DependencyInjectionTestExecutionListener.class })
+public abstract class IntegrationTest {
+}
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTestConfig.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTestConfig.java
new file mode 100644
index 0000000000..6f040c34db
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/IntegrationTestConfig.java
@@ -0,0 +1,9 @@
+package org.baeldung.spring.data.couchbase;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackages = "org.baeldung.spring.data.couchbase")
+public class IntegrationTestConfig {
+}
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/TestCouchbaseConfig.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/TestCouchbaseConfig.java
new file mode 100644
index 0000000000..c298ef0a61
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/TestCouchbaseConfig.java
@@ -0,0 +1,17 @@
+package org.baeldung.spring.data.couchbase;
+
+import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
+import org.springframework.data.couchbase.core.query.Consistency;
+
+public class TestCouchbaseConfig extends MyCouchbaseConfig {
+
+    @Override
+    public String typeKey() {
+        return MappingCouchbaseConverter.TYPEKEY_SYNCGATEWAY_COMPATIBLE;
+    }
+    
+    @Override
+    public Consistency getDefaultConsistency() {
+        return Consistency.READ_YOUR_OWN_WRITES;
+    }
+}
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryServiceTest.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryServiceTest.java
new file mode 100644
index 0000000000..5a718f0807
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/CampusRepositoryServiceTest.java
@@ -0,0 +1,135 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import static org.junit.Assert.*;
+
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+
+import org.baeldung.spring.data.couchbase.IntegrationTest;
+import org.baeldung.spring.data.couchbase.model.Campus;
+import org.baeldung.spring.data.couchbase.repos.CampusRepository;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Metrics;
+import org.springframework.data.geo.Point;
+
+public class CampusRepositoryServiceTest extends IntegrationTest {
+    
+    @Autowired
+    @Qualifier("CampusRepositoryService")
+    private CampusRepositoryService campusService;
+    
+    @Autowired
+    private CampusRepository campusRepo;
+    
+    private final Campus Brown = Campus.Builder.newInstance()
+            .id("campus:Brown")
+            .name("Brown")
+            .location(new Point(71.4025, 51.8268))
+            .build();
+
+    private final Campus Cornell = Campus.Builder.newInstance()
+            .id("campus:Cornell")
+            .name("Cornell")
+            .location(new Point(76.4833, 42.4459))
+            .build();    
+    
+    private final Campus Columbia = Campus.Builder.newInstance()
+            .id("campus:Columbia")
+            .name("Columbia")
+            .location(new Point(73.9626, 40.8075))
+            .build();    
+ 
+    private final Campus Dartmouth = Campus.Builder.newInstance()
+            .id("campus:Dartmouth")
+            .name("Dartmouth")
+            .location(new Point(72.2887, 43.7044))
+            .build();    
+
+    private final Campus Harvard = Campus.Builder.newInstance()
+            .id("campus:Harvard")
+            .name("Harvard")
+            .location(new Point(71.1167, 42.3770))
+            .build();    
+
+    private final Campus Penn = Campus.Builder.newInstance()
+            .id("campus:Penn")
+            .name("Penn")
+            .location(new Point(75.1932, 39.9522))
+            .build();
+
+    private final Campus Princeton = Campus.Builder.newInstance()
+            .id("campus:Princeton")
+            .name("Princeton")
+            .location(new Point(74.6514, 40.3340))
+            .build();
+    
+    private final Campus Yale = Campus.Builder.newInstance()
+            .id("campus:Yale")
+            .name("Yale")
+            .location(new Point(72.9223, 41.3163))
+            .build();
+    
+    private final Point Boston = new Point(71.0589, 42.3601);
+    private final Point NewYorkCity = new Point(74.0059, 40.7128);
+
+    @PostConstruct
+    private void loadCampuses() throws Exception {
+        campusRepo.save(Brown);
+        campusRepo.save(Columbia);
+        campusRepo.save(Cornell);
+        campusRepo.save(Dartmouth);
+        campusRepo.save(Harvard);
+        campusRepo.save(Penn);
+        campusRepo.save(Princeton);
+        campusRepo.save(Yale);
+    }
+    
+    @Test
+    public final void givenNameHarvard_whenFindByName_thenReturnsHarvard() throws Exception {
+        Set<Campus> campuses = campusService.findByName(Harvard.getName());
+        assertNotNull(campuses);
+        assertFalse(campuses.isEmpty());
+        assertTrue(campuses.size() == 1);
+        assertTrue(campuses.contains(Harvard));
+    }
+    
+    @Test
+    public final void givenHarvardId_whenFind_thenReturnsHarvard() throws Exception {
+        Campus actual = campusService.find(Harvard.getId());
+        assertNotNull(actual);
+        assertEquals(Harvard, actual);
+    }
+    
+    @Test
+    public final void whenFindAll_thenReturnsAll() throws Exception {
+        Set<Campus> campuses = campusService.findAll();
+        assertTrue(campuses.contains(Brown));
+        assertTrue(campuses.contains(Columbia));
+        assertTrue(campuses.contains(Cornell));
+        assertTrue(campuses.contains(Dartmouth));
+        assertTrue(campuses.contains(Harvard));
+        assertTrue(campuses.contains(Penn));
+        assertTrue(campuses.contains(Princeton));
+        assertTrue(campuses.contains(Yale));
+    }
+
+    @Test
+    public final void whenFindByLocationNearBoston_thenResultContainsHarvard() throws Exception {
+        Set<Campus> campuses = campusService.findByLocationNear(Boston, new Distance(1, Metrics.NEUTRAL));
+        assertFalse(campuses.isEmpty());
+        assertTrue(campuses.contains(Harvard));
+        assertFalse(campuses.contains(Columbia));
+    }
+    
+    @Test
+    public final void whenFindByLocationNearNewYorkCity_thenResultContainsColumbia() throws Exception {
+        Set<Campus> campuses = campusService.findByLocationNear(NewYorkCity, new Distance(1, Metrics.NEUTRAL));
+        assertFalse(campuses.isEmpty());
+        assertTrue(campuses.contains(Columbia));
+        assertFalse(campuses.contains(Harvard));
+    }
+}
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryServiceTest.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryServiceTest.java
new file mode 100644
index 0000000000..84b6f75d56
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/PersonRepositoryServiceTest.java
@@ -0,0 +1,130 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.baeldung.spring.data.couchbase.IntegrationTest;
+import org.baeldung.spring.data.couchbase.MyCouchbaseConfig;
+import org.baeldung.spring.data.couchbase.model.Person;
+import org.joda.time.DateTime;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import com.couchbase.client.java.Bucket;
+import com.couchbase.client.java.Cluster;
+import com.couchbase.client.java.CouchbaseCluster;
+import com.couchbase.client.java.document.JsonDocument;
+import com.couchbase.client.java.document.json.JsonObject;
+
+public class PersonRepositoryServiceTest extends IntegrationTest {
+
+    private static final String typeField = "_class";
+    private static final String john = "John";
+    private static final String smith = "Smith";
+    private static final String johnSmithId = "person:" + john + ":" + smith;
+    private static final Person johnSmith = new Person(johnSmithId, john, smith);
+    private static final JsonObject jsonJohnSmith = JsonObject.empty()
+            .put(typeField, Person.class.getName())
+            .put("firstName", john)
+            .put("lastName", smith)
+            .put("created", DateTime.now().getMillis());
+
+    private static final String foo = "Foo";
+    private static final String bar = "Bar";
+    private static final String foobarId = "person:" + foo + ":" + bar;
+    private static final Person foobar = new Person(foobarId, foo, bar);
+    private static final JsonObject jsonFooBar = JsonObject.empty()
+            .put(typeField, Person.class.getName())
+            .put("firstName", foo)
+            .put("lastName", bar)
+            .put("created", DateTime.now().getMillis());
+    
+    @Autowired
+    @Qualifier("PersonRepositoryService")
+    private PersonService personService;
+    
+    @BeforeClass
+    public static void setupBeforeClass() {
+        Cluster cluster = CouchbaseCluster.create(MyCouchbaseConfig.NODE_LIST);
+        Bucket bucket = cluster.openBucket(MyCouchbaseConfig.DEFAULT_BUCKET_NAME, MyCouchbaseConfig.DEFAULT_BUCKET_PASSWORD);
+        bucket.upsert(JsonDocument.create(johnSmithId, jsonJohnSmith));
+        bucket.upsert(JsonDocument.create(foobarId, jsonFooBar));
+        bucket.close();
+        cluster.disconnect();
+    }
+
+    @Test
+    public void whenFindingPersonByJohnSmithId_thenReturnsJohnSmith() {
+        Person actualPerson = personService.findOne(johnSmithId);
+        assertNotNull(actualPerson);
+        assertNotNull(actualPerson.getCreated());
+        assertEquals(johnSmith, actualPerson);
+    }
+
+    @Test
+    public void whenFindingAllPersons_thenReturnsTwoOrMorePersonsIncludingJohnSmithAndFooBar() {
+        List<Person> resultList = personService.findAll();
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(resultContains(resultList, johnSmith));
+        assertTrue(resultContains(resultList, foobar));
+        assertTrue(resultList.size() >= 2);
+    }
+
+    @Test
+    public void whenFindingByFirstNameJohn_thenReturnsOnlyPersonsNamedJohn() {
+        String expectedFirstName = john;
+        List<Person> resultList = personService.findByFirstName(expectedFirstName);
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(allResultsContainExpectedFirstName(resultList, expectedFirstName));
+    }
+
+    @Test
+    public void whenFindingByLastNameSmith_thenReturnsOnlyPersonsNamedSmith() {
+        String expectedLastName = smith;
+        List<Person> resultList = personService.findByLastName(expectedLastName);
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(allResultsContainExpectedLastName(resultList, expectedLastName));
+    }
+    
+    private boolean resultContains(List<Person> resultList, Person person) {
+        boolean found = false;
+        for(Person p : resultList) {
+            if(p.equals(person)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private boolean allResultsContainExpectedFirstName(List<Person> resultList, String firstName) {
+        boolean found = false;
+        for(Person p : resultList) {
+            if(p.getFirstName().equals(firstName)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private boolean allResultsContainExpectedLastName(List<Person> resultList, String lastName) {
+        boolean found = false;
+        for(Person p : resultList) {
+            if(p.getLastName().equals(lastName)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+}
diff --git a/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryServiceTest.java b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryServiceTest.java
new file mode 100644
index 0000000000..166f01d754
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/java/org/baeldung/spring/data/couchbase/service/StudentRepositoryServiceTest.java
@@ -0,0 +1,170 @@
+package org.baeldung.spring.data.couchbase.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import javax.validation.ConstraintViolationException;
+
+import org.baeldung.spring.data.couchbase.IntegrationTest;
+import org.baeldung.spring.data.couchbase.MyCouchbaseConfig;
+import org.baeldung.spring.data.couchbase.model.Student;
+import org.joda.time.DateTime;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import com.couchbase.client.java.Bucket;
+import com.couchbase.client.java.Cluster;
+import com.couchbase.client.java.CouchbaseCluster;
+import com.couchbase.client.java.document.JsonDocument;
+import com.couchbase.client.java.document.json.JsonObject;
+
+public class StudentRepositoryServiceTest extends IntegrationTest {
+
+    private static final String typeField = "_class";
+    private static final String joe = "Joe";
+    private static final String college = "College";
+    private static final String joeCollegeId = "student:" + joe + ":" + college;
+    private static final DateTime joeCollegeDob = DateTime.now().minusYears(21);
+    private static final Student joeCollege = new Student(joeCollegeId, joe, college, joeCollegeDob);
+    private static final JsonObject jsonJoeCollege = JsonObject.empty()
+            .put(typeField, Student.class.getName())
+            .put("firstName", joe)
+            .put("lastName", college)
+            .put("created", DateTime.now().getMillis())
+            .put("version", 1);
+
+    private static final String judy = "Judy";
+    private static final String jetson = "Jetson";
+    private static final String judyJetsonId = "student:" + judy + ":" + jetson;
+    private static final DateTime judyJetsonDob = DateTime.now().minusYears(19).minusMonths(5).minusDays(3);
+    private static final Student judyJetson = new Student(judyJetsonId, judy, jetson, judyJetsonDob);
+    private static final JsonObject jsonJudyJetson = JsonObject.empty()
+            .put(typeField, Student.class.getName())
+            .put("firstName", judy)
+            .put("lastName", jetson)
+            .put("created", DateTime.now().getMillis())
+            .put("version", 1);
+
+    @Autowired
+    @Qualifier("StudentRepositoryService")
+    private StudentService studentService;
+
+    @BeforeClass
+    public static void setupBeforeClass() {
+        Cluster cluster = CouchbaseCluster.create(MyCouchbaseConfig.NODE_LIST);
+        Bucket bucket = cluster.openBucket(MyCouchbaseConfig.DEFAULT_BUCKET_NAME, MyCouchbaseConfig.DEFAULT_BUCKET_PASSWORD);
+        bucket.upsert(JsonDocument.create(joeCollegeId, jsonJoeCollege));
+        bucket.upsert(JsonDocument.create(judyJetsonId, jsonJudyJetson));
+        bucket.close();
+        cluster.disconnect();
+    }
+
+    @Test
+    public void whenCreatingStudent_thenDocumentIsPersisted() {
+        String firstName = "Eric";
+        String lastName = "Stratton";
+        DateTime dateOfBirth = DateTime.now().minusYears(25);
+        String id = "student:" + firstName + ":" + lastName;
+        Student expectedStudent = new Student(id, firstName, lastName, dateOfBirth);
+        studentService.create(expectedStudent);
+        Student actualStudent = studentService.findOne(id);
+        assertNotNull(actualStudent.getCreated());
+        assertNotNull(actualStudent);
+        assertEquals(expectedStudent.getId(), actualStudent.getId());
+    }
+
+    @Test(expected=ConstraintViolationException.class)
+    public void whenCreatingStudentWithInvalidFirstName_thenConstraintViolationException() {
+        String firstName = "Er+ic";
+        String lastName = "Stratton";
+        DateTime dateOfBirth = DateTime.now().minusYears(25);
+        String id = "student:" + firstName + ":" + lastName;
+        Student student = new Student(id, firstName, lastName, dateOfBirth);
+        studentService.create(student);
+    }
+
+    @Test(expected=ConstraintViolationException.class)
+    public void whenCreatingStudentWithFutureDob_thenConstraintViolationException() {
+        String firstName = "Jane";
+        String lastName = "Doe";
+        DateTime dateOfBirth = DateTime.now().plusDays(1);
+        String id = "student:" + firstName + ":" + lastName;
+        Student student = new Student(id, firstName, lastName, dateOfBirth);
+        studentService.create(student);
+    }
+
+    @Test
+    public void whenFindingStudentByJohnSmithId_thenReturnsJohnSmith() {
+        Student actualStudent = studentService.findOne(joeCollegeId);
+        assertNotNull(actualStudent);
+        assertNotNull(actualStudent.getCreated());
+        assertEquals(joeCollegeId, actualStudent.getId());
+    }
+
+    @Test
+    public void whenFindingAllStudents_thenReturnsTwoOrMoreStudentsIncludingJoeCollegeAndJudyJetson() {
+        List<Student> resultList = studentService.findAll();
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(resultContains(resultList, joeCollege));
+        assertTrue(resultContains(resultList, judyJetson));
+        assertTrue(resultList.size() >= 2);
+    }
+
+    @Test
+    public void whenFindingByFirstNameJohn_thenReturnsOnlyStudentsNamedJohn() {
+        String expectedFirstName = joe;
+        List<Student> resultList = studentService.findByFirstName(expectedFirstName);
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(allResultsContainExpectedFirstName(resultList, expectedFirstName));
+    }
+
+    @Test
+    public void whenFindingByLastNameSmith_thenReturnsOnlyStudentsNamedSmith() {
+        String expectedLastName = college;
+        List<Student> resultList = studentService.findByLastName(expectedLastName);
+        assertNotNull(resultList);
+        assertFalse(resultList.isEmpty());
+        assertTrue(allResultsContainExpectedLastName(resultList, expectedLastName));
+    }
+
+    private boolean resultContains(List<Student> resultList, Student student) {
+        boolean found = false;
+        for(Student p : resultList) {
+            if(p.getId().equals(student.getId())) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private boolean allResultsContainExpectedFirstName(List<Student> resultList, String firstName) {
+        boolean found = false;
+        for(Student p : resultList) {
+            if(p.getFirstName().equals(firstName)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private boolean allResultsContainExpectedLastName(List<Student> resultList, String lastName) {
+        boolean found = false;
+        for(Student p : resultList) {
+            if(p.getLastName().equals(lastName)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+}
diff --git a/spring-data-couchbase-2b/src/test/resources/logback.xml b/spring-data-couchbase-2b/src/test/resources/logback.xml
new file mode 100644
index 0000000000..d9067fd1da
--- /dev/null
+++ b/spring-data-couchbase-2b/src/test/resources/logback.xml
@@ -0,0 +1,17 @@
+<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.baeldung" level="DEBUG" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
\ No newline at end of file