Skip to content

Commit ed66bf8

Browse files
update versions and fix compiler warnings
1 parent ad37afd commit ed66bf8

File tree

10 files changed

+31
-39
lines changed

10 files changed

+31
-39
lines changed

build.gradle

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
id 'org.springframework.boot' version '3.3.3'
5-
id 'io.spring.dependency-management' version '1.1.6'
6-
id 'org.jetbrains.kotlin.jvm' version '2.0.20'
7-
id 'org.jetbrains.kotlin.plugin.spring' version '2.0.20'
8-
id 'org.jetbrains.kotlin.kapt' version '2.0.20'
4+
id 'org.springframework.boot' version '3.5.4'
5+
id 'io.spring.dependency-management' version '1.1.7'
6+
id 'org.jetbrains.kotlin.jvm' version '2.2.0'
7+
id 'org.jetbrains.kotlin.plugin.spring' version '2.2.0'
8+
id 'org.jetbrains.kotlin.kapt' version '2.2.0'
99
id 'com.google.osdetector' version '1.7.3'
1010
id 'groovy'
1111
id 'application'
1212
}
1313

1414
group = 'com.softeno'
1515
version = '0.0.1-SNAPSHOT'
16-
sourceCompatibility = '17'
16+
sourceCompatibility = '21'
1717

1818
ext {
19-
set('springCloudVersion', '2023.0.3')
20-
set('testcontainersVersion', '1.20.1')
19+
set('springCloudVersion', '2025.0.0')
20+
set('testcontainersVersion', '1.21.3')
2121
}
2222

