Skip to content

Commit 412e4cc

Browse files
author
mhyeon-lee
committed
Upgrade Spring Data JDBC 2.1.0
1 parent 9a5718d commit 412e4cc

File tree

18 files changed

+76
-53
lines changed

18 files changed

+76
-53
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
root = true
33

44
[*.{kt, kts}]
5-
disabled_rules = import-ordering
5+
disabled_rules = import-ordering, indent
6+
# disable indent rule until https://github.com/pinterest/ktlint/issues/764 is fixed.
67

78
[*]
89
# [encoding-utf8]

‎NOTICE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spring-projects/spring-data-commons
2525
https://github.com/spring-projects/spring-data-commons
2626

2727

28-
Spring Data Commons 2.3.2.RELEASE
28+
Spring Data Commons 2.4.0
2929
Copyright (c) [2010-2019] Pivotal Software, Inc.
3030

3131
This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -71,7 +71,7 @@ spring-projects/spring-data-jdbc
7171
https://github.com/spring-projects/spring-data-jdbc
7272

7373

74-
Spring Data JDBC 2.0.2.RELEASE
74+
Spring Data JDBC 2.1.0
7575
Copyright (c) [2017-2019] Pivotal Software, Inc.
7676

7777
This product is licensed to you under the Apache License, Version 2.0 (the "License").

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ buildscript {
2929
}
3030
}
3131
dependencies {
32-
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M3")
32+
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-RC1")
3333
}
3434
}
3535
3636
dependencies {
3737
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
38-
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.4.0-RC2")
38+
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:2.1.0")
3939
}
4040
```
4141

@@ -44,7 +44,7 @@ dependencies {
4444
<parent>
4545
<groupId>org.springframework.boot</groupId>
4646
<artifactId>spring-boot-starter-parent</artifactId>
47-
<version>2.4.0-RC2</version>
47+
<version>2.4.0-RC1</version>
4848
<relativePath/>
4949
</parent>
5050

@@ -56,7 +56,7 @@ dependencies {
5656
<dependency>
5757
<groupId>com.navercorp.spring</groupId>
5858
<artifactId>spring-boot-starter-data-jdbc-plus-sql</artifactId>
59-
<version>2.4.0-RC2</version>
59+
<version>2.1.0</version>
6060
</dependency>
6161
```
6262

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-M2")
12+
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.4.0-RC1")
1313
}
1414
}
1515

