Update spring version for api

Marchosiax · web-flow · commit 89b989363d4f · 2025-02-17T13:57:29.000+03:30
* Update spring version for api

* update github action Java version to 21
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
     name: Build OPEX and run tests with java ${{ matrix.java }}
     steps:
       - name: Checkout Source Code
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
     name: Build OPEX and run tests with java ${{ matrix.java }}
     steps:
       - name: Checkout Source Code
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
     name: Build OPEX and run tests with java ${{ matrix.java }}
     steps:
       - name: Checkout Source Code
diff --git a/api/api-app/Dockerfile b/api/api-app/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11
+FROM openjdk:21
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} app.jar
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
diff --git a/api/api-app/src/main/kotlin/co/nilin/opex/api/app/config/InitializeService.kt b/api/api-app/src/main/kotlin/co/nilin/opex/api/app/config/InitializeService.kt
@@ -3,12 +3,12 @@ package co.nilin.opex.api.app.config
 import co.nilin.opex.api.ports.postgres.dao.SymbolMapRepository
 import co.nilin.opex.api.ports.postgres.model.SymbolMapModel
 import co.nilin.opex.utility.preferences.Preferences
+import jakarta.annotation.PostConstruct
 import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.runBlocking
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.DependsOn
 import org.springframework.stereotype.Component
-import javax.annotation.PostConstruct
 
 @Component
 @DependsOn("postgresConfig")
diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml
@@ -93,18 +93,18 @@ logging:
     org.zalando.logbook: TRACE
 app:
   accountant:
-    url: lb://opex-accountant
+    url: http://opex-accountant
   matching-gateway:
-    url: lb://opex-matching-gateway
+    url: http://opex-matching-gateway
   wallet:
-    url: lb://opex-wallet
+    url: http://opex-wallet
   market:
-    url: lb://opex-market
+    url: http://opex-market
   opex-bc-gateway:
-    url: lb://opex-bc-gateway
+    url: http://opex-bc-gateway
   auth:
-    cert-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/certs
-    token-url: lb://opex-auth/auth/realms/opex/protocol/openid-connect/token
+    cert-url: http://opex-auth/auth/realms/opex/protocol/openid-connect/certs
+    token-url: http://opex-auth/auth/realms/opex/protocol/openid-connect/token
     api-key-client:
       secret: ${API_KEY_CLIENT_SECRET}
   binance:
diff --git a/api/api-ports/api-binance-rest/pom.xml b/api/api-ports/api-binance-rest/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-consul-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/SecurityConfig.kt b/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/SecurityConfig.kt
@@ -1,9 +1,10 @@
 package co.nilin.opex.api.ports.binance.config
 
 import co.nilin.opex.api.core.spi.APIKeyFilter
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.security.config.Customizer
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder
 import org.springframework.security.config.web.server.ServerHttpSecurity
@@ -14,37 +15,36 @@ import org.springframework.web.reactive.function.client.WebClient
 import org.springframework.web.server.WebFilter
 
 @EnableWebFluxSecurity
