diff --git a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt index ff97b511d30..f6dbe709a50 100644 --- a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt +++ b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors + * Copyright 2002-2021 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,8 +54,10 @@ inline fun JdbcOperations.queryForObject(sql: String, args: Array JdbcOperations.queryForObject(sql: String, args: Array): T? = - queryForObject(sql, T::class.java, args) as T + queryForObject(sql, args, T::class.java) as T /** * Extension for [JdbcOperations.queryForList] providing a `queryForList("...")` variant. @@ -86,8 +88,11 @@ inline fun JdbcOperations.queryForList(sql: String, args: Array JdbcOperations.queryForList(sql: String, args: Array): List = - queryForList(sql, T::class.java, args) + queryForList(sql, args, T::class.java) + /** * Extension for [JdbcOperations.query] providing a ResultSetExtractor-like function diff --git a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensionsTests.kt b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensionsTests.kt index 8c1f39fae4b..e3e086b30f6 100644 --- a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensionsTests.kt +++ b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensionsTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors + * Copyright 2002-2021 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,11 +67,12 @@ class JdbcOperationsExtensionsTests { } @Test + @Suppress("DEPRECATION") fun `queryForObject with reified type parameters and args`() { - val args = arrayOf(3) - every { template.queryForObject(sql, any>(), args) } returns 2 + val args = arrayOf(3, 4) + every { template.queryForObject(sql, args, any>()) } returns 2 assertThat(template.queryForObject(sql, args)).isEqualTo(2) - verify { template.queryForObject(sql, any>(), args) } + verify { template.queryForObject(sql, args, any>()) } } @Test @@ -93,12 +94,13 @@ class JdbcOperationsExtensionsTests { } @Test + @Suppress("DEPRECATION") fun `queryForList with reified type parameters and args`() { val list = listOf(1, 2, 3) - val args = arrayOf(3) - every { template.queryForList(sql, any>(), args) } returns list + val args = arrayOf(3, 4) + every { template.queryForList(sql, args, any>()) } returns list template.queryForList(sql, args) - verify { template.queryForList(sql, any>(), args) } + verify { template.queryForList(sql, args, any>()) } } @Test