Skip to content

Commit d7326e4

Browse files
mikereichemikereiche
authored
Only throw exception for id and cas not projected if needed. (#1395)
Closes #1394.
1 parent fd88011 commit d7326e4

7 files changed

+33
-38
lines changed

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.springframework.data.couchbase.core.mapping.event.BeforeConvertEvent;
3838
import org.springframework.data.couchbase.core.mapping.event.BeforeSaveEvent;
3939
import org.springframework.data.couchbase.core.mapping.event.CouchbaseMappingEvent;
40+
import org.springframework.data.couchbase.core.support.TemplateUtils;
4041
import org.springframework.data.couchbase.repository.support.MappingCouchbaseEntityInformation;
4142
import org.springframework.data.mapping.PersistentPropertyAccessor;
4243
import org.springframework.data.mapping.callback.EntityCallbacks;
@@ -45,6 +46,8 @@
4546
import org.springframework.util.Assert;
4647
import org.springframework.util.ClassUtils;
4748

49+
import com.couchbase.client.core.error.CouchbaseException;
50+
4851
/**
4952
* Internal encode/decode support for CouchbaseTemplate.
5053
*
@@ -85,9 +88,7 @@ public CouchbaseDocument encodeEntity(final Object entityToEncode) {
8588
}
8689

8790
@Override
88-
public <T> T decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope, String collection) {
89-
final CouchbaseDocument converted = new CouchbaseDocument(id);
90-
converted.setId(id);
91+
public <T> T decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection) {
9192

9293
// this is the entity class defined for the repository. It may not be the class of the document that was read
9394
// we will reset it after reading the document
@@ -107,18 +108,32 @@ public <T> T decodeEntity(String id, String source, long cas, Class<T> entityCla
107108
// to unwrap. This results in List<String[]> being unwrapped past String[] to String, so this may also be a
108109
// Collection (or Array) of entityClass. We have no way of knowing - so just assume it is what we are told.
109110
// if this is a Collection or array, only the first element will be returned.
111+
final CouchbaseDocument converted = new CouchbaseDocument(id);
110112
Set<Map.Entry<String, Object>> set = ((CouchbaseDocument) translationService.decode(source, converted))
111113
.getContent().entrySet();
112114
return (T) set.iterator().next().getValue();
113115
}
114116

117+
if (id == null) {
118+
throw new CouchbaseException(TemplateUtils.SELECT_ID + " was null. Either use #{#n1ql.selectEntity} or project "
119+
+ TemplateUtils.SELECT_ID);
120+
}
121+
122+
final CouchbaseDocument converted = new CouchbaseDocument(id);
123+
115124
// if possible, set the version property in the source so that if the constructor has a long version argument,
116-
// it will have a value an not fail (as null is not a valid argument for a long argument). This possible failure
125+
// it will have a value and not fail (as null is not a valid argument for a long argument). This possible failure
117126
// can be avoid by defining the argument as Long instead of long.
118127
// persistentEntity is still the (possibly abstract) class specified in the repository definition
119128
// it's possible that the abstract class does not have a version property, and this won't be able to set the version
120-
if (cas != 0 && persistentEntity.getVersionProperty() != null) {
121-
converted.put(persistentEntity.getVersionProperty().getName(), cas);
129+
if (persistentEntity.getVersionProperty() != null) {
130+
if (cas == null) {
131+
throw new CouchbaseException("version/cas in the entity but " + TemplateUtils.SELECT_CAS
132+
+ " was not in result. Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_CAS);
133+
}
134+
if (cas != 0) {
135+
converted.put(persistentEntity.getVersionProperty().getName(), cas);
136+
}
122137
}
123138

124139
// if the constructor has an argument that is long version, then construction will fail if the 'version'

‎src/main/java/org/springframework/data/couchbase/core/NonReactiveSupportWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Mono<CouchbaseDocument> encodeEntity(Object entityToEncode) {
4040
}
4141

4242
@Override
43-
public <T> Mono<T> decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope,
43+
public <T> Mono<T> decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope,
4444
String collection) {
4545
return Mono.fromSupplier(() -> support.decodeEntity(id, source, cas, entityClass, scope, collection));
4646
}

‎src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public Mono<CouchbaseDocument> encodeEntity(final Object entityToEncode) {
8585
}
8686

8787
@Override
88-
public <T> Mono<T> decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope,
88+
public <T> Mono<T> decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope,
8989
String collection) {
9090
return Mono.fromSupplier(() -> {
9191
final CouchbaseDocument converted = new CouchbaseDocument(id);

‎src/main/java/org/springframework/data/couchbase/core/ReactiveFindByAnalyticsOperationSupport.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.data.couchbase.core.support.TemplateUtils;
2323
import org.springframework.util.Assert;
2424

25-
import com.couchbase.client.core.error.CouchbaseException;
2625
import com.couchbase.client.java.analytics.AnalyticsOptions;
2726
import com.couchbase.client.java.analytics.AnalyticsScanConsistency;
2827
import com.couchbase.client.java.analytics.ReactiveAnalyticsResult;
@@ -117,23 +116,13 @@ public Flux<T> all() {
117116
return throwable;
118117
}
119118
}).flatMapMany(ReactiveAnalyticsResult::rowsAsObject).flatMap(row -> {
120-
String id = "";
121-
Long cas = Long.valueOf(0);
122-
if (row.getString(TemplateUtils.SELECT_ID) == null && row.getString(TemplateUtils.SELECT_ID_3x) == null) {
123-
return Flux.error(new CouchbaseException("analytics query did not project " + TemplateUtils.SELECT_ID
124-
+ ". Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_ID + " and "
125-
+ TemplateUtils.SELECT_CAS + " : " + statement));
126-
}
119+
String id = null;
120+
Long cas = null;
127121
id = row.getString(TemplateUtils.SELECT_ID);
128122
if (id == null) {
129123
id = row.getString(TemplateUtils.SELECT_ID_3x);
130124
row.removeKey(TemplateUtils.SELECT_ID_3x);
131125
}
132-
if (row.getLong(TemplateUtils.SELECT_CAS) == null && row.getLong(TemplateUtils.SELECT_CAS_3x) == null) {
133-
return Flux.error(new CouchbaseException("analytics query did not project " + TemplateUtils.SELECT_CAS
134-
+ ". Either use #{#n1ql.selectEntity} or project " + TemplateUtils.SELECT_ID + " and "
135-
+ TemplateUtils.SELECT_CAS + " : " + statement));
136-
}
137126
cas = row.getLong(TemplateUtils.SELECT_CAS);
138127
if (cas == null) {
139128
cas = row.getLong(TemplateUtils.SELECT_CAS_3x);

‎src/main/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.data.couchbase.core.support.TemplateUtils;
2626
import org.springframework.util.Assert;
2727

28-
import com.couchbase.client.core.error.CouchbaseException;
2928
import com.couchbase.client.java.query.QueryOptions;
3029
import com.couchbase.client.java.query.QueryScanConsistency;
3130
import com.couchbase.client.java.query.ReactiveQueryResult;
@@ -184,24 +183,17 @@ public Flux<T> all() {
184183
return throwable;
185184
}
186185
}).flatMapMany(ReactiveQueryResult::rowsAsObject).flatMap(row -> {
187-
String id = "";
188-
Long cas = Long.valueOf(0);
189-
if (!query.isDistinct() && distinctFields == null) {
190-
if (row.getString(TemplateUtils.SELECT_ID) == null && row.getString(TemplateUtils.SELECT_ID_3x) == null) {
191-
return Flux.error(new CouchbaseException(
192-
"query did not project " + TemplateUtils.SELECT_ID + ". Either use #{#n1ql.selectEntity} or project "
193-
+ TemplateUtils.SELECT_ID + " and " + TemplateUtils.SELECT_CAS + " : " + statement));
194-
}
186+
String id = null;
187+
Long cas = null;
188+
if (query.isDistinct() || distinctFields != null) {
189+
id = "";
190+
cas = Long.valueOf(0);
191+
} else {
195192
id = row.getString(TemplateUtils.SELECT_ID);
196193
if (id == null) {
197194
id = row.getString(TemplateUtils.SELECT_ID_3x);
198195
row.removeKey(TemplateUtils.SELECT_ID_3x);
199196
}
200-
if (row.getLong(TemplateUtils.SELECT_CAS) == null && row.getLong(TemplateUtils.SELECT_CAS_3x) == null) {
201-
return Flux.error(new CouchbaseException(
202-
"query did not project " + TemplateUtils.SELECT_CAS + ". Either use #{#n1ql.selectEntity} or project "
203-
+ TemplateUtils.SELECT_ID + " and " + TemplateUtils.SELECT_CAS + " : " + statement));
204-
}
205197
cas = row.getLong(TemplateUtils.SELECT_CAS);
206198
if (cas == null) {
207199
cas = row.getLong(TemplateUtils.SELECT_CAS_3x);

‎src/main/java/org/springframework/data/couchbase/core/ReactiveTemplateSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@
2121
import org.springframework.data.couchbase.core.mapping.event.CouchbaseMappingEvent;
2222

2323
/**
24-
*
2524
* @author Michael Reiche
2625
*/
2726
public interface ReactiveTemplateSupport {
2827

2928
Mono<CouchbaseDocument> encodeEntity(Object entityToEncode);
3029

31-
<T> Mono<T> decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope, String collection);
30+
<T> Mono<T> decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection);
3231

3332
<T> Mono<T> applyUpdatedCas(T entity, CouchbaseDocument converted, long cas);
3433

‎src/main/java/org/springframework/data/couchbase/core/TemplateSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface TemplateSupport {
2626

2727
CouchbaseDocument encodeEntity(Object entityToEncode);
2828

29-
<T> T decodeEntity(String id, String source, long cas, Class<T> entityClass, String scope, String collection);
29+
<T> T decodeEntity(String id, String source, Long cas, Class<T> entityClass, String scope, String collection);
3030

3131
<T> T applyUpdatedCas(T entity, CouchbaseDocument converted, long cas);
3232

0 commit comments

Comments
 (0)