diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt index 6d31afb813..5b26d7f2a3 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt @@ -28,7 +28,7 @@ import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions import org.springframework.data.mongodb.core.mapreduce.MapReduceResults import org.springframework.data.mongodb.core.query.NearQuery import org.springframework.data.mongodb.core.query.Query -import org.springframework.data.mongodb.core.query.Update +import org.springframework.data.mongodb.core.query.UpdateDefinition import java.util.stream.Stream /** @@ -261,7 +261,7 @@ inline fun MongoOperations.findDistinct(query * @author Sebastien Deleuze * @since 2.0 */ -inline fun MongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): T? = +inline fun MongoOperations.findAndModify(query: Query, update: UpdateDefinition, options: FindAndModifyOptions, collectionName: String? = null): T? = if (collectionName != null) findAndModify(query, update, options, T::class.java, collectionName) else findAndModify(query, update, options, T::class.java) @@ -301,7 +301,7 @@ inline fun MongoOperations.insert(batchToSave: Collection): * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun MongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): UpdateResult = +inline fun MongoOperations.upsert(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult = if (collectionName != null) upsert(query, update, T::class.java, collectionName) else upsert(query, update, T::class.java) @@ -312,7 +312,7 @@ inline fun MongoOperations.upsert(query: Query, update: Update * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun MongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): UpdateResult = +inline fun MongoOperations.updateFirst(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult = if (collectionName != null) updateFirst(query, update, T::class.java, collectionName) else updateFirst(query, update, T::class.java) @@ -323,7 +323,7 @@ inline fun MongoOperations.updateFirst(query: Query, update: U * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun MongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): UpdateResult = +inline fun MongoOperations.updateMulti(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult = if (collectionName != null) updateMulti(query, update, T::class.java, collectionName) else updateMulti(query, update, T::class.java) diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt index 669df142bc..04855205c5 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt @@ -25,7 +25,7 @@ import org.springframework.data.mongodb.core.aggregation.TypedAggregation import org.springframework.data.mongodb.core.index.ReactiveIndexOperations import org.springframework.data.mongodb.core.query.NearQuery import org.springframework.data.mongodb.core.query.Query -import org.springframework.data.mongodb.core.query.Update +import org.springframework.data.mongodb.core.query.UpdateDefinition import reactor.core.publisher.Flux import reactor.core.publisher.Mono @@ -194,7 +194,7 @@ inline fun ReactiveMongoOperations.geoNear(near: NearQuery, co * @author Sebastien Deleuze * @since 2.0 */ -inline fun ReactiveMongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): Mono = +inline fun ReactiveMongoOperations.findAndModify(query: Query, update: UpdateDefinition, options: FindAndModifyOptions, collectionName: String? = null): Mono = if (collectionName != null) findAndModify(query, update, options, T::class.java, collectionName) else findAndModify(query, update, options, T::class.java) /** @@ -234,7 +234,7 @@ inline fun ReactiveMongoOperations.insert(batchToSave: Collect * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun ReactiveMongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): Mono = +inline fun ReactiveMongoOperations.upsert(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono = if (collectionName != null) upsert(query, update, T::class.java, collectionName) else upsert(query, update, T::class.java) @@ -245,7 +245,7 @@ inline fun ReactiveMongoOperations.upsert(query: Query, update * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun ReactiveMongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): Mono = +inline fun ReactiveMongoOperations.updateFirst(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono = if (collectionName != null) updateFirst(query, update, T::class.java, collectionName) else updateFirst(query, update, T::class.java) @@ -256,7 +256,7 @@ inline fun ReactiveMongoOperations.updateFirst(query: Query, u * @since 2.0 */ @Suppress("EXTENSION_SHADOWED_BY_MEMBER") -inline fun ReactiveMongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): Mono = +inline fun ReactiveMongoOperations.updateMulti(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono = if (collectionName != null) updateMulti(query, update, T::class.java, collectionName) else updateMulti(query, update, T::class.java)