Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import kotlinx.coroutines.flow.Flow
* @author Denis Stepanov
* @since 3.2
*/
interface CoroutineJpaSpecificationExecutor<T> {
interface CoroutineJpaSpecificationExecutor<T : Any> {

/**
* Returns a single entity matching the given [QuerySpecification].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import kotlinx.coroutines.flow.Flow
* @author Denis Stepanov
* @since 3.1.0
*/
interface CoroutineCrudRepository<E, ID> : GenericRepository<E, ID> {
interface CoroutineCrudRepository<E : Any, ID : Any> : GenericRepository<E, ID> {

/**
* Saves the given valid entity, returning a possibly new entity representing the saved state.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.Flow
* @author Denis Stepanov
* @since 3.4.0
*/
interface CoroutinePageableCrudRepository<E, ID> : CoroutineCrudRepository<E, ID> {
interface CoroutinePageableCrudRepository<E : Any, ID : Any> : CoroutineCrudRepository<E, ID> {

/**
* Find all results for the given sort order.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import kotlin.coroutines.CoroutineContext
* @since 4.2.0
*/
@Experimental
interface CoroutineTransactionOperations<C> {
interface CoroutineTransactionOperations<C : Any> {

/**
* Find optional propagated transaction status.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import io.micronaut.transaction.TransactionExecution
* @since 4.2.0
*/
@Experimental
interface CoroutineTransactionStatus<T> : TransactionExecution {
interface CoroutineTransactionStatus<T : Any> : TransactionExecution {

/**
* @return The connection.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ import kotlin.coroutines.CoroutineContext
@EachBean(ReactorReactiveTransactionOperations::class)
@Singleton
@Internal
class DefaultCoroutineTransactionOperations<C>(private val reactiveTransactionOperations: ReactorReactiveTransactionOperations<C>) : CoroutineTransactionOperations<C> {
class DefaultCoroutineTransactionOperations<C : Any>(private val reactiveTransactionOperations: ReactorReactiveTransactionOperations<C>) : CoroutineTransactionOperations<C> {

override suspend fun <R> execute(definition: TransactionDefinition,
handler: suspend (CoroutineTransactionStatus<C>) -> R): R {
return reactiveTransactionOperations.withTransaction(definition) {
mono<R> {
return reactiveTransactionOperations.withTransactionMono(definition) {
mono<ResultBox<R>> {
val reactorContext = coroutineContext[ReactorContext.Key]
if (reactorContext != null) {
val micronautPropagatedContext =
Expand All @@ -59,13 +59,13 @@ class DefaultCoroutineTransactionOperations<C>(private val reactiveTransactionOp
micronautPropagatedContext
)
return@mono withContext(newCoroutineContext) {
handler(DefaultCoroutineTransactionStatus(it))
ResultBox(handler(DefaultCoroutineTransactionStatus(it)))
}
}
}
handler(DefaultCoroutineTransactionStatus(it))
ResultBox(handler(DefaultCoroutineTransactionStatus(it)))
}
}.awaitSingle()
}.awaitSingle().value
}

override fun findTransactionStatus(coroutineContext: CoroutineContext): CoroutineTransactionStatus<C>? {
Expand All @@ -78,4 +78,6 @@ class DefaultCoroutineTransactionOperations<C>(private val reactiveTransactionOp
}
return null
}

private data class ResultBox<R>(val value: R)
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import io.micronaut.transaction.reactive.ReactiveTransactionStatus
* @since 4.2.0
*/
@Internal
class DefaultCoroutineTransactionStatus<T>(var status: ReactiveTransactionStatus<T>) :
class DefaultCoroutineTransactionStatus<T : Any>(var status: ReactiveTransactionStatus<T>) :
CoroutineTransactionStatus<T> {

override val connection: T
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ h2gis = "2.2.5"
# Gradle plugins

ksp-gradle-plugin = "2.3.9"
kotlin-gradle-plugin = "2.3.21"
kotlin-gradle-plugin = "2.4.0"
jmh-gradle-plugin = "0.7.3"
spring-boot-gradle-plugin = "4.1.0"
spring-dependency-management-gradle-plugin = "1.1.7"
Expand Down
Loading