Skip to content

Commit aa6aab6

Browse files
mp911demp911de
committed
Add missing spread operators to CqlTemplate kotlin extensions.
Closes #1434
1 parent e29bb2f commit aa6aab6

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/cql/AsyncCqlOperationsExtensions.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun <T : Any> AsyncCqlOperations.queryForObject(
5959
entityClass: KClass<T>,
6060
vararg args: Any
6161
): CompletableFuture<T?> =
62-
queryForObject(cql, entityClass.java, args)
62+
queryForObject(cql, entityClass.java, *args)
6363

6464
/**
6565
* Extension for [AsyncCqlOperations.queryForObject] leveraging reified type parameters.
@@ -68,7 +68,7 @@ inline fun <reified T : Any> AsyncCqlOperations.queryForObject(
6868
cql: String,
6969
vararg args: Any
7070
): CompletableFuture<T?> =
71-
queryForObject(cql, T::class.java, args)
71+
queryForObject(cql, T::class.java, *args)
7272

7373
/**
7474
* Extension for [AsyncCqlOperations.queryForObject] leveraging reified type parameters.
@@ -78,7 +78,7 @@ fun <T : Any> AsyncCqlOperations.queryForObject(
7878
vararg args: Any,
7979
function: (Row, Int) -> T
8080
): CompletableFuture<T?> =
81-
queryForObject(cql, RowMapper { row, i -> function(row, i) }, *args)
81+
queryForObject(cql, { row, i -> function(row, i) }, *args)
8282

8383
/**
8484
* Extension for [AsyncCqlOperations.queryForObject] providing a [KClass] based variant.
@@ -114,7 +114,7 @@ inline fun <reified T : Any> AsyncCqlOperations.queryForList(
114114
cql: String,
115115
vararg args: Any
116116
): CompletableFuture<List<T>> =
117-
queryForList(cql, T::class.java, args)
117+
queryForList(cql, T::class.java, *args)
118118

119119
/**
120120
* Extension for [AsyncCqlOperations.queryForList] providing a [KClass] based variant.

‎spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/cql/CqlOperationsExtensions.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ inline fun <reified T : Any> CqlOperations.queryForObject(cql: String): T? =
4646
*/
4747
@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("queryForObject<T>(cql, args)"))
4848
fun <T : Any> CqlOperations.queryForObject(cql: String, entityClass: KClass<T>, vararg args: Any): T? =
49-
queryForObject(cql, entityClass.java, args)
49+
queryForObject(cql, entityClass.java, *args)
5050

5151
/**
5252
* Extension for [CqlOperations.queryForObject] leveraging reified type parameters.
5353
*/
5454
inline fun <reified T : Any> CqlOperations.queryForObject(cql: String, vararg args: Any): T? =
55-
queryForObject(cql, T::class.java, args)
55+
queryForObject(cql, T::class.java, *args)
5656

5757
/**
5858
* Extension for [CqlOperations.queryForObject] leveraging reified type parameters.
5959
*/
6060
fun <T : Any> CqlOperations.queryForObject(cql: String, vararg args: Any, function: (Row, Int) -> T): T? =
61-
queryForObject(cql, function, args)
61+
queryForObject(cql, function, *args)
6262

6363
/**
6464
* Extension for [CqlOperations.queryForObject] providing a [KClass] based variant.
@@ -85,7 +85,7 @@ inline fun <reified T : Any> CqlOperations.queryForList(cql: String): List<T> =
8585
*/
8686
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
8787
inline fun <reified T : Any> CqlOperations.queryForList(cql: String, vararg args: Any): List<T> =
88-
queryForList(cql, T::class.java, args)
88+
queryForList(cql, T::class.java, *args)
8989

9090
/**
9191
* Extension for [CqlOperations.queryForList] providing a [KClass] based variant.

‎spring-data-cassandra/src/main/kotlin/org/springframework/data/cassandra/core/cql/ReactiveCqlOperationsExtensions.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@ inline fun <reified T : Any> ReactiveCqlOperations.queryForObject(cql: String):
4848
*/
4949
@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("queryForObject<T>(cql, args)"))
5050
fun <T : Any> ReactiveCqlOperations.queryForObject(cql: String, entityClass: KClass<T>, vararg args: Any): Mono<T> =
51-
queryForObject(cql, entityClass.java, args)
51+
queryForObject(cql, entityClass.java, *args)
5252

5353
/**
5454
* Extension for [ReactiveCqlOperations.queryForObject] leveraging reified type parameters.
5555
*/
5656
inline fun <reified T : Any> ReactiveCqlOperations.queryForObject(cql: String, vararg args: Any): Mono<T> =
57-
queryForObject(cql, T::class.java, args)
57+
queryForObject(cql, T::class.java, *args)
5858

5959
/**
6060
* Extension for [ReactiveCqlOperations.queryForObject] leveraging reified type parameters.
6161
*/
6262
fun <T : Any> ReactiveCqlOperations.queryForObject(cql: String, vararg args: Any, function: (Row, Int) -> T): Mono<T> =
63-
queryForObject(cql, function, args)
63+
queryForObject(cql, function, *args)
6464

