DATACOUCH-27: Mapping @id field with MappingCouchbaseConverter

Fixed @id field rewriting from CouchbaseDocument into domain object.
More info can be found at DATACOUCH-27 JIRA issue.

Author: Maciej Zasada

.gitignore

@@ -4,3 +4,7 @@ target/
 .classpath
 .project
 .settings/*
+
+# IntelliJ IDEA
+*.iml
+.idea

src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java

@@ -82,7 +82,7 @@ public <R> R read(Class<R> clazz, CouchbaseDocument doc) {
   protected <R> R read(TypeInformation<R> type, CouchbaseDocument doc) {
     return read(type, doc, null);
   }
-  
+
   protected <R> R read(TypeInformation<R> type, final CouchbaseDocument source, Object parent) {
 
     if (source == null) {
@@ -118,13 +118,17 @@ protected <R extends Object> R read(final CouchbasePersistentEntity<R> entity, f
 
     entity.doWithProperties(new PropertyHandler<CouchbasePersistentProperty>() {
       public void doWithPersistentProperty(final CouchbasePersistentProperty prop) {
-        if (!source.containsKey(prop.getFieldName()) || entity.isConstructorArgument(prop)) {
+        if (!doesPropertyExistInSource(prop) || entity.isConstructorArgument(prop)) {
           return;
         }
 
         Object obj = prop.isIdProperty() ? source.getId() : getValueInternal(prop, source, evaluator, result);
         wrapper.setProperty(prop, obj, useFieldAccessOnly);
       }
+
+      private boolean doesPropertyExistInSource(CouchbasePersistentProperty property) {
+        return property.isIdProperty() || source.containsKey(property.getFieldName());
+      }
     });
 
     entity.doWithAssociations(new AssociationHandler<CouchbasePersistentProperty>() {
@@ -201,7 +205,6 @@ private Object getPotentiallyConvertedSimpleRead(Object value, Class<?> target)
     return target.isAssignableFrom(value.getClass()) ? value : conversionService.convert(value, target);
   }
 
-
   @Override
   public void write(final Object source, final CouchbaseDocument target) {
     if (source == null) {

src/test/java/org/springframework/data/couchbase/core/mapping/BasicCouchbasePersistentPropertyTests.java

@@ -90,5 +90,8 @@ public class Beer {
 
     String description;
 
+    public String getId() {
+      return id;
+    }
   }
 }

src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java

@@ -69,7 +69,6 @@ public void needsIDOnEntity() {
       new CouchbaseDocument());
   }
 
-
   @Test
   public void writesString() {
     CouchbaseDocument converted = new CouchbaseDocument();
@@ -94,7 +93,6 @@ public void readsString() {
     assertEquals("foobar", converted.attr0);
   }
 
-
   @Test
   public void writesNumber() {
     CouchbaseDocument converted = new CouchbaseDocument();
@@ -119,7 +117,6 @@ public void readsNumber() {
     assertEquals(42, converted.attr0);
   }
 
-
   @Test
   public void writesBoolean() {
     CouchbaseDocument converted = new CouchbaseDocument();
@@ -176,6 +173,18 @@ public void readsMixedSimpleTypes() {
     assertTrue(converted.attr3);
   }
 
+  @Test
+  public void readsID() {
+    // given:
+    CouchbaseDocument document = new CouchbaseDocument("001");
+
+    // when:
+    BasicCouchbasePersistentPropertyTests.Beer beer = converter.read(BasicCouchbasePersistentPropertyTests.Beer.class,
+        document);
+
+    // then:
+    assertEquals("001", beer.getId());
+  }
 
   @Test
   public void writesUninitializedValues() {
@@ -336,7 +345,6 @@ public void writesAndReadsSetAndNestedSet() {
     assertEquals(attr2, readConverted.attr2);
   }
 
-
   @Test
   public void writesAndReadsValueClass() {
     CouchbaseDocument converted = new CouchbaseDocument();