Migrate to Java 21 and Spring Boot 3.3

Author: Romanow

.github/dependabot.yml

@@ -0,0 +1,12 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "kotlin"
+        versions: [ "2.x" ]
+    commit-message:
+      prefix: "[deps]"

.github/workflows/build.yml

@@ -5,22 +5,16 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: "corretto"
-          java-version: "17"
+          java-version: "21"
           cache: "gradle"
 
-      - name: Build project
-        uses: eskatos/gradle-command-action@v1
-        with:
-          dependencies-cache-enabled: true
-          arguments: clean build
+      - name: Validate
+        uses: pre-commit/[email protected]
 
-      - name: Test Report
-        uses: mikepenz/action-junit-report@v2
-        if: always()
-        with:
-          report_paths: "**/build/test-results/test/TEST-*.xml"
+      - name: Build project
+        run: ./gradlew clean build

.gitignore

@@ -5,4 +5,4 @@
 out/
 bin/
 build/
-generated/
+generated/

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: check-merge-conflict
+      - id: check-case-conflict
+
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.5.4
+    hooks:
+      - id: remove-crlf
+      - id: remove-tabs

README.md

@@ -1,6 +1,7 @@
-# Протоколы обмена информацией
-
 [![Build project](https://github.com/Romanow/web-protocols/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/Romanow/web-protocols/actions/workflows/build.yml)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
+
+# Протоколы обмена информацией
 
 ## Сборка и запуск
 
@@ -106,4 +107,4 @@ $ ./gradlew soap-server:bootRun
 
 ```shell
 $ java -jar soap-client/build/libs/soap-client.jar
-```
+```

_config.yml

@@ -0,0 +1,16 @@
+title: Протоколы обмена информацией
+description: Примеры реализации основных протоколов REST, SOAP, gRPC, GraphQL
+author:
+  name: Romanow
+  email: [email protected]
+
+show_downloads: false
+remote_theme: jekyll/minima
+header_pages: ['']
+
+minima:
+  skin: classic
+  social_links:
+    - { platform: linkedin, user_url: "https://www.linkedin.com/company/it-enduro" }
+    - { platform: telegram, user_url: "https://t.me/romanowalex" }
+    - { platform: youtube, user_url: "https://www.youtube.com/@it_enduro" }

api/build.gradle

@@ -11,4 +11,4 @@ dependencies {
 
 noArg {
     annotation "ru.romanow.protocols.api.model.NoArgConstructor"
-}
+}

api/src/main/java/ru/romanow/protocols/api/model/CreateServerRequest.kt

@@ -27,4 +27,4 @@ data class CreateServerRequest(
     @field:XmlElement
     @NotNull(message = "{field.not.null}")
     val state: StateInfo? = null
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/ErrorDescription.kt

@@ -8,4 +8,4 @@ import jakarta.xml.bind.annotation.XmlElement
 data class ErrorDescription(
     @field:XmlElement val field: String,
     @field:XmlElement val error: String
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/ErrorResponse.kt

@@ -7,4 +7,4 @@ import jakarta.xml.bind.annotation.XmlElement
 @JacksonXmlRootElement(localName = "error")
 data class ErrorResponse(
     @field:XmlElement val message: String? = null
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/Purpose.kt

@@ -6,4 +6,4 @@ enum class Purpose {
 
 fun findPurpose(purpose: String): Purpose {
     return Purpose.values().first { it.name == purpose }
-}
+}

api/src/main/java/ru/romanow/protocols/api/model/ServerResponse.kt

@@ -11,4 +11,4 @@ data class ServerResponse(
     @field:XmlElement val latency: Int,
     @field:XmlElement val bandwidth: Int,
     @field:XmlElement val state: StateInfo
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/ServersResponse.kt

@@ -13,4 +13,4 @@ data class ServersResponse(
     @JacksonXmlProperty(localName = "server")
     @JacksonXmlElementWrapper(useWrapping = false)
     val servers: List<ServerResponse>
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/StateInfo.kt

@@ -17,4 +17,4 @@ data class StateInfo(
     @field:XmlElement
     @NotEmpty(message = "{field.not.empty}")
     val country: String? = null
-)
+)

api/src/main/java/ru/romanow/protocols/api/model/ValidationErrorResponse.kt

@@ -13,4 +13,4 @@ data class ValidationErrorResponse(
     @field:XmlElement
     @JacksonXmlElementWrapper(useWrapping = false)
     val error: List<ErrorDescription>
-)
+)

build.gradle

@@ -1,50 +1,50 @@
 plugins {
     id "idea"
-    id "org.jetbrains.kotlin.jvm" version "1.7.10"
-    id "org.jetbrains.kotlin.plugin.spring" version "1.7.10"
-    id "org.jetbrains.kotlin.plugin.jpa" version "1.7.10"
-    id "org.jetbrains.kotlin.plugin.noarg" version "1.7.10"
-    id "io.spring.dependency-management" version "1.1.0"
-    id "org.springframework.boot" version "3.0.4" apply false
-    id "org.springframework.cloud.contract" version "4.0.2" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.9.25"
+    id "org.jetbrains.kotlin.plugin.spring" version "1.9.25"
+    id "org.jetbrains.kotlin.plugin.jpa" version "1.9.25"
+    id "org.jetbrains.kotlin.plugin.noarg" version "1.9.25"
+    id "io.spring.dependency-management" version "1.1.6"
+    id "org.springframework.boot" version "3.3.6" apply false
+    id "org.springframework.cloud.contract" version "4.1.4" apply false
     id "org.asciidoctor.jvm.convert" version "3.3.2" apply false
     id "io.mateo.cxf-codegen" version "1.2.0" apply false
-    id "com.google.protobuf" version "0.9.2" apply false
+    id "com.google.protobuf" version "0.9.4" apply false
 }
 
 ext {
     // Common
-    springBootVersion = "3.0.4"
-    springContractVersion = "4.0.2"
-    springShellVersion = "3.0.1"
-    kotlinVersion = "1.7.10"
+    springBootVersion = "3.3.6"
+    springContractVersion = "4.1.4"
+    springShellVersion = "3.3.3"
+    kotlinVersion = "1.9.25"
     jetbrainsAnnotationsVersion = "22.0.0"
 
     // RESTful
     openApiVersion = "2.1.0"
-    logbookVersion = "3.0.0-RC.2"
+    logbookVersion = "3.10.0"
     springCloudContractVersion = "4.0.2"
 
     // SOAP
     cxfVersion = "4.0.0"
     jakartaVersion = "4.0.0"
 
     // gRPC
-    grpcVersion = "1.54.0"
-    protobufVersion = "3.22.2"
-    grpcSpringVersion = "5.0.0"
+    grpcVersion = "1.68.1"
+    protobufVersion = "4.28.3"
+    grpcSpringVersion = "3.1.0.RELEASE"
     javaxAnnotationVersion = "1.3.2"
 
     // Test
-    postgresContainerVersion = "1.17.6"
+    postgresContainerVersion = "1.20.4"
 }
 
 allprojects { ->
     apply plugin: "idea"
     apply plugin: "kotlin"
     apply plugin: "io.spring.dependency-management"
 
-    [compileKotlin, compileTestKotlin]*.kotlinOptions*.jvmTarget = "17"
+    [compileKotlin, compileTestKotlin]*.kotlinOptions*.jvmTarget = "21"
 
     repositories {
         mavenCentral()
@@ -79,7 +79,7 @@ allprojects { ->
         }
     }
 
-    tasks.withType(Jar).all {
+    tasks.withType(Jar).configureEach {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 }

common-client/build.gradle

@@ -11,4 +11,4 @@ dependencies {
     api "org.springframework.shell:spring-shell-starter"
 
     api "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
-}
+}

common-client/src/main/java/ru/romanow/protocols/common/client/CommonAutoConfiguration.kt

@@ -8,4 +8,4 @@ import ru.romanow.protocols.common.client.properties.ServiceUrlProperties
 @AutoConfiguration
 @ComponentScan("ru.romanow.protocols.common.client")
 @EnableConfigurationProperties(ServiceUrlProperties::class)
-class CommonAutoConfiguration
+class CommonAutoConfiguration

common-client/src/main/java/ru/romanow/protocols/common/client/commands/ServerCommand.kt

@@ -11,9 +11,7 @@ import org.springframework.stereotype.Component
 import ru.romanow.protocols.common.client.service.ServerClient
 
 @ShellComponent
-class ServerCommand(
-    private val serverClient: ServerClient
-) {
+class ServerCommand(private val serverClient: ServerClient) {
     private val logger = LoggerFactory.getLogger(ServerCommand::class.java)
 
     @ShellMethod(key = ["create"], value = "Create server", prefix = "-")
@@ -73,4 +71,4 @@ class ServerTypeProvider : ValueProvider {
     override fun complete(completionContext: CompletionContext): List<CompletionProposal> {
         return listOf("DATABASE", "BACKEND", "FRONTEND").map { CompletionProposal(it) }
     }
-}
+}

common-client/src/main/java/ru/romanow/protocols/common/client/properties/ServiceUrlProperties.kt

@@ -5,4 +5,4 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 @ConfigurationProperties("application.services")
 data class ServiceUrlProperties(
     val serverUrl: String
-)
+)

common-client/src/main/java/ru/romanow/protocols/common/client/service/ServerClient.kt

@@ -7,4 +7,4 @@ interface ServerClient {
     fun findInCity(city: String): String
     fun update(id: Int, purpose: String?, latency: Int?, bandwidth: Int?, city: String?, country: String?): String
     fun delete(id: Int)
-}
+}

common-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -13,4 +13,4 @@
       "description": "Server url."
     }
   ]
-}
+}

common-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-ru.romanow.protocols.common.client.CommonAutoConfiguration
+ru.romanow.protocols.common.client.CommonAutoConfiguration

common-client/src/main/resources/application-common.yml

@@ -1,3 +1,3 @@
 application:
   services:
-    server-url: http://localhost:8080
+    server-url: http://localhost:8080

common-server/build.gradle

@@ -7,10 +7,11 @@ dependencies {
     api project(":api")
 
     api "org.springframework.boot:spring-boot-starter-data-jpa"
+    api "org.springframework.boot:spring-boot-starter-actuator"
     api "org.springframework.boot:spring-boot-starter-logging"
 
     api "org.postgresql:postgresql"
-    api "org.flywaydb:flyway-core"
+    api "org.flywaydb:flyway-database-postgresql"
 
     api "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
-}
+}

common-server/src/main/java/ru/romanow/protocols/common/server/CommonAutoConfiguration.kt

@@ -9,4 +9,4 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 @ComponentScan("ru.romanow.protocols.common.server")
 @EntityScan("ru.romanow.protocols.common.server.domain")
 @EnableJpaRepositories("ru.romanow.protocols.common.server.repository")
-class CommonAutoConfiguration
+class CommonAutoConfiguration

common-server/src/main/java/ru/romanow/protocols/common/server/domain/Server.kt

@@ -55,4 +55,4 @@ data class Server(
     override fun toString(): String {
         return "Server(id=$id, purpose=$purpose, latency=$latency, bandwidth=$bandwidth)"
     }
-}
+}

common-server/src/main/java/ru/romanow/protocols/common/server/domain/State.kt

@@ -47,4 +47,4 @@ data class State(
     override fun toString(): String {
         return "State(id=$id, city=$city, country=$country)"
     }
-}
+}

common-server/src/main/java/ru/romanow/protocols/common/server/repository/ServerRepository.kt

@@ -9,4 +9,4 @@ interface ServerRepository : JpaRepository<Server, Int> {
 
     @Query("select s from Server s where s.state.city = :city")
     fun findInCity(@Param("city") city: String): List<Server>
-}
+}

common-server/src/main/java/ru/romanow/protocols/common/server/service/ServerService.kt

@@ -10,4 +10,4 @@ interface ServerService {
     fun create(request: CreateServerRequest): ServerResponse
     fun delete(id: Int)
     fun update(id: Int, request: CreateServerRequest): ServerResponse
-}
+}

common-server/src/main/java/ru/romanow/protocols/common/server/service/ServerServiceImpl.kt

@@ -76,4 +76,4 @@ class ServerServiceImpl(
                 country = server.state?.country
             )
         )
-}
+}

common-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-ru.romanow.protocols.common.server.CommonAutoConfiguration
+ru.romanow.protocols.common.server.CommonAutoConfiguration

common-server/src/main/resources/db/migration/V100__CreateServerAndStateTables.sql

@@ -16,4 +16,4 @@ CREATE TABLE servers
         CONSTRAINT fk_servers_state_id REFERENCES states (id)
 );
 
-CREATE INDEX idx_servers_state_id ON servers (state_id);
+CREATE INDEX idx_servers_state_id ON servers (state_id);

common-server/src/main/resources/db/migration/V200__InsertStatesAndServers.sql

@@ -7,4 +7,4 @@ INSERT INTO servers (bandwidth, latency, purpose, state_id)
 VALUES (10000, 10, 'BACKEND', 1),
        (5000, 5, 'DATABASE', 1),
        (5000, 5, 'FRONTEND', 1),
-       (5000, 5, 'BACKEND', 2);
+       (5000, 5, 'BACKEND', 2);

docker-compose.yml

@@ -14,4 +14,4 @@ services:
       - "5432:5432"
 
 volumes:
-  db-data:
+  db-data:

gradle.properties

@@ -1,3 +1,3 @@
 version=1.0.0
 group=ru.romanow.protocols
-org.gradle.daemon=true
+org.gradle.daemon=true