-class SecurityConfig(private val webClient: WebClient) {
-
+@Configuration
+class SecurityConfig(
+    private val webClient: WebClient,
+    private val apiKeyFilter: APIKeyFilter,
     @Value("\${app.auth.cert-url}")
-    private lateinit var jwkUrl: String
-
-    @Autowired
-    private lateinit var apiKeyFilter: APIKeyFilter
+    private val jwkUrl: String
+) {
 
     @Bean
-    fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain? {
-        http.csrf().disable()
-            .authorizeExchange()
-            .pathMatchers("/actuator/**").permitAll()
-            .pathMatchers("/swagger-ui/**").permitAll()
-            .pathMatchers("/swagger-resources/**").permitAll()
-            .pathMatchers("/v2/api-docs").permitAll()
-            .pathMatchers("/v3/depth").permitAll()
-            .pathMatchers("/v3/trades").permitAll()
-            .pathMatchers("/v3/ticker/**").permitAll()
-            .pathMatchers("/v3/exchangeInfo").permitAll()
-            .pathMatchers("/v3/currencyInfo/**").permitAll()
-            .pathMatchers("/v3/klines").permitAll()
-            .pathMatchers("/socket").permitAll()
-            .pathMatchers("/v1/landing/**").permitAll()
-            .pathMatchers("/**").hasAuthority("SCOPE_trust")
-            .anyExchange().authenticated()
-            .and()
+    fun springSecurityFilterChain(http: ServerHttpSecurity): SecurityWebFilterChain {
+        return http.csrf { it.disable() }
+            .authorizeExchange {
+                it.pathMatchers("/actuator/**").permitAll()
+                    .pathMatchers("/swagger-ui/**").permitAll()
+                    .pathMatchers("/swagger-resources/**").permitAll()
+                    .pathMatchers("/v2/api-docs").permitAll()
+                    .pathMatchers("/v3/depth").permitAll()
+                    .pathMatchers("/v3/trades").permitAll()
+                    .pathMatchers("/v3/ticker/**").permitAll()
+                    .pathMatchers("/v3/exchangeInfo").permitAll()
+                    .pathMatchers("/v3/currencyInfo/**").permitAll()
+                    .pathMatchers("/v3/klines").permitAll()
+                    .pathMatchers("/socket").permitAll()
+                    .pathMatchers("/v1/landing/**").permitAll()
+                    .pathMatchers("/**").hasAuthority("SCOPE_trust")
+                    .anyExchange().authenticated()
+            }
             .addFilterBefore(apiKeyFilter as WebFilter, SecurityWebFiltersOrder.AUTHENTICATION)
-            .oauth2ResourceServer()
-            .jwt()
-        return http.build()
+            .oauth2ResourceServer { it.jwt(Customizer.withDefaults()) }
+            .build()
     }
 
     @Bean
diff --git a/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/WebClientConfig.kt b/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/config/WebClientConfig.kt
@@ -1,26 +1,21 @@
 package co.nilin.opex.api.ports.binance.config
 
-import org.springframework.cloud.client.ServiceInstance
-import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer
-import org.springframework.cloud.client.loadbalancer.reactive.ReactorLoadBalancerExchangeFilterFunction
+import org.springframework.cloud.client.loadbalancer.LoadBalanced
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.http.client.reactive.ReactorClientHttpConnector
 import org.springframework.web.reactive.function.client.WebClient
-import org.zalando.logbook.Logbook
-import org.zalando.logbook.netty.LogbookClientHandler
-import reactor.netty.http.client.HttpClient
 
 @Configuration
 class WebClientConfig {
 
     @Bean
-    fun webClient(loadBalancerFactory: ReactiveLoadBalancer.Factory<ServiceInstance>, logbook: Logbook): WebClient {
-        val client = HttpClient.create().doOnConnected { it.addHandlerLast(LogbookClientHandler(logbook)) }
+    @LoadBalanced
+    fun webClientBuilder(): WebClient.Builder {
         return WebClient.builder()
-            //.clientConnector(ReactorClientHttpConnector(client))
-            .filter(ReactorLoadBalancerExchangeFilterFunction(loadBalancerFactory, emptyList()))
-            .build()
     }
 
+    @Bean
+    fun webClient(webclientBuilder: WebClient.Builder): WebClient {
+        return webclientBuilder.build()
+    }
 }
diff --git a/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/util/SecurityExtension.kt b/api/api-ports/api-binance-rest/src/main/kotlin/co/nilin/opex/api/ports/binance/util/SecurityExtension.kt
@@ -1,6 +1,5 @@
 package co.nilin.opex.api.ports.binance.util
 
-import com.nimbusds.jose.shaded.json.JSONArray
 import org.springframework.security.core.context.SecurityContext
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken
 
@@ -10,10 +9,4 @@ fun SecurityContext.jwtAuthentication(): JwtAuthenticationToken {
 
 fun JwtAuthenticationToken.tokenValue(): String {
     return this.token.tokenValue
-}
-
-fun JwtAuthenticationToken.roles(): List<String> {
-    val list = arrayListOf<String>()
-    (token.claims["roles"] as JSONArray?)?.forEach { list.add(it as String) }
-    return list
 }
diff --git a/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/util/SecurityExtension.kt b/api/api-ports/api-opex-rest/src/main/kotlin/co/nilin/opex/api/ports/opex/util/SecurityExtension.kt
@@ -1,6 +1,5 @@
 package co.nilin.opex.api.ports.opex.util
 
-import com.nimbusds.jose.shaded.json.JSONArray
 import org.springframework.security.core.context.SecurityContext
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken
 
@@ -10,10 +9,4 @@ fun SecurityContext.jwtAuthentication(): JwtAuthenticationToken {
 
 fun JwtAuthenticationToken.tokenValue(): String {
     return this.token.tokenValue
-}
-
-fun JwtAuthenticationToken.roles(): List<String> {
-    val list = arrayListOf<String>()
-    (token.claims["roles"] as JSONArray?)?.forEach { list.add(it as String) }
-    return list
 }
diff --git a/api/pom.xml b/api/pom.xml
@@ -15,6 +15,16 @@
     <packaging>pom</packaging>
     <description>Api root of Opex</description>
 
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <java.version>21</java.version>
+        <kotlin.version>2.1.0</kotlin.version>
+        <spring.version>3.4.2</spring.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <error-hanlder.version>1.1.0</error-hanlder.version>
+    </properties>
+
     <modules>
         <module>api-core</module>
         <module>api-app</module>
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -114,6 +114,9 @@
                         <goals>
                             <goal>compile</goal>
                         </goals>
+                        <configuration>
+                            <jvmTarget>${java.version}</jvmTarget>
+                        </configuration>
                     </execution>
                     <execution>
                         <id>test-compile</id>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:11`
	`1`	`+FROM openjdk:21`
`2`	`2`	`ARG JAR_FILE=target/*.jar`
`3`	`3`	`COPY ${JAR_FILE} app.jar`
`4`	`4`	`ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]`