Rebase with main.

Author: mikereiche

pom.xml

@@ -245,7 +245,6 @@
             <scope>compile</scope>
         </dependency>
 
-
     </dependencies>
 
     <repositories>
@@ -263,6 +262,12 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+<!--
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+-->
     </repositories>
 
     <pluginRepositories>

src/main/java/org/springframework/data/couchbase/core/AbstractTemplateSupport.java

@@ -15,6 +15,10 @@
  */
 package org.springframework.data.couchbase.core;
 
+import java.lang.reflect.InaccessibleObjectException;
+import java.util.Map;
+import java.util.Set;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -26,17 +30,16 @@
 import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
 import org.springframework.data.couchbase.core.mapping.event.AfterSaveEvent;
 import org.springframework.data.couchbase.core.mapping.event.CouchbaseMappingEvent;
+import org.springframework.data.couchbase.core.support.TemplateUtils;
 import org.springframework.data.couchbase.repository.support.MappingCouchbaseEntityInformation;
 import org.springframework.data.couchbase.repository.support.TransactionResultHolder;
 import org.springframework.data.couchbase.transaction.CouchbaseResourceHolder;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
-
 import org.springframework.util.ClassUtils;
 
-import java.util.Map;
-import java.util.Set;
+import com.couchbase.client.core.error.CouchbaseException;
 
 public abstract class AbstractTemplateSupport {
 
@@ -47,7 +50,8 @@ public abstract class AbstractTemplateSupport {
 	ApplicationContext applicationContext;
 	static final Logger LOG = LoggerFactory.getLogger(AbstractTemplateSupport.class);
 
-	public AbstractTemplateSupport(ReactiveCouchbaseTemplate template, CouchbaseConverter converter, TranslationService translationService) {
+	public AbstractTemplateSupport(ReactiveCouchbaseTemplate template, CouchbaseConverter converter,
+			TranslationService translationService) {
 		this.template = template;
 		this.converter = converter;
 		this.mappingContext = converter.getMappingContext();
@@ -56,10 +60,8 @@ public AbstractTemplateSupport(ReactiveCouchbaseTemplate template, CouchbaseConv
 
 	abstract ReactiveCouchbaseTemplate getReactiveTemplate();
 
-	public <T> T decodeEntityBase(String id, String source, long cas, Class<T> entityClass, String scope, String collection,
-								  TransactionResultHolder txResultHolder, CouchbaseResourceHolder holder) {
-		final CouchbaseDocument converted = new CouchbaseDocument(id);
-		converted.setId(id);
+	public <T> T decodeEntityBase(String id, String source, Long cas, Class<T> entityClass, String scope,
+			String collection, TransactionResultHolder txResultHolder, CouchbaseResourceHolder holder) {
 
 		// this is the entity class defined for the repository. It may not be the class of the document that was read
 		// we will reset it after reading the document
@@ -79,18 +81,32 @@ public <T> T decodeEntityBase(String id, String source, long cas, Class<T> entit
 			// to unwrap. This results in List<String[]> being unwrapped past String[] to String, so this may also be a
 			// Collection (or Array) of entityClass. We have no way of knowing - so just assume it is what we are told.
 			// if this is a Collection or array, only the first element will be returned.
+			final CouchbaseDocument converted = new CouchbaseDocument(id);
 			Set<Map.Entry<String, Object>> set = ((CouchbaseDocument) translationService.decode(source, converted))
 					.getContent().entrySet();
 			return (T) set.iterator().next().getValue();
 		}
 
+		if (id == null) {
+			throw new CouchbaseException(TemplateUtils.SELECT_ID + " was null. Either use #{#n1ql.selectEntity} or project "
+					+ TemplateUtils.SELECT_ID);
+		}
+
+		final CouchbaseDocument converted = new CouchbaseDocument(id);
+
 		// if possible, set the version property in the source so that if the constructor has a long version argument,
-		// it will have a value an not fail (as null is not a valid argument for a long argument). This possible failure
+		// it will have a value and not fail (as null is not a valid argument for a long argument). This possible failure
 		// can be avoid by defining the argument as Long instead of long.
 		// persistentEntity is still the (possibly abstract) class specified in the repository definition
 		// it's possible that the abstract class does not have a version property, and this won't be able to set the version
-		if (cas != 0 && persistentEntity.getVersionProperty() != null) {
-			converted.put(persistentEntity.getVersionProperty().getName(), cas);
+		if (persistentEntity.getVersionProperty() != null) {
+			if (cas == null) {
+				throw new CouchbaseException("version/cas in the entity but " + TemplateUtils.SELECT_CAS
+						+ " was not in result. Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_CAS);
+			}
+			if (cas != 0) {
+				converted.put(persistentEntity.getVersionProperty().getName(), cas);
+			}
 		}
 
 		// if the constructor has an argument that is long version, then construction will fail if the 'version'
@@ -101,13 +117,13 @@ public <T> T decodeEntityBase(String id, String source, long cas, Class<T> entit
 
 		persistentEntity = couldBePersistentEntity(readEntity.getClass());
 
-		if (cas != 0 && persistentEntity.getVersionProperty() != null) {
+		if (cas != null && cas != 0 && persistentEntity.getVersionProperty() != null) {
 			accessor.setProperty(persistentEntity.getVersionProperty(), cas);
 		}
 		N1qlJoinResolver.handleProperties(persistentEntity, accessor, getReactiveTemplate(), id, scope, collection);
 
-		if(holder != null){
-			holder.transactionResultHolder(txResultHolder, (T)accessor.getBean());
+		if (holder != null) {
+			holder.transactionResultHolder(txResultHolder, (T) accessor.getBean());
 		}
 
 		return accessor.getBean();
@@ -117,13 +133,16 @@ CouchbasePersistentEntity couldBePersistentEntity(Class<?> entityClass) {
 		if (ClassUtils.isPrimitiveOrWrapper(entityClass) || entityClass == String.class) {
 			return null;
 		}
-		return mappingContext.getPersistentEntity(entityClass);
-	}
-
+		try {
+			return mappingContext.getPersistentEntity(entityClass);
+		} catch (InaccessibleObjectException t) {
 
+		}
+		return null;
+	}
 
 	public <T> T applyResultBase(T entity, CouchbaseDocument converted, Object id, long cas,
-								 TransactionResultHolder txResultHolder, CouchbaseResourceHolder holder) {
+			TransactionResultHolder txResultHolder, CouchbaseResourceHolder holder) {
 		ConvertingPropertyAccessor<Object> accessor = getPropertyAccessor(entity);
 
 		final CouchbasePersistentEntity<?> persistentEntity = converter.getMappingContext()
@@ -139,8 +158,8 @@ public <T> T applyResultBase(T entity, CouchbaseDocument converted, Object id, l
 			accessor.setProperty(versionProperty, cas);
 		}
 
-		if(holder != null){
-			holder.transactionResultHolder(txResultHolder, (T)accessor.getBean());
+		if (holder != null) {
+			holder.transactionResultHolder(txResultHolder, (T) accessor.getBean());
 		}
 		maybeEmitEvent(new AfterSaveEvent(accessor.getBean(), converted));
 		return (T) accessor.getBean();
@@ -202,7 +221,7 @@ private boolean canPublishEvent() {
 		return this.applicationContext != null;
 	}
 
-	public TranslationService getTranslationService(){
+	public TranslationService getTranslationService() {
 		return translationService;
 	}
 }

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java

@@ -35,6 +35,8 @@
 import org.springframework.data.couchbase.core.mapping.event.CouchbaseMappingEvent;
 import org.springframework.data.couchbase.core.support.TemplateUtils;
 import org.springframework.data.couchbase.repository.support.MappingCouchbaseEntityInformation;
+import org.springframework.data.couchbase.repository.support.TransactionResultHolder;
+import org.springframework.data.couchbase.transaction.CouchbaseResourceHolder;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.util.Assert;
@@ -73,95 +75,13 @@ public CouchbaseDocument encodeEntity(final Object entityToEncode) {
 	}
 
 	@Override
-	public <T> T decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection) {
-
-		// this is the entity class defined for the repository. It may not be the class of the document that was read
-		// we will reset it after reading the document
-		//
-		// This will fail for the case where:
-		// 1) The version is defined in the concrete class, but not in the abstract class; and
-		// 2) The constructor takes a "long version" argument resulting in an exception would be thrown if version in
-		// the source is null.
-		// We could expose from the MappingCouchbaseConverter determining the persistent entity from the source,
-		// but that is a lot of work to do every time just for this very rare and avoidable case.
-		// TypeInformation<? extends R> typeToUse = typeMapper.readType(source, type);
-
-		CouchbasePersistentEntity persistentEntity = couldBePersistentEntity(entityClass);
-
-		if (persistentEntity == null) { // method could return a Long, Boolean, String etc.
-			// QueryExecutionConverters.unwrapWrapperTypes will recursively unwrap until there is nothing left
-			// to unwrap. This results in List<String[]> being unwrapped past String[] to String, so this may also be a
-			// Collection (or Array) of entityClass. We have no way of knowing - so just assume it is what we are told.
-			// if this is a Collection or array, only the first element will be returned.
-			final CouchbaseDocument converted = new CouchbaseDocument(id);
-			Set<Map.Entry<String, Object>> set = ((CouchbaseDocument) translationService.decode(source, converted))
-					.getContent().entrySet();
-			return (T) set.iterator().next().getValue();
-		}
-
-		if (id == null) {
-			throw new CouchbaseException(TemplateUtils.SELECT_ID + " was null. Either use #{#n1ql.selectEntity} or project "
-					+ TemplateUtils.SELECT_ID);
-		}
-
-		final CouchbaseDocument converted = new CouchbaseDocument(id);
-
-		// if possible, set the version property in the source so that if the constructor has a long version argument,
-		// it will have a value and not fail (as null is not a valid argument for a long argument). This possible failure
-		// can be avoid by defining the argument as Long instead of long.
-		// persistentEntity is still the (possibly abstract) class specified in the repository definition
-		// it's possible that the abstract class does not have a version property, and this won't be able to set the version
-		if (persistentEntity.getVersionProperty() != null) {
-			if (cas == null) {
-				throw new CouchbaseException("version/cas in the entity but " + TemplateUtils.SELECT_CAS
-						+ " was not in result. Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_CAS);
-			}
-			if (cas != 0) {
-				converted.put(persistentEntity.getVersionProperty().getName(), cas);
-			}
-		}
-
-		// if the constructor has an argument that is long version, then construction will fail if the 'version'
-		// is not available as 'null' is not a legal value for a long. Changing the arg to "Long version" would solve this.
-		// (Version doesn't come from 'source', it comes from the cas argument to decodeEntity)
-		T readEntity = converter.read(entityClass, (CouchbaseDocument) translationService.decode(source, converted));
-		final ConvertingPropertyAccessor<T> accessor = getPropertyAccessor(readEntity);
-
-		persistentEntity = couldBePersistentEntity(readEntity.getClass());
-
-		if (cas != null && cas != 0 && persistentEntity.getVersionProperty() != null) {
-			accessor.setProperty(persistentEntity.getVersionProperty(), cas);
-		}
-		N1qlJoinResolver.handleProperties(persistentEntity, accessor, template.reactive(), id, scope, collection);
-		return accessor.getBean();
-	}
-	CouchbasePersistentEntity couldBePersistentEntity(Class<?> entityClass) {
-		if (ClassUtils.isPrimitiveOrWrapper(entityClass) || entityClass == String.class) {
-			return null;
-		}
-		return mappingContext.getPersistentEntity(entityClass);
-	}
-
-	CouchbasePersistentEntity couldBePersistentEntity(Class<?> entityClass) {
-		if (ClassUtils.isPrimitiveOrWrapper(entityClass) || entityClass == String.class) {
-			return null;
-		}
-		try {
-			return mappingContext.getPersistentEntity(entityClass);
-		} catch (InaccessibleObjectException t) {
-
-		}
-		return null;
-	}
-
-	@Override
-	public <T> T decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope, String collection,
+	public <T> T decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection,
 							  TransactionResultHolder txHolder) {
 		return decodeEntity(id, source, cas, entityClass, scope, collection, txHolder);
 	}
 
 	@Override
-	public <T> T decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope, String collection,
+	public <T> T decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection,
 							  TransactionResultHolder txHolder, CouchbaseResourceHolder holder) {
 		return decodeEntityBase(id, source, cas, entityClass, scope, collection, txHolder, holder);
 	}
@@ -225,4 +145,8 @@ protected <T> T maybeCallAfterConvert(T object, CouchbaseDocument document, Stri
 		return object;
 	}
 
+	@Override
+	ReactiveCouchbaseTemplate getReactiveTemplate() {
+		return template.reactive();
+	}
 }