Merge pull request #2 from eugenp/master

Merge upstream to local

core-java-8/src/main/java/com/baeldung/datetime/UseDuration.java

@@ -0,0 +1,16 @@
+package com.baeldung.datetime;
+
+import java.time.Duration;
+import java.time.LocalTime;
+import java.time.Period;
+
+public class UseDuration {
+    
+    public LocalTime modifyDates(LocalTime localTime,Duration duration){
+        return localTime.plus(duration);
+    }
+    
+    public Duration getDifferenceBetweenDates(LocalTime localTime1,LocalTime localTime2){
+        return Duration.between(localTime1, localTime2);
+    }
+}

core-java-8/src/main/java/com/baeldung/datetime/UseLocalDate.java

@@ -0,0 +1,46 @@
+package com.baeldung.datetime;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+
+public class UseLocalDate {
+    
+    public LocalDate getLocalDateUsingFactoryOfMethod(int year, int month, int dayOfMonth){        
+        return LocalDate.of(year, month, dayOfMonth);
+    }
+    
+    public LocalDate getLocalDateUsingParseMethod(String representation){        
+        return LocalDate.parse(representation);
+    }
+    
+    public LocalDate getLocalDateFromClock(){        
+        LocalDate localDate = LocalDate.now();
+        return localDate;
+    }
+    
+    public LocalDate getNextDay(LocalDate localDate){       
+        return localDate.plusDays(1);
+    }
+    
+    public LocalDate getPreviousDay(LocalDate localDate){        
+        return localDate.minus(1, ChronoUnit.DAYS);
+    }
+    
+    public DayOfWeek getDayOfWeek(LocalDate localDate){        
+        DayOfWeek day = localDate.getDayOfWeek();
+        return day;
+    }
+    
+    public LocalDate getFirstDayOfMonth(){        
+        LocalDate firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        return firstDayOfMonth;
+    }
+    
+    public LocalDateTime getStartOfDay(LocalDate localDate){        
+        LocalDateTime startofDay = localDate.atStartOfDay();
+        return startofDay;
+    }
+}

core-java-8/src/main/java/com/baeldung/datetime/UseLocalDateTime.java

@@ -0,0 +1,11 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+
+public class UseLocalDateTime {
+    
+    public LocalDateTime getLocalDateTimeUsingParseMethod(String representation){        
+        return LocalDateTime.parse(representation);
+    }
+
+}

core-java-8/src/main/java/com/baeldung/datetime/UseLocalTime.java

@@ -0,0 +1,35 @@
+package com.baeldung.datetime;
+
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+
+public class UseLocalTime {
+    
+    public LocalTime getLocalTimeUsingFactoryOfMethod(int hour, int min, int seconds){        
+        LocalTime localTime = LocalTime.of(hour, min, seconds);
+        return localTime;
+    }
+    
+    public LocalTime getLocalTimeUsingParseMethod(String timeRepresentation){        
+        LocalTime localTime = LocalTime.parse(timeRepresentation);
+        return localTime;
+    }
+    
+    public LocalTime getLocalTimeFromClock(){        
+        LocalTime localTime = LocalTime.now();
+        return localTime;
+    }
+    
+    public LocalTime addAnHour(LocalTime localTime){
+        LocalTime newTime = localTime.plus(1,ChronoUnit.HOURS);
+        return newTime;
+    }
+    
+    public int getHourFromLocalTime(LocalTime localTime){        
+        return localTime.getHour();
+    }
+    
+    public LocalTime getLocalTimeWithMinuteSetToValue(LocalTime localTime, int minute){        
+        return localTime.withMinute(minute);
+    }
+}

core-java-8/src/main/java/com/baeldung/datetime/UsePeriod.java

@@ -0,0 +1,15 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDate;
+import java.time.Period;
+
+public class UsePeriod {
+    
+    public LocalDate modifyDates(LocalDate localDate,Period period){
+        return localDate.plus(period);
+    }
+    
+    public Period getDifferenceBetweenDates(LocalDate localDate1,LocalDate localDate2){
+        return Period.between(localDate1, localDate2);
+    }
+}

core-java-8/src/main/java/com/baeldung/datetime/UseToInstant.java

@@ -0,0 +1,19 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Calendar;
+import java.util.Date;
+
+public class UseToInstant {
+    
+    public LocalDateTime convertDateToLocalDate(Date date){
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+        return localDateTime;
+    }
+    
+    public LocalDateTime convertDateToLocalDate(Calendar calendar){
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(calendar.toInstant(), ZoneId.systemDefault());
+        return localDateTime;
+    }
+}

core-java-8/src/main/java/com/baeldung/datetime/UseZonedDateTime.java

