Skip to content

Commit 5e664d9

Browse files
mp911deschauder
authored andcommitted
Refine generic boundaries.
Kotlin reacts to JSpecify with increased nullability requirements. See #1980
1 parent f2ac4b7 commit 5e664d9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

spring-data-jdbc/src/main/kotlin/org/springframework/data/jdbc/core/JdbcAggregateOperationsExtensions.kt

+7-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import org.springframework.data.domain.Page
2020
import org.springframework.data.domain.Pageable
2121
import org.springframework.data.domain.Sort
2222
import org.springframework.data.relational.core.query.Query
23-
import java.util.Optional
23+
import java.util.*
2424

2525
/**
2626
* Kotlin extensions for [JdbcAggregateOperations].
@@ -80,7 +80,7 @@ inline fun <reified T> JdbcAggregateOperations.findAll(sort: Sort): List<T> =
8080
/**
8181
* Extension for [JdbcAggregateOperations.findAll] with pagination.
8282
*/
83-
inline fun <reified T> JdbcAggregateOperations.findAll(pageable: Pageable): Page<T> =
83+
inline fun <reified T : Any> JdbcAggregateOperations.findAll(pageable: Pageable): Page<T> =
8484
findAll(T::class.java, pageable)
8585

8686
/**
@@ -98,7 +98,10 @@ inline fun <reified T> JdbcAggregateOperations.findAll(query: Query): List<T> =
9898
/**
9999
* Extension for [JdbcAggregateOperations.findAll] with query and pagination.
100100
*/
101-
inline fun <reified T> JdbcAggregateOperations.findAll(query: Query, pageable: Pageable): Page<T> =
101+
inline fun <reified T : Any> JdbcAggregateOperations.findAll(
102+
query: Query,
103+
pageable: Pageable
104+
): Page<T> =
102105
findAll(query, T::class.java, pageable)
103106

104107
/**
@@ -117,4 +120,4 @@ inline fun <reified T> JdbcAggregateOperations.deleteAllById(ids: Iterable<*>):
117120
* Extension for [JdbcAggregateOperations.deleteAll].
118121
*/
119122
inline fun <reified T> JdbcAggregateOperations.deleteAll(): Unit =
120-
deleteAll(T::class.java)
123+
deleteAll(T::class.java)

0 commit comments

Comments
 (0)