Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align signature of Kotlin extension functions to match Java API.

Browse Source 
Closes: #4153
Original Pull Request: #4154
Related issues: #2602 #3187
This commit is contained in:
Kirill Gavrilov
2022-09-05 21:15:34 +03:00
committed by Christoph Strobl
parent 33c7f0980f
commit 838ddb5d26
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt
View File

@@ -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 <reified T : Any, reified E : Any> MongoOperations.findDistinct(query
* @author Sebastien Deleuze
* @since 2.0
*/
inline fun <reified T : Any> MongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): T? =
inline fun <reified T : Any> 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 <reified T : Any> MongoOperations.insert(batchToSave: Collection<T>):
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> MongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): UpdateResult =
inline fun <reified T : Any> 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 <reified T : Any> MongoOperations.upsert(query: Query, update: Update
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> MongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): UpdateResult =
inline fun <reified T : Any> 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 <reified T : Any> MongoOperations.updateFirst(query: Query, update: U
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> MongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): UpdateResult =
inline fun <reified T : Any> 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)

10
spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt
View File

@@ -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 <reified T : Any> ReactiveMongoOperations.geoNear(near: NearQuery, co
* @author Sebastien Deleuze
* @since 2.0
*/
inline fun <reified T : Any> ReactiveMongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): Mono<T> =
inline fun <reified T : Any> ReactiveMongoOperations.findAndModify(query: Query, update: UpdateDefinition, options: FindAndModifyOptions, collectionName: String? = null): Mono<T> =
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 <reified T : Any> ReactiveMongoOperations.insert(batchToSave: Collect
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> ReactiveMongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
inline fun <reified T : Any> ReactiveMongoOperations.upsert(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
if (collectionName != null) upsert(query, update, T::class.java, collectionName)
else upsert(query, update, T::class.java)
@@ -245,7 +245,7 @@ inline fun <reified T : Any> ReactiveMongoOperations.upsert(query: Query, update
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
inline fun <reified T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
if (collectionName != null) updateFirst(query, update, T::class.java, collectionName)
else updateFirst(query, update, T::class.java)
@@ -256,7 +256,7 @@ inline fun <reified T : Any> ReactiveMongoOperations.updateFirst(query: Query, u
* @since 2.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
inline fun <reified T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
if (collectionName != null) updateMulti(query, update, T::class.java, collectionName)
else updateMulti(query, update, T::class.java)