Skip to content

Commit 02b172d

Browse files
committed
chore: update spring-boot v3.3, kotlin v2
1 parent d6bcb5d commit 02b172d

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ This is my little backend cookbook. I need and use it regularly for various smal
7676
* Found an error -> please [report](https://github.com/osahner/kotlin-spring-boot-rest-jpa-jwt-starter/issues).
7777

7878
### Changelog
79+
* _v0.11.2-SNAPSHOT_: spring-boot 3.3.0, kotlin 2.0.0
7980
* _v0.11.1-SNAPSHOT_: fix token validity time
8081
* _v0.11.0-SNAPSHOT_: spring-boot 3.2.x, kotlin 1.9.x, java 21
8182
* _v0.10.0-SNAPSHOT_: spring-boot 3.1.x, add 2FA, cleanup

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.2.4</version>
8+
<version>3.3.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111

1212
<groupId>osahner</groupId>
1313
<artifactId>kotlin-spring-boot-rest-jpa-jwt-starter</artifactId>
14-
<version>0.11.1-SNAPSHOT</version>
14+
<version>0.11.2-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<name>kotlin spring-boot 2 rest/jpa/jwt starter</name>
@@ -22,15 +22,15 @@
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2323

2424
<java.version>21</java.version>
25-
<kotlin.version>1.9.23</kotlin.version>
25+
<kotlin.version>2.0.0</kotlin.version>
2626

2727
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
2828

2929
<jjwt.version>0.12.5</jjwt.version>
3030
<poi.version>5.2.5</poi.version>
3131
<jasypt.version>1.9.3</jasypt.version>
3232
<opencsv.version>5.9</opencsv.version>
33-
<commons-io.version>2.15.1</commons-io.version>
33+
<commons-io.version>2.16.1</commons-io.version>
3434
<aerogear-otp-java.version>1.0.0</aerogear-otp-java.version>
3535
</properties>
3636

src/main/kotlin/osahner/IndexController.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ import org.springframework.web.bind.annotation.RestController
99
@RestController
1010
@RequestMapping("/api/v1")
1111
class IndexController {
12+
@Suppress("SameReturnValue", "SameReturnValue")
1213
@GetMapping(value = ["", "/", "/test"])
1314
fun helloWorld() = "Pong!"
1415

1516
@GetMapping(value = ["/required"])
1617
fun helloRequiredWorld(@RequestParam(value = "msg", required = true) msg: String) = "Echo \"$msg\"!"
1718

19+
@Suppress("SameReturnValue")
1820
@GetMapping(value = ["/restricted"])
1921
@PreAuthorize("hasAuthority('STANDARD_USER')")
2022
fun helloRestrictedWorld() = "Pong!"

src/main/kotlin/osahner/api/address/Address.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package osahner.api.address
22

33
import jakarta.persistence.*
44
import org.hibernate.Hibernate
5-
import org.hibernate.annotations.GenericGenerator
6-
import org.hibernate.annotations.Parameter
75
import osahner.toArray
86
import osahner.toMap
97
import osahner.writeValueAsString
@@ -14,14 +12,11 @@ import java.time.LocalDateTime
1412
data class Address(
1513
@Id
1614
@GeneratedValue(generator = "address-sequence-generator")
17-
@GenericGenerator(
15+
@SequenceGenerator(
1816
name = "address-sequence-generator",
19-
strategy = "org.hibernate.id.enhanced.SequenceStyleGenerator",
20-
parameters = [
21-
Parameter(name = "sequence_name", value = "address_SEQ"),
22-
Parameter(name = "initial_value", value = "100"),
23-
Parameter(name = "increment_size", value = "1")
24-
]
17+
sequenceName = "address_SEQ",
18+
allocationSize = 1,
19+
initialValue = 100,
2520
)
2621
var id: Int?,
2722

src/main/kotlin/osahner/service/CsvImportService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile
77

88
@Component
99
class CsvImportService {
10+
@Suppress("RedundantModalityModifier")
1011
final inline fun <reified T : CsvImportDto<S>, S> import(file: MultipartFile): Collection<S> =
1112
builder().setInputStream(file.inputStream).get().bufferedReader().use { stream ->
1213
CsvToBeanBuilder<T>(stream)

0 commit comments

Comments
 (0)