6565
/**
6666
* Extension for [ReactiveCqlOperations.queryForObject] providing a [KClass] based variant.
@@ -87,7 +87,7 @@ inline fun <reified T : Any> ReactiveCqlOperations.queryForFlux(cql: String): Fl
8787
*/
8888
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
8989
inline fun <reified T : Any> ReactiveCqlOperations.queryForFlux(cql: String, vararg args: Any): Flux<T> =
90-
queryForFlux(cql, T::class.java, args)
90+
queryForFlux(cql, T::class.java, *args)
9191

9292
/**
9393
* Extension for [ReactiveCqlOperations.queryForFlux] providing a [KClass] based variant.

‎spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/cql/CqlOperationsExtensionsUnitTests.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ class CqlOperationsExtensionsUnitTests {
4949
fun `queryForObject(String, KClass, array) extension should call its Java counterpart`() {
5050

5151
operations.queryForObject("", Person::class, "foo", "bar")
52-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
52+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
5353
}
5454

5555
@Test // DATACASS-484
5656
fun `queryForObject(String, array) extension should call its Java counterpart`() {
5757

5858
operations.queryForObject<Person>("", "foo", "bar")
59-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
59+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
6060
}
6161

6262
@Test // DATACASS-484
@@ -67,7 +67,7 @@ class CqlOperationsExtensionsUnitTests {
6767
operations.queryForObject(
6868
eq(""),
6969
any<RowMapper<Int>>(),
70-
eq(arrayOf(3))
70+
eq(3)
7171
)
7272
}
7373
}
@@ -101,7 +101,7 @@ class CqlOperationsExtensionsUnitTests {
101101
fun `queryForList(String, array) extension should call its Java counterpart`() {
102102

103103
operations.queryForList<Person>("", "foo", "bar")
104-
verify { operations.queryForList("", Person::class.java, arrayOf("foo", "bar")) }
104+
verify { operations.queryForList("", Person::class.java, "foo", "bar") }
105105
}
106106

107107
@Test // DATACASS-484

‎spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/cql/LegacyAsyncCqlOperationsExtensionsUnitTests.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ class LegacyAsyncCqlOperationsExtensionsUnitTests {
5050
fun `queryForObject(String, KClass, array) extension should call its Java counterpart`() {
5151

5252
operations.queryForObject("", Person::class, "foo", "bar")
53-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
53+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
5454
}
5555

5656
@Test // DATACASS-484
5757
fun `queryForObject(String, array) extension should call its Java counterpart`() {
5858

5959
operations.queryForObject<Person>("", "foo", "bar")
60-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
60+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
6161
}
6262

6363
@Test // DATACASS-484
@@ -96,7 +96,7 @@ class LegacyAsyncCqlOperationsExtensionsUnitTests {
9696
fun `queryForList(String, array) extension should call its Java counterpart`() {
9797

9898
operations.queryForList<Person>("", "foo", "bar")
99-
verify { operations.queryForList("", Person::class.java, arrayOf("foo", "bar")) }
99+
verify { operations.queryForList("", Person::class.java, "foo", "bar") }
100100
}
101101

102102
@Test // DATACASS-484

‎spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/core/cql/ReactiveCqlOperationsExtensionsUnitTests.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ class ReactiveCqlOperationsExtensionsUnitTests {
4949
fun `queryForObject(String, KClass, array) extension should call its Java counterpart`() {
5050

5151
operations.queryForObject("", Person::class, "foo", "bar")
52-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
52+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
5353
}
5454

5555
@Test // DATACASS-484
5656
fun `queryForObject(String, array) extension should call its Java counterpart`() {
5757

5858
operations.queryForObject<Person>("", "foo", "bar")
59-
verify { operations.queryForObject("", Person::class.java, arrayOf("foo", "bar")) }
59+
verify { operations.queryForObject("", Person::class.java, "foo", "bar") }
6060
}
6161

6262
@Test // DATACASS-484
@@ -67,7 +67,7 @@ class ReactiveCqlOperationsExtensionsUnitTests {
6767
operations.queryForObject(
6868
eq(""),
6969
any<RowMapper<Int>>(),
70-
eq(arrayOf(3))
70+
eq(3)
7171
)
7272
}
7373
}
@@ -101,7 +101,7 @@ class ReactiveCqlOperationsExtensionsUnitTests {
101101
fun `queryForFlux(String, array) extension should call its Java counterpart`() {
102102

103103
operations.queryForFlux<Person>("", "foo", "bar")
104-
verify { operations.queryForFlux("", Person::class.java, arrayOf("foo", "bar")) }
104+
verify { operations.queryForFlux("", Person::class.java, "foo", "bar") }
105105
}
106106

107107
@Test // DATACASS-484

0 commit comments

Comments
 (0)