Skip to content

Commit 5c105e1

Browse files
authored
Merge pull request #328 from driessamyn/refactor/sonar-code-quality
refactor: extract duplicated string literals in KapperImpl
2 parents 977e48c + f3e47bb commit 5c105e1

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

core/src/main/kotlin/net/samyn/kapper/internal/KapperImpl.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ internal class KapperImpl(
1818
) : Kapper {
1919
companion object {
2020
private val logger: Logger = LoggerFactory.getLogger(this::class.java)
21+
private const val SQL_BLANK_ERROR = "SQL query cannot be empty or blank"
22+
private const val EXECUTING_STMT_LOG = "Executing prepared statement: {}"
2123
}
2224

2325
override fun <T : Any> query(
@@ -27,7 +29,7 @@ internal class KapperImpl(
2729
mapper: (ResultSet, Map<String, Field>) -> T,
2830
args: Args,
2931
): List<T> {
30-
require(sql.isNotBlank()) { "SQL query cannot be empty or blank" }
32+
require(sql.isNotBlank()) { SQL_BLANK_ERROR }
3133
return buildList {
3234
connection.executeQuery(queryFactory(sql), args).use { rs ->
3335
try {
@@ -68,7 +70,7 @@ internal class KapperImpl(
6870
connection.prepareStatement(query.sql).use { stmt ->
6971
val cleanup = args.setParameters(query, stmt, connection.getDbFlavour())
7072
try {
71-
logger.debug("Executing prepared statement: {}", stmt)
73+
logger.debug(EXECUTING_STMT_LOG, stmt)
7274
return stmt.executeUpdate()
7375
} finally {
7476
cleanup()
@@ -87,7 +89,7 @@ internal class KapperImpl(
8789
connection.prepareStatement(query.sql).use { stmt ->
8890
val cleanup = args.setParameters(query.tokens, stmt, obj, connection.getDbFlavour())
8991
try {
90-
logger.debug("Executing prepared statement: {}", stmt)
92+
logger.debug(EXECUTING_STMT_LOG, stmt)
9193
return stmt.executeUpdate()
9294
} finally {
9395
cleanup()
@@ -102,7 +104,7 @@ internal class KapperImpl(
102104
mapper: (ResultSet, Map<String, Field>) -> T,
103105
args: Args,
104106
): List<T> {
105-
require(sql.isNotBlank()) { "SQL query cannot be empty or blank" }
107+
require(sql.isNotBlank()) { SQL_BLANK_ERROR }
106108
return buildList {
107109
connection.executeQuery(queryFactory(sql), args).use { rs ->
108110
try {
@@ -128,12 +130,12 @@ internal class KapperImpl(
128130
obj: A,
129131
args: Map<String, (A) -> Any?>,
130132
): List<R> {
131-
require(sql.isNotBlank()) { "SQL query cannot be empty or blank" }
133+
require(sql.isNotBlank()) { SQL_BLANK_ERROR }
132134
val query = queryFactory(sql)
133135
connection.prepareStatement(query.sql).use { stmt ->
134136
val cleanup = args.setParameters(query.tokens, stmt, obj, connection.getDbFlavour())
135137
try {
136-
logger.debug("Executing prepared statement: {}", stmt)
138+
logger.debug(EXECUTING_STMT_LOG, stmt)
137139
return buildList {
138140
stmt.executeQuery().use { rs ->
139141
try {

0 commit comments

Comments
 (0)