2323
configurations {
@@ -50,7 +50,7 @@ dependencies {
5050
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test'
5151
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
5252
testImplementation 'io.projectreactor:reactor-test'
53-
testImplementation 'io.mockk:mockk:1.13.12'
53+
testImplementation 'io.mockk:mockk:1.14.5'
5454
testImplementation 'com.ninja-squad:springmockk:4.0.2'
5555
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
5656

@@ -66,7 +66,7 @@ dependencies {
6666
testImplementation 'org.testcontainers:junit-jupiter'
6767

6868
// wiremock
69-
testImplementation 'org.wiremock:wiremock-standalone:3.9.1'
69+
testImplementation 'org.wiremock:wiremock-standalone:3.13.1'
7070

7171
// guerydsl
7272
implementation ('com.querydsl:querydsl-mongodb:5.1.0') {
@@ -91,22 +91,22 @@ dependencies {
9191

9292
// macOs ARM only
9393
if (osdetector.classifier == "osx-aarch_64") {
94-
runtimeOnly("io.netty:netty-resolver-dns-native-macos:4.1.113.Final:${osdetector.classifier}")
94+
runtimeOnly("io.netty:netty-resolver-dns-native-macos:4.2.3.Final:${osdetector.classifier}")
9595
}
9696

9797
// s3
98-
implementation 'io.minio:minio:8.5.12'
98+
implementation 'io.minio:minio:8.5.17'
9999

100100
// monitoring
101101
implementation 'org.springframework.boot:spring-boot-starter-actuator'
102102
runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
103103

104104
// elk
105-
implementation 'net.logstash.logback:logstash-logback-encoder:8.0'
105+
implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
106106

107107
// springdoc
108-
implementation 'org.springdoc:springdoc-openapi-starter-common:2.6.0'
109-
implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.6.0'
108+
implementation 'org.springdoc:springdoc-openapi-starter-common:2.8.9'
109+
implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.8.9'
110110

111111
// zipkin
112112
implementation 'io.micrometer:micrometer-tracing-bridge-otel'
@@ -121,13 +121,6 @@ dependencyManagement {
121121
}
122122
}
123123

124-
tasks.withType(KotlinCompile) {
125-
kotlinOptions {
126-
freeCompilerArgs = ['-Xjsr305=strict']
127-
jvmTarget = '17'
128-
}
129-
}
130-
131124
tasks.named('test') {
132125
useJUnitPlatform()
133126
}

src/main/kotlin/com/softeno/template/app/config/security/SecurityConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ class SecurityConfig {
2929

3030
class Jwt2AuthenticationConverter : Converter<Jwt, Collection<GrantedAuthority>> {
3131
override fun convert(jwt: Jwt): Collection<GrantedAuthority> {
32-
val realmAccess = jwt.claims.getOrDefault("realm_access", mapOf<String, Any>()) as Map<String, Any>
33-
val realmRoles = (realmAccess["roles"] ?: listOf<String>()) as Collection<String>
32+
val realmAccess = jwt.claims.getOrDefault("realm_access", mapOf<String, Any>()) as Map<*, *>
33+
val realmRoles = (realmAccess["roles"] ?: listOf<String>()) as Collection<*>
3434

3535
return realmRoles
36-
.map { role: String -> SimpleGrantedAuthority(role) }.toList()
36+
.map { role -> SimpleGrantedAuthority(role as String) }.toList()
3737
}
3838

3939
}

src/main/kotlin/com/softeno/template/app/kafka/KafkaKeycloakController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import reactor.core.publisher.Flux
1414

1515
@Controller
1616
class ReactiveKafkaKeycloakController(
17-
@Qualifier(value = "kafkaKeycloakConsumerTemplate") private val reactiveKafkaConsumerTemplate: ReactiveKafkaConsumerTemplate<String, JsonNode>,
17+
@param:Qualifier(value = "kafkaKeycloakConsumerTemplate") private val reactiveKafkaConsumerTemplate: ReactiveKafkaConsumerTemplate<String, JsonNode>,
1818
private val objectMapper: ObjectMapper
1919
) : CommandLineRunner {
2020
private val log = LogFactory.getLog(javaClass)

src/main/kotlin/com/softeno/template/app/kafka/KafkaSampleHandler.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun KafkaMessage.toMessage() = Message(from = "SYSTEM", to = "ALL", content = th
3131

3232
@Controller
3333
class ReactiveKafkaSampleController(
34-
@Qualifier(value = "kafkaSampleConsumerTemplate") private val reactiveKafkaConsumerTemplate: ReactiveKafkaConsumerTemplate<String, JsonNode>,
34+
@param:Qualifier(value = "kafkaSampleConsumerTemplate") private val reactiveKafkaConsumerTemplate: ReactiveKafkaConsumerTemplate<String, JsonNode>,
3535
private val objectMapper: ObjectMapper,
3636
private val tracer: Tracer,
3737
private val ws: WebSocketNotificationSender,
@@ -55,7 +55,7 @@ class ReactiveKafkaSampleController(
5555

5656
// todo: make better observation handling by reactive kafka, currently the zipkin does not show the traces properly
5757
val contextWithCustomTraceId = tracer.traceContextBuilder()
58-
.traceId(kafkaMessage.traceId ?: RandomUtils.nextLong().toString())
58+
.traceId(kafkaMessage.traceId ?: RandomUtils.secure().toString())
5959
.spanId(tracer.nextSpan().name("kafka-consumer").context().spanId())
6060
.parentId(kafkaMessage.spanId ?: (tracer.currentSpan()?.context()?.spanId() ?: Span.NOOP.context().spanId()))
6161
.sampled(true)
@@ -85,7 +85,7 @@ class ReactiveKafkaSampleController(
8585

8686
@Service
8787
class ReactiveKafkaSampleProducer(
88-
@Qualifier(value = "kafkaSampleProducerTemplate") private val reactiveKafkaProducerTemplate: ReactiveKafkaProducerTemplate<String, KafkaMessage>,
88+
@param:Qualifier(value = "kafkaSampleProducerTemplate") private val reactiveKafkaProducerTemplate: ReactiveKafkaProducerTemplate<String, KafkaMessage>,
8989
private val props: KafkaApplicationProperties
9090
) {
9191
private val log = LogFactory.getLog(javaClass)

src/main/kotlin/com/softeno/template/app/permission/api/Controller.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CoroutinePermissionController(
4747
}
4848

4949
data class PermissionDto(
50-
@JsonProperty("_id")
50+
@param:JsonProperty("_id")
5151
val id: String?,
5252
val name: String,
5353
val description: String,

src/main/kotlin/com/softeno/template/app/user/User.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ data class User(
1313
val email: String,
1414
val permissions: List<Permission>?,
1515
) {
16-
constructor(command: UserModifyCommand) : this(command, null)
1716
constructor(command: UserModifyCommand, permissions: List<Permission>?)
1817
: this(id = null, name = command.name, email = command.email, permissions = permissions, base = null)
1918
}
2019

2120
data class UserModifyCommand(
2221
val name: String,
2322
val email: String,
24-
@JsonProperty("role")
25-
@JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY])
23+
@param:JsonProperty("role")
24+
@param:JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY])
2625
val permissionIds: Set<String>,
2726
val version: Long?
2827
)

src/main/kotlin/com/softeno/template/app/user/api/Controller.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ class CoroutineUserController(
9292
}
9393

9494
data class UserDto(
95-
@JsonProperty("_id")
95+
@param:JsonProperty("_id")
9696
val id: String,
9797
val name: String,
9898
val email: String,
99-
@JsonProperty("role")
100-
@JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY])
99+
@param:JsonProperty("role")
100+
@param:JsonFormat(with = [JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY])
101101
val permissions: List<PermissionDto>?,
102102
val version: Long?,
103103
val createdBy: String?,

src/main/kotlin/com/softeno/template/sample/http/external/config/CircuitBreakerConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ReactiveCircuitBreakerConfig {
1919
fun reactiveResilience4JCircuitBreakerFactory(): ReactiveCircuitBreakerFactory<*, *> {
2020
val circuitBreakerRegistry = CircuitBreakerRegistry.ofDefaults()
2121
val timeLimiterRegistry = TimeLimiterRegistry.ofDefaults()
22-
return ReactiveResilience4JCircuitBreakerFactory(circuitBreakerRegistry, timeLimiterRegistry, null)
22+
return ReactiveResilience4JCircuitBreakerFactory(circuitBreakerRegistry, timeLimiterRegistry, null,null)
2323
}
2424

2525
@Bean

src/main/kotlin/com/softeno/template/sample/http/external/coroutine/ExternalController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ExternalServiceException(message: String) : RuntimeException(message)
1818
@RequestMapping("/external")
1919
@Validated
2020
class ExternalController(
21-
@Qualifier(value = "external") private val webClient: WebClient,
21+
@param:Qualifier(value = "external") private val webClient: WebClient,
2222
private val reactiveCircuitBreakerFactory: ReactiveCircuitBreakerFactory<*, *>,
2323
private val config: ExternalClientConfig
2424
) {

src/main/kotlin/com/softeno/template/sample/scheduled/ScheduledService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit
1818
)
1919
@Service
2020
class ScheduledService(
21-
@Qualifier(value = "scheduledExecutor") private val executor: Executor,
21+
@param:Qualifier(value = "scheduledExecutor") private val executor: Executor,
2222
private val syncService: AsyncService
2323
) {
2424
private val log = LogFactory.getLog(javaClass)

0 commit comments

Comments
 (0)