Adapt to sprig-boot-3 (#190)

.github/workflows/benchmark-test.yml

@@ -41,10 +41,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -69,10 +69,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/codecov.yml

@@ -19,10 +19,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/docker-deploy.yml

@@ -43,10 +43,10 @@ jobs:
         working-directory: cosky-dashboard
         run: npm install && npm install -g @angular/cli && ng build
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/integration-test.yml

@@ -31,10 +31,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/package-deploy.yml

@@ -26,10 +26,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -47,10 +47,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

build.gradle.kts

@@ -36,9 +36,6 @@ val coreProjects = setOf(
     project(":cosky-discovery"),
 )
 val restApiProject = project(":cosky-rest-api")
-// TODO
-// val mirrorProject = project(":cosky-mirror")
-// val serverProjects = setOf(restApiProject, mirrorProject)
 val serverProjects = setOf(restApiProject)
 val exampleProjects = setOf(
     project(":cosky-service-provider"),
@@ -86,7 +83,7 @@ configure(libraryProjects) {
     apply<KotlinPlatformJvmPlugin>()
     configure<KotlinJvmProjectExtension>() {
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(8))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {

cosky-config/src/main/resources/config_remove.lua

@@ -27,9 +27,9 @@ end
 
 local currentVersion = redis.call("hget", configKey, versionField)
 if currentVersion then
-    local result = addHistory(currentVersion, configKey, op);
+    addHistory(currentVersion, configKey, op);
     redis.call("publish", configKey, op);
-    return result;
+    return 1;
 else
     return 0;
 end

cosky-config/src/main/resources/config_rollback.lua

@@ -55,6 +55,6 @@ addHistory(currentVersion, configKey, op)
 local data = targetHistoryConfig["data"];
 local createTime = redis.call('time')[1];
 
-local result = redis.call("hmset", configKey, "configId", configId, "data", data, hashField, targetHash, versionField, nextVersion, "createTime", createTime);
+redis.call("hmset", configKey, "configId", configId, "data", data, hashField, targetHash, versionField, nextVersion, "createTime", createTime);
 redis.call("publish", configKey, op);
-return result;
+return 1;

cosky-config/src/main/resources/config_set.lua

@@ -43,6 +43,6 @@ else
 end
 
 local createTime = redis.call('time')[1];
-local result = redis.call("hmset", configKey, "configId", configId, "data", data, hashField, hash, versionField, nextVersion, "createTime", createTime);
+redis.call("hmset", configKey, "configId", configId, "data", data, hashField, hash, versionField, nextVersion, "createTime", createTime);
 redis.call("publish", configKey, op);
-return result;
+return 1;

cosky-dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosky-dashboard",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

cosky-dependencies/build.gradle.kts

@@ -12,11 +12,11 @@
  */
 
 dependencies {
-    api(platform("org.springframework.boot:spring-boot-dependencies:2.7.12"))
-    api(platform("org.springframework.cloud:spring-cloud-dependencies:2021.0.7"))
-    api(platform("me.ahoo.cosid:cosid-bom:1.19.3"))
-    api(platform("me.ahoo.simba:simba-bom:0.6.6"))
-    api(platform("me.ahoo.cosec:cosec-bom:1.18.2"))
+    api(platform("org.springframework.boot:spring-boot-dependencies:3.1.0"))
+    api(platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3"))
+    api(platform("me.ahoo.cosid:cosid-bom:2.1.0"))
+    api(platform("me.ahoo.simba:simba-bom:2.0.0"))
+    api(platform("me.ahoo.cosec:cosec-bom:2.0.0-M1"))
     constraints {
         api("com.google.guava:guava:32.0.1-jre")
         api("commons-io:commons-io:2.13.0")

cosky-discovery/src/main/resources/registry_remove_service.lua

@@ -17,4 +17,4 @@ if affected > 0 then
     redis.call("hdel", serviceIdxStatKey, serviceId);
 end
 
-return affected;
+return 1;

cosky-discovery/src/main/resources/registry_renew.lua

@@ -37,5 +37,5 @@ if shouldPub then
     redis.call("publish", instanceKey, "renew");
 end
 
-return result;
+return 1;
 

cosky-discovery/src/main/resources/registry_set_metadata.lua

@@ -15,7 +15,7 @@ if #instanceKeys > 0 then
     end
 end
 
-local result = redis.call("hmset", instanceKey, unpack(ARGV, 2, #ARGV));
+redis.call("hmset", instanceKey, unpack(ARGV, 2, #ARGV));
 redis.call("publish", instanceKey, "set_metadata");
-return result;
+return 1;
 

cosky-discovery/src/main/resources/registry_set_service.lua

@@ -9,6 +9,7 @@ local affected = redis.call("sadd", serviceIdxKey, serviceId);
 if affected > 0 then
     redis.call("publish", serviceIdxKey, "set");
     redis.call("hset", serviceIdxStatKey, serviceId, 0);
+    return 1;
 end
 
-return affected;
+return 0;

cosky-rest-api/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 tasks.jar.configure {
@@ -52,7 +52,7 @@ application {
         "-XX:MaxDirectMemorySize=256M",
         "-Xss1m",
         "-server",
-        "-XX:+UseG1GC",
+        "-XX:+UseZGC",
         "-Xlog:gc*:file=logs/$applicationName-gc.log:time,tags:filecount=10,filesize=32M",
         "-XX:+HeapDumpOnOutOfMemoryError",
         "-XX:HeapDumpPath=data",
@@ -76,8 +76,8 @@ dependencies {
     implementation("org.springdoc:springdoc-openapi-kotlin")
     implementation("org.springdoc:springdoc-openapi-webflux-ui")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation(project(":spring-cloud-starter-cosky-config"))
-    implementation(project(":spring-cloud-starter-cosky-discovery"))
+    implementation(project(":cosky-spring-cloud-starter-config"))
+    implementation(project(":cosky-spring-cloud-starter-discovery"))
     implementation("com.google.guava:guava")
     implementation("me.ahoo.cosid:cosid-spring-redis")
     implementation("me.ahoo.cosid:cosid-spring-boot-starter")

cosky-rest-api/src/main/kotlin/me/ahoo/cosky/rest/configuration/GlobalRestExceptionHandler.kt

@@ -39,7 +39,7 @@ class GlobalRestExceptionHandler {
     }
 
     @ExceptionHandler
-    @ResponseStatus
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
     fun handleAll(ex: Exception): ErrorResponse {
         if (log.isErrorEnabled) {
             log.error(ex.message, ex)

cosky-rest-api/src/main/kotlin/me/ahoo/cosky/rest/security/SecurityProperties.kt

@@ -15,21 +15,18 @@ package me.ahoo.cosky.rest.security
 import me.ahoo.cosky.core.CoSky
 import me.ahoo.cosky.rest.security.rbac.Action
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 
 /**
  * Security Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(SecurityProperties.PREFIX)
 class SecurityProperties(
     val enabled: Boolean = true,
     val enforceInitSuperUser: Boolean = false,
     val auditLog: AuditLog = AuditLog()
 ) {
-    @ConstructorBinding
     data class AuditLog(
         val action: Action = Action.WRITE
     )

cosky-rest-api/src/main/kotlin/me/ahoo/cosky/rest/security/audit/AuditLogHandlerInterceptor.kt

@@ -55,7 +55,7 @@ class AuditLogHandlerInterceptor(
         } else {
             exchange.getSecurityContext()?.principal?.id.orEmpty()
         }
-        val action = request.method!!.name
+        val action = request.method.name()
         val ip = requireNotNull(request.remoteAddress).hostString
         val status = requireNotNull(exchange.response.statusCode).value()
         val msg = if (throwable?.message != null) throwable.message!! else ""

cosky-rest-api/src/main/kotlin/me/ahoo/cosky/rest/security/authentication/RefreshTokenAuthentication.kt

@@ -8,7 +8,7 @@ import me.ahoo.cosec.token.TokenVerifier
 import org.springframework.stereotype.Service
 import reactor.core.publisher.Mono
 import reactor.kotlin.core.publisher.toMono
-import javax.validation.constraints.NotBlank
+import jakarta.validation.constraints.NotBlank
 
 @Service
 class RefreshTokenAuthentication(

cosky-spring-cloud-core/build.gradle.kts

@@ -24,6 +24,5 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     kapt("org.springframework.boot:spring-boot-configuration-processor")
     kapt("org.springframework.boot:spring-boot-autoconfigure-processor")
-
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }

spring-cloud-starter-cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/discovery/CoSkyDiscoveryProperties.kt → cosky-spring-cloud-starter-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/discovery/CoSkyDiscoveryProperties.kt

@@ -14,15 +14,13 @@ package me.ahoo.cosky.discovery.spring.cloud.discovery
 
 import me.ahoo.cosky.spring.cloud.CoSkyProperties
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 import java.time.Duration
 
 /**
  * CoSky Discovery Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(CoSkyDiscoveryProperties.PREFIX)
 data class CoSkyDiscoveryProperties(
     val enabled: Boolean = true,

spring-cloud-starter-cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/registry/CoSkyAutoServiceRegistrationOfNoneWeb.kt → cosky-spring-cloud-starter-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/registry/CoSkyAutoServiceRegistrationOfNoneWeb.kt

@@ -12,6 +12,7 @@
  */
 package me.ahoo.cosky.discovery.spring.cloud.registry
 
+import jakarta.annotation.PreDestroy
 import me.ahoo.cosky.core.util.ProcessId
 import me.ahoo.cosky.discovery.ServiceInstanceContext
 import org.slf4j.LoggerFactory
@@ -21,7 +22,6 @@ import org.springframework.boot.web.context.WebServerApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.context.ApplicationListener
-import javax.annotation.PreDestroy
 
 /**
  * CoSky Auto Service Registration Of None Web.

spring-cloud-starter-cosky-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/registry/CoSkyRegistryProperties.kt → cosky-spring-cloud-starter-discovery/src/main/kotlin/me/ahoo/cosky/discovery/spring/cloud/registry/CoSkyRegistryProperties.kt

@@ -16,15 +16,13 @@ import me.ahoo.cosky.discovery.RenewProperties
 import me.ahoo.cosky.discovery.spring.cloud.discovery.CoSkyDiscoveryProperties
 import me.ahoo.cosky.discovery.spring.cloud.support.StatusConstants
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 import java.time.Duration
 
 /**
  * CoSky Registry Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(CoSkyRegistryProperties.PREFIX)
 data class CoSkyRegistryProperties(
     var serviceId: String = "",

examples/cosky-service-consumer/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -30,8 +30,8 @@ dependencies {
     implementation(platform(project(":cosky-dependencies")))
 //    implementation("io.springfox:springfox-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation(project(":spring-cloud-starter-cosky-config"))
-    implementation(project(":spring-cloud-starter-cosky-discovery"))
+    implementation(project(":cosky-spring-cloud-starter-config"))
+    implementation(project(":cosky-spring-cloud-starter-discovery"))
     implementation("com.google.guava:guava")
     implementation("org.springframework.cloud:spring-cloud-starter-loadbalancer")
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign")

examples/cosky-service-provider-api/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 

examples/cosky-service-provider/build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -30,8 +30,8 @@ dependencies {
     implementation(platform(project(":cosky-dependencies")))
 //    implementation("io.springfox:springfox-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation(project(":spring-cloud-starter-cosky-config"))
-    implementation(project(":spring-cloud-starter-cosky-discovery"))
+    implementation(project(":cosky-spring-cloud-starter-config"))
+    implementation(project(":cosky-spring-cloud-starter-discovery"))
     implementation("com.google.guava:guava")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign")

gradle.properties

@@ -11,11 +11,12 @@
 # limitations under the License.
 #
 group=me.ahoo.cosky
-version=3.3.15
+version=4.0.0-M1
 description=High-performance, low-cost microservice governance platform. Service Discovery and Configuration Service.
 website=https://github.com/Ahoo-Wang/cosky
 issues=https://github.com/Ahoo-Wang/cosky/issues
 vcs=https://github.com/Ahoo-Wang/cosky.git
+
 license_name=The Apache Software License, Version 2.0
 license_url=https://www.apache.org/licenses/LICENSE-2.0.txt