@@ -0,0 +1,13 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class UseZonedDateTime {
+    
+    public ZonedDateTime getZonedDateTime(LocalDateTime localDateTime,ZoneId zoneId){        
+        ZonedDateTime zonedDateTime = ZonedDateTime.of(localDateTime, zoneId);
+        return zonedDateTime;
+    }
+}

core-java-8/src/test/java/com/baeldung/datetime/UseLocalDateTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.datetime;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Month;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UseLocalDateTest {
+    
+    UseLocalDate useLocalDate = new UseLocalDate();
+    
+    @Test
+    public void givenValues_whenUsingFactoryOf_thenLocalDate(){
+        Assert.assertEquals("2016-05-10",useLocalDate.getLocalDateUsingFactoryOfMethod(2016,5,10).toString());
+    }
+    
+    @Test
+    public void givenString_whenUsingParse_thenLocalDate(){
+        Assert.assertEquals("2016-05-10",useLocalDate.getLocalDateUsingParseMethod("2016-05-10").toString());
+    }
+    
+    @Test
+    public void whenUsingClock_thenLocalDate(){
+        Assert.assertEquals(LocalDate.now(),useLocalDate.getLocalDateFromClock());
+    }
+    
+    @Test
+    public void givenDate_whenUsingPlus_thenNextDay(){
+        Assert.assertEquals(LocalDate.now().plusDays(1),useLocalDate.getNextDay(LocalDate.now()));
+    }
+    
+    @Test
+    public void givenDate_whenUsingMinus_thenPreviousDay(){
+        Assert.assertEquals(LocalDate.now().minusDays(1),useLocalDate.getPreviousDay(LocalDate.now()));
+    }
+    
+    @Test
+    public void givenToday_whenUsingGetDayOfWeek_thenDayOfWeek(){
+        Assert.assertEquals(DayOfWeek.SUNDAY,useLocalDate.getDayOfWeek(LocalDate.parse("2016-05-22")));
+    }
+    
+    @Test
+    public void givenToday_whenUsingWithTemporalAdjuster_thenFirstDayOfMonth(){
+        Assert.assertEquals(1,useLocalDate.getFirstDayOfMonth().getDayOfMonth());
+    }
+    
+    @Test
+    public void givenLocalDate_whenUsingAtStartOfDay_thenReturnMidnight(){
+        Assert.assertEquals(LocalDateTime.parse("2016-05-22T00:00:00"),useLocalDate.getStartOfDay(LocalDate.parse("2016-05-22")));
+    }
+
+}

core-java-8/src/test/java/com/baeldung/datetime/UseLocalDateTimeTest.java

@@ -0,0 +1,19 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.Month;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UseLocalDateTimeTest {
+    
+    UseLocalDateTime useLocalDateTime = new UseLocalDateTime();
+    
+    @Test
+    public void givenString_whenUsingParse_thenLocalDateTime(){
+        Assert.assertEquals(LocalDate.of(2016, Month.MAY, 10),useLocalDateTime.getLocalDateTimeUsingParseMethod("2016-05-10T06:30").toLocalDate());
+        Assert.assertEquals(LocalTime.of(6,30),useLocalDateTime.getLocalDateTimeUsingParseMethod("2016-05-10T06:30").toLocalTime());
+    }
+}

core-java-8/src/test/java/com/baeldung/datetime/UseLocalTimeTest.java

@@ -0,0 +1,36 @@
+package com.baeldung.datetime;
+
+import java.time.LocalTime;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UseLocalTimeTest {
+    
+    UseLocalTime useLocalTime = new UseLocalTime();
+    
+    @Test
+    public void givenValues_whenUsingFactoryOf_thenLocalTime(){
+        Assert.assertEquals("07:07:07",useLocalTime.getLocalTimeUsingFactoryOfMethod(7,7,7).toString());
+    }
+    
+    @Test
+    public void givenString_whenUsingParse_thenLocalTime(){
+        Assert.assertEquals("06:30",useLocalTime.getLocalTimeUsingParseMethod("06:30").toString());
+    }
+    
+    @Test
+    public void givenTime_whenAddHour_thenLocalTime(){
+        Assert.assertEquals("07:30",useLocalTime.addAnHour(LocalTime.of(6,30)).toString());
+    }
+    
+    @Test
+    public void getHourFromLocalTime(){
+        Assert.assertEquals(1, useLocalTime.getHourFromLocalTime(LocalTime.of(1,1)));
+    }
+    
+    @Test
+    public void getLocalTimeWithMinuteSetToValue(){
+        Assert.assertEquals(LocalTime.of(10, 20), useLocalTime.getLocalTimeWithMinuteSetToValue(LocalTime.of(10,10), 20));
+    }
+}

