From b2625fe521f25f3b8f94883813cd086f00e345cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=80=C9=B4=E1=B4=9B=E1=B4=8F=C9=B4?= Date: Sat, 25 May 2024 04:24:49 +0300 Subject: [PATCH] 1.1.1 (#2) * Minor config updates * Kora Java GraalVM CRUD example added * Kora Java GraalVM CRUD example added * Kora Java GraalVM CRUD example added * Dependencies updated * Kora Java GraalVM CRUD JDBC example added * Kora Java GraalVM CRUD R2DBC example added * Kora Java GraalVM CRUD Cassandra example added * Kora Java GraalVM CRUD Vertx example added * Dependencies updated * GraalVM examples updated and stabilized * Minor improvements * Kafka GraalVM example added * Kafka GraalVM YAMl config support added Dependencies updated --- .github/workflows/test-master.yml | 2 +- .github/workflows/test-pr.yml | 2 +- build.gradle | 5 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 2 + gradlew | 29 +- gradlew.bat | 20 +- kora-java-cache-caffeine/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-cache-redis/build.gradle | 5 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../caffeine/RedisCachedServiceTests.java | 15 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-config-hocon/build.gradle | 3 +- .../kora/example/config/hocon/FooConfig.java | 8 +- .../src/main/resources/application.conf | 6 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-config-yaml/build.gradle | 3 +- .../kora/example/config/hocon/FooConfig.java | 8 +- .../src/main/resources/application.yaml | 6 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-crud/README.md | 2 +- kora-java-crud/build.gradle | 15 +- .../src/main/resources/application.conf | 6 +- kora-java-crud/src/main/resources/logback.xml | 2 + .../main/resources/openapi/http-server.yaml | 1 + .../kora/example/crud/AppContainer.java | 2 + .../kora/example/crud/PetControllerTests.java | 10 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-database-cassandra/build.gradle | 7 +- .../src/main/resources/application.conf | 14 +- .../src/main/resources/logback.xml | 2 + .../src/main/resources/migrations/setup.cql | 8 +- .../cassandra/CassandraCrudReactorTests.java | 10 +- .../cassandra/CassandraCrudSyncTests.java | 10 +- .../CassandraMapperParameterTests.java | 10 +- ...CassandraMapperResultSetReactiveTests.java | 10 +- .../CassandraMapperResultSetTests.java | 10 +- .../CassandraMapperRowColumnTests.java | 10 +- .../cassandra/CassandraMapperRowTests.java | 10 +- .../example/cassandra/CassandraUdtTests.java | 10 +- .../src/test/resources/logback-test.xml | 6 +- kora-java-database-jdbc/build.gradle | 10 +- .../src/main/resources/application.conf | 6 +- .../src/main/resources/logback.xml | 2 + .../example/jdbc/JdbcCrudMacrosTests.java | 8 +- .../example/jdbc/JdbcCrudReactorTests.java | 8 +- .../kora/example/jdbc/JdbcCrudSyncTests.java | 8 +- .../jdbc/JdbcIdRandomCompositeTests.java | 9 +- .../kora/example/jdbc/JdbcIdRandomTests.java | 10 +- .../jdbc/JdbcIdSequenceCompositeTests.java | 9 +- .../example/jdbc/JdbcIdSequenceTests.java | 8 +- .../kora/example/jdbc/JdbcJsonbTests.java | 8 +- .../example/jdbc/JdbcMapperColumnTests.java | 8 +- .../jdbc/JdbcMapperParameterTests.java | 8 +- .../jdbc/JdbcMapperResultSetTests.java | 8 +- .../kora/example/jdbc/JdbcMapperRowTests.java | 8 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-database-r2dbc/build.gradle | 11 +- .../src/main/resources/application.conf | 6 +- .../src/main/resources/logback.xml | 2 + .../example/r2dbc/R2dbcCrudMacrosTests.java | 8 +- .../example/r2dbc/R2dbcCrudSyncTests.java | 8 +- .../kora/example/r2dbc/R2dbcCrudTests.java | 8 +- .../example/r2dbc/R2dbcIdRandomTests.java | 10 +- .../example/r2dbc/R2dbcIdSequenceTests.java | 10 +- .../example/r2dbc/R2dbcMapperColumnTests.java | 8 +- .../r2dbc/R2dbcMapperParameterTests.java | 8 +- .../example/r2dbc/R2dbcMapperRowTests.java | 8 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-database-vertx/build.gradle | 9 +- .../src/main/resources/application.conf | 6 +- .../src/main/resources/logback.xml | 2 + .../example/vertx/VertxCrudReactorTests.java | 8 +- .../example/vertx/VertxCrudSyncTests.java | 8 +- .../example/vertx/VertxMapperColumnTests.java | 8 +- .../vertx/VertxMapperParameterTests.java | 8 +- .../vertx/VertxMapperResultSetTests.java | 8 +- .../example/vertx/VertxMapperRowTests.java | 8 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-graalvm-crud-cassandra/Dockerfile | 25 ++ kora-java-graalvm-crud-cassandra/README.md | 49 +++ kora-java-graalvm-crud-cassandra/build.gradle | 179 ++++++++++ .../gradle.properties | 16 + .../graalvm/crud/cassandra/Application.java | 36 ++ .../controller/HttpExceptionHandler.java | 42 +++ .../cassandra/controller/PetDelegate.java | 86 +++++ .../graalvm/crud/cassandra/model/dao/Pet.java | 27 ++ .../cassandra/model/mapper/PetMapper.java | 18 + .../cassandra/repository/PetRepository.java | 27 ++ .../mapper/PetStatusParameterMapper.java | 20 ++ .../mapper/PetStatusResultMapper.java | 24 ++ .../crud/cassandra/service/PetCache.java | 11 + .../crud/cassandra/service/PetService.java | 75 +++++ .../src/main/resources/application.conf | 75 +++++ .../src/main/resources/logback.xml | 20 ++ .../src/main/resources/migrations/setup.cql | 8 + .../main/resources/openapi/http-server.yaml | 315 ++++++++++++++++++ .../graalvm/crud/cassandra/AppContainer.java | 47 +++ .../crud/cassandra/PetControllerTests.java | 220 ++++++++++++ .../crud/cassandra/PetServiceTests.java | 112 +++++++ .../src/test/resources/logback-test.xml | 24 ++ kora-java-graalvm-crud-jdbc/Dockerfile | 25 ++ kora-java-graalvm-crud-jdbc/README.md | 49 +++ kora-java-graalvm-crud-jdbc/build.gradle | 180 ++++++++++ kora-java-graalvm-crud-jdbc/gradle.properties | 6 + .../graalvm/crud/jdbc/Application.java | 36 ++ .../jdbc/controller/HttpExceptionHandler.java | 42 +++ .../crud/jdbc/controller/PetDelegate.java | 79 +++++ .../graalvm/crud/jdbc/model/dao/Pet.java | 25 ++ .../crud/jdbc/model/dao/PetCategory.java | 8 + .../crud/jdbc/model/dao/PetWithCategory.java | 14 + .../crud/jdbc/model/mapper/PetMapper.java | 15 + .../jdbc/repository/CategoryRepository.java | 22 ++ .../crud/jdbc/repository/PetRepository.java | 32 ++ .../mapper/PetStatusParameterMapper.java | 21 ++ .../mapper/PetStatusResultMapper.java | 25 ++ .../graalvm/crud/jdbc/service/PetCache.java | 10 + .../graalvm/crud/jdbc/service/PetService.java | 94 ++++++ .../src/main/resources/application.conf | 60 ++++ .../db/migration/V1__setup-tables.sql | 16 + .../src/main/resources/logback.xml | 20 ++ .../main/resources/openapi/http-server.yaml | 315 ++++++++++++++++++ .../graalvm/crud/jdbc/AppContainer.java | 47 +++ .../graalvm/crud/jdbc/PetControllerTests.java | 210 ++++++++++++ .../graalvm/crud/jdbc/PetServiceTests.java | 123 +++++++ .../src/test/resources/logback-test.xml | 24 ++ kora-java-graalvm-crud-r2dbc/Dockerfile | 25 ++ kora-java-graalvm-crud-r2dbc/README.md | 49 +++ kora-java-graalvm-crud-r2dbc/build.gradle | 182 ++++++++++ .../gradle.properties | 6 + .../graalvm/crud/r2dbc/Application.java | 36 ++ .../controller/HttpExceptionHandler.java | 42 +++ .../crud/r2dbc/controller/PetDelegate.java | 82 +++++ .../graalvm/crud/r2dbc/model/dao/Pet.java | 25 ++ .../crud/r2dbc/model/dao/PetCategory.java | 8 + .../crud/r2dbc/model/dao/PetWithCategory.java | 18 + .../crud/r2dbc/model/mapper/PetMapper.java | 15 + .../r2dbc/repository/CategoryRepository.java | 23 ++ .../crud/r2dbc/repository/PetRepository.java | 32 ++ .../mapper/PetStatusParameterMapper.java | 20 ++ .../mapper/PetStatusResultMapper.java | 24 ++ .../graalvm/crud/r2dbc/service/PetCache.java | 10 + .../crud/r2dbc/service/PetService.java | 91 +++++ .../src/main/resources/application.conf | 60 ++++ .../db/migration/V1__setup-tables.sql | 16 + .../src/main/resources/logback.xml | 20 ++ .../main/resources/openapi/http-server.yaml | 315 ++++++++++++++++++ .../graalvm/crud/r2dbc/AppContainer.java | 47 +++ .../crud/r2dbc/PetControllerTests.java | 211 ++++++++++++ .../graalvm/crud/r2dbc/PetServiceTests.java | 127 +++++++ .../src/test/resources/logback-test.xml | 24 ++ kora-java-graalvm-crud-vertx/Dockerfile | 25 ++ kora-java-graalvm-crud-vertx/README.md | 49 +++ kora-java-graalvm-crud-vertx/build.gradle | 184 ++++++++++ .../gradle.properties | 6 + .../graalvm/crud/vertx/Application.java | 36 ++ .../controller/HttpExceptionHandler.java | 43 +++ .../crud/vertx/controller/PetDelegate.java | 93 ++++++ .../graalvm/crud/vertx/model/dao/Pet.java | 25 ++ .../crud/vertx/model/dao/PetCategory.java | 8 + .../crud/vertx/model/dao/PetWithCategory.java | 14 + .../crud/vertx/model/mapper/PetMapper.java | 15 + .../vertx/repository/CategoryRepository.java | 21 ++ .../crud/vertx/repository/PetRepository.java | 30 ++ .../mapper/PetStatusParameterMapper.java | 19 ++ .../mapper/PetStatusResultMapper.java | 23 ++ .../graalvm/crud/vertx/service/PetCache.java | 10 + .../crud/vertx/service/PetService.java | 91 +++++ .../src/main/resources/application.conf | 60 ++++ .../db/migration/V1__setup-tables.sql | 16 + .../src/main/resources/logback.xml | 20 ++ .../main/resources/openapi/http-server.yaml | 315 ++++++++++++++++++ .../graalvm/crud/vertx/AppContainer.java | 47 +++ .../crud/vertx/PetControllerTests.java | 210 ++++++++++++ .../graalvm/crud/vertx/PetServiceTests.java | 127 +++++++ .../src/test/resources/logback-test.xml | 24 ++ kora-java-graalvm-kafka/Dockerfile | 25 ++ kora-java-graalvm-kafka/README.md | 34 ++ kora-java-graalvm-kafka/build.gradle | 137 ++++++++ kora-java-graalvm-kafka/gradle.properties | 2 + .../example/graalvm/kafka/Application.java | 26 ++ .../example/graalvm/kafka/TaskPublisher.java | 14 + .../example/graalvm/kafka/UserListener.java | 24 ++ .../src/main/resources/application.yaml | 24 ++ .../src/main/resources/logback.xml | 20 ++ .../example/graalvm/kafka/AppContainer.java | 47 +++ .../graalvm/kafka/UserListenerTests.java | 46 +++ .../src/test/resources/logback-test.xml | 24 ++ kora-java-grpc-client/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-grpc-server/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-helloworld/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../kora/example/helloworld/AppContainer.java | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-http-client/build.gradle | 7 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../http/client/FormHttpClientTests.java | 16 +- .../client/InterceptedHttpClientTests.java | 12 +- .../http/client/JsonHttpClientTests.java | 16 +- .../client/MapperRequestHttpClientTests.java | 12 +- .../client/MapperResponseHttpClientTests.java | 12 +- .../client/ParametersHttpClientTests.java | 12 +- .../http/client/ReactorHttpClientTests.java | 12 +- .../http/client/VoidHttpClientTests.java | 12 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-http-server/build.gradle | 5 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../InterceptedControllerTests.java | 3 +- .../httpserver/JsonPostControllerTests.java | 4 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-kafka/build.gradle | 5 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + ...utoCommitRecordExceptionListenerTests.java | 5 +- .../AutoCommitRecordJsonListenerTests.java | 6 +- .../AutoCommitRecordListenerTests.java | 6 +- .../AutoCommitRecordMapperListenerTests.java | 6 +- .../AutoCommitRecordsListenerTests.java | 6 +- ...toCommitRecordsTelemetryListenerTests.java | 2 +- ...AutoCommitValueExceptionListenerTests.java | 6 +- .../AutoCommitValueJsonListenerTests.java | 6 +- ...utoCommitValueKeyHeadersListenerTests.java | 6 +- .../AutoCommitValueKeyListenerTests.java | 6 +- .../AutoCommitValueListenerTests.java | 6 +- .../AutoCommitValueMapperListenerTests.java | 6 +- .../ManualCommitRecordListenerTests.java | 6 +- .../publisher/ProducerJsonPublisherTests.java | 6 +- .../ProducerMapperPublisherTests.java | 6 +- .../publisher/ProducerPublisherTests.java | 6 +- .../publisher/TopicJsonPublisherTests.java | 6 +- .../TopicKeyHeadersPublisherTests.java | 6 +- .../publisher/TopicKeyPublisherTests.java | 6 +- .../publisher/TopicMapperPublisherTests.java | 6 +- .../kafka/publisher/TopicPublisherTests.java | 6 +- .../TransactionalPublisherTests.java | 3 +- .../src/test/resources/logback-test.xml | 4 +- .../build.gradle | 8 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../main/resources/openapi/petstoreV3.yaml | 1 + .../http/client/HttpClientPetV2Tests.java | 12 +- .../http/client/HttpClientPetV3Tests.java | 12 +- .../src/test/resources/logback-test.xml | 5 +- .../build.gradle | 8 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../main/resources/openapi/petstoreV3.yaml | 1 + .../src/test/resources/logback-test.xml | 5 +- kora-java-resilient/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-scheduling-jdk/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-scheduling-quartz/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-soap-client/build.gradle | 5 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../soap/client/SimpleServiceTests.java | 12 +- .../src/test/resources/logback-test.xml | 5 +- kora-java-telemetry/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../kora/example/telemetry/AppContainer.java | 2 + .../src/test/resources/logback-test.xml | 5 +- kora-java-validation/build.gradle | 3 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../validation/ArgumentValidatorTests.java | 4 +- .../validation/ResultValidatorTests.java | 2 +- .../src/test/resources/logback-test.xml | 5 +- kora-kotlin-crud/README.md | 2 +- kora-kotlin-crud/build.gradle.kts | 4 +- .../src/main/resources/application.conf | 6 +- .../src/main/resources/logback.xml | 2 + .../main/resources/openapi/http-server.yaml | 1 + .../kora/kotlin/example/crud/AppContainer.kt | 2 + .../kotlin/example/crud/PetControllerTests.kt | 10 +- .../src/test/resources/logback-test.xml | 5 +- kora-kotlin-helloworld/build.gradle.kts | 4 +- .../src/main/resources/application.conf | 4 +- .../src/main/resources/logback.xml | 2 + .../src/test/resources/logback-test.xml | 5 +- settings.gradle | 6 + 305 files changed, 6977 insertions(+), 570 deletions(-) create mode 100644 kora-java-graalvm-crud-cassandra/Dockerfile create mode 100644 kora-java-graalvm-crud-cassandra/README.md create mode 100644 kora-java-graalvm-crud-cassandra/build.gradle create mode 100644 kora-java-graalvm-crud-cassandra/gradle.properties create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/Application.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/HttpExceptionHandler.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/PetDelegate.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/dao/Pet.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/mapper/PetMapper.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/PetRepository.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusParameterMapper.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusResultMapper.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetCache.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetService.java create mode 100644 kora-java-graalvm-crud-cassandra/src/main/resources/application.conf create mode 100644 kora-java-graalvm-crud-cassandra/src/main/resources/logback.xml create mode 100644 kora-java-graalvm-crud-cassandra/src/main/resources/migrations/setup.cql create mode 100644 kora-java-graalvm-crud-cassandra/src/main/resources/openapi/http-server.yaml create mode 100644 kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/AppContainer.java create mode 100644 kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetControllerTests.java create mode 100644 kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetServiceTests.java create mode 100644 kora-java-graalvm-crud-cassandra/src/test/resources/logback-test.xml create mode 100644 kora-java-graalvm-crud-jdbc/Dockerfile create mode 100644 kora-java-graalvm-crud-jdbc/README.md create mode 100644 kora-java-graalvm-crud-jdbc/build.gradle create mode 100644 kora-java-graalvm-crud-jdbc/gradle.properties create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/Application.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/HttpExceptionHandler.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/PetDelegate.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/Pet.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetCategory.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetWithCategory.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/mapper/PetMapper.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/CategoryRepository.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/PetRepository.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusParameterMapper.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusResultMapper.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetCache.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetService.java create mode 100644 kora-java-graalvm-crud-jdbc/src/main/resources/application.conf create mode 100644 kora-java-graalvm-crud-jdbc/src/main/resources/db/migration/V1__setup-tables.sql create mode 100644 kora-java-graalvm-crud-jdbc/src/main/resources/logback.xml create mode 100644 kora-java-graalvm-crud-jdbc/src/main/resources/openapi/http-server.yaml create mode 100644 kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/AppContainer.java create mode 100644 kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetControllerTests.java create mode 100644 kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetServiceTests.java create mode 100644 kora-java-graalvm-crud-jdbc/src/test/resources/logback-test.xml create mode 100644 kora-java-graalvm-crud-r2dbc/Dockerfile create mode 100644 kora-java-graalvm-crud-r2dbc/README.md create mode 100644 kora-java-graalvm-crud-r2dbc/build.gradle create mode 100644 kora-java-graalvm-crud-r2dbc/gradle.properties create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/Application.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/HttpExceptionHandler.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/PetDelegate.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/Pet.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetCategory.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetWithCategory.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/mapper/PetMapper.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/CategoryRepository.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/PetRepository.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusParameterMapper.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusResultMapper.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetCache.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetService.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/resources/application.conf create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/resources/db/migration/V1__setup-tables.sql create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/resources/logback.xml create mode 100644 kora-java-graalvm-crud-r2dbc/src/main/resources/openapi/http-server.yaml create mode 100644 kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/AppContainer.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetControllerTests.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetServiceTests.java create mode 100644 kora-java-graalvm-crud-r2dbc/src/test/resources/logback-test.xml create mode 100644 kora-java-graalvm-crud-vertx/Dockerfile create mode 100644 kora-java-graalvm-crud-vertx/README.md create mode 100644 kora-java-graalvm-crud-vertx/build.gradle create mode 100644 kora-java-graalvm-crud-vertx/gradle.properties create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/Application.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/HttpExceptionHandler.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/PetDelegate.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/Pet.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetCategory.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetWithCategory.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/mapper/PetMapper.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/CategoryRepository.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/PetRepository.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusParameterMapper.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusResultMapper.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetCache.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetService.java create mode 100644 kora-java-graalvm-crud-vertx/src/main/resources/application.conf create mode 100644 kora-java-graalvm-crud-vertx/src/main/resources/db/migration/V1__setup-tables.sql create mode 100644 kora-java-graalvm-crud-vertx/src/main/resources/logback.xml create mode 100644 kora-java-graalvm-crud-vertx/src/main/resources/openapi/http-server.yaml create mode 100644 kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/AppContainer.java create mode 100644 kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetControllerTests.java create mode 100644 kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetServiceTests.java create mode 100644 kora-java-graalvm-crud-vertx/src/test/resources/logback-test.xml create mode 100644 kora-java-graalvm-kafka/Dockerfile create mode 100644 kora-java-graalvm-kafka/README.md create mode 100644 kora-java-graalvm-kafka/build.gradle create mode 100644 kora-java-graalvm-kafka/gradle.properties create mode 100644 kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/Application.java create mode 100644 kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/TaskPublisher.java create mode 100644 kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/UserListener.java create mode 100644 kora-java-graalvm-kafka/src/main/resources/application.yaml create mode 100644 kora-java-graalvm-kafka/src/main/resources/logback.xml create mode 100644 kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/AppContainer.java create mode 100644 kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/UserListenerTests.java create mode 100644 kora-java-graalvm-kafka/src/test/resources/logback-test.xml diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml index 06dcbc3..2a76840 100644 --- a/.github/workflows/test-master.yml +++ b/.github/workflows/test-master.yml @@ -23,4 +23,4 @@ jobs: run: "./gradlew testClasses" - name: Test - run: "./gradlew test" + run: "./gradlew test jacocoTestReport --no-parallel" diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 717277f..1bf0de3 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -34,7 +34,7 @@ jobs: run: "./gradlew testClasses" - name: Test - run: "./gradlew test jacocoTestReport" + run: "./gradlew test jacocoTestReport --no-parallel" - name: Test Report if: matrix.java == '17' diff --git a/build.gradle b/build.gradle index 0726a35..d6ad895 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id "com.diffplug.spotless" version "6.19.0" + id "org.graalvm.buildtools.native" version "0.10.1" // or dependsOn fails in graalvm examples id "com.asarkar.gradle.build-time-tracker" version "4.3.0" } @@ -9,6 +10,7 @@ version = koraVersion repositories { mavenLocal() mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } subprojects { @@ -22,6 +24,7 @@ subprojects { repositories { mavenLocal() mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } spotless { @@ -35,7 +38,7 @@ subprojects { } configurations { - all { + configureEach { resolutionStrategy { cacheChangingModulesFor 0, "seconds" // check for updates every build } diff --git a/gradle.properties b/gradle.properties index fdec7f2..2eecb93 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ groupId=ru.tinkoff.kora -koraVersion=1.0.9 +koraVersion=1.1.1 ##### GRADLE ##### diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..d64cd4917707c1f8861d8cb53dd15194d4248596 100644 GIT binary patch literal 43462 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 literal 61574 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 ScNgau(U?ep-K_E5zy1%ZQTdPn diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/kora-java-cache-caffeine/build.gradle b/kora-java-cache-caffeine/build.gradle index d23a0e8..c455d8f 100644 --- a/kora-java-cache-caffeine/build.gradle +++ b/kora-java-cache-caffeine/build.gradle @@ -68,13 +68,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-cache-caffeine/src/main/resources/application.conf b/kora-java-cache-caffeine/src/main/resources/application.conf index 1cb02f8..81540ee 100644 --- a/kora-java-cache-caffeine/src/main/resources/application.conf +++ b/kora-java-cache-caffeine/src/main/resources/application.conf @@ -5,6 +5,6 @@ my-cache { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-cache-caffeine/src/main/resources/logback.xml b/kora-java-cache-caffeine/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-cache-caffeine/src/main/resources/logback.xml +++ b/kora-java-cache-caffeine/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-cache-caffeine/src/test/resources/logback-test.xml b/kora-java-cache-caffeine/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-cache-caffeine/src/test/resources/logback-test.xml +++ b/kora-java-cache-caffeine/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-cache-redis/build.gradle b/kora-java-cache-redis/build.gradle index 108fa48..0690ced 100644 --- a/kora-java-cache-redis/build.gradle +++ b/kora-java-cache-redis/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-redis:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-redis:0.11.0" testImplementation "redis.clients:jedis:4.4.3" } @@ -70,13 +70,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-cache-redis/src/main/resources/application.conf b/kora-java-cache-redis/src/main/resources/application.conf index 757489c..8b29348 100644 --- a/kora-java-cache-redis/src/main/resources/application.conf +++ b/kora-java-cache-redis/src/main/resources/application.conf @@ -16,6 +16,6 @@ lettuce { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-cache-redis/src/main/resources/logback.xml b/kora-java-cache-redis/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-cache-redis/src/main/resources/logback.xml +++ b/kora-java-cache-redis/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-cache-redis/src/test/java/ru/tinkoff/kora/example/cache/caffeine/RedisCachedServiceTests.java b/kora-java-cache-redis/src/test/java/ru/tinkoff/kora/example/cache/caffeine/RedisCachedServiceTests.java index 5769b5d..91e6a8b 100644 --- a/kora-java-cache-redis/src/test/java/ru/tinkoff/kora/example/cache/caffeine/RedisCachedServiceTests.java +++ b/kora-java-cache-redis/src/test/java/ru/tinkoff/kora/example/cache/caffeine/RedisCachedServiceTests.java @@ -4,13 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.redis.*; +import io.goodforgod.testcontainers.extensions.redis.ConnectionRedis; +import io.goodforgod.testcontainers.extensions.redis.RedisConnection; +import io.goodforgod.testcontainers.extensions.redis.TestcontainersRedis; import java.math.BigDecimal; -import java.time.Duration; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.testcontainers.utility.DockerImageName; import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier; import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; @@ -20,11 +20,7 @@ @KoraAppTest(Application.class) class RedisCachedServiceTests implements KoraAppTestConfigModifier { - @ContainerRedis - private static final RedisContainer CONTAINER = new RedisContainer<>(DockerImageName.parse("redis:7.2-alpine")) - .waitAfterStart(Duration.ofSeconds(1)); - - @ContainerRedisConnection + @ConnectionRedis private RedisConnection connection; @TestComponent @@ -42,7 +38,8 @@ public KoraConfigModification config() { } @BeforeEach - void cleanup() { + void cleanup() throws Exception { + Thread.sleep(150); cache.invalidateAll(); } diff --git a/kora-java-cache-redis/src/test/resources/logback-test.xml b/kora-java-cache-redis/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-cache-redis/src/test/resources/logback-test.xml +++ b/kora-java-cache-redis/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-config-hocon/build.gradle b/kora-java-config-hocon/build.gradle index d0ca9be..0eb3772 100644 --- a/kora-java-config-hocon/build.gradle +++ b/kora-java-config-hocon/build.gradle @@ -68,13 +68,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-config-hocon/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java b/kora-java-config-hocon/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java index bed9a6d..9489f54 100644 --- a/kora-java-config-hocon/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java +++ b/kora-java-config-hocon/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java @@ -1,6 +1,8 @@ package ru.tinkoff.kora.example.config.hocon; import jakarta.annotation.Nullable; +import java.math.BigDecimal; +import java.math.BigInteger; import java.time.*; import java.util.*; import java.util.regex.Pattern; @@ -46,13 +48,11 @@ public interface FooConfig { long valueLong(); - // TODO 1.0.5 - // BigInteger valueBigInt(); + BigInteger valueBigInt(); double valueDouble(); - // TODO 1.0.5 - // BigDecimal valueBigDecimal(); + BigDecimal valueBigDecimal(); boolean valueBoolean(); diff --git a/kora-java-config-hocon/src/main/resources/application.conf b/kora-java-config-hocon/src/main/resources/application.conf index 40b842b..e60e9ee 100644 --- a/kora-java-config-hocon/src/main/resources/application.conf +++ b/kora-java-config-hocon/src/main/resources/application.conf @@ -18,11 +18,9 @@ foo { valueDuration = "250s" valueInt = 1 valueLong = 2 - //TODO 1.0.5 -// valueBigInt = 3 + valueBigInt = 3 valueDouble = 4.1 - //TODO 1.0.5 -// valueBigDecimal = 5.1 + valueBigDecimal = 5.1 valueBoolean = true valueListAsString = "v1,v2" valueListAsArray = ["v1", "v2"] diff --git a/kora-java-config-hocon/src/main/resources/logback.xml b/kora-java-config-hocon/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-config-hocon/src/main/resources/logback.xml +++ b/kora-java-config-hocon/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-config-hocon/src/test/resources/logback-test.xml b/kora-java-config-hocon/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-config-hocon/src/test/resources/logback-test.xml +++ b/kora-java-config-hocon/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-config-yaml/build.gradle b/kora-java-config-yaml/build.gradle index 7526cc5..61cb4de 100644 --- a/kora-java-config-yaml/build.gradle +++ b/kora-java-config-yaml/build.gradle @@ -68,13 +68,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-config-yaml/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java b/kora-java-config-yaml/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java index bed9a6d..9489f54 100644 --- a/kora-java-config-yaml/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java +++ b/kora-java-config-yaml/src/main/java/ru/tinkoff/kora/example/config/hocon/FooConfig.java @@ -1,6 +1,8 @@ package ru.tinkoff.kora.example.config.hocon; import jakarta.annotation.Nullable; +import java.math.BigDecimal; +import java.math.BigInteger; import java.time.*; import java.util.*; import java.util.regex.Pattern; @@ -46,13 +48,11 @@ public interface FooConfig { long valueLong(); - // TODO 1.0.5 - // BigInteger valueBigInt(); + BigInteger valueBigInt(); double valueDouble(); - // TODO 1.0.5 - // BigDecimal valueBigDecimal(); + BigDecimal valueBigDecimal(); boolean valueBoolean(); diff --git a/kora-java-config-yaml/src/main/resources/application.yaml b/kora-java-config-yaml/src/main/resources/application.yaml index 84a11b3..e276c32 100644 --- a/kora-java-config-yaml/src/main/resources/application.yaml +++ b/kora-java-config-yaml/src/main/resources/application.yaml @@ -18,11 +18,9 @@ foo: valueDuration: "250s" valueInt: 1 valueLong: 2 - #TODO 1.0.5 -# valueBigInt: 3 + valueBigInt: 3 valueDouble: 4.1 - #TODO 1.0.5 -# valueBigDecimal: 5.1 + valueBigDecimal: 5.1 valueBoolean: true valueListAsString: "v1,v2" valueListAsArray: ["v1", "v2"] diff --git a/kora-java-config-yaml/src/main/resources/logback.xml b/kora-java-config-yaml/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-config-yaml/src/main/resources/logback.xml +++ b/kora-java-config-yaml/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-config-yaml/src/test/resources/logback-test.xml b/kora-java-config-yaml/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-config-yaml/src/test/resources/logback-test.xml +++ b/kora-java-config-yaml/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-crud/README.md b/kora-java-crud/README.md index a833051..d986333 100644 --- a/kora-java-crud/README.md +++ b/kora-java-crud/README.md @@ -1,6 +1,6 @@ # Kora Java CRUD Service -Пример сервиса реализованного на Kora с HTTP [CRUD](https://appmaster.io/ru/blog/grubye-operatsii-chto-takoe-grubye-operatsii) API, +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою. В примере использовались модули: diff --git a/kora-java-crud/build.gradle b/kora-java-crud/build.gradle index 5fa2863..a24676d 100644 --- a/kora-java-crud/build.gradle +++ b/kora-java-crud/build.gradle @@ -42,7 +42,6 @@ dependencies { implementation "ru.tinkoff.kora:micrometer-module" implementation "ru.tinkoff.kora:json-module" implementation "ru.tinkoff.kora:validation-module" - implementation "ru.tinkoff.kora:validation-common" implementation "ru.tinkoff.kora:cache-caffeine" implementation "ru.tinkoff.kora:resilient-kora" implementation "ru.tinkoff.kora:config-hocon" @@ -50,19 +49,18 @@ dependencies { implementation "ru.tinkoff.kora:logging-logback" implementation "org.mapstruct:mapstruct:1.5.5.Final" - implementation "org.postgresql:postgresql:42.6.0" + implementation "org.postgresql:postgresql:42.7.2" testImplementation "org.json:json:20231013" testImplementation "org.skyscreamer:jsonassert:1.5.1" testImplementation "org.mockito:mockito-core:5.6.0" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" testImplementation "org.testcontainers:junit-jupiter:1.17.6" } -// OpenAPI Generator for HTTP Server -tasks.register("openApiGenerateHttpServer", GenerateTask) { +openApiGenerate { generatorName = "kora" group = "openapi tools" inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" @@ -71,12 +69,12 @@ tasks.register("openApiGenerateHttpServer", GenerateTask) { modelPackage = "ru.tinkoff.kora.example.crud.openapi.http.server.model" invokerPackage = "ru.tinkoff.kora.example.crud.openapi.http.server.invoker" configOptions = [ - mode : "java-server", // так же есть java_server вариация HTTP Server"а + mode : "java-server", // так же есть java-server вариация HTTP Server"а enableServerValidation: "true" ] } -compileJava.dependsOn tasks.openApiGenerateHttpServer +compileJava.dependsOn tasks.openApiGenerate test.dependsOn tasks.shadowJar //noinspection GroovyAssignabilityCheck @@ -128,13 +126,12 @@ flyway { locations = ["classpath:db/migration"] } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-crud/src/main/resources/application.conf b/kora-java-crud/src/main/resources/application.conf index 6047c88..08f5f45 100644 --- a/kora-java-crud/src/main/resources/application.conf +++ b/kora-java-crud/src/main/resources/application.conf @@ -9,7 +9,7 @@ db { username = ${POSTGRES_USER} password = ${POSTGRES_PASS} maxPoolSize = 10 - poolName = "example" + poolName = "kora" initializationFailTimeout = "10s" } @@ -55,6 +55,6 @@ resilient { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-crud/src/main/resources/logback.xml b/kora-java-crud/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-crud/src/main/resources/logback.xml +++ b/kora-java-crud/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-crud/src/main/resources/openapi/http-server.yaml b/kora-java-crud/src/main/resources/openapi/http-server.yaml index 8851744..8d99f49 100644 --- a/kora-java-crud/src/main/resources/openapi/http-server.yaml +++ b/kora-java-crud/src/main/resources/openapi/http-server.yaml @@ -79,6 +79,7 @@ paths: type: integer format: int64 nullable: false + minimum: 1 responses: '200': description: successful operation diff --git a/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/AppContainer.java b/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/AppContainer.java index a222a98..6d1e115 100644 --- a/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/AppContainer.java +++ b/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/AppContainer.java @@ -2,6 +2,7 @@ import java.net.URI; import java.nio.file.Paths; +import java.time.Duration; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; @@ -31,6 +32,7 @@ public static AppContainer build() { protected void configure() { super.configure(); withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); } diff --git a/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/PetControllerTests.java b/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/PetControllerTests.java index 4bd0700..fa979dc 100644 --- a/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/PetControllerTests.java +++ b/kora-java-crud/src/test/java/ru/tinkoff/kora/example/crud/PetControllerTests.java @@ -4,10 +4,10 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.Network; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; @@ -20,7 +20,7 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( network = @Network(shared = true), mode = ContainerMode.PER_RUN, migration = @Migration( @@ -32,11 +32,11 @@ class PetControllerTests { private static final AppContainer container = AppContainer.build() .withNetwork(org.testcontainers.containers.Network.SHARED); - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @BeforeAll - public static void setup(@ContainerPostgresConnection JdbcConnection connection) { + public static void setup(@ConnectionPostgreSQL JdbcConnection connection) { var params = connection.paramsInNetwork().orElseThrow(); container.withEnv(Map.of( "POSTGRES_JDBC_URL", params.jdbcUrl(), diff --git a/kora-java-crud/src/test/resources/logback-test.xml b/kora-java-crud/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-crud/src/test/resources/logback-test.xml +++ b/kora-java-crud/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-database-cassandra/build.gradle b/kora-java-database-cassandra/build.gradle index 6fb03fb..410e88c 100644 --- a/kora-java-database-cassandra/build.gradle +++ b/kora-java-database-cassandra/build.gradle @@ -27,13 +27,13 @@ dependencies { annotationProcessor "ru.tinkoff.kora:annotation-processors" implementation "ru.tinkoff.kora:database-cassandra" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.11.0" } //noinspection GroovyAssignabilityCheck @@ -74,13 +74,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-database-cassandra/src/main/resources/application.conf b/kora-java-database-cassandra/src/main/resources/application.conf index 4e30017..1438826 100644 --- a/kora-java-database-cassandra/src/main/resources/application.conf +++ b/kora-java-database-cassandra/src/main/resources/application.conf @@ -1,12 +1,12 @@ cassandra { auth { - login = ${?CASSANDRA_USER} - password = ${?CASSANDRA_PASS} + login = ${CASSANDRA_USER} + password = ${CASSANDRA_PASS} } basic { - contactPoints = ${?CASSANDRA_CONTACT_POINTS} - dc = ${?CASSANDRA_DC} - sessionKeyspace = ${?CASSANDRA_KEYSPACE} + contactPoints = ${CASSANDRA_CONTACT_POINTS} + dc = ${CASSANDRA_DC} + sessionKeyspace = ${CASSANDRA_KEYSPACE} request { timeout = 5s } @@ -16,6 +16,6 @@ cassandra { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-database-cassandra/src/main/resources/logback.xml b/kora-java-database-cassandra/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-database-cassandra/src/main/resources/logback.xml +++ b/kora-java-database-cassandra/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-database-cassandra/src/main/resources/migrations/setup.cql b/kora-java-database-cassandra/src/main/resources/migrations/setup.cql index 87fe9d3..68acc94 100644 --- a/kora-java-database-cassandra/src/main/resources/migrations/setup.cql +++ b/kora-java-database-cassandra/src/main/resources/migrations/setup.cql @@ -1,6 +1,4 @@ -CREATE KEYSPACE IF NOT EXISTS cassandra WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}; - -CREATE TABLE IF NOT EXISTS cassandra.entities +CREATE TABLE IF NOT EXISTS entities ( id VARCHAR, value1 INT, @@ -10,10 +8,10 @@ CREATE TABLE IF NOT EXISTS cassandra.entities ); -CREATE TYPE IF NOT EXISTS cassandra.username(first text, last text); +CREATE TYPE IF NOT EXISTS username(first text, last text); -CREATE TABLE IF NOT EXISTS cassandra.entities_udt +CREATE TABLE IF NOT EXISTS entities_udt ( id VARCHAR, name FROZEN, diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudReactorTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudReactorTests.java index 8c8ea1e..90ac21d 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudReactorTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudReactorTests.java @@ -4,7 +4,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.time.Duration; @@ -20,13 +20,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraCrudReactorTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -36,11 +36,11 @@ class CassandraCrudReactorTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudSyncTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudSyncTests.java index baf3ac9..31b4488 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudSyncTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraCrudSyncTests.java @@ -4,7 +4,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -19,13 +19,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraCrudSyncTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -35,11 +35,11 @@ class CassandraCrudSyncTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperParameterTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperParameterTests.java index d4a30bc..8dd0fcd 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperParameterTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperParameterTests.java @@ -5,7 +5,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -20,13 +20,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraMapperParameterTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -38,11 +38,11 @@ class CassandraMapperParameterTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetReactiveTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetReactiveTests.java index 87672d8..ab079df 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetReactiveTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetReactiveTests.java @@ -5,7 +5,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -20,13 +20,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraMapperResultSetReactiveTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -38,11 +38,11 @@ class CassandraMapperResultSetReactiveTests implements KoraAppTestConfigModifier @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetTests.java index f298ea9..f407209 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperResultSetTests.java @@ -5,7 +5,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -20,13 +20,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraMapperResultSetTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -38,11 +38,11 @@ class CassandraMapperResultSetTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowColumnTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowColumnTests.java index 9ef000c..7c52f79 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowColumnTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowColumnTests.java @@ -4,7 +4,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -20,13 +20,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraMapperRowColumnTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -38,11 +38,11 @@ class CassandraMapperRowColumnTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowTests.java index a959d94..fef8d97 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraMapperRowTests.java @@ -4,7 +4,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import java.util.List; @@ -19,13 +19,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraMapperRowTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -37,11 +37,11 @@ class CassandraMapperRowTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraUdtTests.java b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraUdtTests.java index ecd630f..cd6e99a 100644 --- a/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraUdtTests.java +++ b/kora-java-database-cassandra/src/test/java/ru/tinkoff/kora/example/cassandra/CassandraUdtTests.java @@ -5,7 +5,7 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; -import io.goodforgod.testcontainers.extensions.cassandra.ContainerCassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; import io.goodforgod.testcontainers.extensions.cassandra.Migration; import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; import org.jetbrains.annotations.NotNull; @@ -19,13 +19,13 @@ mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.SCRIPTS, - migrations = { "migrations" }, + locations = { "migrations" }, apply = Migration.Mode.PER_METHOD, drop = Migration.Mode.PER_METHOD)) @KoraAppTest(Application.class) class CassandraUdtTests implements KoraAppTestConfigModifier { - @ContainerCassandraConnection + @ConnectionCassandra private CassandraConnection connection; @TestComponent @@ -35,11 +35,11 @@ class CassandraUdtTests implements KoraAppTestConfigModifier { @Override public KoraConfigModification config() { return KoraConfigModification - .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().host() + ":" + connection.params().port()) + .ofSystemProperty("CASSANDRA_CONTACT_POINTS", connection.params().contactPoint()) .withSystemProperty("CASSANDRA_USER", connection.params().username()) .withSystemProperty("CASSANDRA_PASS", connection.params().password()) .withSystemProperty("CASSANDRA_DC", connection.params().datacenter()) - .withSystemProperty("CASSANDRA_KEYSPACE", "cassandra"); + .withSystemProperty("CASSANDRA_KEYSPACE", connection.params().keyspace()); } @Test diff --git a/kora-java-database-cassandra/src/test/resources/logback-test.xml b/kora-java-database-cassandra/src/test/resources/logback-test.xml index e730b42..adccdab 100644 --- a/kora-java-database-cassandra/src/test/resources/logback-test.xml +++ b/kora-java-database-cassandra/src/test/resources/logback-test.xml @@ -16,11 +16,9 @@ - - + - - + diff --git a/kora-java-database-jdbc/build.gradle b/kora-java-database-jdbc/build.gradle index 21027ec..4f5382a 100644 --- a/kora-java-database-jdbc/build.gradle +++ b/kora-java-database-jdbc/build.gradle @@ -26,16 +26,15 @@ dependencies { koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") annotationProcessor "ru.tinkoff.kora:annotation-processors" - implementation "org.postgresql:postgresql:42.6.0" + implementation "org.postgresql:postgresql:42.7.2" implementation "ru.tinkoff.kora:database-jdbc" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) - implementation "io.azam.ulidj:ulidj:1.0.4" // For sortable UUID (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" } //noinspection GroovyAssignabilityCheck @@ -74,13 +73,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-database-jdbc/src/main/resources/application.conf b/kora-java-database-jdbc/src/main/resources/application.conf index 0906df7..b367d0e 100644 --- a/kora-java-database-jdbc/src/main/resources/application.conf +++ b/kora-java-database-jdbc/src/main/resources/application.conf @@ -3,12 +3,12 @@ db { username = ${POSTGRES_USER} password = ${POSTGRES_PASS} maxPoolSize = 10 - poolName = "example" + poolName = "kora" } logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-database-jdbc/src/main/resources/logback.xml b/kora-java-database-jdbc/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-database-jdbc/src/main/resources/logback.xml +++ b/kora-java-database-jdbc/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudMacrosTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudMacrosTests.java index 142ceb8..b4348f2 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudMacrosTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudMacrosTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class JdbcCrudMacrosTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudReactorTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudReactorTests.java index f690faf..a8b8dc1 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudReactorTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudReactorTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.time.Duration; import java.util.List; import org.jetbrains.annotations.NotNull; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcCrudReactorTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudSyncTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudSyncTests.java index bcf591c..19e6f96 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudSyncTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcCrudSyncTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class JdbcCrudSyncTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeTests.java index ed8dde3..eb43c63 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomCompositeTests.java @@ -3,10 +3,7 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; -import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; -import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.*; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -17,7 +14,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -26,7 +23,7 @@ @KoraAppTest(Application.class) class JdbcIdRandomCompositeTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomTests.java index a5035bf..a6b4107 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdRandomTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import ru.tinkoff.kora.example.jdbc.JdbcIdRandomRepository.Entity; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class JdbcIdRandomTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent @@ -41,7 +41,7 @@ public KoraConfigModification config() { @Test void insertOne() { // given - var entityCreate = new Entity("Bob"); + var entityCreate = new Entity("Ivan"); // when repository.insert(entityCreate); diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceCompositeTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceCompositeTests.java index 233b000..77e8378 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceCompositeTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceCompositeTests.java @@ -3,10 +3,7 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; -import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; -import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.*; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -17,7 +14,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -26,7 +23,7 @@ @KoraAppTest(Application.class) class JdbcIdSequenceCompositeTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceTests.java index 38853a1..9fb4e37 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcIdSequenceTests.java @@ -4,10 +4,10 @@ import static ru.tinkoff.kora.example.jdbc.JdbcIdSequenceRepository.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcIdSequenceTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcJsonbTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcJsonbTests.java index 21df0a3..59695a3 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcJsonbTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcJsonbTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.UUID; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcJsonbTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperColumnTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperColumnTests.java index 7e7deb6..ba063a6 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperColumnTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperColumnTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcMapperColumnTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperParameterTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperParameterTests.java index e42d714..67b6bd2 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperParameterTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperParameterTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcMapperParameterTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperResultSetTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperResultSetTests.java index e9c378d..0a259cd 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperResultSetTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperResultSetTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class JdbcMapperResultSetTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperRowTests.java b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperRowTests.java index 522e26e..e18fec2 100644 --- a/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperRowTests.java +++ b/kora-java-database-jdbc/src/test/java/ru/tinkoff/kora/example/jdbc/JdbcMapperRowTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class JdbcMapperRowTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-jdbc/src/test/resources/logback-test.xml b/kora-java-database-jdbc/src/test/resources/logback-test.xml index e730b42..eb35050 100644 --- a/kora-java-database-jdbc/src/test/resources/logback-test.xml +++ b/kora-java-database-jdbc/src/test/resources/logback-test.xml @@ -16,11 +16,10 @@ - - + - + diff --git a/kora-java-database-r2dbc/build.gradle b/kora-java-database-r2dbc/build.gradle index 450c8ef..1e7021a 100644 --- a/kora-java-database-r2dbc/build.gradle +++ b/kora-java-database-r2dbc/build.gradle @@ -26,16 +26,16 @@ dependencies { koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") annotationProcessor "ru.tinkoff.kora:annotation-processors" - runtimeOnly "io.netty:netty-transport-native-epoll:4.1.100.Final:linux-x86_64" - implementation "org.postgresql:r2dbc-postgresql:1.0.0.RELEASE" + runtimeOnly "io.netty:netty-transport-native-epoll:4.1.109.Final:linux-x86_64" + implementation "org.postgresql:r2dbc-postgresql:1.0.4.RELEASE" implementation "ru.tinkoff.kora:database-r2dbc" implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6" - testImplementation "org.postgresql:postgresql:42.6.0" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" + testImplementation "org.postgresql:postgresql:42.7.2" } //noinspection GroovyAssignabilityCheck @@ -74,13 +74,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-database-r2dbc/src/main/resources/application.conf b/kora-java-database-r2dbc/src/main/resources/application.conf index aa5039d..e1e3829 100644 --- a/kora-java-database-r2dbc/src/main/resources/application.conf +++ b/kora-java-database-r2dbc/src/main/resources/application.conf @@ -3,12 +3,12 @@ db { username = ${POSTGRES_USER} password = ${POSTGRES_PASS} maxPoolSize = 10 - poolName = "example" + poolName = "kora" } logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-database-r2dbc/src/main/resources/logback.xml b/kora-java-database-r2dbc/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-database-r2dbc/src/main/resources/logback.xml +++ b/kora-java-database-r2dbc/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudMacrosTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudMacrosTests.java index 64b5f19..f95bc75 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudMacrosTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudMacrosTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.time.Duration; import java.util.List; import org.jetbrains.annotations.NotNull; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class R2dbcCrudMacrosTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudSyncTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudSyncTests.java index 446b3d9..05f90d5 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudSyncTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudSyncTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class R2dbcCrudSyncTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudTests.java index e308b11..794d3b7 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcCrudTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.time.Duration; import java.util.List; import org.jetbrains.annotations.NotNull; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class R2dbcCrudTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdRandomTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdRandomTests.java index fba9fee..32f7318 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdRandomTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdRandomTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class R2dbcIdRandomTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent @@ -43,7 +43,7 @@ public KoraConfigModification config() { @Test void syncSingleSuccess() { // given - var entityCreate = new R2dbcIdRandomRepository.Entity("Bob"); + var entityCreate = new R2dbcIdRandomRepository.Entity("Ivan"); // when repository.insert(entityCreate).block(); diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdSequenceTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdSequenceTests.java index fa981cd..b24f13e 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdSequenceTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcIdSequenceTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class R2dbcIdSequenceTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent @@ -43,7 +43,7 @@ public KoraConfigModification config() { @Test void syncSingleSuccess() { // given - var entityCreate = new R2dbcIdSequenceRepository.Entity("Bob"); + var entityCreate = new R2dbcIdSequenceRepository.Entity("Ivan"); // when long id = repository.insert(entityCreate).block(); diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperColumnTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperColumnTests.java index a6e78d0..ae01003 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperColumnTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperColumnTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class R2dbcMapperColumnTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperParameterTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperParameterTests.java index b316a92..e323b72 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperParameterTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperParameterTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class R2dbcMapperParameterTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperRowTests.java b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperRowTests.java index 5eb9f48..dc50ff1 100644 --- a/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperRowTests.java +++ b/kora-java-database-r2dbc/src/test/java/ru/tinkoff/kora/example/r2dbc/R2dbcMapperRowTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class R2dbcMapperRowTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-r2dbc/src/test/resources/logback-test.xml b/kora-java-database-r2dbc/src/test/resources/logback-test.xml index e730b42..eb35050 100644 --- a/kora-java-database-r2dbc/src/test/resources/logback-test.xml +++ b/kora-java-database-r2dbc/src/test/resources/logback-test.xml @@ -16,11 +16,10 @@ - - + - + diff --git a/kora-java-database-vertx/build.gradle b/kora-java-database-vertx/build.gradle index a157b9a..eb9e138 100644 --- a/kora-java-database-vertx/build.gradle +++ b/kora-java-database-vertx/build.gradle @@ -29,14 +29,14 @@ dependencies { implementation "ru.tinkoff.kora:database-vertx" implementation "io.vertx:vertx-pg-client:4.3.8" implementation "com.ongres.scram:client:2.1" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.9.6" - testImplementation "org.postgresql:postgresql:42.6.0" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" + testImplementation "org.postgresql:postgresql:42.7.2" } //noinspection GroovyAssignabilityCheck @@ -75,13 +75,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-database-vertx/src/main/resources/application.conf b/kora-java-database-vertx/src/main/resources/application.conf index 48fb0b7..861ab14 100644 --- a/kora-java-database-vertx/src/main/resources/application.conf +++ b/kora-java-database-vertx/src/main/resources/application.conf @@ -3,12 +3,12 @@ db { username = ${POSTGRES_USER} password = ${POSTGRES_PASS} maxPoolSize = 10 - poolName = "example" + poolName = "kora" } logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-database-vertx/src/main/resources/logback.xml b/kora-java-database-vertx/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-database-vertx/src/main/resources/logback.xml +++ b/kora-java-database-vertx/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudReactorTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudReactorTests.java index 056550d..a8039f1 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudReactorTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudReactorTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class VertxCrudReactorTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudSyncTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudSyncTests.java index ec58839..cd64fc3 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudSyncTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxCrudSyncTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class VertxCrudSyncTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperColumnTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperColumnTests.java index 1435361..ec1eadb 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperColumnTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperColumnTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class VertxMapperColumnTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperParameterTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperParameterTests.java index e9af4ba..8c422a6 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperParameterTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperParameterTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; @@ -17,7 +17,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -26,7 +26,7 @@ @KoraAppTest(Application.class) class VertxMapperParameterTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperResultSetTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperResultSetTests.java index c8df504..3dc943d 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperResultSetTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperResultSetTests.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class VertxMapperResultSetTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperRowTests.java b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperRowTests.java index 9b2c036..97b2342 100644 --- a/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperRowTests.java +++ b/kora-java-database-vertx/src/test/java/ru/tinkoff/kora/example/vertx/VertxMapperRowTests.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; import io.goodforgod.testcontainers.extensions.jdbc.Migration; -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,7 +15,7 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersPostgres( +@TestcontainersPostgreSQL( mode = ContainerMode.PER_RUN, migration = @Migration( engine = Migration.Engines.FLYWAY, @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class VertxMapperRowTests implements KoraAppTestConfigModifier { - @ContainerPostgresConnection + @ConnectionPostgreSQL private JdbcConnection connection; @TestComponent diff --git a/kora-java-database-vertx/src/test/resources/logback-test.xml b/kora-java-database-vertx/src/test/resources/logback-test.xml index e730b42..eb35050 100644 --- a/kora-java-database-vertx/src/test/resources/logback-test.xml +++ b/kora-java-database-vertx/src/test/resources/logback-test.xml @@ -16,11 +16,10 @@ - - + - + diff --git a/kora-java-graalvm-crud-cassandra/Dockerfile b/kora-java-graalvm-crud-cassandra/Dockerfile new file mode 100644 index 0000000..de40743 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/Dockerfile @@ -0,0 +1,25 @@ +FROM ghcr.io/graalvm/native-image-community:21 as builder + +ARG APP_DIR=/opt/application +ARG JAR_DIR=build/libs +WORKDIR $APP_DIR + +ADD $JAR_DIR/*.jar $APP_DIR/application.jar + +RUN native-image --no-fallback -classpath $APP_DIR/application.jar + +FROM ubuntu:noble-20240212 as runner + +ARG APP_DIR=/opt/application +WORKDIR $APP_DIR + +COPY --from=builder $APP_DIR/application $APP_DIR/application + +ARG DOCKER_USER=app +RUN groupadd -r $DOCKER_USER && useradd -rg $DOCKER_USER $DOCKER_USER +RUN chmod +x application +USER $DOCKER_USER + +EXPOSE 8080/tcp +EXPOSE 8085/tcp +CMD "/opt/application/application" \ No newline at end of file diff --git a/kora-java-graalvm-crud-cassandra/README.md b/kora-java-graalvm-crud-cassandra/README.md new file mode 100644 index 0000000..d440c92 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/README.md @@ -0,0 +1,49 @@ +# Kora Java GraalVM CRUD Cassandra Service + +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, +в качестве базы данных выступает Cassandra, используется кэш Redis, а также другие модули которые использовались бы в реальном приложении в бою. + +В примере использовались модули: +- [HTTP Server](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/) +- [HTTP Server OpenAPI Generation](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-codegen/) +- [Probes](https://kora-projects.github.io/kora-docs/ru/documentation/probes/) +- [Metrics](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/) +- [Database Cassandra](https://kora-projects.github.io/kora-docs/ru/documentation/database-cassandra/) +- [JSON](https://kora-projects.github.io/kora-docs/ru/documentation/json/) +- [Resilient](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/) +- [Validation](https://kora-projects.github.io/kora-docs/ru/documentation/validation/) +- [Cache Redis](https://kora-projects.github.io/kora-docs/ru/documentation/cache/#redis) + +Скомпилирован с помощью [GraalVM](https://www.graalvm.org/release-notes/JDK_21/) + +## Build + +Собрать артефакт: + +```shell +./gradlew shadowJar +docker build -t kora-java-graalvm-crud-cassandra . +``` + +### Generate + +Сгенерировать API для HTTP Server: +```shell +./gradlew openApiGenerateHttpServer +``` + +## Run + +Запустить локально: +```shell +./gradlew run +``` + +## Test + +Тесты используют [Testcontainers](https://java.testcontainers.org/), требуется [Docker](https://docs.docker.com/engine/install/) окружение для запуска тестов или аналогичные контейнерные окружения ([colima](https://github.com/abiosoft/colima) / итп) + +Протестировать локально: +```shell +./gradlew test +``` diff --git a/kora-java-graalvm-crud-cassandra/build.gradle b/kora-java-graalvm-crud-cassandra/build.gradle new file mode 100644 index 0000000..8c57607 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/build.gradle @@ -0,0 +1,179 @@ +buildscript { + dependencies { + classpath("ru.tinkoff.kora:openapi-generator:$koraVersion") + } +} + +plugins { + id "java" + id "jacoco" + id "application" + + id "org.openapi.generator" version "7.1.0" + id "com.github.johnrengelman.shadow" version "8.1.1" + id "org.graalvm.buildtools.native" version "0.10.1" +} + +repositories { + mavenLocal() + mavenCentral() +} + +mainClassName = "ru.tinkoff.kora.example.graalvm.crud.cassandra.Application" + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +configurations { + koraBom + implementation.extendsFrom(koraBom) + annotationProcessor.extendsFrom(koraBom) +} + +dependencies { + koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") + annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" + annotationProcessor "ru.tinkoff.kora:annotation-processors" + annotationProcessor "io.goodforgod:graalvm-hint-processor:1.2.0" + compileOnly "io.goodforgod:graalvm-hint-annotations:1.2.0" + + implementation "ru.tinkoff.kora:http-server-undertow" + implementation "ru.tinkoff.kora:database-cassandra" + implementation "ru.tinkoff.kora:micrometer-module" + implementation "ru.tinkoff.kora:json-module" + implementation "ru.tinkoff.kora:validation-module" + implementation "ru.tinkoff.kora:cache-redis" + implementation "ru.tinkoff.kora:resilient-kora" + implementation "ru.tinkoff.kora:config-hocon" + implementation "ru.tinkoff.kora:openapi-management" + implementation "ru.tinkoff.kora:logging-logback" + + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) + implementation "org.mapstruct:mapstruct:1.5.5.Final" + + testImplementation "org.json:json:20231013" + testImplementation "org.skyscreamer:jsonassert:1.5.1" + testImplementation "redis.clients:jedis:4.4.3" + + testImplementation "org.mockito:mockito-core:5.6.0" + testImplementation "ru.tinkoff.kora:test-junit5" + testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.11.0" + testImplementation "io.goodforgod:testcontainers-extensions-redis:0.11.0" + testImplementation "org.testcontainers:junit-jupiter:1.17.6" +} + +openApiGenerate { + generatorName = "kora" + group = "openapi tools" + inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" + outputDir = "$buildDir/generated/openapi" + apiPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.api" + modelPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.model" + invokerPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.invoker" + configOptions = [ + mode : "java-reactive-server", // так же есть java-server вариация HTTP Server"а + enableServerValidation: "true" + ] +} + +graalvmNative { + binaries { + main { + imageName = "$project.name" + mainClass = "$mainClassName" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.matching("GraalVM Community") + } + } + } + metadataRepository { + enabled = true + } +} + +compileJava.dependsOn tasks.openApiGenerate +processResources.dependsOn tasks.collectReachabilityMetadata +test.dependsOn tasks.shadowJar + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "CASSANDRA_CONTACT_POINTS": "$cassandraHost:$cassandraPort", + "CASSANDRA_USER" : "$cassandraUser", + "CASSANDRA_PASS" : "$cassandraPassword", + "CASSANDRA_DC" : "$cassandraDatacenter", + "CASSANDRA_KEYSPACE" : "$cassandraKeyspace", + "REDIS_URL" : "redis://$redisHost:$redisPort/$redisDatabase", + "REDIS_USER" : "$redisUser", + "REDIS_PASS" : "$redisPassword", + ]) +} + +test { + jvmArgs += [ + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=1", + ] + + environment([ + "": "" + ]) + + useJUnitPlatform() + testLogging { + showStandardStreams(true) + events("passed", "skipped", "failed") + exceptionFormat("full") + } + + jacoco { + excludes += ["**/Application*"] + } + + reports { + html.required = false + junitXml.required = false + } +} + +sourceSets { + main { + java.srcDirs += "$buildDir/generated/openapi" + resources.srcDirs += "$buildDir/native-reachability-metadata" + } +} + +jar.enabled = false +shadowJar { + mergeServiceFiles() + manifest { + attributes "Main-Class": mainClassName + attributes "Implementation-Version": koraVersion + } +} + +artifacts { + archives shadowJar +} + +compileJava { + options.encoding("UTF-8") + options.incremental(true) + options.fork = true +} + +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } +} + +javadoc { + options.encoding = "UTF-8" + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true) + } +} \ No newline at end of file diff --git a/kora-java-graalvm-crud-cassandra/gradle.properties b/kora-java-graalvm-crud-cassandra/gradle.properties new file mode 100644 index 0000000..ed8614b --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/gradle.properties @@ -0,0 +1,16 @@ +##### CASSANDRA ##### +cassandraHost=localhost +cassandraPort=9042 +cassandraUser=cassandra +cassandraPassword=cassandra +cassandraDatacenter=datacenter1 +cassandraKeyspace=petshop + + +##### REDIS ##### +redisHost=localhost +redisPort=6379 +redisDatabase=0 +redisUser=default +redisPassword=redis + diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/Application.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/Application.java new file mode 100644 index 0000000..edd762a --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/Application.java @@ -0,0 +1,36 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra; + +import io.goodforgod.graalvm.hint.annotation.NativeImageHint; +import io.goodforgod.graalvm.hint.annotation.ResourceHint; +import ru.tinkoff.kora.application.graph.KoraApplication; +import ru.tinkoff.kora.cache.redis.RedisCacheModule; +import ru.tinkoff.kora.common.KoraApp; +import ru.tinkoff.kora.config.hocon.HoconConfigModule; +import ru.tinkoff.kora.database.cassandra.CassandraDatabaseModule; +import ru.tinkoff.kora.http.server.undertow.UndertowHttpServerModule; +import ru.tinkoff.kora.json.module.JsonModule; +import ru.tinkoff.kora.logging.logback.LogbackModule; +import ru.tinkoff.kora.micrometer.module.MetricsModule; +import ru.tinkoff.kora.openapi.management.OpenApiManagementModule; +import ru.tinkoff.kora.resilient.ResilientModule; +import ru.tinkoff.kora.validation.module.ValidationModule; + +@ResourceHint(include = { "openapi/http-server.yaml" }) +@NativeImageHint(name = "application", entrypoint = Application.class) +@KoraApp +public interface Application extends + HoconConfigModule, + LogbackModule, + CassandraDatabaseModule, + ValidationModule, + JsonModule, + RedisCacheModule, + ResilientModule, + MetricsModule, + OpenApiManagementModule, + UndertowHttpServerModule { + + static void main(String[] args) { + KoraApplication.run(ApplicationGraph::graph); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/HttpExceptionHandler.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/HttpExceptionHandler.java new file mode 100644 index 0000000..7c0085c --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/HttpExceptionHandler.java @@ -0,0 +1,42 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.controller; + +import io.micrometer.core.instrument.config.validate.ValidationException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeoutException; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.common.Context; +import ru.tinkoff.kora.common.Tag; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.http.common.body.HttpBody; +import ru.tinkoff.kora.http.server.common.*; +import ru.tinkoff.kora.json.common.JsonWriter; + +@Tag(HttpServerModule.class) +@Component +public final class HttpExceptionHandler implements HttpServerInterceptor { + + private final JsonWriter errorJsonWriter; + + public HttpExceptionHandler(JsonWriter errorJsonWriter) { + this.errorJsonWriter = errorJsonWriter; + } + + @Override + public CompletionStage intercept(Context context, HttpServerRequest request, InterceptChain chain) + throws Exception { + return chain.process(context, request).exceptionally(e -> { + if (e instanceof HttpServerResponseException ex) { + return ex; + } + + var body = HttpBody.json(errorJsonWriter.toByteArrayUnchecked(new MessageTO(e.getMessage()))); + if (e instanceof IllegalArgumentException || e instanceof ValidationException) { + return HttpServerResponse.of(400, body); + } else if (e instanceof TimeoutException) { + return HttpServerResponse.of(408, body); + } else { + return HttpServerResponse.of(500, body); + } + }); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/PetDelegate.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/PetDelegate.java new file mode 100644 index 0000000..0cf73f4 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/controller/PetDelegate.java @@ -0,0 +1,86 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.controller; + +import static ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiResponses.*; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.mapper.PetMapper; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.service.PetService; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiDelegate; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; + +@Component +public final class PetDelegate implements PetApiDelegate { + + private final PetMapper petMapper; + private final PetService petService; + + public PetDelegate(PetMapper petMapper, PetService petService) { + this.petMapper = petMapper; + this.petService = petService; + } + + @Override + public Mono getPetById(long petId) { + if (petId < 0) { + return Mono.just(new GetPetByIdApiResponse.GetPetById400ApiResponse(malformedId(petId))); + } + + return petService.findByID(petId) + .map(pet -> { + var body = petMapper.asDTO(pet); + return ((GetPetByIdApiResponse) new GetPetByIdApiResponse.GetPetById200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new GetPetByIdApiResponse.GetPetById404ApiResponse(notFound(petId)))); + } + + @Override + public Mono addPet(PetCreateTO petCreateTO) { + return petService.add(petCreateTO) + .map(pet -> { + var body = petMapper.asDTO(pet); + return new AddPetApiResponse.AddPet200ApiResponse(body); + }); + } + + @Override + public Mono updatePet(long petId, PetUpdateTO petUpdateTO) { + if (petId < 0) { + return Mono.just(new UpdatePetApiResponse.UpdatePet400ApiResponse(malformedId(petId))); + } + + return petService.update(petId, petUpdateTO) + .map(updated -> { + var body = petMapper.asDTO(updated); + return ((UpdatePetApiResponse) new UpdatePetApiResponse.UpdatePet200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new UpdatePetApiResponse.UpdatePet404ApiResponse(notFound(petId)))); + } + + @Override + public Mono deletePet(long petId) { + if (petId < 0) { + return Mono.just(new DeletePetApiResponse.DeletePet400ApiResponse(malformedId(petId))); + } + + return petService.delete(petId) + .map(isDeleted -> { + if (isDeleted) { + return new DeletePetApiResponse.DeletePet200ApiResponse( + new MessageTO("Successfully deleted pet with ID: " + petId)); + } else { + return new DeletePetApiResponse.DeletePet404ApiResponse(notFound(petId)); + } + }); + } + + private static MessageTO notFound(long petId) { + return new MessageTO("Pet not found for ID: " + petId); + } + + private static MessageTO malformedId(long petId) { + return new MessageTO("Pet malformed ID: " + petId); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/dao/Pet.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/dao/Pet.java new file mode 100644 index 0000000..3d97b86 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/dao/Pet.java @@ -0,0 +1,27 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; +import ru.tinkoff.kora.json.common.annotation.Json; + +@Json +@Table("pets") +public record Pet(@Id @Column("id") long id, + @Column("name") String name, + @Column("status") Status status, + @Column("category") String category) { + + public enum Status { + + AVAILABLE(0), + PENDING(10), + SOLD(20); + + public final int code; + + Status(int code) { + this.code = code; + } + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/mapper/PetMapper.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/mapper/PetMapper.java new file mode 100644 index 0000000..651b5fc --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/model/mapper/PetMapper.java @@ -0,0 +1,18 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.model.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetTO; + +@Mapper +public interface PetMapper { + + @Mapping(source = "pet", target = "category") + PetTO asDTO(Pet pet); + + @Mapping(source = "id", target = "id") + @Mapping(source = "category", target = "name") + CategoryTO asCategoryTO(Pet pet); +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/PetRepository.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/PetRepository.java new file mode 100644 index 0000000..0a29fb1 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/PetRepository.java @@ -0,0 +1,27 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.repository; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.database.cassandra.CassandraRepository; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; + +@Repository +public interface PetRepository extends CassandraRepository { + + @Query(""" + SELECT %{return#selects} + FROM %{return#table} + WHERE id = :id + """) + Mono findById(long id); + + @Query("INSERT INTO %{entity#inserts}") + Mono insert(Pet entity); + + @Query("UPDATE %{entity#table} SET %{entity#updates} WHERE %{entity#where = @id}") + Mono update(Pet entity); + + @Query("DELETE FROM pets WHERE id = :id") + Mono deleteById(long id); +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusParameterMapper.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusParameterMapper.java new file mode 100644 index 0000000..4545540 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusParameterMapper.java @@ -0,0 +1,20 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.repository.mapper; + +import com.datastax.oss.driver.api.core.data.SettableByName; +import jakarta.annotation.Nullable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.cassandra.mapper.parameter.CassandraParameterColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; + +@Component +public final class PetStatusParameterMapper implements CassandraParameterColumnMapper { + + @Override + public void apply(SettableByName stmt, int index, @Nullable Pet.Status value) { + if (value == null) { + stmt.setToNull(index); + } else { + stmt.set(index, value.code, Integer.class); + } + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusResultMapper.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusResultMapper.java new file mode 100644 index 0000000..d61b1f7 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/repository/mapper/PetStatusResultMapper.java @@ -0,0 +1,24 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.repository.mapper; + +import com.datastax.oss.driver.api.core.data.GettableByName; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.cassandra.mapper.result.CassandraRowColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; + +@Component +public final class PetStatusResultMapper implements CassandraRowColumnMapper { + + private final Pet.Status[] statuses = Pet.Status.values(); + + @Override + public Pet.Status apply(GettableByName row, int index) { + final int code = row.get(index, Integer.class); + for (Pet.Status status : statuses) { + if (code == status.code) { + return status; + } + } + + throw new IllegalStateException("Unknown code: " + code); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetCache.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetCache.java new file mode 100644 index 0000000..b3dd4e9 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetCache.java @@ -0,0 +1,11 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.service; + +import ru.tinkoff.kora.cache.annotation.Cache; +import ru.tinkoff.kora.cache.redis.RedisCache; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; +import ru.tinkoff.kora.json.common.annotation.Json; + +@Cache("pet-cache") +public interface PetCache extends RedisCache { + +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetService.java b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetService.java new file mode 100644 index 0000000..558a105 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/service/PetService.java @@ -0,0 +1,75 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra.service; + +import java.util.concurrent.ThreadLocalRandom; +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.cache.annotation.CacheInvalidate; +import ru.tinkoff.kora.cache.annotation.CachePut; +import ru.tinkoff.kora.cache.annotation.Cacheable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.resilient.circuitbreaker.annotation.CircuitBreaker; +import ru.tinkoff.kora.resilient.retry.annotation.Retry; +import ru.tinkoff.kora.resilient.timeout.annotation.Timeout; + +@Component +public class PetService { + + private final PetRepository petRepository; + + public PetService(PetRepository petRepository) { + this.petRepository = petRepository; + } + + @Cacheable(PetCache.class) + @CircuitBreaker("pet") + @Retry("pet") + @Timeout("pet") + public Mono findByID(long petId) { + return petRepository.findById(petId); + } + + @CircuitBreaker("pet") + @Timeout("pet") + public Mono add(PetCreateTO createTO) { + final long petId = ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE); + final Pet pet = new Pet(petId, createTO.name(), Pet.Status.AVAILABLE, createTO.category().name()); + return petRepository.insert(pet).then(Mono.just(pet)); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CachePut(value = PetCache.class, parameters = "id") + public Mono update(long id, PetUpdateTO updateTO) { + return petRepository.findById(id) + .flatMap(pet -> { + var status = (updateTO.status() == null) + ? pet.status() + : toStatus(updateTO.status()); + + var category = (updateTO.category() == null) + ? pet.category() + : updateTO.category().name(); + + var petUpdate = new Pet(pet.id(), updateTO.name(), status, category); + return petRepository.update(petUpdate).then(Mono.just(petUpdate)); + }); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CacheInvalidate(PetCache.class) + public Mono delete(long petId) { + return petRepository.deleteById(petId).thenReturn(true); + } + + private static Pet.Status toStatus(PetUpdateTO.StatusEnum statusEnum) { + return switch (statusEnum) { + case AVAILABLE -> Pet.Status.AVAILABLE; + case PENDING -> Pet.Status.PENDING; + case SOLD -> Pet.Status.SOLD; + }; + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/resources/application.conf b/kora-java-graalvm-crud-cassandra/src/main/resources/application.conf new file mode 100644 index 0000000..1c2e776 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/resources/application.conf @@ -0,0 +1,75 @@ +httpServer { + publicApiHttpPort = 8080 + privateApiHttpPort = 8085 +} + + +cassandra { + auth { + login = ${CASSANDRA_USER} + password = ${CASSANDRA_PASS} + } + basic { + contactPoints = ${CASSANDRA_CONTACT_POINTS} + dc = ${CASSANDRA_DC} + sessionKeyspace = ${CASSANDRA_KEYSPACE} + request { + timeout = 5s + } + } +} + +pet-cache { + maximumSize = 1000 + expireAfterWrite = ${?CACHE_EXPIRE_WRITE} + keyPrefix = "pet-" +} + + +lettuce { + uri = ${REDIS_URL} + user = ${REDIS_USER} + password = ${REDIS_PASS} + socketTimeout = 15s + commandTimeout = 15s +} + + +openapi { + management { + enabled = true + file = "openapi/http-server.yaml" + swaggerui { + enabled = true + } + rapidoc { + enabled = true + } + } +} + + +resilient { + circuitbreaker.pet { + slidingWindowSize = 50 + minimumRequiredCalls = 25 + failureRateThreshold = 50 + permittedCallsInHalfOpenState = 10 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } +} + + +logging.level { + "root": "WARN" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" + "ru.tinkoff.kora.application.graph.internal.loom.VirtualThreadExecutorHolder": "DEBUG" +} diff --git a/kora-java-graalvm-crud-cassandra/src/main/resources/logback.xml b/kora-java-graalvm-crud-cassandra/src/main/resources/logback.xml new file mode 100644 index 0000000..745e83f --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + UTF-8 + %d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-cassandra/src/main/resources/migrations/setup.cql b/kora-java-graalvm-crud-cassandra/src/main/resources/migrations/setup.cql new file mode 100644 index 0000000..52d87ac --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/resources/migrations/setup.cql @@ -0,0 +1,8 @@ +CREATE TABLE IF NOT EXISTS pets +( + id BIGINT, + name VARCHAR, + status INT, + category VARCHAR, + PRIMARY KEY (id) +); diff --git a/kora-java-graalvm-crud-cassandra/src/main/resources/openapi/http-server.yaml b/kora-java-graalvm-crud-cassandra/src/main/resources/openapi/http-server.yaml new file mode 100644 index 0000000..8d99f49 --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/main/resources/openapi/http-server.yaml @@ -0,0 +1,315 @@ +openapi: 3.0.3 +info: + title: Swagger Petstore - OpenAPI 3.0 + description: |- + This is a sample Pet Store Server based on the OpenAPI 3.0 specification. You can find out more about + Swagger at [https://swagger.io](https://swagger.io). + license: + name: Apache 2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.11 +externalDocs: + description: Find out more about Swagger + url: https://swagger.io +tags: + - name: pet + description: Everything about your Pets + externalDocs: + description: Find out more + url: https://swagger.io +paths: + /v3/pets: + post: + tags: + - pet + summary: Add a new pet to the store + description: Add a new pet to the store + operationId: addPet + requestBody: + required: true + description: Create a new pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetCreateTO' + responses: + '200': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + /v3/pets/{id}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: id + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + nullable: false + minimum: 1 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + put: + tags: + - pet + summary: Update an existing pet + description: Update an existing pet by Id + operationId: updatePet + parameters: + - name: id + in: path + description: Pet id to update + required: true + schema: + type: integer + format: int64 + requestBody: + description: Update an existent pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetUpdateTO' + required: true + responses: + '200': + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + delete: + tags: + - pet + summary: Deletes a pet + description: delete a pet + operationId: deletePet + parameters: + - name: id + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' +components: + schemas: + MessageTO: + type: object + properties: + message: + type: string + CategoryTO: + required: + - id + - name + type: object + properties: + id: + type: integer + format: int64 + example: 1 + name: + type: string + example: Dogs + CategoryCreateTO: + required: + - name + type: object + properties: + name: + type: string + example: Dogs + PetStatusTO: + properties: + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + PetTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + example: 10 + nullable: false + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryTO' + PetCreateTO: + required: + - name + - category + type: object + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' + PetUpdateTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - name + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' diff --git a/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/AppContainer.java b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/AppContainer.java new file mode 100644 index 0000000..a61700a --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/AppContainer.java @@ -0,0 +1,47 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra; + +import java.net.URI; +import java.nio.file.Paths; +import java.time.Duration; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; + +public final class AppContainer extends GenericContainer { + + private AppContainer() { + super(new ImageFromDockerfile("kora-java-graalvm-crud-cassandra") + .withDockerfile(Paths.get("Dockerfile").toAbsolutePath())); + } + + private AppContainer(DockerImageName image) { + super(image); + } + + public static AppContainer build() { + final String appImage = System.getenv("IMAGE_KORA_JAVA_GRAALVM_CRUD_CASSANDRA"); + return (appImage != null && !appImage.isBlank()) + ? new AppContainer(DockerImageName.parse(appImage)) + : new AppContainer(); + } + + @Override + protected void configure() { + super.configure(); + withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); + withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); + waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); + } + + public int getPort() { + return getMappedPort(8080); + } + + public URI getURI() { + return URI.create(String.format("http://%s:%s", getHost(), getPort())); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetControllerTests.java b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetControllerTests.java new file mode 100644 index 0000000..522ae7a --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetControllerTests.java @@ -0,0 +1,220 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra; + +import static org.junit.jupiter.api.Assertions.*; + +import io.goodforgod.testcontainers.extensions.ContainerMode; +import io.goodforgod.testcontainers.extensions.Network; +import io.goodforgod.testcontainers.extensions.cassandra.CassandraConnection; +import io.goodforgod.testcontainers.extensions.cassandra.ConnectionCassandra; +import io.goodforgod.testcontainers.extensions.cassandra.Migration; +import io.goodforgod.testcontainers.extensions.cassandra.TestcontainersCassandra; +import io.goodforgod.testcontainers.extensions.redis.ConnectionRedis; +import io.goodforgod.testcontainers.extensions.redis.RedisConnection; +import io.goodforgod.testcontainers.extensions.redis.TestcontainersRedis; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Map; +import org.json.JSONObject; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; + +@TestcontainersCassandra( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN, + migration = @Migration( + locations = "migrations", + engine = Migration.Engines.SCRIPTS, + apply = Migration.Mode.PER_METHOD, + drop = Migration.Mode.PER_METHOD)) +@TestcontainersRedis( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN) +class PetControllerTests { + + private static final AppContainer container = AppContainer.build() + .withNetwork(org.testcontainers.containers.Network.SHARED); + + @ConnectionCassandra + private CassandraConnection connection; + + @BeforeEach + public void setup(@ConnectionCassandra CassandraConnection cassandraConnection, + @ConnectionRedis RedisConnection redisConnection) { + if (!container.isRunning()) { + var paramsCassandra = cassandraConnection.paramsInNetwork().orElseThrow(); + var paramsRedis = redisConnection.paramsInNetwork().orElseThrow(); + container.withEnv(Map.of( + "CASSANDRA_CONTACT_POINTS", paramsCassandra.contactPoint(), + "CASSANDRA_USER", paramsCassandra.username(), + "CASSANDRA_PASS", paramsCassandra.password(), + "CASSANDRA_DC", paramsCassandra.datacenter(), + "CASSANDRA_KEYSPACE", paramsCassandra.keyspace(), + "CACHE_EXPIRE_WRITE", "0s", + "REDIS_URL", paramsRedis.uri().toString(), + "REDIS_USER", paramsRedis.username(), + "REDIS_PASS", paramsRedis.password())); + + container.start(); + } + } + + @AfterAll + public static void cleanup() { + container.stop(); + } + + @Test + void addPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var requestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var request = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(requestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response.statusCode(), response.body()); + + // then + connection.assertCountsEquals(1, "pets"); + var responseBody = new JSONObject(response.body()); + assertNotNull(responseBody.query("/id")); + assertNotEquals(0L, responseBody.query("/id")); + assertNotNull(responseBody.query("/status")); + assertEquals(requestBody.query("/name"), responseBody.query("/name")); + assertNotNull(responseBody.query("/category/id")); + assertEquals(requestBody.query("/category/name"), responseBody.query("/category/name")); + } + + @Test + void getPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + var createResponseBody = new JSONObject(createResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, getResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(createResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void updatePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var updateRequestBody = new JSONObject() + .put("name", "doggie2") + .put("status", "pending") + .put("category", new JSONObject() + .put("name", "Dogs2")); + + var updateRequest = HttpRequest.newBuilder() + .PUT(HttpRequest.BodyPublishers.ofString(updateRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var updateResponse = httpClient.send(updateRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, updateResponse.statusCode(), updateResponse.body()); + var updateResponseBody = new JSONObject(updateResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(updateResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void deletePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var deleteRequest = HttpRequest.newBuilder() + .DELETE() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var deleteResponse = httpClient.send(deleteRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, deleteResponse.statusCode(), deleteResponse.body()); + + // then + connection.assertCountsEquals(0, "pets"); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetServiceTests.java b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetServiceTests.java new file mode 100644 index 0000000..393cfcd --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/test/java/ru/tinkoff/kora/example/graalvm/crud/cassandra/PetServiceTests.java @@ -0,0 +1,112 @@ +package ru.tinkoff.kora.example.graalvm.crud.cassandra; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; + +import java.util.Collections; +import java.util.concurrent.CompletableFuture; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.service.PetCache; +import ru.tinkoff.kora.example.graalvm.crud.cassandra.service.PetService; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier; +import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; +import ru.tinkoff.kora.test.extension.junit5.TestComponent; + +@KoraAppTest(Application.class) +class PetServiceTests implements KoraAppTestConfigModifier { + + @Mock + @TestComponent + private PetCache petCache; + @Mock + @TestComponent + private PetRepository petRepository; + + @TestComponent + private PetService petService; + + @NotNull + @Override + public KoraConfigModification config() { + return KoraConfigModification.ofString(""" + resilient { + circuitbreaker.pet { + slidingWindowSize = 2 + minimumRequiredCalls = 2 + failureRateThreshold = 100 + permittedCallsInHalfOpenState = 1 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } + } + """); + } + + @Test + void updatePetWithNewCategoryCreated() { + // given + mockCache(); + mockRepository(); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertNotEquals(0L, added.id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("cat"))).blockOptional(); + assertTrue(updated.isPresent()); + assertNotEquals(0L, updated.get().id()); + + // then + Mockito.verify(petRepository).insert(any()); + } + + @Test + void updatePetWithSameCategory() { + // given + mockCache(); + mockRepository(); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertNotEquals(0L, added.id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("dog"))).blockOptional(); + assertTrue(updated.isPresent()); + assertNotEquals(0L, updated.get().id()); + + // then + Mockito.verify(petRepository).insert(any()); + } + + private void mockCache() { + Mockito.when(petCache.getAsync(anyLong())).thenReturn(CompletableFuture.completedFuture(null)); + Mockito.when(petCache.put(anyLong(), any())).then(invocation -> invocation.getArguments()[1]); + Mockito.when(petCache.getAsync(anyCollection())).thenReturn(CompletableFuture.completedFuture(Collections.emptyMap())); + } + + private void mockRepository() { + Mockito.when(petRepository.insert(any())).thenReturn(Mono.empty()); + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.empty()); + } +} diff --git a/kora-java-graalvm-crud-cassandra/src/test/resources/logback-test.xml b/kora-java-graalvm-crud-cassandra/src/test/resources/logback-test.xml new file mode 100644 index 0000000..adccdab --- /dev/null +++ b/kora-java-graalvm-crud-cassandra/src/test/resources/logback-test.xml @@ -0,0 +1,24 @@ + + + + + + UTF-8 + %cyan(%d{HH:mm:ss.SSS}) %highlight(%-5level) [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-jdbc/Dockerfile b/kora-java-graalvm-crud-jdbc/Dockerfile new file mode 100644 index 0000000..de40743 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/Dockerfile @@ -0,0 +1,25 @@ +FROM ghcr.io/graalvm/native-image-community:21 as builder + +ARG APP_DIR=/opt/application +ARG JAR_DIR=build/libs +WORKDIR $APP_DIR + +ADD $JAR_DIR/*.jar $APP_DIR/application.jar + +RUN native-image --no-fallback -classpath $APP_DIR/application.jar + +FROM ubuntu:noble-20240212 as runner + +ARG APP_DIR=/opt/application +WORKDIR $APP_DIR + +COPY --from=builder $APP_DIR/application $APP_DIR/application + +ARG DOCKER_USER=app +RUN groupadd -r $DOCKER_USER && useradd -rg $DOCKER_USER $DOCKER_USER +RUN chmod +x application +USER $DOCKER_USER + +EXPOSE 8080/tcp +EXPOSE 8085/tcp +CMD "/opt/application/application" \ No newline at end of file diff --git a/kora-java-graalvm-crud-jdbc/README.md b/kora-java-graalvm-crud-jdbc/README.md new file mode 100644 index 0000000..86b668c --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/README.md @@ -0,0 +1,49 @@ +# Kora Java GraalVM CRUD JDBC Service + +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, +в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою. + +В примере использовались модули: +- [HTTP Server](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/) +- [HTTP Server OpenAPI Generation](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-codegen/) +- [Probes](https://kora-projects.github.io/kora-docs/ru/documentation/probes/) +- [Metrics](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/) +- [Database JDBC](https://kora-projects.github.io/kora-docs/ru/documentation/database-jdbc/) +- [JSON](https://kora-projects.github.io/kora-docs/ru/documentation/json/) +- [Resilient](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/) +- [Validation](https://kora-projects.github.io/kora-docs/ru/documentation/validation/) +- [Cache Caffeine](https://kora-projects.github.io/kora-docs/ru/documentation/cache/#caffeine) + +Скомпилирован с помощью [GraalVM](https://www.graalvm.org/release-notes/JDK_21/) + +## Build + +Собрать артефакт: + +```shell +./gradlew shadowJar +docker build -t kora-java-graalvm-crud-jdbc . +``` + +### Generate + +Сгенерировать API для HTTP Server: +```shell +./gradlew openApiGenerateHttpServer +``` + +## Run + +Запустить локально: +```shell +./gradlew run +``` + +## Test + +Тесты используют [Testcontainers](https://java.testcontainers.org/), требуется [Docker](https://docs.docker.com/engine/install/) окружение для запуска тестов или аналогичные контейнерные окружения ([colima](https://github.com/abiosoft/colima) / итп) + +Протестировать локально: +```shell +./gradlew test +``` diff --git a/kora-java-graalvm-crud-jdbc/build.gradle b/kora-java-graalvm-crud-jdbc/build.gradle new file mode 100644 index 0000000..99501a7 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/build.gradle @@ -0,0 +1,180 @@ +buildscript { + dependencies { + classpath("ru.tinkoff.kora:openapi-generator:$koraVersion") + } +} + +plugins { + id "java" + id "jacoco" + id "application" + + id "org.openapi.generator" version "7.1.0" + id "com.github.johnrengelman.shadow" version "8.1.1" + id "org.flywaydb.flyway" version "8.4.2" + id "org.graalvm.buildtools.native" version "0.10.1" +} + +repositories { + mavenLocal() + mavenCentral() +} + +mainClassName = "ru.tinkoff.kora.example.graalvm.crud.jdbc.Application" + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +configurations { + koraBom + implementation.extendsFrom(koraBom) + annotationProcessor.extendsFrom(koraBom) +} + +dependencies { + koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") + annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" + annotationProcessor "ru.tinkoff.kora:annotation-processors" + annotationProcessor "io.goodforgod:graalvm-hint-processor:1.2.0" + compileOnly "io.goodforgod:graalvm-hint-annotations:1.2.0" + + implementation "ru.tinkoff.kora:http-server-undertow" + implementation "ru.tinkoff.kora:database-jdbc" + implementation "ru.tinkoff.kora:micrometer-module" + implementation "ru.tinkoff.kora:json-module" + implementation "ru.tinkoff.kora:validation-module" + implementation "ru.tinkoff.kora:cache-caffeine" + implementation "ru.tinkoff.kora:resilient-kora" + implementation "ru.tinkoff.kora:config-hocon" + implementation "ru.tinkoff.kora:openapi-management" + implementation "ru.tinkoff.kora:logging-logback" + + runtimeOnly "org.postgresql:postgresql:42.7.2" + implementation "org.mapstruct:mapstruct:1.5.5.Final" + + testImplementation "org.json:json:20231013" + testImplementation "org.skyscreamer:jsonassert:1.5.1" + + testImplementation "org.mockito:mockito-core:5.6.0" + testImplementation "ru.tinkoff.kora:test-junit5" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" + testImplementation "org.testcontainers:junit-jupiter:1.17.6" +} + +openApiGenerate { + generatorName = "kora" + group = "openapi tools" + inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" + outputDir = "$buildDir/generated/openapi" + apiPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.api" + modelPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.model" + invokerPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.invoker" + configOptions = [ + mode : "java-server", // так же есть java-server вариация HTTP Server"а + enableServerValidation: "true" + ] +} + +graalvmNative { + binaries { + main { + imageName = "$project.name" + mainClass = "$mainClassName" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.matching("GraalVM Community") + } + } + } + metadataRepository { + enabled = true + } +} + +compileJava.dependsOn tasks.openApiGenerate +processResources.dependsOn tasks.collectReachabilityMetadata +test.dependsOn tasks.shadowJar + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "POSTGRES_JDBC_URL": "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase", + "POSTGRES_USER" : "$postgresUser", + "POSTGRES_PASS" : "$postgresPassword", + ]) +} + +test { + jvmArgs += [ + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=1", + ] + + environment([ + "": "" + ]) + + useJUnitPlatform() + testLogging { + showStandardStreams(true) + events("passed", "skipped", "failed") + exceptionFormat("full") + } + + jacoco { + excludes += ["**/Application*"] + } + + reports { + html.required = false + junitXml.required = false + } +} + +sourceSets { + main { + java.srcDirs += "$buildDir/generated/openapi" + resources.srcDirs += "$buildDir/native-reachability-metadata" + } +} + +flyway { + url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase" + user = "$postgresUser" + password = "$postgresPassword" + locations = ["classpath:db/migration"] +} + +jar.enabled = false +shadowJar { + mergeServiceFiles() + manifest { + attributes "Main-Class": mainClassName + attributes "Implementation-Version": koraVersion + } +} + +artifacts { + archives shadowJar +} + +compileJava { + options.encoding("UTF-8") + options.incremental(true) + options.fork = true +} + +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } +} + +javadoc { + options.encoding = "UTF-8" + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true) + } +} \ No newline at end of file diff --git a/kora-java-graalvm-crud-jdbc/gradle.properties b/kora-java-graalvm-crud-jdbc/gradle.properties new file mode 100644 index 0000000..8e7a509 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/gradle.properties @@ -0,0 +1,6 @@ +##### POSTGRES ##### +postgresHost=localhost +postgresPort=5432 +postgresUser=postgres +postgresPassword=postgres +postgresDatabase=postgres diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/Application.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/Application.java new file mode 100644 index 0000000..e7870e5 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/Application.java @@ -0,0 +1,36 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc; + +import io.goodforgod.graalvm.hint.annotation.NativeImageHint; +import io.goodforgod.graalvm.hint.annotation.ResourceHint; +import ru.tinkoff.kora.application.graph.KoraApplication; +import ru.tinkoff.kora.cache.caffeine.CaffeineCacheModule; +import ru.tinkoff.kora.common.KoraApp; +import ru.tinkoff.kora.config.hocon.HoconConfigModule; +import ru.tinkoff.kora.database.jdbc.JdbcDatabaseModule; +import ru.tinkoff.kora.http.server.undertow.UndertowHttpServerModule; +import ru.tinkoff.kora.json.module.JsonModule; +import ru.tinkoff.kora.logging.logback.LogbackModule; +import ru.tinkoff.kora.micrometer.module.MetricsModule; +import ru.tinkoff.kora.openapi.management.OpenApiManagementModule; +import ru.tinkoff.kora.resilient.ResilientModule; +import ru.tinkoff.kora.validation.module.ValidationModule; + +@ResourceHint(include = { "openapi/http-server.yaml" }) +@NativeImageHint(name = "application", entrypoint = Application.class) +@KoraApp +public interface Application extends + HoconConfigModule, + LogbackModule, + JdbcDatabaseModule, + ValidationModule, + JsonModule, + CaffeineCacheModule, + ResilientModule, + MetricsModule, + OpenApiManagementModule, + UndertowHttpServerModule { + + static void main(String[] args) { + KoraApplication.run(ApplicationGraph::graph); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/HttpExceptionHandler.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/HttpExceptionHandler.java new file mode 100644 index 0000000..5e3358c --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/HttpExceptionHandler.java @@ -0,0 +1,42 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.controller; + +import io.micrometer.core.instrument.config.validate.ValidationException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeoutException; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.common.Context; +import ru.tinkoff.kora.common.Tag; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.http.common.body.HttpBody; +import ru.tinkoff.kora.http.server.common.*; +import ru.tinkoff.kora.json.common.JsonWriter; + +@Tag(HttpServerModule.class) +@Component +public final class HttpExceptionHandler implements HttpServerInterceptor { + + private final JsonWriter errorJsonWriter; + + public HttpExceptionHandler(JsonWriter errorJsonWriter) { + this.errorJsonWriter = errorJsonWriter; + } + + @Override + public CompletionStage intercept(Context context, HttpServerRequest request, InterceptChain chain) + throws Exception { + return chain.process(context, request).exceptionally(e -> { + if (e instanceof HttpServerResponseException ex) { + return ex; + } + + var body = HttpBody.json(errorJsonWriter.toByteArrayUnchecked(new MessageTO(e.getMessage()))); + if (e instanceof IllegalArgumentException || e instanceof ValidationException) { + return HttpServerResponse.of(400, body); + } else if (e instanceof TimeoutException) { + return HttpServerResponse.of(408, body); + } else { + return HttpServerResponse.of(500, body); + } + }); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/PetDelegate.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/PetDelegate.java new file mode 100644 index 0000000..ee8a82f --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/controller/PetDelegate.java @@ -0,0 +1,79 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.controller; + +import static ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiResponses.*; + +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.mapper.PetMapper; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.service.PetService; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiDelegate; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.*; + +@Component +public final class PetDelegate implements PetApiDelegate { + + private final PetMapper petMapper; + private final PetService petService; + + public PetDelegate(PetMapper petMapper, PetService petService) { + this.petMapper = petMapper; + this.petService = petService; + } + + @Override + public GetPetByIdApiResponse getPetById(long petId) { + if (petId < 0) { + return new GetPetByIdApiResponse.GetPetById400ApiResponse(malformedId(petId)); + } + + var pet = petService.findByID(petId); + if (pet.isPresent()) { + var body = petMapper.asDTO(pet.get()); + return new GetPetByIdApiResponse.GetPetById200ApiResponse(body); + } else { + return new GetPetByIdApiResponse.GetPetById404ApiResponse(notFound(petId)); + } + } + + @Override + public AddPetApiResponse addPet(PetCreateTO petCreateTO) { + var pet = petService.add(petCreateTO); + var body = petMapper.asDTO(pet); + return new AddPetApiResponse.AddPet200ApiResponse(body); + } + + @Override + public UpdatePetApiResponse updatePet(long petId, PetUpdateTO petUpdateTO) { + if (petId < 0) { + return new UpdatePetApiResponse.UpdatePet400ApiResponse(malformedId(petId)); + } + + var updated = petService.update(petId, petUpdateTO); + if (updated.isPresent()) { + var body = petMapper.asDTO(updated.get()); + return new UpdatePetApiResponse.UpdatePet200ApiResponse(body); + } else { + return new UpdatePetApiResponse.UpdatePet404ApiResponse(notFound(petId)); + } + } + + @Override + public DeletePetApiResponse deletePet(long petId) { + if (petId < 0) { + return new DeletePetApiResponse.DeletePet400ApiResponse(malformedId(petId)); + } + + if (petService.delete(petId)) { + return new DeletePetApiResponse.DeletePet200ApiResponse(new MessageTO("Successfully deleted pet with ID: " + petId)); + } else { + return new DeletePetApiResponse.DeletePet404ApiResponse(notFound(petId)); + } + } + + private static MessageTO notFound(long petId) { + return new MessageTO("Pet not found for ID: " + petId); + } + + private static MessageTO malformedId(long petId) { + return new MessageTO("Pet malformed ID: " + petId); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/Pet.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/Pet.java new file mode 100644 index 0000000..1c4f907 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/Pet.java @@ -0,0 +1,25 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("pets") +public record Pet(@Id @Column("id") long id, + @Column("name") String name, + @Column("status") Status status, + @Column("category_id") long categoryId) { + + public enum Status { + + AVAILABLE(0), + PENDING(10), + SOLD(20); + + public final int code; + + Status(int code) { + this.code = code; + } + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetCategory.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetCategory.java new file mode 100644 index 0000000..98ab510 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetCategory.java @@ -0,0 +1,8 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("categories") +public record PetCategory(@Id long id, + String name) {} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetWithCategory.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetWithCategory.java new file mode 100644 index 0000000..bc7966b --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/dao/PetWithCategory.java @@ -0,0 +1,14 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Embedded; + +public record PetWithCategory(@Column("id") long id, + @Column("name") String name, + @Column("status") Pet.Status status, + @Embedded("category_") PetCategory category) { + + public Pet getPet() { + return new Pet(id, name, status, category.id()); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/mapper/PetMapper.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/mapper/PetMapper.java new file mode 100644 index 0000000..b32b4b0 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/model/mapper/PetMapper.java @@ -0,0 +1,15 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.model.mapper; + +import org.mapstruct.Mapper; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetWithCategory; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetTO; + +@Mapper +public interface PetMapper { + + PetTO asDTO(PetWithCategory pet); + + CategoryTO asDTO(PetCategory category); +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/CategoryRepository.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/CategoryRepository.java new file mode 100644 index 0000000..14a85e5 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/CategoryRepository.java @@ -0,0 +1,22 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.repository; + +import java.util.Optional; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.jdbc.JdbcRepository; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetCategory; + +@Repository +public interface CategoryRepository extends JdbcRepository { + + @Query("SELECT %{return#selects} FROM %{return#table} WHERE name = :name") + Optional findByName(String name); + + @Id + @Query("INSERT INTO categories(name) VALUES (:categoryName)") + long insert(String categoryName); + + @Query("DELETE FROM categories WHERE id = :id") + void deleteById(long id); +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/PetRepository.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/PetRepository.java new file mode 100644 index 0000000..af5be34 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/PetRepository.java @@ -0,0 +1,32 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.repository; + +import java.util.Optional; +import ru.tinkoff.kora.database.common.UpdateCount; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.jdbc.JdbcRepository; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetWithCategory; + +@Repository +public interface PetRepository extends JdbcRepository { + + @Query(""" + SELECT p.id, p.name, p.status, p.category_id, c.name as category_name + FROM pets p + JOIN categories c on c.id = p.category_id + WHERE p.id = :id + """) + Optional findById(long id); + + @Id + @Query("INSERT INTO %{entity#inserts -= id}") + long insert(Pet entity); + + @Query("UPDATE %{entity#table} SET %{entity#updates} WHERE %{entity#where = @id}") + void update(Pet entity); + + @Query("DELETE FROM pets WHERE id = :id") + UpdateCount deleteById(long id); +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusParameterMapper.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusParameterMapper.java new file mode 100644 index 0000000..cec0871 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusParameterMapper.java @@ -0,0 +1,21 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.mapper; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Types; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.jdbc.mapper.parameter.JdbcParameterColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.Pet; + +@Component +public final class PetStatusParameterMapper implements JdbcParameterColumnMapper { + + @Override + public void set(PreparedStatement stmt, int index, Pet.Status value) throws SQLException { + if (value == null) { + stmt.setNull(index, Types.INTEGER); + } else { + stmt.setInt(index, value.code); + } + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusResultMapper.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusResultMapper.java new file mode 100644 index 0000000..62fb611 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/repository/mapper/PetStatusResultMapper.java @@ -0,0 +1,25 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.mapper; + +import java.sql.ResultSet; +import java.sql.SQLException; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.jdbc.mapper.result.JdbcResultColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.Pet; + +@Component +public final class PetStatusResultMapper implements JdbcResultColumnMapper { + + private final Pet.Status[] statuses = Pet.Status.values(); + + @Override + public Pet.Status apply(ResultSet row, int index) throws SQLException { + final int code = row.getInt(index); + for (Pet.Status status : statuses) { + if (code == status.code) { + return status; + } + } + + throw new IllegalStateException("Unknown code: " + code); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetCache.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetCache.java new file mode 100644 index 0000000..cc9e795 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetCache.java @@ -0,0 +1,10 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.service; + +import ru.tinkoff.kora.cache.annotation.Cache; +import ru.tinkoff.kora.cache.caffeine.CaffeineCache; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetWithCategory; + +@Cache("pet-cache") +public interface PetCache extends CaffeineCache { + +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetService.java b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetService.java new file mode 100644 index 0000000..28acd83 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/service/PetService.java @@ -0,0 +1,94 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc.service; + +import java.util.Optional; +import java.util.concurrent.ThreadLocalRandom; +import ru.tinkoff.kora.cache.annotation.CacheInvalidate; +import ru.tinkoff.kora.cache.annotation.CachePut; +import ru.tinkoff.kora.cache.annotation.Cacheable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.model.dao.PetWithCategory; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.resilient.circuitbreaker.annotation.CircuitBreaker; +import ru.tinkoff.kora.resilient.retry.annotation.Retry; +import ru.tinkoff.kora.resilient.timeout.annotation.Timeout; + +@Component +public class PetService { + + private final PetRepository petRepository; + private final CategoryRepository categoryRepository; + + public PetService(PetRepository petRepository, CategoryRepository categoryRepository) { + this.petRepository = petRepository; + this.categoryRepository = categoryRepository; + } + + @Cacheable(PetCache.class) + @CircuitBreaker("pet") + @Retry("pet") + @Timeout("pet") + public Optional findByID(long petId) { + return petRepository.findById(petId); + } + + @CircuitBreaker("pet") + @Timeout("pet") + public PetWithCategory add(PetCreateTO createTO) { + final long petCategoryId = categoryRepository.findByName(createTO.category().name()) + .map(PetCategory::id) + .orElseGet(() -> categoryRepository.insert(createTO.category().name())); + + var pet = new Pet(ThreadLocalRandom.current().nextInt(0, Integer.MAX_VALUE), createTO.name(), Pet.Status.AVAILABLE, + petCategoryId); + var petId = petRepository.insert(pet); + + return new PetWithCategory(petId, pet.name(), pet.status(), + new PetCategory(petCategoryId, createTO.category().name())); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CachePut(value = PetCache.class, parameters = "id") + public Optional update(long id, PetUpdateTO updateTO) { + final Optional existing = petRepository.findById(id); + if (existing.isEmpty()) { + return Optional.empty(); + } + + var category = existing.get().category(); + if (updateTO.category() != null) { + category = categoryRepository.findByName(updateTO.category().name()).orElseGet(() -> { + final long newCategoryId = categoryRepository.insert(updateTO.category().name()); + return new PetCategory(newCategoryId, updateTO.category().name()); + }); + } + + var status = (updateTO.status() == null) + ? existing.get().status() + : toStatus(updateTO.status()); + var result = new PetWithCategory(existing.get().id(), updateTO.name(), status, category); + + petRepository.update(result.getPet()); + return Optional.of(result); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CacheInvalidate(PetCache.class) + public boolean delete(long petId) { + return petRepository.deleteById(petId).value() == 1; + } + + private static Pet.Status toStatus(PetUpdateTO.StatusEnum statusEnum) { + return switch (statusEnum) { + case AVAILABLE -> Pet.Status.AVAILABLE; + case PENDING -> Pet.Status.PENDING; + case SOLD -> Pet.Status.SOLD; + }; + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/resources/application.conf b/kora-java-graalvm-crud-jdbc/src/main/resources/application.conf new file mode 100644 index 0000000..b36f0c4 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/resources/application.conf @@ -0,0 +1,60 @@ +httpServer { + publicApiHttpPort = 8080 + privateApiHttpPort = 8085 +} + + +db { + jdbcUrl = ${POSTGRES_JDBC_URL} + username = ${POSTGRES_USER} + password = ${POSTGRES_PASS} + maxPoolSize = 10 + poolName = "kora" + initializationFailTimeout = "10s" +} + + +pet-cache { + maximumSize = 1000 + expireAfterWrite = ${?CACHE_EXPIRE_WRITE} +} + + +openapi { + management { + enabled = true + file = "openapi/http-server.yaml" + swaggerui { + enabled = true + } + rapidoc { + enabled = true + } + } +} + + +resilient { + circuitbreaker.pet { + slidingWindowSize = 50 + minimumRequiredCalls = 25 + failureRateThreshold = 50 + permittedCallsInHalfOpenState = 10 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } +} + + +logging.level { + "root": "WARN" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" + "ru.tinkoff.kora.application.graph.internal.loom.VirtualThreadExecutorHolder": "DEBUG" +} diff --git a/kora-java-graalvm-crud-jdbc/src/main/resources/db/migration/V1__setup-tables.sql b/kora-java-graalvm-crud-jdbc/src/main/resources/db/migration/V1__setup-tables.sql new file mode 100644 index 0000000..3e70499 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/resources/db/migration/V1__setup-tables.sql @@ -0,0 +1,16 @@ +CREATE TABLE IF NOT EXISTS categories +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + PRIMARY KEY (id) +); + + +CREATE TABLE IF NOT EXISTS pets +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + status SMALLINT NOT NULL, + category_id BIGINT NOT NULL REFERENCES categories(id), + PRIMARY KEY (id) +); diff --git a/kora-java-graalvm-crud-jdbc/src/main/resources/logback.xml b/kora-java-graalvm-crud-jdbc/src/main/resources/logback.xml new file mode 100644 index 0000000..745e83f --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + UTF-8 + %d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-jdbc/src/main/resources/openapi/http-server.yaml b/kora-java-graalvm-crud-jdbc/src/main/resources/openapi/http-server.yaml new file mode 100644 index 0000000..8d99f49 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/main/resources/openapi/http-server.yaml @@ -0,0 +1,315 @@ +openapi: 3.0.3 +info: + title: Swagger Petstore - OpenAPI 3.0 + description: |- + This is a sample Pet Store Server based on the OpenAPI 3.0 specification. You can find out more about + Swagger at [https://swagger.io](https://swagger.io). + license: + name: Apache 2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.11 +externalDocs: + description: Find out more about Swagger + url: https://swagger.io +tags: + - name: pet + description: Everything about your Pets + externalDocs: + description: Find out more + url: https://swagger.io +paths: + /v3/pets: + post: + tags: + - pet + summary: Add a new pet to the store + description: Add a new pet to the store + operationId: addPet + requestBody: + required: true + description: Create a new pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetCreateTO' + responses: + '200': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + /v3/pets/{id}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: id + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + nullable: false + minimum: 1 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + put: + tags: + - pet + summary: Update an existing pet + description: Update an existing pet by Id + operationId: updatePet + parameters: + - name: id + in: path + description: Pet id to update + required: true + schema: + type: integer + format: int64 + requestBody: + description: Update an existent pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetUpdateTO' + required: true + responses: + '200': + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + delete: + tags: + - pet + summary: Deletes a pet + description: delete a pet + operationId: deletePet + parameters: + - name: id + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' +components: + schemas: + MessageTO: + type: object + properties: + message: + type: string + CategoryTO: + required: + - id + - name + type: object + properties: + id: + type: integer + format: int64 + example: 1 + name: + type: string + example: Dogs + CategoryCreateTO: + required: + - name + type: object + properties: + name: + type: string + example: Dogs + PetStatusTO: + properties: + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + PetTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + example: 10 + nullable: false + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryTO' + PetCreateTO: + required: + - name + - category + type: object + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' + PetUpdateTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - name + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' diff --git a/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/AppContainer.java b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/AppContainer.java new file mode 100644 index 0000000..90192cd --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/AppContainer.java @@ -0,0 +1,47 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc; + +import java.net.URI; +import java.nio.file.Paths; +import java.time.Duration; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; + +public final class AppContainer extends GenericContainer { + + private AppContainer() { + super(new ImageFromDockerfile("kora-java-graalvm-crud-jdbc") + .withDockerfile(Paths.get("Dockerfile").toAbsolutePath())); + } + + private AppContainer(DockerImageName image) { + super(image); + } + + public static AppContainer build() { + final String appImage = System.getenv("IMAGE_KORA_JAVA_GRAALVM_CRUD_JDBC"); + return (appImage != null && !appImage.isBlank()) + ? new AppContainer(DockerImageName.parse(appImage)) + : new AppContainer(); + } + + @Override + protected void configure() { + super.configure(); + withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); + withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); + waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); + } + + public int getPort() { + return getMappedPort(8080); + } + + public URI getURI() { + return URI.create(String.format("http://%s:%s", getHost(), getPort())); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetControllerTests.java b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetControllerTests.java new file mode 100644 index 0000000..085fb59 --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetControllerTests.java @@ -0,0 +1,210 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc; + +import static org.junit.jupiter.api.Assertions.*; + +import io.goodforgod.testcontainers.extensions.ContainerMode; +import io.goodforgod.testcontainers.extensions.Network; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; +import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; +import io.goodforgod.testcontainers.extensions.jdbc.Migration; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Map; +import org.json.JSONObject; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; + +@TestcontainersPostgreSQL( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN, + migration = @Migration( + engine = Migration.Engines.FLYWAY, + apply = Migration.Mode.PER_METHOD, + drop = Migration.Mode.PER_METHOD)) +class PetControllerTests { + + private static final AppContainer container = AppContainer.build() + .withNetwork(org.testcontainers.containers.Network.SHARED); + + @ConnectionPostgreSQL + private JdbcConnection connection; + + @BeforeEach + public void setup(@ConnectionPostgreSQL JdbcConnection connection) { + if (!container.isRunning()) { + var params = connection.paramsInNetwork().orElseThrow(); + container.withEnv(Map.of( + "POSTGRES_JDBC_URL", params.jdbcUrl(), + "POSTGRES_USER", params.username(), + "POSTGRES_PASS", params.password(), + "CACHE_EXPIRE_WRITE", "0s")); + + container.start(); + } + } + + @AfterAll + public static void cleanup() { + container.stop(); + } + + @Test + void addPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var requestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var request = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(requestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response.statusCode(), response.body()); + + // then + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var responseBody = new JSONObject(response.body()); + assertNotNull(responseBody.query("/id")); + assertNotEquals(0L, responseBody.query("/id")); + assertNotNull(responseBody.query("/status")); + assertEquals(requestBody.query("/name"), responseBody.query("/name")); + assertNotNull(responseBody.query("/category/id")); + assertEquals(requestBody.query("/category/name"), responseBody.query("/category/name")); + } + + @Test + void getPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, getResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(createResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void updatePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var updateRequestBody = new JSONObject() + .put("name", "doggie2") + .put("status", "pending") + .put("category", new JSONObject() + .put("name", "Dogs2")); + + var updateRequest = HttpRequest.newBuilder() + .PUT(HttpRequest.BodyPublishers.ofString(updateRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var updateResponse = httpClient.send(updateRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, updateResponse.statusCode(), updateResponse.body()); + var updateResponseBody = new JSONObject(updateResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(updateResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void deletePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var deleteRequest = HttpRequest.newBuilder() + .DELETE() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var deleteResponse = httpClient.send(deleteRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, deleteResponse.statusCode(), deleteResponse.body()); + + // then + connection.assertCountsEquals(0, "pets"); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetServiceTests.java b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetServiceTests.java new file mode 100644 index 0000000..8ca45be --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/jdbc/PetServiceTests.java @@ -0,0 +1,123 @@ +package ru.tinkoff.kora.example.graalvm.crud.jdbc; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; + +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.service.PetCache; +import ru.tinkoff.kora.example.graalvm.crud.jdbc.service.PetService; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier; +import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; +import ru.tinkoff.kora.test.extension.junit5.TestComponent; + +@KoraAppTest(Application.class) +class PetServiceTests implements KoraAppTestConfigModifier { + + @Mock + @TestComponent + private PetCache petCache; + @Mock + @TestComponent + private PetRepository petRepository; + @Mock + @TestComponent + private CategoryRepository categoryRepository; + + @TestComponent + private PetService petService; + + @NotNull + @Override + public KoraConfigModification config() { + return KoraConfigModification.ofString(""" + resilient { + circuitbreaker.pet { + slidingWindowSize = 2 + minimumRequiredCalls = 2 + failureRateThreshold = 100 + permittedCallsInHalfOpenState = 1 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } + } + """); + } + + @Test + void updatePetWithNewCategoryCreated() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L, "cat", 2L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Optional.of(added)); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("cat"))); + assertTrue(updated.isPresent()); + assertEquals(1, updated.get().id()); + assertEquals(2, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository, Mockito.times(2)).insert(any()); + } + + @Test + void updatePetWithSameCategory() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Optional.of(added)); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Optional.of(added.category())); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("dog"))); + assertTrue(updated.isPresent()); + assertNotEquals(0, updated.get().id()); + assertNotEquals(0, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository).insert(any()); + } + + private void mockCache() { + Mockito.when(petCache.get(anyLong())).thenReturn(null); + Mockito.when(petCache.put(anyLong(), any())).then(invocation -> invocation.getArguments()[1]); + Mockito.when(petCache.get(anyCollection())).thenReturn(Collections.emptyMap()); + } + + private void mockRepository(Map categoryNameToId) { + categoryNameToId.forEach((k, v) -> Mockito.when(categoryRepository.insert(k)).thenReturn(v)); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Optional.empty()); + Mockito.when(petRepository.insert(any())).thenReturn(1L); + Mockito.when(petRepository.findById(anyLong())).thenReturn(Optional.empty()); + } +} diff --git a/kora-java-graalvm-crud-jdbc/src/test/resources/logback-test.xml b/kora-java-graalvm-crud-jdbc/src/test/resources/logback-test.xml new file mode 100644 index 0000000..adccdab --- /dev/null +++ b/kora-java-graalvm-crud-jdbc/src/test/resources/logback-test.xml @@ -0,0 +1,24 @@ + + + + + + UTF-8 + %cyan(%d{HH:mm:ss.SSS}) %highlight(%-5level) [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-r2dbc/Dockerfile b/kora-java-graalvm-crud-r2dbc/Dockerfile new file mode 100644 index 0000000..de40743 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/Dockerfile @@ -0,0 +1,25 @@ +FROM ghcr.io/graalvm/native-image-community:21 as builder + +ARG APP_DIR=/opt/application +ARG JAR_DIR=build/libs +WORKDIR $APP_DIR + +ADD $JAR_DIR/*.jar $APP_DIR/application.jar + +RUN native-image --no-fallback -classpath $APP_DIR/application.jar + +FROM ubuntu:noble-20240212 as runner + +ARG APP_DIR=/opt/application +WORKDIR $APP_DIR + +COPY --from=builder $APP_DIR/application $APP_DIR/application + +ARG DOCKER_USER=app +RUN groupadd -r $DOCKER_USER && useradd -rg $DOCKER_USER $DOCKER_USER +RUN chmod +x application +USER $DOCKER_USER + +EXPOSE 8080/tcp +EXPOSE 8085/tcp +CMD "/opt/application/application" \ No newline at end of file diff --git a/kora-java-graalvm-crud-r2dbc/README.md b/kora-java-graalvm-crud-r2dbc/README.md new file mode 100644 index 0000000..3b98d3b --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/README.md @@ -0,0 +1,49 @@ +# Kora Java GraalVM CRUD R2DBC Service + +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, +в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою. + +В примере использовались модули: +- [HTTP Server](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/) +- [HTTP Server OpenAPI Generation](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-codegen/) +- [Probes](https://kora-projects.github.io/kora-docs/ru/documentation/probes/) +- [Metrics](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/) +- [Database R2DBC](https://kora-projects.github.io/kora-docs/ru/documentation/database-r2dbc/) +- [JSON](https://kora-projects.github.io/kora-docs/ru/documentation/json/) +- [Resilient](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/) +- [Validation](https://kora-projects.github.io/kora-docs/ru/documentation/validation/) +- [Cache Caffeine](https://kora-projects.github.io/kora-docs/ru/documentation/cache/#caffeine) + +Скомпилирован с помощью [GraalVM](https://www.graalvm.org/release-notes/JDK_21/) + +## Build + +Собрать артефакт: + +```shell +./gradlew shadowJar +docker build -t kora-java-graalvm-crud-r2dbc . +``` + +### Generate + +Сгенерировать API для HTTP Server: +```shell +./gradlew openApiGenerateHttpServer +``` + +## Run + +Запустить локально: +```shell +./gradlew run +``` + +## Test + +Тесты используют [Testcontainers](https://java.testcontainers.org/), требуется [Docker](https://docs.docker.com/engine/install/) окружение для запуска тестов или аналогичные контейнерные окружения ([colima](https://github.com/abiosoft/colima) / итп) + +Протестировать локально: +```shell +./gradlew test +``` diff --git a/kora-java-graalvm-crud-r2dbc/build.gradle b/kora-java-graalvm-crud-r2dbc/build.gradle new file mode 100644 index 0000000..c8b135c --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/build.gradle @@ -0,0 +1,182 @@ +buildscript { + dependencies { + classpath("ru.tinkoff.kora:openapi-generator:$koraVersion") + } +} + +plugins { + id "java" + id "jacoco" + id "application" + + id "org.openapi.generator" version "7.1.0" + id "com.github.johnrengelman.shadow" version "8.1.1" + id "org.flywaydb.flyway" version "8.4.2" + id "org.graalvm.buildtools.native" version "0.10.1" +} + +repositories { + mavenLocal() + mavenCentral() +} + +mainClassName = "ru.tinkoff.kora.example.graalvm.crud.r2dbc.Application" + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +configurations { + koraBom + implementation.extendsFrom(koraBom) + annotationProcessor.extendsFrom(koraBom) +} + +dependencies { + koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") + annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" + annotationProcessor "ru.tinkoff.kora:annotation-processors" + annotationProcessor "io.goodforgod:graalvm-hint-processor:1.2.0" + compileOnly "io.goodforgod:graalvm-hint-annotations:1.2.0" + compileOnly "org.postgresql:postgresql:42.7.2" + + implementation "ru.tinkoff.kora:http-server-undertow" + implementation "ru.tinkoff.kora:database-r2dbc" + implementation "ru.tinkoff.kora:micrometer-module" + implementation "ru.tinkoff.kora:json-module" + implementation "ru.tinkoff.kora:validation-module" + implementation "ru.tinkoff.kora:cache-caffeine" + implementation "ru.tinkoff.kora:resilient-kora" + implementation "ru.tinkoff.kora:config-hocon" + implementation "ru.tinkoff.kora:openapi-management" + implementation "ru.tinkoff.kora:logging-logback" + + implementation "org.mapstruct:mapstruct:1.5.5.Final" + implementation "org.postgresql:r2dbc-postgresql:1.0.4.RELEASE" + + testImplementation "org.json:json:20231013" + testImplementation "org.skyscreamer:jsonassert:1.5.1" + testImplementation "org.postgresql:postgresql:42.7.2" + + testImplementation "org.mockito:mockito-core:5.6.0" + testImplementation "ru.tinkoff.kora:test-junit5" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" + testImplementation "org.testcontainers:junit-jupiter:1.17.6" +} + +openApiGenerate { + generatorName = "kora" + group = "openapi tools" + inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" + outputDir = "$buildDir/generated/openapi" + apiPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.api" + modelPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.model" + invokerPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.invoker" + configOptions = [ + mode : "java-reactive-server", // так же есть java-server вариация HTTP Server"а + enableServerValidation: "true" + ] +} + +graalvmNative { + binaries { + main { + imageName = "$project.name" + mainClass = "$mainClassName" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.matching("GraalVM Community") + } + } + } + metadataRepository { + enabled = true + } +} + +compileJava.dependsOn tasks.openApiGenerate +processResources.dependsOn tasks.collectReachabilityMetadata +test.dependsOn tasks.shadowJar + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "POSTGRES_R2DBC_URL": "r2dbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase", + "POSTGRES_USER" : "$postgresUser", + "POSTGRES_PASS" : "$postgresPassword", + ]) +} + +test { + jvmArgs += [ + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=1", + ] + + environment([ + "": "" + ]) + + useJUnitPlatform() + testLogging { + showStandardStreams(true) + events("passed", "skipped", "failed") + exceptionFormat("full") + } + + jacoco { + excludes += ["**/Application*"] + } + + reports { + html.required = false + junitXml.required = false + } +} + +sourceSets { + main { + java.srcDirs += "$buildDir/generated/openapi" + resources.srcDirs += "$buildDir/native-reachability-metadata" + } +} + +flyway { + url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase" + user = "$postgresUser" + password = "$postgresPassword" + locations = ["classpath:db/migration"] +} + +jar.enabled = false +shadowJar { + mergeServiceFiles() + manifest { + attributes "Main-Class": mainClassName + attributes "Implementation-Version": koraVersion + } +} + +artifacts { + archives shadowJar +} + +compileJava { + options.encoding("UTF-8") + options.incremental(true) + options.fork = true +} + +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } +} + +javadoc { + options.encoding = "UTF-8" + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true) + } +} \ No newline at end of file diff --git a/kora-java-graalvm-crud-r2dbc/gradle.properties b/kora-java-graalvm-crud-r2dbc/gradle.properties new file mode 100644 index 0000000..8e7a509 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/gradle.properties @@ -0,0 +1,6 @@ +##### POSTGRES ##### +postgresHost=localhost +postgresPort=5432 +postgresUser=postgres +postgresPassword=postgres +postgresDatabase=postgres diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/Application.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/Application.java new file mode 100644 index 0000000..a877774 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/Application.java @@ -0,0 +1,36 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc; + +import io.goodforgod.graalvm.hint.annotation.NativeImageHint; +import io.goodforgod.graalvm.hint.annotation.ResourceHint; +import ru.tinkoff.kora.application.graph.KoraApplication; +import ru.tinkoff.kora.cache.caffeine.CaffeineCacheModule; +import ru.tinkoff.kora.common.KoraApp; +import ru.tinkoff.kora.config.hocon.HoconConfigModule; +import ru.tinkoff.kora.database.r2dbc.R2dbcDatabaseModule; +import ru.tinkoff.kora.http.server.undertow.UndertowHttpServerModule; +import ru.tinkoff.kora.json.module.JsonModule; +import ru.tinkoff.kora.logging.logback.LogbackModule; +import ru.tinkoff.kora.micrometer.module.MetricsModule; +import ru.tinkoff.kora.openapi.management.OpenApiManagementModule; +import ru.tinkoff.kora.resilient.ResilientModule; +import ru.tinkoff.kora.validation.module.ValidationModule; + +@ResourceHint(include = { "openapi/http-server.yaml" }) +@NativeImageHint(name = "application", entrypoint = Application.class) +@KoraApp +public interface Application extends + HoconConfigModule, + LogbackModule, + R2dbcDatabaseModule, + ValidationModule, + JsonModule, + CaffeineCacheModule, + ResilientModule, + MetricsModule, + OpenApiManagementModule, + UndertowHttpServerModule { + + static void main(String[] args) { + KoraApplication.run(ApplicationGraph::graph); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/HttpExceptionHandler.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/HttpExceptionHandler.java new file mode 100644 index 0000000..3a5f251 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/HttpExceptionHandler.java @@ -0,0 +1,42 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.controller; + +import io.micrometer.core.instrument.config.validate.ValidationException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeoutException; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.common.Context; +import ru.tinkoff.kora.common.Tag; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.http.common.body.HttpBody; +import ru.tinkoff.kora.http.server.common.*; +import ru.tinkoff.kora.json.common.JsonWriter; + +@Tag(HttpServerModule.class) +@Component +public final class HttpExceptionHandler implements HttpServerInterceptor { + + private final JsonWriter errorJsonWriter; + + public HttpExceptionHandler(JsonWriter errorJsonWriter) { + this.errorJsonWriter = errorJsonWriter; + } + + @Override + public CompletionStage intercept(Context context, HttpServerRequest request, InterceptChain chain) + throws Exception { + return chain.process(context, request).exceptionally(e -> { + if (e instanceof HttpServerResponseException ex) { + return ex; + } + + var body = HttpBody.json(errorJsonWriter.toByteArrayUnchecked(new MessageTO(e.getMessage()))); + if (e instanceof IllegalArgumentException || e instanceof ValidationException) { + return HttpServerResponse.of(400, body); + } else if (e instanceof TimeoutException) { + return HttpServerResponse.of(408, body); + } else { + return HttpServerResponse.of(500, body); + } + }); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/PetDelegate.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/PetDelegate.java new file mode 100644 index 0000000..7222a13 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/controller/PetDelegate.java @@ -0,0 +1,82 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.controller; + +import static ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiResponses.*; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiDelegate; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.mapper.PetMapper; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.service.PetService; + +@Component +public final class PetDelegate implements PetApiDelegate { + + private final PetMapper petMapper; + private final PetService petService; + + public PetDelegate(PetMapper petMapper, PetService petService) { + this.petMapper = petMapper; + this.petService = petService; + } + + @Override + public Mono getPetById(long petId) { + if (petId < 0) { + return Mono.just(new GetPetByIdApiResponse.GetPetById400ApiResponse(malformedId(petId))); + } + + return petService.findByID(petId) + .map(pet -> { + var body = petMapper.asDTO(pet); + return ((GetPetByIdApiResponse) new GetPetByIdApiResponse.GetPetById200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new GetPetByIdApiResponse.GetPetById404ApiResponse(notFound(petId)))); + } + + @Override + public Mono addPet(PetCreateTO petCreateTO) { + return petService.add(petCreateTO) + .map(pet -> { + var body = petMapper.asDTO(pet); + return new AddPetApiResponse.AddPet200ApiResponse(body); + }); + } + + @Override + public Mono updatePet(long petId, PetUpdateTO petUpdateTO) { + if (petId < 0) { + return Mono.just(new UpdatePetApiResponse.UpdatePet400ApiResponse(malformedId(petId))); + } + + return petService.update(petId, petUpdateTO) + .map(pet -> { + var body = petMapper.asDTO(pet); + return ((UpdatePetApiResponse) new UpdatePetApiResponse.UpdatePet200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new UpdatePetApiResponse.UpdatePet404ApiResponse(notFound(petId)))); + } + + @Override + public Mono deletePet(long petId) { + if (petId < 0) { + return Mono.just(new DeletePetApiResponse.DeletePet400ApiResponse(malformedId(petId))); + } + + return petService.delete(petId) + .map(isDeleted -> (isDeleted) + ? new DeletePetApiResponse.DeletePet200ApiResponse( + new MessageTO("Successfully deleted pet with ID: " + petId)) + : new DeletePetApiResponse.DeletePet404ApiResponse(notFound(petId))); + } + + private static MessageTO notFound(long petId) { + return new MessageTO("Pet not found for ID: " + petId); + } + + private static MessageTO malformedId(long petId) { + return new MessageTO("Pet malformed ID: " + petId); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/Pet.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/Pet.java new file mode 100644 index 0000000..d285192 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/Pet.java @@ -0,0 +1,25 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("pets") +public record Pet(@Id @Column("id") long id, + @Column("name") String name, + @Column("status") Status status, + @Column("category_id") long categoryId) { + + public enum Status { + + AVAILABLE(0), + PENDING(10), + SOLD(20); + + public final int code; + + Status(int code) { + this.code = code; + } + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetCategory.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetCategory.java new file mode 100644 index 0000000..8cfb55f --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetCategory.java @@ -0,0 +1,8 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("categories") +public record PetCategory(@Id long id, + String name) {} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetWithCategory.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetWithCategory.java new file mode 100644 index 0000000..eb44134 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/dao/PetWithCategory.java @@ -0,0 +1,18 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Embedded; + +public record PetWithCategory(@Column("id") long id, + @Column("name") String name, + @Column("status") Pet.Status status, + @Embedded("category_") PetCategory category) { + + public PetWithCategory(Pet pet, PetCategory category) { + this(pet.id(), pet.name(), pet.status(), category); + } + + public Pet getPet() { + return new Pet(id, name, status, category.id()); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/mapper/PetMapper.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/mapper/PetMapper.java new file mode 100644 index 0000000..40effdd --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/model/mapper/PetMapper.java @@ -0,0 +1,15 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.mapper; + +import org.mapstruct.Mapper; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetTO; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetWithCategory; + +@Mapper +public interface PetMapper { + + PetTO asDTO(PetWithCategory pet); + + CategoryTO asDTO(PetCategory category); +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/CategoryRepository.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/CategoryRepository.java new file mode 100644 index 0000000..a88df75 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/CategoryRepository.java @@ -0,0 +1,23 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.database.common.UpdateCount; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.r2dbc.R2dbcRepository; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetCategory; + +@Repository +public interface CategoryRepository extends R2dbcRepository { + + @Query("SELECT %{return#selects} FROM %{return#table} WHERE name = :name") + Mono findByName(String name); + + @Id + @Query("INSERT INTO categories(name) VALUES (:categoryName)") + Mono insert(String categoryName); + + @Query("DELETE FROM categories WHERE id = :id") + Mono deleteById(long id); +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/PetRepository.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/PetRepository.java new file mode 100644 index 0000000..9c18736 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/PetRepository.java @@ -0,0 +1,32 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.database.common.UpdateCount; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.r2dbc.R2dbcRepository; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetWithCategory; + +@Repository +public interface PetRepository extends R2dbcRepository { + + @Query(""" + SELECT p.id, p.name, p.status, p.category_id, c.name as category_name + FROM pets p + JOIN categories c on c.id = p.category_id + WHERE p.id = :id + """) + Mono findById(long id); + + @Id + @Query("INSERT INTO %{entity#inserts -= id}") + Mono insert(Pet entity); + + @Query("UPDATE %{entity#table} SET %{entity#updates} WHERE %{entity#where = @id}") + Mono update(Pet entity); + + @Query("DELETE FROM pets WHERE id = :id") + Mono deleteById(long id); +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusParameterMapper.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusParameterMapper.java new file mode 100644 index 0000000..958051f --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusParameterMapper.java @@ -0,0 +1,20 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.mapper; + +import io.r2dbc.spi.Statement; +import jakarta.annotation.Nullable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.r2dbc.mapper.parameter.R2dbcParameterColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.Pet; + +@Component +public final class PetStatusParameterMapper implements R2dbcParameterColumnMapper { + + @Override + public void apply(Statement stmt, int index, @Nullable Pet.Status value) { + if (value == null) { + stmt.bindNull(index, Integer.class); + } else { + stmt.bind(index, value.code); + } + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusResultMapper.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusResultMapper.java new file mode 100644 index 0000000..543e2bf --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/repository/mapper/PetStatusResultMapper.java @@ -0,0 +1,24 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.mapper; + +import io.r2dbc.spi.Row; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.r2dbc.mapper.result.R2dbcResultColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.Pet; + +@Component +public final class PetStatusResultMapper implements R2dbcResultColumnMapper { + + private final Pet.Status[] statuses = Pet.Status.values(); + + @Override + public Pet.Status apply(Row row, String label) { + final int code = row.get(label, Integer.class); + for (Pet.Status status : statuses) { + if (code == status.code) { + return status; + } + } + + throw new IllegalStateException("Unknown code: " + code); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetCache.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetCache.java new file mode 100644 index 0000000..3515e97 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetCache.java @@ -0,0 +1,10 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.service; + +import ru.tinkoff.kora.cache.annotation.Cache; +import ru.tinkoff.kora.cache.caffeine.CaffeineCache; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetWithCategory; + +@Cache("pet-cache") +public interface PetCache extends CaffeineCache { + +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetService.java b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetService.java new file mode 100644 index 0000000..8a552e1 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/service/PetService.java @@ -0,0 +1,91 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc.service; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.cache.annotation.CacheInvalidate; +import ru.tinkoff.kora.cache.annotation.CachePut; +import ru.tinkoff.kora.cache.annotation.Cacheable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.model.dao.PetWithCategory; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.PetRepository; +import ru.tinkoff.kora.resilient.circuitbreaker.annotation.CircuitBreaker; +import ru.tinkoff.kora.resilient.retry.annotation.Retry; +import ru.tinkoff.kora.resilient.timeout.annotation.Timeout; + +@Component +public class PetService { + + private final PetRepository petRepository; + private final CategoryRepository categoryRepository; + + public PetService(PetRepository petRepository, CategoryRepository categoryRepository) { + this.petRepository = petRepository; + this.categoryRepository = categoryRepository; + } + + @Cacheable(PetCache.class) + @CircuitBreaker("pet") + @Retry("pet") + @Timeout("pet") + public Mono findByID(long petId) { + return petRepository.findById(petId); + } + + @CircuitBreaker("pet") + @Timeout("pet") + public Mono add(PetCreateTO createTO) { + return categoryRepository.findByName(createTO.category().name()) + .map(PetCategory::id) + .switchIfEmpty(categoryRepository.insert(createTO.category().name())) + .flatMap(categoryId -> { + var pet = new Pet(0, createTO.name(), Pet.Status.AVAILABLE, categoryId); + return petRepository.insert(pet) + .map(petId -> new PetWithCategory(petId, pet.name(), pet.status(), + new PetCategory(categoryId, createTO.category().name()))); + }); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CachePut(value = PetCache.class, parameters = "id") + public Mono update(long id, PetUpdateTO updateTO) { + return petRepository.findById(id) + .flatMap(existingPet -> { + var categoryMono = Mono.just(existingPet.category()); + if (updateTO.category() != null) { + categoryMono = categoryRepository.findByName(updateTO.category().name()) + .switchIfEmpty(Mono.defer(() -> categoryRepository.insert(updateTO.category().name()) + .map(newCategoryId -> new PetCategory(newCategoryId, updateTO.category().name())))); + } + + var status = (updateTO.status() == null) + ? existingPet.status() + : toStatus(updateTO.status()); + + return categoryMono + .flatMap(category -> { + var result = new PetWithCategory(existingPet.id(), updateTO.name(), status, category); + return petRepository.update(result.getPet()).then(Mono.just(result)); + }); + }); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CacheInvalidate(PetCache.class) + public Mono delete(long petId) { + return petRepository.deleteById(petId).map(counter -> counter.value() == 1); + } + + private static Pet.Status toStatus(PetUpdateTO.StatusEnum statusEnum) { + return switch (statusEnum) { + case AVAILABLE -> Pet.Status.AVAILABLE; + case PENDING -> Pet.Status.PENDING; + case SOLD -> Pet.Status.SOLD; + }; + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/resources/application.conf b/kora-java-graalvm-crud-r2dbc/src/main/resources/application.conf new file mode 100644 index 0000000..269f7c1 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/resources/application.conf @@ -0,0 +1,60 @@ +httpServer { + publicApiHttpPort = 8080 + privateApiHttpPort = 8085 +} + + +db { + r2dbcUrl = ${POSTGRES_R2DBC_URL} + username = ${POSTGRES_USER} + password = ${POSTGRES_PASS} + maxPoolSize = 10 + poolName = "kora" + initializationFailTimeout = "10s" +} + + +pet-cache { + maximumSize = 1000 + expireAfterWrite = ${?CACHE_EXPIRE_WRITE} +} + + +openapi { + management { + enabled = true + file = "openapi/http-server.yaml" + swaggerui { + enabled = true + } + rapidoc { + enabled = true + } + } +} + + +resilient { + circuitbreaker.pet { + slidingWindowSize = 50 + minimumRequiredCalls = 25 + failureRateThreshold = 50 + permittedCallsInHalfOpenState = 10 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } +} + + +logging.level { + "root": "WARN" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" + "ru.tinkoff.kora.application.graph.internal.loom.VirtualThreadExecutorHolder": "DEBUG" +} diff --git a/kora-java-graalvm-crud-r2dbc/src/main/resources/db/migration/V1__setup-tables.sql b/kora-java-graalvm-crud-r2dbc/src/main/resources/db/migration/V1__setup-tables.sql new file mode 100644 index 0000000..3e70499 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/resources/db/migration/V1__setup-tables.sql @@ -0,0 +1,16 @@ +CREATE TABLE IF NOT EXISTS categories +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + PRIMARY KEY (id) +); + + +CREATE TABLE IF NOT EXISTS pets +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + status SMALLINT NOT NULL, + category_id BIGINT NOT NULL REFERENCES categories(id), + PRIMARY KEY (id) +); diff --git a/kora-java-graalvm-crud-r2dbc/src/main/resources/logback.xml b/kora-java-graalvm-crud-r2dbc/src/main/resources/logback.xml new file mode 100644 index 0000000..745e83f --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + UTF-8 + %d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-r2dbc/src/main/resources/openapi/http-server.yaml b/kora-java-graalvm-crud-r2dbc/src/main/resources/openapi/http-server.yaml new file mode 100644 index 0000000..8d99f49 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/main/resources/openapi/http-server.yaml @@ -0,0 +1,315 @@ +openapi: 3.0.3 +info: + title: Swagger Petstore - OpenAPI 3.0 + description: |- + This is a sample Pet Store Server based on the OpenAPI 3.0 specification. You can find out more about + Swagger at [https://swagger.io](https://swagger.io). + license: + name: Apache 2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.11 +externalDocs: + description: Find out more about Swagger + url: https://swagger.io +tags: + - name: pet + description: Everything about your Pets + externalDocs: + description: Find out more + url: https://swagger.io +paths: + /v3/pets: + post: + tags: + - pet + summary: Add a new pet to the store + description: Add a new pet to the store + operationId: addPet + requestBody: + required: true + description: Create a new pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetCreateTO' + responses: + '200': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + /v3/pets/{id}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: id + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + nullable: false + minimum: 1 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + put: + tags: + - pet + summary: Update an existing pet + description: Update an existing pet by Id + operationId: updatePet + parameters: + - name: id + in: path + description: Pet id to update + required: true + schema: + type: integer + format: int64 + requestBody: + description: Update an existent pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetUpdateTO' + required: true + responses: + '200': + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + delete: + tags: + - pet + summary: Deletes a pet + description: delete a pet + operationId: deletePet + parameters: + - name: id + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' +components: + schemas: + MessageTO: + type: object + properties: + message: + type: string + CategoryTO: + required: + - id + - name + type: object + properties: + id: + type: integer + format: int64 + example: 1 + name: + type: string + example: Dogs + CategoryCreateTO: + required: + - name + type: object + properties: + name: + type: string + example: Dogs + PetStatusTO: + properties: + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + PetTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + example: 10 + nullable: false + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryTO' + PetCreateTO: + required: + - name + - category + type: object + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' + PetUpdateTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - name + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' diff --git a/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/AppContainer.java b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/AppContainer.java new file mode 100644 index 0000000..2071bdd --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/AppContainer.java @@ -0,0 +1,47 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc; + +import java.net.URI; +import java.nio.file.Paths; +import java.time.Duration; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; + +public final class AppContainer extends GenericContainer { + + private AppContainer() { + super(new ImageFromDockerfile("kora-java-graalvm-crud-r2dbc") + .withDockerfile(Paths.get("Dockerfile").toAbsolutePath())); + } + + private AppContainer(DockerImageName image) { + super(image); + } + + public static AppContainer build() { + final String appImage = System.getenv("IMAGE_KORA_JAVA_GRAALVM_CRUD_R2DBC"); + return (appImage != null && !appImage.isBlank()) + ? new AppContainer(DockerImageName.parse(appImage)) + : new AppContainer(); + } + + @Override + protected void configure() { + super.configure(); + withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); + withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); + waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); + } + + public int getPort() { + return getMappedPort(8080); + } + + public URI getURI() { + return URI.create(String.format("http://%s:%s", getHost(), getPort())); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetControllerTests.java b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetControllerTests.java new file mode 100644 index 0000000..61d56d1 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetControllerTests.java @@ -0,0 +1,211 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc; + +import static org.junit.jupiter.api.Assertions.*; + +import io.goodforgod.testcontainers.extensions.ContainerMode; +import io.goodforgod.testcontainers.extensions.Network; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; +import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; +import io.goodforgod.testcontainers.extensions.jdbc.Migration; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Map; +import org.json.JSONObject; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; + +@TestcontainersPostgreSQL( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN, + migration = @Migration( + engine = Migration.Engines.FLYWAY, + apply = Migration.Mode.PER_METHOD, + drop = Migration.Mode.PER_METHOD)) +class PetControllerTests { + + private static final AppContainer container = AppContainer.build() + .withNetwork(org.testcontainers.containers.Network.SHARED); + + @ConnectionPostgreSQL + private JdbcConnection connection; + + @BeforeEach + public void setup(@ConnectionPostgreSQL JdbcConnection connection) { + if (!container.isRunning()) { + var params = connection.paramsInNetwork().orElseThrow(); + container.withEnv(Map.of( + "POSTGRES_R2DBC_URL", + "r2dbc:postgresql://%s:%s/%s".formatted(params.host(), params.port(), params.database()), + "POSTGRES_USER", params.username(), + "POSTGRES_PASS", params.password(), + "CACHE_EXPIRE_WRITE", "0s")); + + container.start(); + } + } + + @AfterAll + public static void cleanup() { + container.stop(); + } + + @Test + void addPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var requestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var request = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(requestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response.statusCode(), response.body()); + + // then + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var responseBody = new JSONObject(response.body()); + assertNotNull(responseBody.query("/id")); + assertNotEquals(0L, responseBody.query("/id")); + assertNotNull(responseBody.query("/status")); + assertEquals(requestBody.query("/name"), responseBody.query("/name")); + assertNotNull(responseBody.query("/category/id")); + assertEquals(requestBody.query("/category/name"), responseBody.query("/category/name")); + } + + @Test + void getPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, getResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(createResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void updatePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var updateRequestBody = new JSONObject() + .put("name", "doggie2") + .put("status", "pending") + .put("category", new JSONObject() + .put("name", "Dogs2")); + + var updateRequest = HttpRequest.newBuilder() + .PUT(HttpRequest.BodyPublishers.ofString(updateRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var updateResponse = httpClient.send(updateRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, updateResponse.statusCode(), updateResponse.body()); + var updateResponseBody = new JSONObject(updateResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(updateResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void deletePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var deleteRequest = HttpRequest.newBuilder() + .DELETE() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var deleteResponse = httpClient.send(deleteRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, deleteResponse.statusCode(), deleteResponse.body()); + + // then + connection.assertCountsEquals(0, "pets"); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetServiceTests.java b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetServiceTests.java new file mode 100644 index 0000000..47fec72 --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/test/java/ru/tinkoff/kora/example/graalvm/crud/r2dbc/PetServiceTests.java @@ -0,0 +1,127 @@ +package ru.tinkoff.kora.example.graalvm.crud.r2dbc; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; + +import java.util.Collections; +import java.util.Map; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.service.PetCache; +import ru.tinkoff.kora.example.graalvm.crud.r2dbc.service.PetService; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier; +import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; +import ru.tinkoff.kora.test.extension.junit5.TestComponent; + +@KoraAppTest(Application.class) +class PetServiceTests implements KoraAppTestConfigModifier { + + @Mock + @TestComponent + private PetCache petCache; + @Mock + @TestComponent + private PetRepository petRepository; + @Mock + @TestComponent + private CategoryRepository categoryRepository; + + @TestComponent + private PetService petService; + + @NotNull + @Override + public KoraConfigModification config() { + return KoraConfigModification.ofString(""" + resilient { + circuitbreaker.pet { + slidingWindowSize = 2 + minimumRequiredCalls = 2 + failureRateThreshold = 100 + permittedCallsInHalfOpenState = 1 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } + } + """); + } + + @Test + void updatePetWithNewCategoryCreated() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L, "cat", 2L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("cat"))) + .blockOptional(); + assertTrue(updated.isPresent()); + assertEquals(1, updated.get().id()); + assertEquals(2, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository, Mockito.times(2)).insert(any()); + } + + @Test + void updatePetWithSameCategory() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Mono.just(added.category())); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("dog"))) + .blockOptional(); + assertTrue(updated.isPresent()); + assertNotEquals(0, updated.get().id()); + assertNotEquals(0, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository).insert(any()); + } + + private void mockCache() { + Mockito.when(petCache.get(anyLong())).thenReturn(null); + Mockito.when(petCache.put(anyLong(), any())).then(invocation -> invocation.getArguments()[1]); + Mockito.when(petCache.get(anyCollection())).thenReturn(Collections.emptyMap()); + } + + private void mockRepository(Map categoryNameToId) { + categoryNameToId.forEach((k, v) -> Mockito.when(categoryRepository.insert(k)).thenReturn(Mono.just(v))); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Mono.empty()); + Mockito.when(petRepository.insert(any())).thenReturn(Mono.just(1L)); + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.empty()); + } +} diff --git a/kora-java-graalvm-crud-r2dbc/src/test/resources/logback-test.xml b/kora-java-graalvm-crud-r2dbc/src/test/resources/logback-test.xml new file mode 100644 index 0000000..adccdab --- /dev/null +++ b/kora-java-graalvm-crud-r2dbc/src/test/resources/logback-test.xml @@ -0,0 +1,24 @@ + + + + + + UTF-8 + %cyan(%d{HH:mm:ss.SSS}) %highlight(%-5level) [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-vertx/Dockerfile b/kora-java-graalvm-crud-vertx/Dockerfile new file mode 100644 index 0000000..de40743 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/Dockerfile @@ -0,0 +1,25 @@ +FROM ghcr.io/graalvm/native-image-community:21 as builder + +ARG APP_DIR=/opt/application +ARG JAR_DIR=build/libs +WORKDIR $APP_DIR + +ADD $JAR_DIR/*.jar $APP_DIR/application.jar + +RUN native-image --no-fallback -classpath $APP_DIR/application.jar + +FROM ubuntu:noble-20240212 as runner + +ARG APP_DIR=/opt/application +WORKDIR $APP_DIR + +COPY --from=builder $APP_DIR/application $APP_DIR/application + +ARG DOCKER_USER=app +RUN groupadd -r $DOCKER_USER && useradd -rg $DOCKER_USER $DOCKER_USER +RUN chmod +x application +USER $DOCKER_USER + +EXPOSE 8080/tcp +EXPOSE 8085/tcp +CMD "/opt/application/application" \ No newline at end of file diff --git a/kora-java-graalvm-crud-vertx/README.md b/kora-java-graalvm-crud-vertx/README.md new file mode 100644 index 0000000..2aef01a --- /dev/null +++ b/kora-java-graalvm-crud-vertx/README.md @@ -0,0 +1,49 @@ +# Kora Java GraalVM CRUD Vertx Service + +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, +в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою. + +В примере использовались модули: +- [HTTP Server](https://kora-projects.github.io/kora-docs/ru/documentation/http-server/) +- [HTTP Server OpenAPI Generation](https://kora-projects.github.io/kora-docs/ru/documentation/openapi-codegen/) +- [Probes](https://kora-projects.github.io/kora-docs/ru/documentation/probes/) +- [Metrics](https://kora-projects.github.io/kora-docs/ru/documentation/metrics/) +- [Database Vertx](https://kora-projects.github.io/kora-docs/ru/documentation/database-vertx/) +- [JSON](https://kora-projects.github.io/kora-docs/ru/documentation/json/) +- [Resilient](https://kora-projects.github.io/kora-docs/ru/documentation/resilient/) +- [Validation](https://kora-projects.github.io/kora-docs/ru/documentation/validation/) +- [Cache Caffeine](https://kora-projects.github.io/kora-docs/ru/documentation/cache/#caffeine) + +Скомпилирован с помощью [GraalVM](https://www.graalvm.org/release-notes/JDK_21/) + +## Build + +Собрать артефакт: + +```shell +./gradlew shadowJar +docker build -t kora-java-graalvm-crud-vertx . +``` + +### Generate + +Сгенерировать API для HTTP Server: +```shell +./gradlew openApiGenerateHttpServer +``` + +## Run + +Запустить локально: +```shell +./gradlew run +``` + +## Test + +Тесты используют [Testcontainers](https://java.testcontainers.org/), требуется [Docker](https://docs.docker.com/engine/install/) окружение для запуска тестов или аналогичные контейнерные окружения ([colima](https://github.com/abiosoft/colima) / итп) + +Протестировать локально: +```shell +./gradlew test +``` diff --git a/kora-java-graalvm-crud-vertx/build.gradle b/kora-java-graalvm-crud-vertx/build.gradle new file mode 100644 index 0000000..bcae7f3 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/build.gradle @@ -0,0 +1,184 @@ +buildscript { + dependencies { + classpath("ru.tinkoff.kora:openapi-generator:$koraVersion") + } +} + +plugins { + id "java" + id "jacoco" + id "application" + + id "org.openapi.generator" version "7.1.0" + id "com.github.johnrengelman.shadow" version "8.1.1" + id "org.flywaydb.flyway" version "8.4.2" + id "org.graalvm.buildtools.native" version "0.10.1" +} + +repositories { + mavenLocal() + mavenCentral() +} + +mainClassName = "ru.tinkoff.kora.example.graalvm.crud.vertx.Application" + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +configurations { + koraBom + implementation.extendsFrom(koraBom) + annotationProcessor.extendsFrom(koraBom) +} + +dependencies { + koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") + annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" + annotationProcessor "ru.tinkoff.kora:annotation-processors" + annotationProcessor "io.goodforgod:graalvm-hint-processor:1.2.0" + compileOnly "io.goodforgod:graalvm-hint-annotations:1.2.0" + compileOnly "org.postgresql:postgresql:42.7.2" + + implementation "ru.tinkoff.kora:http-server-undertow" + implementation "ru.tinkoff.kora:database-vertx" + implementation "ru.tinkoff.kora:micrometer-module" + implementation "ru.tinkoff.kora:json-module" + implementation "ru.tinkoff.kora:validation-module" + implementation "ru.tinkoff.kora:cache-caffeine" + implementation "ru.tinkoff.kora:resilient-kora" + implementation "ru.tinkoff.kora:config-hocon" + implementation "ru.tinkoff.kora:openapi-management" + implementation "ru.tinkoff.kora:logging-logback" + + implementation "org.mapstruct:mapstruct:1.5.5.Final" + implementation "io.vertx:vertx-pg-client:4.3.8" + implementation "com.ongres.scram:client:2.1" + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) + + testImplementation "org.json:json:20231013" + testImplementation "org.skyscreamer:jsonassert:1.5.1" + testImplementation "org.postgresql:postgresql:42.7.2" + + testImplementation "org.mockito:mockito-core:5.6.0" + testImplementation "ru.tinkoff.kora:test-junit5" + testImplementation "io.goodforgod:testcontainers-extensions-postgres:0.11.0" + testImplementation "org.testcontainers:junit-jupiter:1.17.6" +} + +openApiGenerate { + generatorName = "kora" + group = "openapi tools" + inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" + outputDir = "$buildDir/generated/openapi" + apiPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.api" + modelPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.model" + invokerPackage = "ru.tinkoff.kora.example.graalvm.crud.openapi.server.invoker" + configOptions = [ + mode : "java-reactive-server", // так же есть java-server вариация HTTP Server"а + enableServerValidation: "true" + ] +} + +graalvmNative { + binaries { + main { + imageName = "$project.name" + mainClass = "$mainClassName" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.matching("GraalVM Community") + } + } + } + metadataRepository { + enabled = true + } +} + +compileJava.dependsOn tasks.openApiGenerate +processResources.dependsOn tasks.collectReachabilityMetadata +test.dependsOn tasks.shadowJar + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "POSTGRES_VERTX_URL": ":postgresql://$postgresHost:$postgresPort/$postgresDatabase", + "POSTGRES_USER" : "$postgresUser", + "POSTGRES_PASS" : "$postgresPassword", + ]) +} + +test { + jvmArgs += [ + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=1", + ] + + environment([ + "": "" + ]) + + useJUnitPlatform() + testLogging { + showStandardStreams(true) + events("passed", "skipped", "failed") + exceptionFormat("full") + } + + jacoco { + excludes += ["**/Application*"] + } + + reports { + html.required = false + junitXml.required = false + } +} + +sourceSets { + main { + java.srcDirs += "$buildDir/generated/openapi" + resources.srcDirs += "$buildDir/native-reachability-metadata" + } +} + +flyway { + url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase" + user = "$postgresUser" + password = "$postgresPassword" + locations = ["classpath:db/migration"] +} + +jar.enabled = false +shadowJar { + mergeServiceFiles() + manifest { + attributes "Main-Class": mainClassName + attributes "Implementation-Version": koraVersion + } +} + +artifacts { + archives shadowJar +} + +compileJava { + options.encoding("UTF-8") + options.incremental(true) + options.fork = true +} + +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } +} + +javadoc { + options.encoding = "UTF-8" + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true) + } +} \ No newline at end of file diff --git a/kora-java-graalvm-crud-vertx/gradle.properties b/kora-java-graalvm-crud-vertx/gradle.properties new file mode 100644 index 0000000..8e7a509 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/gradle.properties @@ -0,0 +1,6 @@ +##### POSTGRES ##### +postgresHost=localhost +postgresPort=5432 +postgresUser=postgres +postgresPassword=postgres +postgresDatabase=postgres diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/Application.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/Application.java new file mode 100644 index 0000000..37c675b --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/Application.java @@ -0,0 +1,36 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx; + +import io.goodforgod.graalvm.hint.annotation.NativeImageHint; +import io.goodforgod.graalvm.hint.annotation.ResourceHint; +import ru.tinkoff.kora.application.graph.KoraApplication; +import ru.tinkoff.kora.cache.caffeine.CaffeineCacheModule; +import ru.tinkoff.kora.common.KoraApp; +import ru.tinkoff.kora.config.hocon.HoconConfigModule; +import ru.tinkoff.kora.database.vertx.VertxDatabaseModule; +import ru.tinkoff.kora.http.server.undertow.UndertowHttpServerModule; +import ru.tinkoff.kora.json.module.JsonModule; +import ru.tinkoff.kora.logging.logback.LogbackModule; +import ru.tinkoff.kora.micrometer.module.MetricsModule; +import ru.tinkoff.kora.openapi.management.OpenApiManagementModule; +import ru.tinkoff.kora.resilient.ResilientModule; +import ru.tinkoff.kora.validation.module.ValidationModule; + +@ResourceHint(include = { "openapi/http-server.yaml" }) +@NativeImageHint(name = "application", entrypoint = Application.class) +@KoraApp +public interface Application extends + HoconConfigModule, + LogbackModule, + VertxDatabaseModule, + ValidationModule, + JsonModule, + CaffeineCacheModule, + ResilientModule, + MetricsModule, + OpenApiManagementModule, + UndertowHttpServerModule { + + static void main(String[] args) { + KoraApplication.run(ApplicationGraph::graph); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/HttpExceptionHandler.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/HttpExceptionHandler.java new file mode 100644 index 0000000..9a6fa53 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/HttpExceptionHandler.java @@ -0,0 +1,43 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.controller; + +import io.micrometer.core.instrument.config.validate.ValidationException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeoutException; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.common.Context; +import ru.tinkoff.kora.common.Tag; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.http.common.body.HttpBody; +import ru.tinkoff.kora.http.server.common.*; +import ru.tinkoff.kora.json.common.JsonWriter; + +@Tag(HttpServerModule.class) +@Component +public final class HttpExceptionHandler implements HttpServerInterceptor { + + private final JsonWriter errorJsonWriter; + + public HttpExceptionHandler(JsonWriter errorJsonWriter) { + this.errorJsonWriter = errorJsonWriter; + } + + @Override + public CompletionStage intercept(Context context, HttpServerRequest request, InterceptChain chain) + throws Exception { + return chain.process(context, request).exceptionally(e -> { + if (e instanceof HttpServerResponseException ex) { + return ex; + } + + e.printStackTrace(); + var body = HttpBody.json(errorJsonWriter.toByteArrayUnchecked(new MessageTO(e.getMessage()))); + if (e instanceof IllegalArgumentException || e instanceof ValidationException) { + return HttpServerResponse.of(400, body); + } else if (e instanceof TimeoutException) { + return HttpServerResponse.of(408, body); + } else { + return HttpServerResponse.of(500, body); + } + }); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/PetDelegate.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/PetDelegate.java new file mode 100644 index 0000000..572271d --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/controller/PetDelegate.java @@ -0,0 +1,93 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.controller; + +import static ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiResponses.*; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.api.PetApiDelegate; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.MessageTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.mapper.PetMapper; +import ru.tinkoff.kora.example.graalvm.crud.vertx.service.PetService; + +@Component +public final class PetDelegate implements PetApiDelegate { + + private final PetMapper petMapper; + private final PetService petService; + + public PetDelegate(PetMapper petMapper, PetService petService) { + this.petMapper = petMapper; + this.petService = petService; + } + + @Override + public Mono getPetById(long petId) { + if (petId < 0) { + return Mono.just(new GetPetByIdApiResponse.GetPetById400ApiResponse(malformedId(petId))); + } + + return petService.findByID(petId) + .map(pet -> { + var body = petMapper.asDTO(pet); + return ((GetPetByIdApiResponse) new GetPetByIdApiResponse.GetPetById200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new GetPetByIdApiResponse.GetPetById404ApiResponse(notFound(petId)))); + } + + @Override + public Mono addPet(PetCreateTO petCreateTO) { + Logger logger = LoggerFactory.getLogger(getClass()); + return petService.add(petCreateTO) + .doOnSuccess(r -> { + if (r == null) { + logger.warn("INSERT NULL"); + } else { + logger.warn("INSERT NOT NULL"); + } + }) + .doOnError(e -> { logger.warn("ERROR - " + e); }) + .map(pet -> { + var body = petMapper.asDTO(pet); + return new AddPetApiResponse.AddPet200ApiResponse(body); + }); + } + + @Override + public Mono updatePet(long petId, PetUpdateTO petUpdateTO) { + if (petId < 0) { + return Mono.just(new UpdatePetApiResponse.UpdatePet400ApiResponse(malformedId(petId))); + } + + return petService.update(petId, petUpdateTO) + .map(pet -> { + var body = petMapper.asDTO(pet); + return ((UpdatePetApiResponse) new UpdatePetApiResponse.UpdatePet200ApiResponse(body)); + }) + .switchIfEmpty(Mono.fromSupplier(() -> new UpdatePetApiResponse.UpdatePet404ApiResponse(notFound(petId)))); + } + + @Override + public Mono deletePet(long petId) { + if (petId < 0) { + return Mono.just(new DeletePetApiResponse.DeletePet400ApiResponse(malformedId(petId))); + } + + return petService.delete(petId) + .map(isDeleted -> (isDeleted) + ? new DeletePetApiResponse.DeletePet200ApiResponse( + new MessageTO("Successfully deleted pet with ID: " + petId)) + : new DeletePetApiResponse.DeletePet404ApiResponse(notFound(petId))); + } + + private static MessageTO notFound(long petId) { + return new MessageTO("Pet not found for ID: " + petId); + } + + private static MessageTO malformedId(long petId) { + return new MessageTO("Pet malformed ID: " + petId); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/Pet.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/Pet.java new file mode 100644 index 0000000..fc8f842 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/Pet.java @@ -0,0 +1,25 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("pets") +public record Pet(@Id @Column("id") long id, + @Column("name") String name, + @Column("status") Status status, + @Column("category_id") long categoryId) { + + public enum Status { + + AVAILABLE(0), + PENDING(10), + SOLD(20); + + public final int code; + + Status(int code) { + this.code = code; + } + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetCategory.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetCategory.java new file mode 100644 index 0000000..0dc285e --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetCategory.java @@ -0,0 +1,8 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Id; +import ru.tinkoff.kora.database.common.annotation.Table; + +@Table("categories") +public record PetCategory(@Id long id, + String name) {} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetWithCategory.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetWithCategory.java new file mode 100644 index 0000000..7c15099 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/dao/PetWithCategory.java @@ -0,0 +1,14 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao; + +import ru.tinkoff.kora.database.common.annotation.Column; +import ru.tinkoff.kora.database.common.annotation.Embedded; + +public record PetWithCategory(@Column("id") long id, + @Column("name") String name, + @Column("status") Pet.Status status, + @Embedded("category_") PetCategory category) { + + public Pet getPet() { + return new Pet(id, name, status, category.id()); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/mapper/PetMapper.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/mapper/PetMapper.java new file mode 100644 index 0000000..2372331 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/model/mapper/PetMapper.java @@ -0,0 +1,15 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.model.mapper; + +import org.mapstruct.Mapper; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetTO; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetWithCategory; + +@Mapper +public interface PetMapper { + + PetTO asDTO(PetWithCategory pet); + + CategoryTO asDTO(PetCategory category); +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/CategoryRepository.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/CategoryRepository.java new file mode 100644 index 0000000..ca5a28b --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/CategoryRepository.java @@ -0,0 +1,21 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.repository; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.database.common.UpdateCount; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.vertx.VertxRepository; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetCategory; + +@Repository +public interface CategoryRepository extends VertxRepository { + + @Query("SELECT %{return#selects} FROM %{return#table} WHERE name = :name") + Mono findByName(String name); + + @Query("INSERT INTO categories(name) VALUES (:categoryName) RETURNING id") + Mono insert(String categoryName); + + @Query("DELETE FROM categories WHERE id = :id") + Mono deleteById(long id); +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/PetRepository.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/PetRepository.java new file mode 100644 index 0000000..e299066 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/PetRepository.java @@ -0,0 +1,30 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.repository; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.database.common.UpdateCount; +import ru.tinkoff.kora.database.common.annotation.Query; +import ru.tinkoff.kora.database.common.annotation.Repository; +import ru.tinkoff.kora.database.vertx.VertxRepository; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetWithCategory; + +@Repository +public interface PetRepository extends VertxRepository { + + @Query(""" + SELECT p.id, p.name, p.status, p.category_id, c.name as category_name + FROM pets p + JOIN categories c on c.id = p.category_id + WHERE p.id = :id + """) + Mono findById(long id); + + @Query("INSERT INTO %{entity#inserts -= id} RETURNING id") + Mono insert(Pet entity); + + @Query("UPDATE %{entity#table} SET %{entity#updates} WHERE %{entity#where = @id}") + Mono update(Pet entity); + + @Query("DELETE FROM pets WHERE id = :id") + Mono deleteById(long id); +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusParameterMapper.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusParameterMapper.java new file mode 100644 index 0000000..5a273eb --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusParameterMapper.java @@ -0,0 +1,19 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.repository.mapper; + +import jakarta.annotation.Nullable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.vertx.mapper.parameter.VertxParameterColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.Pet; + +@Component +public final class PetStatusParameterMapper implements VertxParameterColumnMapper { + + @Override + public Object apply(@Nullable Pet.Status value) { + if (value == null) { + return null; + } else { + return value.code; + } + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusResultMapper.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusResultMapper.java new file mode 100644 index 0000000..cdbfa21 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/repository/mapper/PetStatusResultMapper.java @@ -0,0 +1,23 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.repository.mapper; + +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.database.vertx.mapper.result.VertxResultColumnMapper; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.Pet; + +@Component +public final class PetStatusResultMapper implements VertxResultColumnMapper { + + private final Pet.Status[] statuses = Pet.Status.values(); + + @Override + public Pet.Status apply(io.vertx.sqlclient.Row row, int index) { + final int code = row.get(Integer.class, index); + for (Pet.Status status : statuses) { + if (code == status.code) { + return status; + } + } + + throw new IllegalStateException("Unknown code: " + code); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetCache.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetCache.java new file mode 100644 index 0000000..2c1a4e5 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetCache.java @@ -0,0 +1,10 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.service; + +import ru.tinkoff.kora.cache.annotation.Cache; +import ru.tinkoff.kora.cache.caffeine.CaffeineCache; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetWithCategory; + +@Cache("pet-cache") +public interface PetCache extends CaffeineCache { + +} diff --git a/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetService.java b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetService.java new file mode 100644 index 0000000..c56b721 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/java/ru/tinkoff/kora/example/graalvm/crud/vertx/service/PetService.java @@ -0,0 +1,91 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx.service; + +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.cache.annotation.CacheInvalidate; +import ru.tinkoff.kora.cache.annotation.CachePut; +import ru.tinkoff.kora.cache.annotation.Cacheable; +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.Pet; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetCategory; +import ru.tinkoff.kora.example.graalvm.crud.vertx.model.dao.PetWithCategory; +import ru.tinkoff.kora.example.graalvm.crud.vertx.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.vertx.repository.PetRepository; +import ru.tinkoff.kora.resilient.circuitbreaker.annotation.CircuitBreaker; +import ru.tinkoff.kora.resilient.retry.annotation.Retry; +import ru.tinkoff.kora.resilient.timeout.annotation.Timeout; + +@Component +public class PetService { + + private final PetRepository petRepository; + private final CategoryRepository categoryRepository; + + public PetService(PetRepository petRepository, CategoryRepository categoryRepository) { + this.petRepository = petRepository; + this.categoryRepository = categoryRepository; + } + + @Cacheable(PetCache.class) + @CircuitBreaker("pet") + @Retry("pet") + @Timeout("pet") + public Mono findByID(long petId) { + return petRepository.findById(petId); + } + + @CircuitBreaker("pet") + @Timeout("pet") + public Mono add(PetCreateTO createTO) { + return categoryRepository.findByName(createTO.category().name()) + .map(PetCategory::id) + .switchIfEmpty(categoryRepository.insert(createTO.category().name())) + .flatMap(categoryId -> { + var pet = new Pet(0, createTO.name(), Pet.Status.AVAILABLE, categoryId); + return petRepository.insert(pet) + .map(petId -> new PetWithCategory(petId, pet.name(), pet.status(), + new PetCategory(categoryId, createTO.category().name()))); + }); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CachePut(value = PetCache.class, parameters = "id") + public Mono update(long id, PetUpdateTO updateTO) { + return petRepository.findById(id) + .flatMap(existingPet -> { + var categoryMono = Mono.just(existingPet.category()); + if (updateTO.category() != null) { + categoryMono = categoryRepository.findByName(updateTO.category().name()) + .switchIfEmpty(Mono.defer(() -> categoryRepository.insert(updateTO.category().name()) + .map(newCategoryId -> new PetCategory(newCategoryId, updateTO.category().name())))); + } + + var status = (updateTO.status() == null) + ? existingPet.status() + : toStatus(updateTO.status()); + + return categoryMono + .flatMap(category -> { + var result = new PetWithCategory(existingPet.id(), updateTO.name(), status, category); + return petRepository.update(result.getPet()).then(Mono.just(result)); + }); + }); + } + + @CircuitBreaker("pet") + @Timeout("pet") + @CacheInvalidate(PetCache.class) + public Mono delete(long petId) { + return petRepository.deleteById(petId).map(counter -> counter.value() == 1); + } + + private static Pet.Status toStatus(PetUpdateTO.StatusEnum statusEnum) { + return switch (statusEnum) { + case AVAILABLE -> Pet.Status.AVAILABLE; + case PENDING -> Pet.Status.PENDING; + case SOLD -> Pet.Status.SOLD; + }; + } +} diff --git a/kora-java-graalvm-crud-vertx/src/main/resources/application.conf b/kora-java-graalvm-crud-vertx/src/main/resources/application.conf new file mode 100644 index 0000000..e13d1a3 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/resources/application.conf @@ -0,0 +1,60 @@ +httpServer { + publicApiHttpPort = 8080 + privateApiHttpPort = 8085 +} + + +db { + connectionUri = ${POSTGRES_VERTX_URL} + username = ${POSTGRES_USER} + password = ${POSTGRES_PASS} + maxPoolSize = 10 + poolName = "kora" + initializationFailTimeout = "10s" +} + + +pet-cache { + maximumSize = 1000 + expireAfterWrite = ${?CACHE_EXPIRE_WRITE} +} + + +openapi { + management { + enabled = true + file = "openapi/http-server.yaml" + swaggerui { + enabled = true + } + rapidoc { + enabled = true + } + } +} + + +resilient { + circuitbreaker.pet { + slidingWindowSize = 50 + minimumRequiredCalls = 25 + failureRateThreshold = 50 + permittedCallsInHalfOpenState = 10 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } +} + + +logging.level { + "root": "WARN" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" + "ru.tinkoff.kora.application.graph.internal.loom.VirtualThreadExecutorHolder": "DEBUG" +} diff --git a/kora-java-graalvm-crud-vertx/src/main/resources/db/migration/V1__setup-tables.sql b/kora-java-graalvm-crud-vertx/src/main/resources/db/migration/V1__setup-tables.sql new file mode 100644 index 0000000..3e70499 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/resources/db/migration/V1__setup-tables.sql @@ -0,0 +1,16 @@ +CREATE TABLE IF NOT EXISTS categories +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + PRIMARY KEY (id) +); + + +CREATE TABLE IF NOT EXISTS pets +( + id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY, + name VARCHAR NOT NULL, + status SMALLINT NOT NULL, + category_id BIGINT NOT NULL REFERENCES categories(id), + PRIMARY KEY (id) +); diff --git a/kora-java-graalvm-crud-vertx/src/main/resources/logback.xml b/kora-java-graalvm-crud-vertx/src/main/resources/logback.xml new file mode 100644 index 0000000..745e83f --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + UTF-8 + %d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + diff --git a/kora-java-graalvm-crud-vertx/src/main/resources/openapi/http-server.yaml b/kora-java-graalvm-crud-vertx/src/main/resources/openapi/http-server.yaml new file mode 100644 index 0000000..8d99f49 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/main/resources/openapi/http-server.yaml @@ -0,0 +1,315 @@ +openapi: 3.0.3 +info: + title: Swagger Petstore - OpenAPI 3.0 + description: |- + This is a sample Pet Store Server based on the OpenAPI 3.0 specification. You can find out more about + Swagger at [https://swagger.io](https://swagger.io). + license: + name: Apache 2.0 + url: https://www.apache.org/licenses/LICENSE-2.0.html + version: 1.0.11 +externalDocs: + description: Find out more about Swagger + url: https://swagger.io +tags: + - name: pet + description: Everything about your Pets + externalDocs: + description: Find out more + url: https://swagger.io +paths: + /v3/pets: + post: + tags: + - pet + summary: Add a new pet to the store + description: Add a new pet to the store + operationId: addPet + requestBody: + required: true + description: Create a new pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetCreateTO' + responses: + '200': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + /v3/pets/{id}: + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: id + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + nullable: false + minimum: 1 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + put: + tags: + - pet + summary: Update an existing pet + description: Update an existing pet by Id + operationId: updatePet + parameters: + - name: id + in: path + description: Pet id to update + required: true + schema: + type: integer + format: int64 + requestBody: + description: Update an existent pet in the store + content: + application/json: + schema: + $ref: '#/components/schemas/PetUpdateTO' + required: true + responses: + '200': + description: Successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/PetTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + delete: + tags: + - pet + summary: Deletes a pet + description: delete a pet + operationId: deletePet + parameters: + - name: id + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '400': + description: Invalid parameters supplier + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '404': + description: Pet not found + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '408': + description: Timeout exception + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '429': + description: Too many requests + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/MessageTO' +components: + schemas: + MessageTO: + type: object + properties: + message: + type: string + CategoryTO: + required: + - id + - name + type: object + properties: + id: + type: integer + format: int64 + example: 1 + name: + type: string + example: Dogs + CategoryCreateTO: + required: + - name + type: object + properties: + name: + type: string + example: Dogs + PetStatusTO: + properties: + status: + type: string + description: pet status in the store + enum: + - available + - pending + - sold + PetTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - id + - name + properties: + id: + type: integer + format: int64 + example: 10 + nullable: false + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryTO' + PetCreateTO: + required: + - name + - category + type: object + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' + PetUpdateTO: + allOf: + - $ref: '#/components/schemas/PetStatusTO' + - type: object + required: + - name + properties: + name: + type: string + example: doggie + nullable: false + minLength: 1 + maxLength: 50 + category: + $ref: '#/components/schemas/CategoryCreateTO' diff --git a/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/AppContainer.java b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/AppContainer.java new file mode 100644 index 0000000..c002c8d --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/AppContainer.java @@ -0,0 +1,47 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx; + +import java.net.URI; +import java.nio.file.Paths; +import java.time.Duration; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; + +public final class AppContainer extends GenericContainer { + + private AppContainer() { + super(new ImageFromDockerfile("kora-java-graalvm-crud-r2dbc") + .withDockerfile(Paths.get("Dockerfile").toAbsolutePath())); + } + + private AppContainer(DockerImageName image) { + super(image); + } + + public static AppContainer build() { + final String appImage = System.getenv("IMAGE_KORA_JAVA_GRAALVM_CRUD_R2DBC"); + return (appImage != null && !appImage.isBlank()) + ? new AppContainer(DockerImageName.parse(appImage)) + : new AppContainer(); + } + + @Override + protected void configure() { + super.configure(); + withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); + withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); + waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); + } + + public int getPort() { + return getMappedPort(8080); + } + + public URI getURI() { + return URI.create(String.format("http://%s:%s", getHost(), getPort())); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetControllerTests.java b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetControllerTests.java new file mode 100644 index 0000000..bed57a8 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetControllerTests.java @@ -0,0 +1,210 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx; + +import static org.junit.jupiter.api.Assertions.*; + +import io.goodforgod.testcontainers.extensions.ContainerMode; +import io.goodforgod.testcontainers.extensions.Network; +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL; +import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection; +import io.goodforgod.testcontainers.extensions.jdbc.Migration; +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Map; +import org.json.JSONObject; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; + +@TestcontainersPostgreSQL( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN, + migration = @Migration( + engine = Migration.Engines.FLYWAY, + apply = Migration.Mode.PER_METHOD, + drop = Migration.Mode.PER_METHOD)) +class PetControllerTests { + + private static final AppContainer container = AppContainer.build() + .withNetwork(org.testcontainers.containers.Network.SHARED); + + @ConnectionPostgreSQL + private JdbcConnection connection; + + @BeforeEach + public void setup(@ConnectionPostgreSQL JdbcConnection connection) { + if (!container.isRunning()) { + var params = connection.paramsInNetwork().orElseThrow(); + container.withEnv(Map.of( + "POSTGRES_VERTX_URL", "postgresql://%s:%s/%s".formatted(params.host(), params.port(), params.database()), + "POSTGRES_USER", params.username(), + "POSTGRES_PASS", params.password(), + "CACHE_EXPIRE_WRITE", "0s")); + + container.start(); + } + } + + @AfterAll + public static void cleanup() { + container.stop(); + } + + @Test + void addPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var requestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var request = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(requestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response.statusCode(), response.body()); + + // then + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var responseBody = new JSONObject(response.body()); + assertNotNull(responseBody.query("/id")); + assertNotEquals(0L, responseBody.query("/id")); + assertNotNull(responseBody.query("/status")); + assertEquals(requestBody.query("/name"), responseBody.query("/name")); + assertNotNull(responseBody.query("/category/id")); + assertEquals(requestBody.query("/category/name"), responseBody.query("/category/name")); + } + + @Test + void getPet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + // when + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, getResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(createResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void updatePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var updateRequestBody = new JSONObject() + .put("name", "doggie2") + .put("status", "pending") + .put("category", new JSONObject() + .put("name", "Dogs2")); + + var updateRequest = HttpRequest.newBuilder() + .PUT(HttpRequest.BodyPublishers.ofString(updateRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var updateResponse = httpClient.send(updateRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, updateResponse.statusCode(), updateResponse.body()); + var updateResponseBody = new JSONObject(updateResponse.body()); + + // then + var getRequest = HttpRequest.newBuilder() + .GET() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var getResponse = httpClient.send(getRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), getResponse.body()); + + var getResponseBody = new JSONObject(getResponse.body()); + JSONAssert.assertEquals(updateResponseBody.toString(), getResponseBody.toString(), JSONCompareMode.LENIENT); + } + + @Test + void deletePet() throws Exception { + // given + var httpClient = HttpClient.newHttpClient(); + var createRequestBody = new JSONObject() + .put("name", "doggie") + .put("category", new JSONObject() + .put("name", "Dogs")); + + var createRequest = HttpRequest.newBuilder() + .POST(HttpRequest.BodyPublishers.ofString(createRequestBody.toString())) + .uri(container.getURI().resolve("/v3/pets")) + .timeout(Duration.ofSeconds(5)) + .build(); + + var createResponse = httpClient.send(createRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, createResponse.statusCode(), createResponse.body()); + connection.assertCountsEquals(1, "pets"); + connection.assertCountsEquals(1, "categories"); + var createResponseBody = new JSONObject(createResponse.body()); + + // when + var deleteRequest = HttpRequest.newBuilder() + .DELETE() + .uri(container.getURI().resolve("/v3/pets/" + createResponseBody.query("/id"))) + .timeout(Duration.ofSeconds(5)) + .build(); + + var deleteResponse = httpClient.send(deleteRequest, HttpResponse.BodyHandlers.ofString()); + assertEquals(200, deleteResponse.statusCode(), deleteResponse.body()); + + // then + connection.assertCountsEquals(0, "pets"); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetServiceTests.java b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetServiceTests.java new file mode 100644 index 0000000..104fba7 --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/test/java/ru/tinkoff/kora/example/graalvm/crud/vertx/PetServiceTests.java @@ -0,0 +1,127 @@ +package ru.tinkoff.kora.example.graalvm.crud.vertx; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; + +import java.util.Collections; +import java.util.Map; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; +import reactor.core.publisher.Mono; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.CategoryCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetCreateTO; +import ru.tinkoff.kora.example.graalvm.crud.openapi.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.graalvm.crud.vertx.repository.CategoryRepository; +import ru.tinkoff.kora.example.graalvm.crud.vertx.repository.PetRepository; +import ru.tinkoff.kora.example.graalvm.crud.vertx.service.PetCache; +import ru.tinkoff.kora.example.graalvm.crud.vertx.service.PetService; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; +import ru.tinkoff.kora.test.extension.junit5.KoraAppTestConfigModifier; +import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; +import ru.tinkoff.kora.test.extension.junit5.TestComponent; + +@KoraAppTest(Application.class) +class PetServiceTests implements KoraAppTestConfigModifier { + + @Mock + @TestComponent + private PetCache petCache; + @Mock + @TestComponent + private PetRepository petRepository; + @Mock + @TestComponent + private CategoryRepository categoryRepository; + + @TestComponent + private PetService petService; + + @NotNull + @Override + public KoraConfigModification config() { + return KoraConfigModification.ofString(""" + resilient { + circuitbreaker.pet { + slidingWindowSize = 2 + minimumRequiredCalls = 2 + failureRateThreshold = 100 + permittedCallsInHalfOpenState = 1 + waitDurationInOpenState = 15s + } + timeout.pet { + duration = 5000ms + } + retry.pet { + delay = 100ms + attempts = 2 + } + } + """); + } + + @Test + void updatePetWithNewCategoryCreated() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L, "cat", 2L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("cat"))) + .blockOptional(); + assertTrue(updated.isPresent()); + assertEquals(1, updated.get().id()); + assertEquals(2, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository, Mockito.times(2)).insert(any()); + } + + @Test + void updatePetWithSameCategory() { + // given + mockCache(); + mockRepository(Map.of("dog", 1L)); + + var added = petService.add(new PetCreateTO("dog", new CategoryCreateTO("dog"))).block(); + assertEquals(1, added.id()); + assertEquals(1, added.category().id()); + + // when + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.just(added)); + Mockito.when(petRepository.update(any())).thenReturn(Mono.empty()); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Mono.just(added.category())); + var updated = petService.update(added.id(), + new PetUpdateTO(PetUpdateTO.StatusEnum.PENDING, "cat", new CategoryCreateTO("dog"))) + .blockOptional(); + assertTrue(updated.isPresent()); + assertNotEquals(0, updated.get().id()); + assertNotEquals(0, updated.get().category().id()); + + // then + Mockito.verify(petRepository).insert(any()); + Mockito.verify(categoryRepository).insert(any()); + } + + private void mockCache() { + Mockito.when(petCache.get(anyLong())).thenReturn(null); + Mockito.when(petCache.put(anyLong(), any())).then(invocation -> invocation.getArguments()[1]); + Mockito.when(petCache.get(anyCollection())).thenReturn(Collections.emptyMap()); + } + + private void mockRepository(Map categoryNameToId) { + categoryNameToId.forEach((k, v) -> Mockito.when(categoryRepository.insert(k)).thenReturn(Mono.just(v))); + Mockito.when(categoryRepository.findByName(any())).thenReturn(Mono.empty()); + Mockito.when(petRepository.insert(any())).thenReturn(Mono.just(1L)); + Mockito.when(petRepository.findById(anyLong())).thenReturn(Mono.empty()); + } +} diff --git a/kora-java-graalvm-crud-vertx/src/test/resources/logback-test.xml b/kora-java-graalvm-crud-vertx/src/test/resources/logback-test.xml new file mode 100644 index 0000000..adccdab --- /dev/null +++ b/kora-java-graalvm-crud-vertx/src/test/resources/logback-test.xml @@ -0,0 +1,24 @@ + + + + + + UTF-8 + %cyan(%d{HH:mm:ss.SSS}) %highlight(%-5level) [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + + + + + diff --git a/kora-java-graalvm-kafka/Dockerfile b/kora-java-graalvm-kafka/Dockerfile new file mode 100644 index 0000000..de40743 --- /dev/null +++ b/kora-java-graalvm-kafka/Dockerfile @@ -0,0 +1,25 @@ +FROM ghcr.io/graalvm/native-image-community:21 as builder + +ARG APP_DIR=/opt/application +ARG JAR_DIR=build/libs +WORKDIR $APP_DIR + +ADD $JAR_DIR/*.jar $APP_DIR/application.jar + +RUN native-image --no-fallback -classpath $APP_DIR/application.jar + +FROM ubuntu:noble-20240212 as runner + +ARG APP_DIR=/opt/application +WORKDIR $APP_DIR + +COPY --from=builder $APP_DIR/application $APP_DIR/application + +ARG DOCKER_USER=app +RUN groupadd -r $DOCKER_USER && useradd -rg $DOCKER_USER $DOCKER_USER +RUN chmod +x application +USER $DOCKER_USER + +EXPOSE 8080/tcp +EXPOSE 8085/tcp +CMD "/opt/application/application" \ No newline at end of file diff --git a/kora-java-graalvm-kafka/README.md b/kora-java-graalvm-kafka/README.md new file mode 100644 index 0000000..c85ab92 --- /dev/null +++ b/kora-java-graalvm-kafka/README.md @@ -0,0 +1,34 @@ +# Kora Java GraalVM Kafka + +Пример модуля Kafka в Kora. + +В примере использовались модули: +- [Kafka](https://kora-projects.github.io/kora-docs/ru/documentation/kafka/) +- [JSON](https://kora-projects.github.io/kora-docs/ru/documentation/json/) + +Скомпилирован с помощью [GraalVM](https://www.graalvm.org/release-notes/JDK_21/) + +## Build + +Собрать артефакт: + +```shell +./gradlew shadowJar +docker build -t kora-java-graalvm-kafka . +``` + +## Run + +Запустить локально: +```shell +./gradlew run +``` + +## Test + +Тесты используют [Testcontainers](https://java.testcontainers.org/), требуется [Docker](https://docs.docker.com/engine/install/) окружение для запуска тестов или аналогичные контейнерные окружения ([colima](https://github.com/abiosoft/colima) / итп) + +Протестировать локально: +```shell +./gradlew test +``` diff --git a/kora-java-graalvm-kafka/build.gradle b/kora-java-graalvm-kafka/build.gradle new file mode 100644 index 0000000..13d2083 --- /dev/null +++ b/kora-java-graalvm-kafka/build.gradle @@ -0,0 +1,137 @@ +plugins { + id "java" + id "jacoco" + id "application" + + id "com.github.johnrengelman.shadow" version "8.1.1" + id "org.graalvm.buildtools.native" version "0.10.1" +} + +repositories { + mavenLocal() + mavenCentral() +} + +mainClassName = "ru.tinkoff.kora.example.graalvm.kafka.Application" + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +configurations { + koraBom + implementation.extendsFrom(koraBom) + annotationProcessor.extendsFrom(koraBom) +} + +dependencies { + koraBom platform("ru.tinkoff.kora:kora-parent:$koraVersion") + annotationProcessor "ru.tinkoff.kora:annotation-processors" + annotationProcessor "io.goodforgod:graalvm-hint-processor:1.2.0" + compileOnly "io.goodforgod:graalvm-hint-annotations:1.2.0" + + implementation "ru.tinkoff.kora:http-server-undertow" + implementation "ru.tinkoff.kora:kafka" + implementation "ru.tinkoff.kora:json-module" + implementation "ru.tinkoff.kora:config-yaml" + implementation "ru.tinkoff.kora:micrometer-module" + implementation "ru.tinkoff.kora:logging-logback" + + testImplementation "org.json:json:20231013" + testImplementation "org.mockito:mockito-core:5.6.0" + testImplementation "ru.tinkoff.kora:test-junit5" + testImplementation "io.goodforgod:testcontainers-extensions-kafka:0.11.0" + testImplementation "org.testcontainers:junit-jupiter:1.17.6" +} + +graalvmNative { + binaries { + main { + imageName = "$project.name" + mainClass = "$mainClassName" + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.matching("GraalVM Community") + } + } + } + metadataRepository { + enabled = true + } +} + +processResources.dependsOn tasks.collectReachabilityMetadata +test.dependsOn tasks.shadowJar + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "KAFKA_BOOTSTRAP": "$kafkaBootstrapServers" + ]) +} + +test { + jvmArgs += [ + "-XX:+TieredCompilation", + "-XX:TieredStopAtLevel=1", + ] + + environment([ + "": "" + ]) + + useJUnitPlatform() + testLogging { + showStandardStreams(true) + events("passed", "skipped", "failed") + exceptionFormat("full") + } + + jacoco { + excludes += ["**/Application*"] + } + + reports { + html.required = false + junitXml.required = false + } +} + +sourceSets { + main { + resources.srcDirs += "$buildDir/native-reachability-metadata" + } +} + +jar.enabled = false +shadowJar { + mergeServiceFiles() + manifest { + attributes "Main-Class": mainClassName + attributes "Implementation-Version": koraVersion + } +} + +artifacts { + archives shadowJar +} + +compileJava { + options.encoding("UTF-8") + options.incremental(true) + options.fork = true +} + +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } +} + +javadoc { + options.encoding = "UTF-8" + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true) + } +} \ No newline at end of file diff --git a/kora-java-graalvm-kafka/gradle.properties b/kora-java-graalvm-kafka/gradle.properties new file mode 100644 index 0000000..71fdfaa --- /dev/null +++ b/kora-java-graalvm-kafka/gradle.properties @@ -0,0 +1,2 @@ +##### KAFKA ##### +kafkaBootstrapServers=localhost:9092 diff --git a/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/Application.java b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/Application.java new file mode 100644 index 0000000..81ceab8 --- /dev/null +++ b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/Application.java @@ -0,0 +1,26 @@ +package ru.tinkoff.kora.example.graalvm.kafka; + +import io.goodforgod.graalvm.hint.annotation.NativeImageHint; +import ru.tinkoff.kora.application.graph.KoraApplication; +import ru.tinkoff.kora.common.KoraApp; +import ru.tinkoff.kora.config.yaml.YamlConfigModule; +import ru.tinkoff.kora.http.server.undertow.UndertowModule; +import ru.tinkoff.kora.json.module.JsonModule; +import ru.tinkoff.kora.kafka.common.KafkaModule; +import ru.tinkoff.kora.logging.logback.LogbackModule; +import ru.tinkoff.kora.micrometer.module.MetricsModule; + +@NativeImageHint(name = "application", entrypoint = Application.class) +@KoraApp +public interface Application extends + YamlConfigModule, + LogbackModule, + JsonModule, + UndertowModule, + KafkaModule, + MetricsModule { + + static void main(String[] args) { + KoraApplication.run(ApplicationGraph::graph); + } +} diff --git a/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/TaskPublisher.java b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/TaskPublisher.java new file mode 100644 index 0000000..30240f0 --- /dev/null +++ b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/TaskPublisher.java @@ -0,0 +1,14 @@ +package ru.tinkoff.kora.example.graalvm.kafka; + +import ru.tinkoff.kora.json.common.annotation.Json; +import ru.tinkoff.kora.kafka.common.annotation.KafkaPublisher; + +@KafkaPublisher("kafka.publisher.task") +public interface TaskPublisher { + + @Json + record Task(String name, long code) {} + + @KafkaPublisher.Topic("kafka.publisher.task") + void send(@Json TaskPublisher.Task value); +} diff --git a/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/UserListener.java b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/UserListener.java new file mode 100644 index 0000000..ed8a7ac --- /dev/null +++ b/kora-java-graalvm-kafka/src/main/java/ru/tinkoff/kora/example/graalvm/kafka/UserListener.java @@ -0,0 +1,24 @@ +package ru.tinkoff.kora.example.graalvm.kafka; + +import ru.tinkoff.kora.common.Component; +import ru.tinkoff.kora.json.common.annotation.Json; +import ru.tinkoff.kora.kafka.common.annotation.KafkaListener; + +@Component +public final class UserListener { + + @Json + public record User(String id, String name) {} + + private final TaskPublisher taskPublisher; + + public UserListener(TaskPublisher taskPublisher) { + this.taskPublisher = taskPublisher; + } + + @KafkaListener("kafka.listener.user") + void process(@Json UserListener.User value) { + long code = System.currentTimeMillis(); + taskPublisher.send(new TaskPublisher.Task(value.name() + "-" + code, code)); + } +} diff --git a/kora-java-graalvm-kafka/src/main/resources/application.yaml b/kora-java-graalvm-kafka/src/main/resources/application.yaml new file mode 100644 index 0000000..528539f --- /dev/null +++ b/kora-java-graalvm-kafka/src/main/resources/application.yaml @@ -0,0 +1,24 @@ +kafka: + publisher: + task: + topic: "tasks" + driverProperties: + bootstrap: + servers: ${KAFKA_BOOTSTRAP} + listener: + user: + pollTimeout: 250ms + topics: "users" + driverProperties: + bootstrap.servers: ${KAFKA_BOOTSTRAP} + group.id: "users-gi" + auto.offset.reset: "latest" + enable.auto.commit: true + + +logging: + level: + root: "WARN" + ru.tinkoff.kora: "INFO" + ru.tinkoff.kora.example: "INFO" + ru.tinkoff.kora.application.graph.internal.loom.VirtualThreadExecutorHolder: "DEBUG" \ No newline at end of file diff --git a/kora-java-graalvm-kafka/src/main/resources/logback.xml b/kora-java-graalvm-kafka/src/main/resources/logback.xml new file mode 100644 index 0000000..745e83f --- /dev/null +++ b/kora-java-graalvm-kafka/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + + UTF-8 + %d{HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + diff --git a/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/AppContainer.java b/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/AppContainer.java new file mode 100644 index 0000000..740be19 --- /dev/null +++ b/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/AppContainer.java @@ -0,0 +1,47 @@ +package ru.tinkoff.kora.example.graalvm.kafka; + +import java.net.URI; +import java.nio.file.Paths; +import java.time.Duration; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; + +public final class AppContainer extends GenericContainer { + + private AppContainer() { + super(new ImageFromDockerfile("kora-java-graalvm-kafka") + .withDockerfile(Paths.get("Dockerfile").toAbsolutePath())); + } + + private AppContainer(DockerImageName image) { + super(image); + } + + public static AppContainer build() { + final String appImage = System.getenv("IMAGE_KORA_JAVA_GRAALVM_KAFKA"); + return (appImage != null && !appImage.isBlank()) + ? new AppContainer(DockerImageName.parse(appImage)) + : new AppContainer(); + } + + @Override + protected void configure() { + super.configure(); + withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); + withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); + waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); + } + + public int getPort() { + return getMappedPort(8080); + } + + public URI getURI() { + return URI.create(String.format("http://%s:%s", getHost(), getPort())); + } +} diff --git a/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/UserListenerTests.java b/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/UserListenerTests.java new file mode 100644 index 0000000..0727ae9 --- /dev/null +++ b/kora-java-graalvm-kafka/src/test/java/ru/tinkoff/kora/example/graalvm/kafka/UserListenerTests.java @@ -0,0 +1,46 @@ +package ru.tinkoff.kora.example.graalvm.kafka; + +import io.goodforgod.testcontainers.extensions.ContainerMode; +import io.goodforgod.testcontainers.extensions.Network; +import io.goodforgod.testcontainers.extensions.kafka.*; +import java.time.Duration; +import java.util.Map; +import java.util.UUID; +import org.json.JSONObject; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +@TestcontainersKafka( + network = @Network(shared = true), + mode = ContainerMode.PER_RUN, + topics = @Topics({ "tasks", "users" })) +class UserListenerTests { + + private static final AppContainer container = AppContainer.build() + .withNetwork(org.testcontainers.containers.Network.SHARED); + + @ConnectionKafka + private KafkaConnection connection; + + @BeforeAll + public static void setup(@ConnectionKafka KafkaConnection connection) { + var params = connection.paramsInNetwork().orElseThrow(); + container.withEnv(Map.of("KAFKA_BOOTSTRAP", params.bootstrapServers())); + container.start(); + } + + @Test + void userEventReceivedAndTaskEventSent() { + // given + var topicUsers = "users"; + var topicTasks = "tasks"; + var event = new JSONObject().put("id", UUID.randomUUID().toString()).put("name", "Ivan"); + + // when + var consumerTask = connection.subscribe(topicTasks); + connection.send(topicUsers, Event.ofValueAndRandomKey(event)); + + // then + consumerTask.assertReceivedEqualsInTime(1, Duration.ofSeconds(20)); + } +} diff --git a/kora-java-graalvm-kafka/src/test/resources/logback-test.xml b/kora-java-graalvm-kafka/src/test/resources/logback-test.xml new file mode 100644 index 0000000..adccdab --- /dev/null +++ b/kora-java-graalvm-kafka/src/test/resources/logback-test.xml @@ -0,0 +1,24 @@ + + + + + + UTF-8 + %cyan(%d{HH:mm:ss.SSS}) %highlight(%-5level) [%thread] %logger{36} - %msg%n + + + + + + + + + + + + + + + + + diff --git a/kora-java-grpc-client/build.gradle b/kora-java-grpc-client/build.gradle index 3b47b9c..01692a3 100644 --- a/kora-java-grpc-client/build.gradle +++ b/kora-java-grpc-client/build.gradle @@ -95,13 +95,12 @@ sourceSets { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-grpc-client/src/main/resources/application.conf b/kora-java-grpc-client/src/main/resources/application.conf index ae7d490..1beb554 100644 --- a/kora-java-grpc-client/src/main/resources/application.conf +++ b/kora-java-grpc-client/src/main/resources/application.conf @@ -7,6 +7,6 @@ grpcClient { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-grpc-client/src/main/resources/logback.xml b/kora-java-grpc-client/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-grpc-client/src/main/resources/logback.xml +++ b/kora-java-grpc-client/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-grpc-client/src/test/resources/logback-test.xml b/kora-java-grpc-client/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-grpc-client/src/test/resources/logback-test.xml +++ b/kora-java-grpc-client/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-grpc-server/build.gradle b/kora-java-grpc-server/build.gradle index 544a3c4..9ad7a0f 100644 --- a/kora-java-grpc-server/build.gradle +++ b/kora-java-grpc-server/build.gradle @@ -96,13 +96,12 @@ sourceSets { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-grpc-server/src/main/resources/application.conf b/kora-java-grpc-server/src/main/resources/application.conf index 011482b..e502497 100644 --- a/kora-java-grpc-server/src/main/resources/application.conf +++ b/kora-java-grpc-server/src/main/resources/application.conf @@ -5,6 +5,6 @@ grpcServer { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-grpc-server/src/main/resources/logback.xml b/kora-java-grpc-server/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-grpc-server/src/main/resources/logback.xml +++ b/kora-java-grpc-server/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-grpc-server/src/test/resources/logback-test.xml b/kora-java-grpc-server/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-grpc-server/src/test/resources/logback-test.xml +++ b/kora-java-grpc-server/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-helloworld/build.gradle b/kora-java-helloworld/build.gradle index 76853fe..0e0b2c0 100644 --- a/kora-java-helloworld/build.gradle +++ b/kora-java-helloworld/build.gradle @@ -74,13 +74,12 @@ test { test.dependsOn tasks.shadowJar -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-helloworld/src/main/resources/application.conf b/kora-java-helloworld/src/main/resources/application.conf index dc5f2e0..2828793 100644 --- a/kora-java-helloworld/src/main/resources/application.conf +++ b/kora-java-helloworld/src/main/resources/application.conf @@ -6,6 +6,6 @@ httpServer { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-helloworld/src/main/resources/logback.xml b/kora-java-helloworld/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-helloworld/src/main/resources/logback.xml +++ b/kora-java-helloworld/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-helloworld/src/test/java/ru/tinkoff/kora/example/helloworld/AppContainer.java b/kora-java-helloworld/src/test/java/ru/tinkoff/kora/example/helloworld/AppContainer.java index 196a748..311c01f 100644 --- a/kora-java-helloworld/src/test/java/ru/tinkoff/kora/example/helloworld/AppContainer.java +++ b/kora-java-helloworld/src/test/java/ru/tinkoff/kora/example/helloworld/AppContainer.java @@ -2,6 +2,7 @@ import java.net.URI; import java.nio.file.Paths; +import java.time.Duration; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; @@ -31,6 +32,7 @@ public static AppContainer build() { protected void configure() { super.configure(); withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer.class))); waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)); } diff --git a/kora-java-helloworld/src/test/resources/logback-test.xml b/kora-java-helloworld/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-helloworld/src/test/resources/logback-test.xml +++ b/kora-java-helloworld/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-http-client/build.gradle b/kora-java-http-client/build.gradle index 94e924d..a72afd9 100644 --- a/kora-java-http-client/build.gradle +++ b/kora-java-http-client/build.gradle @@ -28,13 +28,13 @@ dependencies { implementation "ru.tinkoff.kora:http-client-jdk" implementation "ru.tinkoff.kora:json-module" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.11.0" } test.dependsOn tasks.shadowJar @@ -73,13 +73,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-http-client/src/main/resources/application.conf b/kora-java-http-client/src/main/resources/application.conf index d80236d..e2853bc 100644 --- a/kora-java-http-client/src/main/resources/application.conf +++ b/kora-java-http-client/src/main/resources/application.conf @@ -9,6 +9,6 @@ httpClient.default { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-http-client/src/main/resources/logback.xml b/kora-java-http-client/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-http-client/src/main/resources/logback.xml +++ b/kora-java-http-client/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/FormHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/FormHttpClientTests.java index c694500..00512f0 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/FormHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/FormHttpClientTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.nio.charset.StandardCharsets; import java.util.List; import org.jetbrains.annotations.NotNull; @@ -22,12 +22,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class FormHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override @@ -46,14 +46,14 @@ void formEncodedHttpClient() { .withMethod("POST") .withHeader("content-type", "application/x-www-form-urlencoded") .withPath("/form/encoded") - .withBody(new StringBody("password=12345&name=Bob"))) + .withBody(new StringBody("password=12345&name=Ivan"))) .respond( org.mockserver.model.HttpResponse.response() .withBody("OK")); // then var response = httpClient.formEncoded(new FormUrlEncoded( - new FormUrlEncoded.FormPart("name", "Bob"), + new FormUrlEncoded.FormPart("name", "Ivan"), new FormUrlEncoded.FormPart("password", "12345"))); assertEquals(200, response.code()); diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/InterceptedHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/InterceptedHttpClientTests.java index ca7d51a..3385ed9 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/InterceptedHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/InterceptedHttpClientTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; @@ -13,12 +13,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class InterceptedHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/JsonHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/JsonHttpClientTests.java index c552480..fbfcca0 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/JsonHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/JsonHttpClientTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.mockserver.model.StringBody; @@ -14,12 +14,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class JsonHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override @@ -40,11 +40,11 @@ void jsonHttpClient() { .withBody(new StringBody("{\"id\":\"1\"}"))) .respond( org.mockserver.model.HttpResponse.response() - .withBody("{\"name\":\"Bob\",\"value\":100}")); + .withBody("{\"name\":\"Ivan\",\"value\":100}")); // then var response = httpClient.post(new JsonHttpClient.JsonRequest("1")); - assertEquals("Bob", response.name()); + assertEquals("Ivan", response.name()); assertEquals(100, response.value()); } } diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperRequestHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperRequestHttpClientTests.java index d1f7560..043f3c2 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperRequestHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperRequestHttpClientTests.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; @@ -14,12 +14,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class MapperRequestHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperResponseHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperResponseHttpClientTests.java index f45e4c5..b2d53a3 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperResponseHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/MapperResponseHttpClientTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.*; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import ru.tinkoff.kora.test.extension.junit5.KoraAppTest; @@ -13,12 +13,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class MapperResponseHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ParametersHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ParametersHttpClientTests.java index 44b60e5..f7a535b 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ParametersHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ParametersHttpClientTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.util.List; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -14,12 +14,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class ParametersHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ReactorHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ReactorHttpClientTests.java index 44d66e3..89fcc71 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ReactorHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/ReactorHttpClientTests.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.nio.charset.StandardCharsets; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -15,12 +15,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class ReactorHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/VoidHttpClientTests.java b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/VoidHttpClientTests.java index e28bad6..684e797 100644 --- a/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/VoidHttpClientTests.java +++ b/kora-java-http-client/src/test/java/ru/tinkoff/kora/example/http/client/VoidHttpClientTests.java @@ -1,9 +1,9 @@ package ru.tinkoff.kora.example.http.client; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.time.Duration; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -12,12 +12,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class VoidHttpClientTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-http-client/src/test/resources/logback-test.xml b/kora-java-http-client/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-http-client/src/test/resources/logback-test.xml +++ b/kora-java-http-client/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-http-server/build.gradle b/kora-java-http-server/build.gradle index 5b58c1f..681ceea 100644 --- a/kora-java-http-server/build.gradle +++ b/kora-java-http-server/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation "ru.tinkoff.kora:http-server-undertow" implementation "ru.tinkoff.kora:json-module" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" @@ -68,13 +68,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-http-server/src/main/resources/application.conf b/kora-java-http-server/src/main/resources/application.conf index dc5f2e0..2828793 100644 --- a/kora-java-http-server/src/main/resources/application.conf +++ b/kora-java-http-server/src/main/resources/application.conf @@ -6,6 +6,6 @@ httpServer { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-http-server/src/main/resources/logback.xml b/kora-java-http-server/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-http-server/src/main/resources/logback.xml +++ b/kora-java-http-server/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/InterceptedControllerTests.java b/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/InterceptedControllerTests.java index a74f31a..52a3310 100644 --- a/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/InterceptedControllerTests.java +++ b/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/InterceptedControllerTests.java @@ -38,7 +38,8 @@ void interceptedController() throws Exception { // then var interceptedLogs = Awaitility.await() .atMost(Duration.ofSeconds(30)) - .until(() -> container.getLogs().split("\n"), logs -> logs.length >= 9); + .until(() -> container.getLogs().split("\n"), + logs -> Arrays.stream(logs).anyMatch(log -> log.endsWith("Method Level Interceptor"))); assertTrue(Arrays.stream(interceptedLogs).anyMatch(log -> log.endsWith("Server Level Interceptor"))); assertTrue(Arrays.stream(interceptedLogs).anyMatch(log -> log.endsWith("Controller Level Interceptor"))); assertTrue(Arrays.stream(interceptedLogs).anyMatch(log -> log.endsWith("Method Level Interceptor"))); diff --git a/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/JsonPostControllerTests.java b/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/JsonPostControllerTests.java index 688421c..043054d 100644 --- a/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/JsonPostControllerTests.java +++ b/kora-java-http-server/src/test/java/ru/tinkoff/kora/example/httpserver/JsonPostControllerTests.java @@ -23,13 +23,13 @@ void jsonPostController() throws Exception { // then var request = HttpRequest.newBuilder() - .POST(HttpRequest.BodyPublishers.ofString("{\"name\":\"Bob\"}")) + .POST(HttpRequest.BodyPublishers.ofString("{\"name\":\"Ivan\"}")) .uri(container.getURI().resolve("/json")) .timeout(Duration.ofSeconds(5)) .build(); var response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); assertEquals(200, response.statusCode(), response.body()); - assertEquals("Hello world: Bob", response.body(), response.body()); + assertEquals("Hello world: Ivan", response.body(), response.body()); } } diff --git a/kora-java-http-server/src/test/resources/logback-test.xml b/kora-java-http-server/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-http-server/src/test/resources/logback-test.xml +++ b/kora-java-http-server/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-kafka/build.gradle b/kora-java-kafka/build.gradle index d3523d6..4d909dc 100644 --- a/kora-java-kafka/build.gradle +++ b/kora-java-kafka/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-kafka:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-kafka:0.11.0" } //noinspection GroovyAssignabilityCheck @@ -71,13 +71,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-kafka/src/main/resources/application.conf b/kora-java-kafka/src/main/resources/application.conf index 58b1bb8..2710c0d 100644 --- a/kora-java-kafka/src/main/resources/application.conf +++ b/kora-java-kafka/src/main/resources/application.conf @@ -30,6 +30,6 @@ kafka { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-kafka/src/main/resources/logback.xml b/kora-java-kafka/src/main/resources/logback.xml index 9bc40f3..27d7854 100644 --- a/kora-java-kafka/src/main/resources/logback.xml +++ b/kora-java-kafka/src/main/resources/logback.xml @@ -16,6 +16,8 @@ + + diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordExceptionListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordExceptionListenerTests.java index 6bb20b7..679708e 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordExceptionListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordExceptionListenerTests.java @@ -5,7 +5,6 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.kafka.*; import java.time.Duration; -import java.util.Timer; import java.util.concurrent.Executors; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; @@ -23,7 +22,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordExceptionListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordExceptionListenerModule.AutoCommitRecordExceptionListenerProcessTag.class) @@ -46,7 +45,7 @@ void processed() throws InterruptedException { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordJsonListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordJsonListenerTests.java index 2d338e2..d7101a9 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordJsonListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordJsonListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordJsonListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordJsonListenerModule.AutoCommitRecordJsonListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordListenerTests.java index 733d19a..13d4624 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordListenerModule.AutoCommitRecordListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordMapperListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordMapperListenerTests.java index 079aa04..bd00ab4 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordMapperListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordMapperListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordMapperListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordMapperListenerModule.AutoCommitRecordMapperListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsListenerTests.java index b7c3244..dce3fce 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordsListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordsListenerModule.AutoCommitRecordsListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsTelemetryListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsTelemetryListenerTests.java index 83b1935..9c4e852 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsTelemetryListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitRecordsTelemetryListenerTests.java @@ -21,7 +21,7 @@ @KoraAppTest(Application.class) class AutoCommitRecordsTelemetryListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitRecordsTelemetryListenerModule.AutoCommitRecordsTelemetryListenerProcessTag.class) diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueExceptionListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueExceptionListenerTests.java index da5184f..fba1eff 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueExceptionListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueExceptionListenerTests.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -26,7 +26,7 @@ @KoraAppTest(Application.class) class AutoCommitValueExceptionListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueExceptionListenerModule.AutoCommitValueExceptionListenerProcessTag.class) @@ -47,7 +47,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueJsonListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueJsonListenerTests.java index 3d841d5..0c96e27 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueJsonListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueJsonListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitValueJsonListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueJsonListenerModule.AutoCommitValueJsonListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyHeadersListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyHeadersListenerTests.java index cd4ff4e..0396a7f 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyHeadersListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyHeadersListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitValueKeyHeadersListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueKeyHeadersListenerModule.AutoCommitValueKeyHeadersListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyListenerTests.java index b615d3a..472f23a 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueKeyListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitValueKeyListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueKeyListenerModule.AutoCommitValueKeyListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueListenerTests.java index 3bb9444..721cfb6 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitValueListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueListenerModule.AutoCommitValueListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueMapperListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueMapperListenerTests.java index f94190e..6eee5b5 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueMapperListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/AutoCommitValueMapperListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class AutoCommitValueMapperListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(AutoCommitValueMapperListenerModule.AutoCommitValueMapperListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/ManualCommitRecordListenerTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/ManualCommitRecordListenerTests.java index b4e964d..b811631 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/ManualCommitRecordListenerTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/listener/ManualCommitRecordListenerTests.java @@ -1,7 +1,7 @@ package ru.tinkoff.kora.example.kafka.listener; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.Event; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; @@ -24,7 +24,7 @@ @KoraAppTest(Application.class) class ManualCommitRecordListenerTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @Tag(ManualCommitRecordListenerModule.ManualCommitRecordListenerProcessTag.class) @@ -45,7 +45,7 @@ public KoraConfigModification config() { void processed() { // given var topic = "my-topic-consumer"; - var event = new JSONObject().put("username", "Bob").put("code", 1); + var event = new JSONObject().put("username", "Ivan").put("code", 1); // when connection.send(topic, Event.ofValueAndRandomKey(event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerJsonPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerJsonPublisherTests.java index 9e6811e..4b5a56e 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerJsonPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerJsonPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -22,7 +22,7 @@ @KoraAppTest(Application.class) class ProducerJsonPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -43,7 +43,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new ProducerJsonPublisher.MyEvent(name, code); publisher.send(new ProducerRecord<>(topic, event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerMapperPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerMapperPublisherTests.java index 187bc7a..a6fa634 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerMapperPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerMapperPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -22,7 +22,7 @@ @KoraAppTest(Application.class) class ProducerMapperPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -43,7 +43,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new ProducerMapperPublisher.MyEvent(name, code); publisher.send(new ProducerRecord<>(topic, event)); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerPublisherTests.java index 1e76bac..4068394 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/ProducerPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -23,7 +23,7 @@ @KoraAppTest(Application.class) class ProducerPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -45,7 +45,7 @@ void processed() throws InterruptedException { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new JSONObject().put("username", name).put("code", code); publisher.send(new ProducerRecord<>(topic, event.toString())); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicJsonPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicJsonPublisherTests.java index 82902d8..3ceae85 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicJsonPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicJsonPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -21,7 +21,7 @@ @KoraAppTest(Application.class) class TopicJsonPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -42,7 +42,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new TopicJsonPublisher.MyEvent(name, code); publisher.send(event); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyHeadersPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyHeadersPublisherTests.java index 9b8b876..45acf61 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyHeadersPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyHeadersPublisherTests.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -25,7 +25,7 @@ @KoraAppTest(Application.class) class TopicKeyHeadersPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -46,7 +46,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new JSONObject().put("username", name).put("code", code); publisher.send("1", event.toString(), new RecordHeaders(List.of(new RecordHeader("2", "3".getBytes(StandardCharsets.UTF_8))))); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyPublisherTests.java index cff86a0..4e84197 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicKeyPublisherTests.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -21,7 +21,7 @@ @KoraAppTest(Application.class) class TopicKeyPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -42,7 +42,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new JSONObject().put("username", name).put("code", code); publisher.send("1", event.toString()); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicMapperPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicMapperPublisherTests.java index dfed5a5..4eb81d3 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicMapperPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicMapperPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -21,7 +21,7 @@ @KoraAppTest(Application.class) class TopicMapperPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -42,7 +42,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new TopicMapperPublisher.MyEvent(name, code); publisher.send(event); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicPublisherTests.java index a063848..8ea5cd1 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TopicPublisherTests.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection; +import io.goodforgod.testcontainers.extensions.kafka.ConnectionKafka; import io.goodforgod.testcontainers.extensions.kafka.KafkaConnection; import io.goodforgod.testcontainers.extensions.kafka.TestcontainersKafka; import io.goodforgod.testcontainers.extensions.kafka.Topics; @@ -22,7 +22,7 @@ @KoraAppTest(Application.class) class TopicPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection + @ConnectionKafka private KafkaConnection connection; @TestComponent @@ -43,7 +43,7 @@ void processed() { // when var code = ThreadLocalRandom.current().nextInt(1, 100_000); - var name = "Bob"; + var name = "Ivan"; var event = new JSONObject().put("username", name).put("code", code); publisher.send(event.toString()); diff --git a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TransactionalPublisherTests.java b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TransactionalPublisherTests.java index 5e63751..b6b36ea 100644 --- a/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TransactionalPublisherTests.java +++ b/kora-java-kafka/src/test/java/ru/tinkoff/kora/example/kafka/publisher/TransactionalPublisherTests.java @@ -4,7 +4,6 @@ import io.goodforgod.testcontainers.extensions.ContainerMode; import io.goodforgod.testcontainers.extensions.kafka.*; -import io.goodforgod.testcontainers.extensions.kafka.ContainerKafkaConnection.Property; import io.goodforgod.testcontainers.extensions.kafka.Topics; import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; @@ -22,7 +21,7 @@ @KoraAppTest(Application.class) class TransactionalPublisherTests implements KoraAppTestConfigModifier { - @ContainerKafkaConnection(properties = @Property(name = ConsumerConfig.ISOLATION_LEVEL_CONFIG, value = "read_committed")) + @ConnectionKafka(properties = { ConsumerConfig.ISOLATION_LEVEL_CONFIG, "read_committed" }) private KafkaConnection connection; @TestComponent diff --git a/kora-java-kafka/src/test/resources/logback-test.xml b/kora-java-kafka/src/test/resources/logback-test.xml index 89dcf64..66bab1b 100644 --- a/kora-java-kafka/src/test/resources/logback-test.xml +++ b/kora-java-kafka/src/test/resources/logback-test.xml @@ -16,10 +16,12 @@ + + - + diff --git a/kora-java-openapi-generator-http-client/build.gradle b/kora-java-openapi-generator-http-client/build.gradle index 6bafb95..66bb1eb 100644 --- a/kora-java-openapi-generator-http-client/build.gradle +++ b/kora-java-openapi-generator-http-client/build.gradle @@ -36,10 +36,9 @@ dependencies { annotationProcessor "ru.tinkoff.kora:annotation-processors" implementation "ru.tinkoff.kora:validation-module" - implementation "ru.tinkoff.kora:validation-common" implementation "ru.tinkoff.kora:http-client-jdk" implementation "ru.tinkoff.kora:json-module" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" @@ -47,7 +46,7 @@ dependencies { testImplementation "org.json:json:20231013" testImplementation "org.skyscreamer:jsonassert:1.5.1" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.11.0" } // OpeAPI for V2 @@ -123,13 +122,12 @@ sourceSets { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-openapi-generator-http-client/src/main/resources/application.conf b/kora-java-openapi-generator-http-client/src/main/resources/application.conf index 68eb285..5c8424e 100644 --- a/kora-java-openapi-generator-http-client/src/main/resources/application.conf +++ b/kora-java-openapi-generator-http-client/src/main/resources/application.conf @@ -16,6 +16,6 @@ httpClient.petV3.PetApi { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-openapi-generator-http-client/src/main/resources/logback.xml b/kora-java-openapi-generator-http-client/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-openapi-generator-http-client/src/main/resources/logback.xml +++ b/kora-java-openapi-generator-http-client/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-openapi-generator-http-client/src/main/resources/openapi/petstoreV3.yaml b/kora-java-openapi-generator-http-client/src/main/resources/openapi/petstoreV3.yaml index 70107f1..d4e1511 100644 --- a/kora-java-openapi-generator-http-client/src/main/resources/openapi/petstoreV3.yaml +++ b/kora-java-openapi-generator-http-client/src/main/resources/openapi/petstoreV3.yaml @@ -149,6 +149,7 @@ paths: type: integer format: int64 nullable: false + minimum: 1 responses: '200': description: successful operation diff --git a/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV2Tests.java b/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV2Tests.java index ac4ba93..fa62d40 100644 --- a/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV2Tests.java +++ b/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV2Tests.java @@ -6,9 +6,9 @@ import static org.mockserver.model.HttpResponse.response; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.util.List; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; @@ -25,12 +25,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class HttpClientPetV2Tests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV3Tests.java b/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV3Tests.java index 1c2119f..7eb0e9d 100644 --- a/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV3Tests.java +++ b/kora-java-openapi-generator-http-client/src/test/java/ru/tinkoff/kora/example/openapi/http/client/HttpClientPetV3Tests.java @@ -6,9 +6,9 @@ import static org.mockserver.model.HttpResponse.response; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import java.util.List; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; @@ -25,12 +25,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_RUN) +@TestcontainersMockServer(mode = ContainerMode.PER_RUN) @KoraAppTest(Application.class) class HttpClientPetV3Tests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-openapi-generator-http-client/src/test/resources/logback-test.xml b/kora-java-openapi-generator-http-client/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-openapi-generator-http-client/src/test/resources/logback-test.xml +++ b/kora-java-openapi-generator-http-client/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-openapi-generator-http-server/build.gradle b/kora-java-openapi-generator-http-server/build.gradle index 3fc4b3d..e7738b6 100644 --- a/kora-java-openapi-generator-http-server/build.gradle +++ b/kora-java-openapi-generator-http-server/build.gradle @@ -36,10 +36,9 @@ dependencies { annotationProcessor "ru.tinkoff.kora:annotation-processors" implementation "ru.tinkoff.kora:validation-module" - implementation "ru.tinkoff.kora:validation-common" implementation "ru.tinkoff.kora:http-server-undertow" implementation "ru.tinkoff.kora:json-module" - implementation "io.projectreactor:reactor-core:3.5.10" // For reactive examples (optional) + implementation "io.projectreactor:reactor-core:3.6.3" // For reactive examples (optional) implementation "ru.tinkoff.kora:logging-logback" implementation "ru.tinkoff.kora:config-hocon" @@ -75,7 +74,7 @@ tasks.register("openApiGeneratePetV3", GenerateTask) { modelPackage = "ru.tinkoff.kora.example.openapi.petV3.model" invokerPackage = "ru.tinkoff.kora.example.openapi.petV3.invoker" configOptions = [ - mode : "java-reactive-server", // так же есть java_server вариация HTTP Server'а + mode : "java-reactive-server", // так же есть java-server вариация HTTP Server'а enableServerValidation: "true" ] } @@ -117,13 +116,12 @@ sourceSets { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-openapi-generator-http-server/src/main/resources/application.conf b/kora-java-openapi-generator-http-server/src/main/resources/application.conf index dc5f2e0..2828793 100644 --- a/kora-java-openapi-generator-http-server/src/main/resources/application.conf +++ b/kora-java-openapi-generator-http-server/src/main/resources/application.conf @@ -6,6 +6,6 @@ httpServer { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-openapi-generator-http-server/src/main/resources/logback.xml b/kora-java-openapi-generator-http-server/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-openapi-generator-http-server/src/main/resources/logback.xml +++ b/kora-java-openapi-generator-http-server/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-openapi-generator-http-server/src/main/resources/openapi/petstoreV3.yaml b/kora-java-openapi-generator-http-server/src/main/resources/openapi/petstoreV3.yaml index 70107f1..d4e1511 100644 --- a/kora-java-openapi-generator-http-server/src/main/resources/openapi/petstoreV3.yaml +++ b/kora-java-openapi-generator-http-server/src/main/resources/openapi/petstoreV3.yaml @@ -149,6 +149,7 @@ paths: type: integer format: int64 nullable: false + minimum: 1 responses: '200': description: successful operation diff --git a/kora-java-openapi-generator-http-server/src/test/resources/logback-test.xml b/kora-java-openapi-generator-http-server/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-openapi-generator-http-server/src/test/resources/logback-test.xml +++ b/kora-java-openapi-generator-http-server/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-resilient/build.gradle b/kora-java-resilient/build.gradle index 658abe7..8096906 100644 --- a/kora-java-resilient/build.gradle +++ b/kora-java-resilient/build.gradle @@ -68,13 +68,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-resilient/src/main/resources/application.conf b/kora-java-resilient/src/main/resources/application.conf index b9a49f7..126fcd2 100644 --- a/kora-java-resilient/src/main/resources/application.conf +++ b/kora-java-resilient/src/main/resources/application.conf @@ -28,6 +28,6 @@ resilient { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-resilient/src/main/resources/logback.xml b/kora-java-resilient/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-resilient/src/main/resources/logback.xml +++ b/kora-java-resilient/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-resilient/src/test/resources/logback-test.xml b/kora-java-resilient/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-resilient/src/test/resources/logback-test.xml +++ b/kora-java-resilient/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-scheduling-jdk/build.gradle b/kora-java-scheduling-jdk/build.gradle index 49e93ef..3c929a2 100644 --- a/kora-java-scheduling-jdk/build.gradle +++ b/kora-java-scheduling-jdk/build.gradle @@ -69,13 +69,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-scheduling-jdk/src/main/resources/application.conf b/kora-java-scheduling-jdk/src/main/resources/application.conf index b2a4c8a..81c4c93 100644 --- a/kora-java-scheduling-jdk/src/main/resources/application.conf +++ b/kora-java-scheduling-jdk/src/main/resources/application.conf @@ -12,6 +12,6 @@ scheduling { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-scheduling-jdk/src/main/resources/logback.xml b/kora-java-scheduling-jdk/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-scheduling-jdk/src/main/resources/logback.xml +++ b/kora-java-scheduling-jdk/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-scheduling-jdk/src/test/resources/logback-test.xml b/kora-java-scheduling-jdk/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-scheduling-jdk/src/test/resources/logback-test.xml +++ b/kora-java-scheduling-jdk/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-scheduling-quartz/build.gradle b/kora-java-scheduling-quartz/build.gradle index e7b8ad0..2153340 100644 --- a/kora-java-scheduling-quartz/build.gradle +++ b/kora-java-scheduling-quartz/build.gradle @@ -69,13 +69,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-scheduling-quartz/src/main/resources/application.conf b/kora-java-scheduling-quartz/src/main/resources/application.conf index cace772..34f234d 100644 --- a/kora-java-scheduling-quartz/src/main/resources/application.conf +++ b/kora-java-scheduling-quartz/src/main/resources/application.conf @@ -13,6 +13,6 @@ scheduling { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-scheduling-quartz/src/main/resources/logback.xml b/kora-java-scheduling-quartz/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-scheduling-quartz/src/main/resources/logback.xml +++ b/kora-java-scheduling-quartz/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-scheduling-quartz/src/test/resources/logback-test.xml b/kora-java-scheduling-quartz/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-scheduling-quartz/src/test/resources/logback-test.xml +++ b/kora-java-scheduling-quartz/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-soap-client/build.gradle b/kora-java-soap-client/build.gradle index 426ea74..7ec8ad1 100644 --- a/kora-java-soap-client/build.gradle +++ b/kora-java-soap-client/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation "ru.tinkoff.kora:config-hocon" testImplementation "ru.tinkoff.kora:test-junit5" - testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.9.6" + testImplementation "io.goodforgod:testcontainers-extensions-mockserver:0.11.0" } //noinspection GroovyAssignabilityCheck @@ -92,13 +92,12 @@ wsdl2java { ] } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-soap-client/src/main/resources/application.conf b/kora-java-soap-client/src/main/resources/application.conf index b3afe95..0148bf6 100644 --- a/kora-java-soap-client/src/main/resources/application.conf +++ b/kora-java-soap-client/src/main/resources/application.conf @@ -12,6 +12,6 @@ httpClient.default { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-soap-client/src/main/resources/logback.xml b/kora-java-soap-client/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-soap-client/src/main/resources/logback.xml +++ b/kora-java-soap-client/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-soap-client/src/test/java/ru/tinkoff/kora/example/soap/client/SimpleServiceTests.java b/kora-java-soap-client/src/test/java/ru/tinkoff/kora/example/soap/client/SimpleServiceTests.java index f51103a..2a456c2 100644 --- a/kora-java-soap-client/src/test/java/ru/tinkoff/kora/example/soap/client/SimpleServiceTests.java +++ b/kora-java-soap-client/src/test/java/ru/tinkoff/kora/example/soap/client/SimpleServiceTests.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.goodforgod.testcontainers.extensions.ContainerMode; -import io.goodforgod.testcontainers.extensions.mockserver.ContainerMockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.MockserverConnection; -import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockserver; +import io.goodforgod.testcontainers.extensions.mockserver.ConnectionMockServer; +import io.goodforgod.testcontainers.extensions.mockserver.MockServerConnection; +import io.goodforgod.testcontainers.extensions.mockserver.TestcontainersMockServer; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.mockserver.model.XmlBody; @@ -16,12 +16,12 @@ import ru.tinkoff.kora.test.extension.junit5.KoraConfigModification; import ru.tinkoff.kora.test.extension.junit5.TestComponent; -@TestcontainersMockserver(mode = ContainerMode.PER_CLASS) +@TestcontainersMockServer(mode = ContainerMode.PER_CLASS) @KoraAppTest(Application.class) class SimpleServiceTests implements KoraAppTestConfigModifier { - @ContainerMockserverConnection - private MockserverConnection mockserverConnection; + @ConnectionMockServer + private MockServerConnection mockserverConnection; @NotNull @Override diff --git a/kora-java-soap-client/src/test/resources/logback-test.xml b/kora-java-soap-client/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-soap-client/src/test/resources/logback-test.xml +++ b/kora-java-soap-client/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-telemetry/build.gradle b/kora-java-telemetry/build.gradle index 2871193..ca6908a 100644 --- a/kora-java-telemetry/build.gradle +++ b/kora-java-telemetry/build.gradle @@ -66,13 +66,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-telemetry/src/main/resources/application.conf b/kora-java-telemetry/src/main/resources/application.conf index b2881c9..34892f1 100644 --- a/kora-java-telemetry/src/main/resources/application.conf +++ b/kora-java-telemetry/src/main/resources/application.conf @@ -21,6 +21,6 @@ tracing { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-telemetry/src/main/resources/logback.xml b/kora-java-telemetry/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-telemetry/src/main/resources/logback.xml +++ b/kora-java-telemetry/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-telemetry/src/test/java/ru/tinkoff/kora/example/telemetry/AppContainer.java b/kora-java-telemetry/src/test/java/ru/tinkoff/kora/example/telemetry/AppContainer.java index df80a21..1b6ebd1 100644 --- a/kora-java-telemetry/src/test/java/ru/tinkoff/kora/example/telemetry/AppContainer.java +++ b/kora-java-telemetry/src/test/java/ru/tinkoff/kora/example/telemetry/AppContainer.java @@ -2,6 +2,7 @@ import java.net.URI; import java.nio.file.Paths; +import java.time.Duration; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; @@ -31,6 +32,7 @@ public static AppContainer build() { protected void configure() { super.configure(); withExposedPorts(8080, 8085); + withStartupTimeout(Duration.ofSeconds(120)); withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(getClass()))); waitingFor(Wait.forHttp("/readiness") .forPort(8085) diff --git a/kora-java-telemetry/src/test/resources/logback-test.xml b/kora-java-telemetry/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-telemetry/src/test/resources/logback-test.xml +++ b/kora-java-telemetry/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-java-validation/build.gradle b/kora-java-validation/build.gradle index 9791599..535f52d 100644 --- a/kora-java-validation/build.gradle +++ b/kora-java-validation/build.gradle @@ -61,13 +61,12 @@ test { } } -jar.enabled = true +jar.enabled = false shadowJar { mergeServiceFiles() manifest { attributes "Main-Class": mainClassName attributes "Implementation-Version": koraVersion - attributes "Build-Time": java.time.OffsetDateTime.now() } } diff --git a/kora-java-validation/src/main/resources/application.conf b/kora-java-validation/src/main/resources/application.conf index b7f05da..aa7b2b0 100644 --- a/kora-java-validation/src/main/resources/application.conf +++ b/kora-java-validation/src/main/resources/application.conf @@ -1,5 +1,5 @@ logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-java-validation/src/main/resources/logback.xml b/kora-java-validation/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-java-validation/src/main/resources/logback.xml +++ b/kora-java-validation/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ArgumentValidatorTests.java b/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ArgumentValidatorTests.java index 1886feb..ca6db8b 100644 --- a/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ArgumentValidatorTests.java +++ b/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ArgumentValidatorTests.java @@ -17,7 +17,7 @@ class ArgumentValidatorTests { @Test void createSuccess() { // given - var user = new ArgumentValidator.User("1", "Bob", "2"); + var user = new ArgumentValidator.User("1", "Ivan", "2"); var code = "ME2"; // then @@ -28,7 +28,7 @@ void createSuccess() { @Test void createFails() { // given - var user = new ArgumentValidator.User("1", "Bob", "2"); + var user = new ArgumentValidator.User("1", "Ivan", "2"); var code = "2"; // then diff --git a/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ResultValidatorTests.java b/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ResultValidatorTests.java index f3c8b81..5f8af9a 100644 --- a/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ResultValidatorTests.java +++ b/kora-java-validation/src/test/java/ru/tinkoff/kora/example/validation/ResultValidatorTests.java @@ -16,7 +16,7 @@ class ResultValidatorTests { @Test void createSuccess() { // given - var name = "Bob"; + var name = "Ivan"; var status = "2"; // then diff --git a/kora-java-validation/src/test/resources/logback-test.xml b/kora-java-validation/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-java-validation/src/test/resources/logback-test.xml +++ b/kora-java-validation/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-kotlin-crud/README.md b/kora-kotlin-crud/README.md index b419e04..194d5b0 100644 --- a/kora-kotlin-crud/README.md +++ b/kora-kotlin-crud/README.md @@ -1,6 +1,6 @@ # Kora Kotlin CRUD Service -Пример сервиса реализованного на Kora с HTTP [CRUD](https://appmaster.io/ru/blog/grubye-operatsii-chto-takoe-grubye-operatsii) API, +Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою. В примере использовались модули: diff --git a/kora-kotlin-crud/build.gradle.kts b/kora-kotlin-crud/build.gradle.kts index 2eb417d..fd63aab 100644 --- a/kora-kotlin-crud/build.gradle.kts +++ b/kora-kotlin-crud/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { implementation("ru.tinkoff.kora:openapi-management") implementation("ru.tinkoff.kora:logging-logback") - implementation("org.postgresql:postgresql:42.6.0") + implementation("org.postgresql:postgresql:42.7.2") implementation("org.mapstruct:mapstruct:1.5.5.Final") testImplementation("org.json:json:20231013") @@ -67,7 +67,7 @@ dependencies { testImplementation("io.mockk:mockk:1.13.8") testImplementation("ru.tinkoff.kora:test-junit5") - testImplementation("io.goodforgod:testcontainers-extensions-postgres:0.9.6") + testImplementation("io.goodforgod:testcontainers-extensions-postgres:0.11.0") testImplementation("org.testcontainers:junit-jupiter:1.17.6") } diff --git a/kora-kotlin-crud/src/main/resources/application.conf b/kora-kotlin-crud/src/main/resources/application.conf index 6047c88..08f5f45 100644 --- a/kora-kotlin-crud/src/main/resources/application.conf +++ b/kora-kotlin-crud/src/main/resources/application.conf @@ -9,7 +9,7 @@ db { username = ${POSTGRES_USER} password = ${POSTGRES_PASS} maxPoolSize = 10 - poolName = "example" + poolName = "kora" initializationFailTimeout = "10s" } @@ -55,6 +55,6 @@ resilient { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-kotlin-crud/src/main/resources/logback.xml b/kora-kotlin-crud/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-kotlin-crud/src/main/resources/logback.xml +++ b/kora-kotlin-crud/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-kotlin-crud/src/main/resources/openapi/http-server.yaml b/kora-kotlin-crud/src/main/resources/openapi/http-server.yaml index 8851744..8d99f49 100644 --- a/kora-kotlin-crud/src/main/resources/openapi/http-server.yaml +++ b/kora-kotlin-crud/src/main/resources/openapi/http-server.yaml @@ -79,6 +79,7 @@ paths: type: integer format: int64 nullable: false + minimum: 1 responses: '200': description: successful operation diff --git a/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/AppContainer.kt b/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/AppContainer.kt index 2dfc714..7f6afc2 100644 --- a/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/AppContainer.kt +++ b/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/AppContainer.kt @@ -8,6 +8,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile import org.testcontainers.utility.DockerImageName import java.net.URI import java.nio.file.Paths +import java.time.Duration import java.util.concurrent.Future class AppContainer : GenericContainer { @@ -32,6 +33,7 @@ class AppContainer : GenericContainer { override fun configure() { super.configure() withExposedPorts(8080, 8085) + withStartupTimeout(Duration.ofSeconds(120)) withLogConsumer(Slf4jLogConsumer(LoggerFactory.getLogger(AppContainer::class.java))) waitingFor(Wait.forHttp("/system/readiness").forPort(8085).forStatusCode(200)) } diff --git a/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/PetControllerTests.kt b/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/PetControllerTests.kt index ed9ae10..bc6a0c4 100644 --- a/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/PetControllerTests.kt +++ b/kora-kotlin-crud/src/test/kotlin/ru/tinkoff/kora/kotlin/example/crud/PetControllerTests.kt @@ -2,10 +2,10 @@ package ru.tinkoff.kora.kotlin.example.crud import io.goodforgod.testcontainers.extensions.ContainerMode import io.goodforgod.testcontainers.extensions.Network -import io.goodforgod.testcontainers.extensions.jdbc.ContainerPostgresConnection +import io.goodforgod.testcontainers.extensions.jdbc.ConnectionPostgreSQL import io.goodforgod.testcontainers.extensions.jdbc.JdbcConnection import io.goodforgod.testcontainers.extensions.jdbc.Migration -import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgres +import io.goodforgod.testcontainers.extensions.jdbc.TestcontainersPostgreSQL import org.json.JSONObject import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Assertions.* @@ -20,7 +20,7 @@ import java.net.http.HttpRequest import java.net.http.HttpResponse import java.time.Duration -@TestcontainersPostgres( +@TestcontainersPostgreSQL( network = Network(shared = true), mode = ContainerMode.PER_RUN, migration = Migration( @@ -29,7 +29,7 @@ import java.time.Duration drop = Migration.Mode.PER_METHOD ) ) -class PetControllerTests(@ContainerPostgresConnection val connection: JdbcConnection) { +class PetControllerTests(@ConnectionPostgreSQL val connection: JdbcConnection) { companion object { @@ -37,7 +37,7 @@ class PetControllerTests(@ContainerPostgresConnection val connection: JdbcConnec @JvmStatic @BeforeAll - fun setup(@ContainerPostgresConnection connection: JdbcConnection) { + fun setup(@ConnectionPostgreSQL connection: JdbcConnection) { val params = connection.paramsInNetwork().orElseThrow() container.withEnv( mapOf( diff --git a/kora-kotlin-crud/src/test/resources/logback-test.xml b/kora-kotlin-crud/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-kotlin-crud/src/test/resources/logback-test.xml +++ b/kora-kotlin-crud/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/kora-kotlin-helloworld/build.gradle.kts b/kora-kotlin-helloworld/build.gradle.kts index b4184ae..dddb997 100644 --- a/kora-kotlin-helloworld/build.gradle.kts +++ b/kora-kotlin-helloworld/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("application") - kotlin("jvm") version ("1.9.22") - id("com.google.devtools.ksp") version ("1.9.22-1.0.16") + kotlin("jvm") version ("1.9.10") + id("com.google.devtools.ksp") version ("1.9.10-1.0.13") } repositories { diff --git a/kora-kotlin-helloworld/src/main/resources/application.conf b/kora-kotlin-helloworld/src/main/resources/application.conf index dc5f2e0..2828793 100644 --- a/kora-kotlin-helloworld/src/main/resources/application.conf +++ b/kora-kotlin-helloworld/src/main/resources/application.conf @@ -6,6 +6,6 @@ httpServer { logging.level { "root": "WARN" - "ru.tinkoff.kora": "DEBUG" - "ru.tinkoff.kora.example": "DEBUG" + "ru.tinkoff.kora": "INFO" + "ru.tinkoff.kora.example": "INFO" } diff --git a/kora-kotlin-helloworld/src/main/resources/logback.xml b/kora-kotlin-helloworld/src/main/resources/logback.xml index 7f6b209..745e83f 100644 --- a/kora-kotlin-helloworld/src/main/resources/logback.xml +++ b/kora-kotlin-helloworld/src/main/resources/logback.xml @@ -15,4 +15,6 @@ + + diff --git a/kora-kotlin-helloworld/src/test/resources/logback-test.xml b/kora-kotlin-helloworld/src/test/resources/logback-test.xml index a9af3b9..adccdab 100644 --- a/kora-kotlin-helloworld/src/test/resources/logback-test.xml +++ b/kora-kotlin-helloworld/src/test/resources/logback-test.xml @@ -16,10 +16,9 @@ - - + - + diff --git a/settings.gradle b/settings.gradle index 26dea0a..91990fb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { gradlePluginPortal() mavenLocal() mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } } @@ -31,5 +32,10 @@ include "kora-java-config-hocon" include "kora-java-config-yaml" include "kora-java-helloworld" include "kora-java-crud" +include "kora-java-graalvm-crud-jdbc" +include "kora-java-graalvm-crud-r2dbc" +include "kora-java-graalvm-crud-vertx" +include "kora-java-graalvm-crud-cassandra" +include "kora-java-graalvm-kafka" include "kora-kotlin-helloworld" include "kora-kotlin-crud"