Skip to content

Commit ff45cdb

Browse files
mikereichemikereiche
authored
Merge branch 'main' into datacouch_1325_collection_support_for_n1qljoin
2 parents 671ed80 + ef56e3f commit ff45cdb

32 files changed

+436
-179
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</parent>
1919

2020
<properties>
21-
<couchbase>3.2.4</couchbase>
22-
<couchbase.osgi>3.2.4</couchbase.osgi>
21+
<couchbase>3.2.5</couchbase>
22+
<couchbase.osgi>3.2.5</couchbase.osgi>
2323
<springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
2424
<java-module-name>spring.data.couchbase</java-module-name>
2525
</properties>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -117,10 +117,10 @@ interface InsertByIdInScope<T> extends InsertByIdInCollection<T>, InScope<T> {
117117
interface InsertByIdWithDurability<T> extends InsertByIdInScope<T>, WithDurability<T> {
118118

119119
@Override
120-
InsertByIdInCollection<T> withDurability(DurabilityLevel durabilityLevel);
120+
InsertByIdInScope<T> withDurability(DurabilityLevel durabilityLevel);
121121

122122
@Override
123-
InsertByIdInCollection<T> withDurability(PersistTo persistTo, ReplicateTo replicateTo);
123+
InsertByIdInScope<T> withDurability(PersistTo persistTo, ReplicateTo replicateTo);
124124

125125
}
126126

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -100,14 +100,14 @@ public InsertByIdWithOptions<T> inCollection(final String collection) {
100100
}
101101

102102
@Override
103-
public InsertByIdInCollection<T> withDurability(final DurabilityLevel durabilityLevel) {
103+
public InsertByIdInScope<T> withDurability(final DurabilityLevel durabilityLevel) {
104104
Assert.notNull(durabilityLevel, "Durability Level must not be null.");
105105
return new ExecutableInsertByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,
106106
durabilityLevel, expiry);
107107
}
108108

109109
@Override
110-
public InsertByIdInCollection<T> withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
110+
public InsertByIdInScope<T> withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
111111
Assert.notNull(persistTo, "PersistTo must not be null.");
112112
Assert.notNull(replicateTo, "ReplicateTo must not be null.");
113113
return new ExecutableInsertByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -114,10 +114,10 @@ interface RemoveByIdInScope extends RemoveByIdInCollection, InScope<Object> {
114114
interface RemoveByIdWithDurability extends RemoveByIdInScope, WithDurability<RemoveResult> {
115115

116116
@Override
117-
RemoveByIdInCollection withDurability(DurabilityLevel durabilityLevel);
117+
RemoveByIdInScope withDurability(DurabilityLevel durabilityLevel);
118118

119119
@Override
120-
RemoveByIdInCollection withDurability(PersistTo persistTo, ReplicateTo replicateTo);
120+
RemoveByIdInScope withDurability(PersistTo persistTo, ReplicateTo replicateTo);
121121

122122
}
123123

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -92,14 +92,14 @@ public RemoveByIdWithOptions inCollection(final String collection) {
9292
}
9393

9494
@Override
95-
public RemoveByIdInCollection withDurability(final DurabilityLevel durabilityLevel) {
95+
public RemoveByIdInScope withDurability(final DurabilityLevel durabilityLevel) {
9696
Assert.notNull(durabilityLevel, "Durability Level must not be null.");
9797
return new ExecutableRemoveByIdSupport(template, domainType, scope, collection, options, persistTo, replicateTo,
9898
durabilityLevel, cas);
9999
}
100100

101101
@Override
102-
public RemoveByIdInCollection withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
102+
public RemoveByIdInScope withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
103103
Assert.notNull(persistTo, "PersistTo must not be null.");
104104
Assert.notNull(replicateTo, "ReplicateTo must not be null.");
105105
return new ExecutableRemoveByIdSupport(template, domainType, scope, collection, options, persistTo, replicateTo,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ public Mono<Long> count() {
149149
} else {
150150
return throwable;
151151
}
152-
}).flatMapMany(ReactiveAnalyticsResult::rowsAsObject).map(row -> row.getLong("__count")).next();
152+
}).flatMapMany(ReactiveAnalyticsResult::rowsAsObject)
153+
.map(row -> row.getLong(row.getNames().iterator().next())).next();
153154
});
154155
}
155156

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -113,10 +113,10 @@ interface InsertByIdInScope<T> extends InsertByIdInCollection<T>, InScope<T> {
113113
interface InsertByIdWithDurability<T> extends InsertByIdInScope<T>, WithDurability<T> {
114114

115115
@Override
116-
InsertByIdInCollection<T> withDurability(DurabilityLevel durabilityLevel);
116+
InsertByIdInScope<T> withDurability(DurabilityLevel durabilityLevel);
117117

118118
@Override
119-
InsertByIdInCollection<T> withDurability(PersistTo persistTo, ReplicateTo replicateTo);
119+
InsertByIdInScope<T> withDurability(PersistTo persistTo, ReplicateTo replicateTo);
120120

121121
}
122122

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -125,14 +125,14 @@ public InsertByIdWithOptions<T> inCollection(final String collection) {
125125
}
126126

127127
@Override
128-
public InsertByIdInCollection<T> withDurability(final DurabilityLevel durabilityLevel) {
128+
public InsertByIdInScope<T> withDurability(final DurabilityLevel durabilityLevel) {
129129
Assert.notNull(durabilityLevel, "Durability Level must not be null.");
130130
return new ReactiveInsertByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,
131131
durabilityLevel, expiry, support);
132132
}
133133

134134
@Override
135-
public InsertByIdInCollection<T> withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
135+
public InsertByIdInScope<T> withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
136136
Assert.notNull(persistTo, "PersistTo must not be null.");
137137
Assert.notNull(replicateTo, "ReplicateTo must not be null.");
138138
return new ReactiveInsertByIdSupport<>(template, domainType, scope, collection, options, persistTo, replicateTo,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -112,10 +112,10 @@ interface RemoveByIdInScope extends RemoveByIdInCollection, InScope<Object> {
112112

113113
interface RemoveByIdWithDurability extends RemoveByIdInScope, WithDurability<RemoveResult> {
114114
@Override
115-
RemoveByIdInCollection withDurability(DurabilityLevel durabilityLevel);
115+
RemoveByIdInScope withDurability(DurabilityLevel durabilityLevel);
116116

117117
@Override
118-
RemoveByIdInCollection withDurability(PersistTo persistTo, ReplicateTo replicateTo);
118+
RemoveByIdInScope withDurability(PersistTo persistTo, ReplicateTo replicateTo);
119119

120120
}
121121

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,14 +105,14 @@ private RemoveOptions buildRemoveOptions(RemoveOptions options) {
105105
}
106106

107107
@Override
108-
public RemoveByIdInCollection withDurability(final DurabilityLevel durabilityLevel) {
108+
public RemoveByIdInScope withDurability(final DurabilityLevel durabilityLevel) {
109109
Assert.notNull(durabilityLevel, "Durability Level must not be null.");
110110
return new ReactiveRemoveByIdSupport(template, domainType, scope, collection, options, persistTo, replicateTo,
111111
durabilityLevel, cas);
112112
}
113113

114114
@Override
115-
public RemoveByIdInCollection withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
115+
public RemoveByIdInScope withDurability(final PersistTo persistTo, final ReplicateTo replicateTo) {
116116
Assert.notNull(persistTo, "PersistTo must not be null.");
117117
Assert.notNull(replicateTo, "ReplicateTo must not be null.");
118118
return new ReactiveRemoveByIdSupport(template, domainType, scope, collection, options, persistTo, replicateTo,

0 commit comments

Comments
 (0)