DATACOUCH-145 - Use Id/Field annotations from Couchbase SDK

The @Field annotation has been removed in favor of the one from the Couchbase SDK.

Similarly, CouchbasePersistentEntity now recognize the SDK's @Id annotation. Note that if both Spring Data and Couchbase @Id are present (on two distinct fields), the one from Spring Data will be taken into account.

src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java

@@ -52,7 +52,7 @@ import org.springframework.data.annotation.Version;
 import org.springframework.data.couchbase.IntegrationTestApplicationConfig;
 import org.springframework.data.couchbase.core.convert.MappingCouchbaseConverter;
 import org.springframework.data.couchbase.core.mapping.Document;
-import org.springframework.data.couchbase.core.mapping.Field;
+import com.couchbase.client.java.repository.annotation.Field;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

src/integration/java/org/springframework/data/couchbase/repository/Party.java

@@ -3,7 +3,7 @@ package org.springframework.data.couchbase.repository;
 import java.util.Date;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.couchbase.core.mapping.Field;
+import com.couchbase.client.java.repository.annotation.Field;
 
 /**
  * An entity used to test conversion of parameters in query derivations.

src/integration/java/org/springframework/data/couchbase/repository/cdi/Person.java

@@ -17,7 +17,7 @@
 package org.springframework.data.couchbase.repository.cdi;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.couchbase.core.mapping.Field;
+import com.couchbase.client.java.repository.annotation.Field;
 
 /**
  * @author Mark Paluch