core-java-8/src/test/java/com/baeldung/datetime/UsePeriodTest.java

@@ -0,0 +1,29 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UsePeriodTest {
+    UsePeriod usingPeriod=new UsePeriod();
+    
+    @Test
+    public void givenPeriodAndLocalDate_thenCalculateModifiedDate(){
+        Period period = Period.ofDays(1);
+        LocalDate localDate = LocalDate.parse("2007-05-10");
+        Assert.assertEquals(localDate.plusDays(1),usingPeriod.modifyDates(localDate, period));
+    }
+    
+    @Test
+    public void givenDates_thenGetPeriod(){
+        LocalDate localDate1 = LocalDate.parse("2007-05-10");
+        LocalDate localDate2 = LocalDate.parse("2007-05-15");
+        
+        Assert.assertEquals(Period.ofDays(5), usingPeriod.getDifferenceBetweenDates(localDate1, localDate2));
+    }
+}

core-java-8/src/test/java/com/baeldung/datetime/UseZonedDateTimeTest.java

@@ -0,0 +1,20 @@
+package com.baeldung.datetime;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UseZonedDateTimeTest {
+    
+    UseZonedDateTime zonedDateTime=new UseZonedDateTime();
+    
+    @Test
+    public void givenZoneId_thenZonedDateTime(){
+        ZoneId zoneId=ZoneId.of("Europe/Paris");
+        ZonedDateTime zonedDatetime=zonedDateTime.getZonedDateTime(LocalDateTime.parse("2016-05-20T06:30"), zoneId);
+        Assert.assertEquals(zoneId,ZoneId.from(zonedDatetime));
+    }
+}

jsf/pom.xml

@@ -90,12 +90,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -112,5 +121,10 @@
 
         <!--Tomcat-->
         <javax.servlet.version>3.1.0</javax.servlet.version>
+
+        <!-- maven plugins -->
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-war-plugin.version>2.6</maven-war-plugin.version>
+
     </properties>
 </project>

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

spring-all/src/main/java/org/baeldung/scopes/Person.java

@@ -0,0 +1,27 @@
+package org.baeldung.scopes;
+
+public class Person {
+	private String name;
+	private int age;
+
+	public Person() {
+	}
+
+	public Person(final String name, final int age) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(final String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return "Person [name=" + name + "]";
+	}
+
+}

spring-all/src/main/java/org/baeldung/scopes/ScopesController.java

@@ -0,0 +1,31 @@
+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 requestMessage;
+
+	@Resource(name = "sessionMessage")
+	HelloMessageGenerator sessionMessage;
+
+	@RequestMapping("/scopes")
+	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";
+	}
+
+}

spring-all/src/main/java/org/baeldung/spring/config/ScopesConfig.java

@@ -0,0 +1,57 @@
+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;
+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();
+	}
+
+	@Bean
+	@Scope(value = WebApplicationContext.SCOPE_GLOBAL_SESSION, proxyMode = ScopedProxyMode.TARGET_CLASS)
+	public HelloMessageGenerator globalSessionMessage() {
+		return new HelloMessageGenerator();
+	}
+
+	@Bean
+	@Scope("prototype")
+	public Person personPrototype() {
+		return new Person();
+	}
+
+	@Bean
+	@Scope("singleton")
+	public Person personSingleton() {
+		return new Person();
+	}
+}

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>

spring-all/src/main/webapp/WEB-INF/view/scopesExample.jsp

@@ -0,0 +1,10 @@
+<html>
+<head></head>
+
+<body>
+    <h1>Bean Scopes Examples</h1>
+    <br>
+ Request Message: ${requestMessage }<br>
+ Session Message: ${sessionMessage }
+</body>
+</html>

spring-all/src/test/java/org/baeldung/scopes/ScopesTest.java

@@ -0,0 +1,43 @@
+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 String NAME_OTHER = "Anna Jones";
+
+	@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);
+		Assert.assertEquals(NAME, personSingletonB.getName());
+
+		((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);
+		personPrototypeB.setName(NAME_OTHER);
+
+		Assert.assertEquals(NAME, personPrototypeA.getName());
+		Assert.assertEquals(NAME_OTHER, personPrototypeB.getName());
+
+		((AbstractApplicationContext) applicationContext).close();
+	}
+
+}

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

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>

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,24 @@ 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));
     }
-    
+
+    @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(Person p : resultList) {
-            if(p.equals(person)) {
+        for (final Person p : resultList) {
+            if (p.equals(person)) {
                 found = true;
                 break;
             }
@@ -104,8 +103,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 +114,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;
             }

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>

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>

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>

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
+```

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>

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());
+    }
+}

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