Migrate to Java 21 and Spring Boot 3.3

Author: Romanow

README.md

@@ -37,36 +37,27 @@ Server Command
        find-all: Get all servers
 ```
 
-### Common modules
-
-* [API models](/api)
-* [Server Common](/common-server)
-* [Client Common](/common-client)
-
 ### RESTful
 
-* [RESTful Server](/restful)
-* [Rest Client](/rest-client)
-
-##### Запуск сервера
+Сервер:
 
 ```shell
 $ ./gradlew restful:bootRun
 ```
 
 Для просмотра API доступен [Swagger UI](http://localhost:8080/swagger-ui/index.html)
 
-##### Запуск клиента
+Клиент:
 
 ```shell
 $ java -jar rest-client/build/libs/rest-client.jar
 ```
 
 ### GraphQL
 
-* [GraphQL Server](/graphql)
+Протокол [servers.graphqls](graphql/src/main/resources/graphql/servers.graphqls).
 
-##### Запуск сервера
+Сервер:
 
 ```shell
 $ ./gradlew graphql:bootRun
@@ -76,34 +67,29 @@ $ ./gradlew graphql:bootRun
 
 ### gRPC
 
-* [gRPC Protocol](/grpc-protocol)
-* [gRPC Server](/grpc-server)
-* [gRPC Client](/grpc-client)
+Протокол [ServerService.proto](grpc-protocol/src/main/proto/ServerService.proto).
 
-##### Запуск сервера
+Сервер:
 
 ```shell
 $ ./gradlew grpc-server:bootRun
 ```
 
-##### Запуск клиента
+Клиент:
 
 ```shell
 $ java -jar grpc-client/build/libs/grpc-client.jar
 ```
 
 ### SOAP
 
-* [SOAP Server](/soap-server)
-* [SOAP Client](/soap-client)
-
-##### Запуск сервера
+Сервер:
 
 ```shell
 $ ./gradlew soap-server:bootRun
 ```
 
-##### Запуск клиента
+Клиент:
 
 ```shell
 $ java -jar soap-client/build/libs/soap-client.jar

common-client/build.gradle

@@ -8,7 +8,7 @@ dependencies {
 
     api "org.springframework.boot:spring-boot-starter"
     api "org.springframework.boot:spring-boot-starter-logging"
-    api "org.springframework.shell:spring-shell-starter"
+    api "org.springframework.shell:spring-shell-starter-jna"
 
     api "org.jetbrains:annotations:$jetbrainsAnnotationsVersion"
 }

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

@@ -1,3 +1,10 @@
+spring:
+  shell:
+    interactive:
+      enabled: true
+    script:
+      enabled: true
+
 application:
   services:
     server-url: http://localhost:8080

grpc-client/src/main/java/ru/romanow/protocols/grpc/service/GrpcServerClient.kt

@@ -12,10 +12,10 @@ import ru.romanow.protocols.grpc.ServerServiceModels.Purpose
 import ru.romanow.protocols.grpc.ServerServiceModels.StateInfo
 
 @Service
-class GrpcServerClient(
-    @GrpcClient("local-grpc-server")
-    private val serverService: ServerServiceBlockingStub
-) : ServerClient {
+class GrpcServerClient : ServerClient {
+
+    @GrpcClient("default")
+    private lateinit var serverService: ServerServiceBlockingStub
 
     override fun create(purpose: String): String {
         val request = CreateServerRequest.newBuilder()

grpc-client/src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 grpc:
   client:
-    local-grpc-server:
-      address: 'static://127.0.0.1:8080'
+    default:
+      address: "static://127.0.0.1:8080"
       negotiationType: plaintext