‎guide-projects/plus-repository-guide/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dependencies {
55
implementation("org.projectlombok:lombok")
66
annotationProcessor("org.projectlombok:lombok")
77

8-
implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
9-
implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
10-
implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
8+
implementation("org.springframework.data:spring-data-jdbc:2.1.0")
9+
implementation("org.springframework.data:spring-data-relational:2.1.0")
10+
implementation("org.springframework.data:spring-data-commons:2.4.0")
1111

1212
testImplementation("org.springframework.boot:spring-boot-starter-test") {
1313
exclude group: "org.junit.vintage", module: "junit-vintage-engine"

‎guide-projects/plus-sql-java-groovy-guide/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ dependencies {
3939
implementation("org.codehaus.groovy:groovy:2.5.8")
4040
implementation("com.h2database:h2")
4141

42-
implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
43-
implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
44-
implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
42+
implementation("org.springframework.data:spring-data-jdbc:2.1.0")
43+
implementation("org.springframework.data:spring-data-relational:2.1.0")
44+
implementation("org.springframework.data:spring-data-commons:2.4.0")
4545

4646
implementation project(":spring-data-plus-sql-gen")
4747
annotationProcessor project(":spring-data-plus-sql-gen")
48-
annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
49-
annotationProcessor("org.springframework.data:spring-data-relational:2.1.0-RC2")
50-
annotationProcessor("org.springframework.data:spring-data-commons:2.4.0-RC2")
48+
annotationProcessor("org.springframework.data:spring-data-jdbc:2.1.0")
49+
annotationProcessor("org.springframework.data:spring-data-relational:2.1.0")
50+
annotationProcessor("org.springframework.data:spring-data-commons:2.4.0")
5151

5252
compileOnly("org.projectlombok:lombok")
5353
annotationProcessor("org.projectlombok:lombok")

‎guide-projects/plus-sql-java-kotlin-guide/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
6+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
77
}
88
}
99

@@ -37,9 +37,9 @@ dependencies {
3737
implementation("org.projectlombok:lombok")
3838
annotationProcessor("org.projectlombok:lombok")
3939

40-
implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
41-
implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
42-
implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
40+
implementation("org.springframework.data:spring-data-jdbc:2.1.0")
41+
implementation("org.springframework.data:spring-data-relational:2.1.0")
42+
implementation("org.springframework.data:spring-data-commons:2.4.0")
4343

4444
testImplementation("org.springframework.boot:spring-boot-starter-test") {
4545
exclude group: "org.junit.vintage", module: "junit-vintage-engine"

‎guide-projects/plus-sql-kotlin-guide/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ buildscript {
55
maven(url = "https://plugins.gradle.org/m2/")
66
}
77
dependencies {
8-
classpath("org.jlleitschuh.gradle:ktlint-gradle:9.1.0")
8+
classpath("org.jlleitschuh.gradle:ktlint-gradle:9.4.1")
99
}
1010
}
1111

1212
plugins {
13-
id("org.jlleitschuh.gradle.ktlint") version "9.1.0"
14-
kotlin("jvm") version "1.3.72"
15-
kotlin("plugin.spring") version "1.3.72"
13+
id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
14+
kotlin("jvm") version "1.4.10"
15+
kotlin("plugin.spring") version "1.4.10"
1616
}
1717

1818
repositories {
@@ -27,9 +27,9 @@ dependencies {
2727
implementation("org.jetbrains.kotlin:kotlin-reflect")
2828
implementation("com.h2database:h2")
2929

30-
implementation("org.springframework.data:spring-data-jdbc:2.1.0-RC2")
31-
implementation("org.springframework.data:spring-data-relational:2.1.0-RC2")
32-
implementation("org.springframework.data:spring-data-commons:2.4.0-RC2")
30+
implementation("org.springframework.data:spring-data-jdbc:2.1.0")
31+
implementation("org.springframework.data:spring-data-relational:2.1.0")
32+
implementation("org.springframework.data:spring-data-commons:2.4.0")
3333

3434
testImplementation("org.springframework.boot:spring-boot-starter-test") {
3535
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")

‎guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/board/BoardRepository.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,25 @@ class BoardRepositoryImpl(entityProvider: EntityJdbcProvider) : JdbcRepositorySu
4545
override fun findGraphById(id: Long): Board? {
4646
val sql = this.sqls.selectGraphById()
4747
return findOne(
48-
sql, mapParameterSource()
48+
sql,
49+
mapParameterSource()
4950
.addValue("boardId", id)
5051
).orElse(null)
5152
}
5253

5354
override fun findAllGraph(): List<Board> {
5455
val sql = this.sqls.selectAllGraph()
5556
return find(
56-
sql, mapParameterSource()
57+
sql,
58+
mapParameterSource()
5759
)
5860
}
5961

6062
override fun findPostDtoByPostId(postId: Long): PostDto? {
6163
val sql = this.sqls.selectPostDtoByPostId()
6264
return findOne(
63-
sql, mapParameterSource()
65+
sql,
66+
mapParameterSource()
6467
.addValue("postId", postId),
6568
PostDto::class.java
6669
).orElse(null)

‎guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/order/OrderRepository.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,17 @@ class OrderRepositoryImpl(entityProvider: EntityJdbcProvider) : JdbcRepositorySu
4646
override fun findByPurchaserNo(purchaserNo: String): List<Order> {
4747
val sql = this.sqls.selectByPurchaserNo()
4848
return find(
49-
sql, mapParameterSource()
49+
sql,
50+
mapParameterSource()
5051
.addValue("purchaserNo", purchaserNo)
5152
)
5253
}
5354

5455
override fun search(criteria: OrderCriteria): List<Order> {
5556
val sql = this.sqls.search(criteria)
5657
return find(
57-
sql, mapParameterSource()
58+
sql,
59+
mapParameterSource()
5860
.addValue("purchaserNo", criteria.purchaserNo)
5961
.addValue("status", criteria.status.name)
6062
)
@@ -63,7 +65,8 @@ class OrderRepositoryImpl(entityProvider: EntityJdbcProvider) : JdbcRepositorySu
6365
override fun countByPurchaserNo(purchaserNo: String): Long {
6466
val sql = this.sqls.countByPurchaserNo()
6567
return selectSingleValue(
66-
sql, mapParameterSource()
68+
sql,
69+
mapParameterSource()
6770
.addValue("purchaserNo", purchaserNo),
6871
Long::class.java
6972
)

0 commit comments

Comments
 (0)