diff --git a/Dockerfile b/Dockerfile index 34c89b4..16cec53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG RUN_IMAGE=eclipse-temurin:21-jre-jammy +ARG RUN_IMAGE=eclipse-temurin:25-jre-jammy FROM ${RUN_IMAGE} ARG TARGET_DIR=/opt/app diff --git a/build.gradle b/build.gradle index 27c31e2..b2bccb7 100644 --- a/build.gradle +++ b/build.gradle @@ -19,15 +19,11 @@ plugins { group = groupId version = koraVersion -application { - applicationName = "application" - mainClassName = "ru.tinkoff.kora.java.crud.Application" - applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"] +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } -sourceCompatibility = JavaVersion.VERSION_21 -targetCompatibility = JavaVersion.VERSION_21 - repositories { mavenCentral() maven { url "https://central.sonatype.com/repository/maven-snapshots" } @@ -69,12 +65,27 @@ dependencies { testImplementation "org.testcontainers:junit-jupiter:1.19.8" } +application { + applicationName = "application" + mainClass = "ru.tinkoff.kora.example.Application" + applicationDefaultJvmArgs = ["-Dfile.encoding=UTF-8"] +} + +//noinspection GroovyAssignabilityCheck +run { + environment([ + "POSTGRES_JDBC_URL": "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase", + "POSTGRES_USER" : "$postgresUser", + "POSTGRES_PASS" : "$postgresPassword", + ]) +} + def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateTask) { generatorName = "kora" group = "openapi tools" inputSpec = "$projectDir/src/main/resources/openapi/http-server.yaml" outputDir = "$buildDir/generated/openapi" - def corePackage = "ru.tinkoff.kora.java.crud.openapi.http.server" + def corePackage = "ru.tinkoff.kora.example.openapi.http.server" apiPackage = "${corePackage}.api" modelPackage = "${corePackage}.model" invokerPackage = "${corePackage}.invoker" @@ -86,15 +97,6 @@ def openApiGeneratePetV3 = tasks.register("openApiGenerateHttpServer", GenerateT sourceSets.main { java.srcDirs += openApiGeneratePetV3.get().outputDir } compileJava.dependsOn openApiGeneratePetV3 -//noinspection GroovyAssignabilityCheck -run { - environment([ - "POSTGRES_JDBC_URL": "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase", - "POSTGRES_USER" : "$postgresUser", - "POSTGRES_PASS" : "$postgresPassword", - ]) -} - distTar { archiveFileName = "application.tar" } @@ -118,8 +120,10 @@ test { exceptionFormat("full") } + exclude("**/\$*") + jacoco { - excludes += ["**/Application*"] + excludes += ["**/generated/**", "**/Application*", "**/\$*"] } reports { @@ -128,14 +132,6 @@ test { } } -check.dependsOn jacocoTestReport -jacocoTestReport { - reports { - xml.required = true - html.outputLocation = layout.buildDirectory.dir("jacocoHtml") - } -} - flyway { url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase" user = "$postgresUser" @@ -149,6 +145,15 @@ compileJava { options.fork = false } +check.dependsOn jacocoTestReport +jacocoTestReport { + reports { + xml.required = true + html.outputLocation = layout.buildDirectory.dir("jacocoHtml") + } + classDirectories = files(classDirectories.files.collect { fileTree(dir: it, excludes: test.jacoco.excludes) }) +} + javadoc { options.encoding = "UTF-8" if (JavaVersion.current().isJava9Compatible()) { diff --git a/gradle.properties b/gradle.properties index ccfe697..497717b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ groupId=ru.tinkoff.kora -koraVersion=1.2.0 +koraVersion=1.2.3 ##### GRADLE ##### diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1adfb4..2e11132 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -133,22 +132,29 @@ 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. 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=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -165,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -193,16 +198,19 @@ 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, 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" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index f127cfd..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +45,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 @@ -56,22 +59,21 @@ 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 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/ru/tinkoff/kora/java/crud/Application.java b/src/main/java/ru/tinkoff/kora/example/Application.java similarity index 96% rename from src/main/java/ru/tinkoff/kora/java/crud/Application.java rename to src/main/java/ru/tinkoff/kora/example/Application.java index 1e625ca..e4ec830 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/Application.java +++ b/src/main/java/ru/tinkoff/kora/example/Application.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud; +package ru.tinkoff.kora.example; import ru.tinkoff.kora.application.graph.KoraApplication; import ru.tinkoff.kora.cache.caffeine.CaffeineCacheModule; diff --git a/src/main/java/ru/tinkoff/kora/java/crud/controller/HttpExceptionHandler.java b/src/main/java/ru/tinkoff/kora/example/controller/HttpExceptionHandler.java similarity index 94% rename from src/main/java/ru/tinkoff/kora/java/crud/controller/HttpExceptionHandler.java rename to src/main/java/ru/tinkoff/kora/example/controller/HttpExceptionHandler.java index d25e299..e35d67e 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/controller/HttpExceptionHandler.java +++ b/src/main/java/ru/tinkoff/kora/example/controller/HttpExceptionHandler.java @@ -1,19 +1,18 @@ -package ru.tinkoff.kora.java.crud.controller; +package ru.tinkoff.kora.example.controller; import io.micrometer.core.instrument.config.validate.ValidationException; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.TimeoutException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.tinkoff.kora.common.Component; import ru.tinkoff.kora.common.Context; import ru.tinkoff.kora.common.Tag; +import ru.tinkoff.kora.example.openapi.http.server.model.MessageTO; import ru.tinkoff.kora.http.common.body.HttpBody; import ru.tinkoff.kora.http.server.common.*; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.MessageTO; import ru.tinkoff.kora.json.common.JsonWriter; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.TimeoutException; - @Tag(HttpServerModule.class) @Component public final class HttpExceptionHandler implements HttpServerInterceptor { diff --git a/src/main/java/ru/tinkoff/kora/java/crud/controller/PetDelegate.java b/src/main/java/ru/tinkoff/kora/example/controller/PetDelegate.java similarity index 66% rename from src/main/java/ru/tinkoff/kora/java/crud/controller/PetDelegate.java rename to src/main/java/ru/tinkoff/kora/example/controller/PetDelegate.java index d33d5b8..6ffd6d3 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/controller/PetDelegate.java +++ b/src/main/java/ru/tinkoff/kora/example/controller/PetDelegate.java @@ -1,13 +1,13 @@ -package ru.tinkoff.kora.java.crud.controller; +package ru.tinkoff.kora.example.controller; import ru.tinkoff.kora.common.Component; -import ru.tinkoff.kora.java.crud.model.mapper.PetMapper; -import ru.tinkoff.kora.java.crud.openapi.http.server.api.PetApiDelegate; -import ru.tinkoff.kora.java.crud.openapi.http.server.api.PetApiResponses; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.MessageTO; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetCreateTO; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetUpdateTO; -import ru.tinkoff.kora.java.crud.service.PetService; +import ru.tinkoff.kora.example.model.mapper.PetMapper; +import ru.tinkoff.kora.example.openapi.http.server.api.PetApiDelegate; +import ru.tinkoff.kora.example.openapi.http.server.api.PetApiResponses; +import ru.tinkoff.kora.example.openapi.http.server.model.MessageTO; +import ru.tinkoff.kora.example.openapi.http.server.model.PetCreateTO; +import ru.tinkoff.kora.example.openapi.http.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.service.PetService; @Component public final class PetDelegate implements PetApiDelegate { @@ -22,10 +22,6 @@ public PetDelegate(PetMapper petMapper, PetService petService) { @Override public PetApiResponses.GetPetByIdApiResponse getPetById(long petId) { - if (petId < 0) { - return new PetApiResponses.GetPetByIdApiResponse.GetPetById400ApiResponse(malformedId(petId)); - } - var pet = petService.findByID(petId); if (pet.isPresent()) { var body = petMapper.asDTO(pet.get()); @@ -44,10 +40,6 @@ public PetApiResponses.AddPetApiResponse addPet(PetCreateTO petCreateTO) { @Override public PetApiResponses.UpdatePetApiResponse updatePet(long petId, PetUpdateTO petUpdateTO) { - if (petId < 0) { - return new PetApiResponses.UpdatePetApiResponse.UpdatePet400ApiResponse(malformedId(petId)); - } - var updated = petService.update(petId, petUpdateTO); if (updated.isPresent()) { var body = petMapper.asDTO(updated.get()); @@ -59,10 +51,6 @@ public PetApiResponses.UpdatePetApiResponse updatePet(long petId, PetUpdateTO pe @Override public PetApiResponses.DeletePetApiResponse deletePet(long petId) { - if (petId < 0) { - return new PetApiResponses.DeletePetApiResponse.DeletePet400ApiResponse(malformedId(petId)); - } - if (petService.delete(petId)) { return new PetApiResponses.DeletePetApiResponse.DeletePet200ApiResponse( new MessageTO("Successfully deleted pet with ID: " + petId)); @@ -74,8 +62,4 @@ public PetApiResponses.DeletePetApiResponse deletePet(long 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/src/main/java/ru/tinkoff/kora/java/crud/model/dao/Pet.java b/src/main/java/ru/tinkoff/kora/example/model/dao/Pet.java similarity index 92% rename from src/main/java/ru/tinkoff/kora/java/crud/model/dao/Pet.java rename to src/main/java/ru/tinkoff/kora/example/model/dao/Pet.java index 84f7aae..107278e 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/model/dao/Pet.java +++ b/src/main/java/ru/tinkoff/kora/example/model/dao/Pet.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud.model.dao; +package ru.tinkoff.kora.example.model.dao; import ru.tinkoff.kora.database.common.annotation.Column; import ru.tinkoff.kora.database.common.annotation.Id; diff --git a/src/main/java/ru/tinkoff/kora/example/model/mapper/PetMapper.java b/src/main/java/ru/tinkoff/kora/example/model/mapper/PetMapper.java new file mode 100644 index 0000000..cafd209 --- /dev/null +++ b/src/main/java/ru/tinkoff/kora/example/model/mapper/PetMapper.java @@ -0,0 +1,11 @@ +package ru.tinkoff.kora.example.model.mapper; + +import org.mapstruct.Mapper; +import ru.tinkoff.kora.example.model.dao.Pet; +import ru.tinkoff.kora.example.openapi.http.server.model.PetTO; + +@Mapper +public interface PetMapper { + + PetTO asDTO(Pet pet); +} diff --git a/src/main/java/ru/tinkoff/kora/java/crud/repository/PetRepository.java b/src/main/java/ru/tinkoff/kora/example/repository/PetRepository.java similarity index 89% rename from src/main/java/ru/tinkoff/kora/java/crud/repository/PetRepository.java rename to src/main/java/ru/tinkoff/kora/example/repository/PetRepository.java index 3327c73..d660f6c 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/repository/PetRepository.java +++ b/src/main/java/ru/tinkoff/kora/example/repository/PetRepository.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud.repository; +package ru.tinkoff.kora.example.repository; import java.util.Optional; import ru.tinkoff.kora.database.common.UpdateCount; @@ -6,7 +6,7 @@ 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.java.crud.model.dao.Pet; +import ru.tinkoff.kora.example.model.dao.Pet; @Repository public interface PetRepository extends JdbcRepository { diff --git a/src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusParameterMapper.java b/src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusParameterMapper.java similarity index 85% rename from src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusParameterMapper.java rename to src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusParameterMapper.java index 5210131..b1c38e9 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusParameterMapper.java +++ b/src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusParameterMapper.java @@ -1,11 +1,11 @@ -package ru.tinkoff.kora.java.crud.repository.mapper; +package ru.tinkoff.kora.example.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.java.crud.model.dao.Pet; +import ru.tinkoff.kora.example.model.dao.Pet; @Component public final class PetStatusParameterMapper implements JdbcParameterColumnMapper { diff --git a/src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusResultMapper.java b/src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusResultMapper.java similarity index 87% rename from src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusResultMapper.java rename to src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusResultMapper.java index 4267a5f..50a16bd 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/repository/mapper/PetStatusResultMapper.java +++ b/src/main/java/ru/tinkoff/kora/example/repository/mapper/PetStatusResultMapper.java @@ -1,10 +1,10 @@ -package ru.tinkoff.kora.java.crud.repository.mapper; +package ru.tinkoff.kora.example.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.java.crud.model.dao.Pet; +import ru.tinkoff.kora.example.model.dao.Pet; @Component public final class PetStatusResultMapper implements JdbcResultColumnMapper { diff --git a/src/main/java/ru/tinkoff/kora/java/crud/service/PetCache.java b/src/main/java/ru/tinkoff/kora/example/service/PetCache.java similarity index 67% rename from src/main/java/ru/tinkoff/kora/java/crud/service/PetCache.java rename to src/main/java/ru/tinkoff/kora/example/service/PetCache.java index f247e65..138c4ed 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/service/PetCache.java +++ b/src/main/java/ru/tinkoff/kora/example/service/PetCache.java @@ -1,8 +1,8 @@ -package ru.tinkoff.kora.java.crud.service; +package ru.tinkoff.kora.example.service; import ru.tinkoff.kora.cache.annotation.Cache; import ru.tinkoff.kora.cache.caffeine.CaffeineCache; -import ru.tinkoff.kora.java.crud.model.dao.Pet; +import ru.tinkoff.kora.example.model.dao.Pet; @Cache("pet-cache") public interface PetCache extends CaffeineCache { diff --git a/src/main/java/ru/tinkoff/kora/java/crud/service/PetService.java b/src/main/java/ru/tinkoff/kora/example/service/PetService.java similarity index 84% rename from src/main/java/ru/tinkoff/kora/java/crud/service/PetService.java rename to src/main/java/ru/tinkoff/kora/example/service/PetService.java index 8ba4fd7..f6d5830 100644 --- a/src/main/java/ru/tinkoff/kora/java/crud/service/PetService.java +++ b/src/main/java/ru/tinkoff/kora/example/service/PetService.java @@ -1,19 +1,18 @@ -package ru.tinkoff.kora.java.crud.service; +package ru.tinkoff.kora.example.service; +import java.util.Optional; 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.java.crud.model.dao.Pet; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetCreateTO; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetUpdateTO; -import ru.tinkoff.kora.java.crud.repository.PetRepository; +import ru.tinkoff.kora.example.model.dao.Pet; +import ru.tinkoff.kora.example.openapi.http.server.model.PetCreateTO; +import ru.tinkoff.kora.example.openapi.http.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.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; -import java.util.Optional; - @Component public class PetService { @@ -50,8 +49,8 @@ public Optional update(long id, PetUpdateTO updateTO) { final Pet pet = existing.get(); if (pet.name().equals(updateTO.name()) - && updateTO.status() != null - && pet.status().equals(toStatus(updateTO.status()))) { + && updateTO.status() != null + && pet.status().equals(toStatus(updateTO.status()))) { return existing; } diff --git a/src/main/java/ru/tinkoff/kora/java/crud/model/mapper/PetMapper.java b/src/main/java/ru/tinkoff/kora/java/crud/model/mapper/PetMapper.java deleted file mode 100644 index fd9fde7..0000000 --- a/src/main/java/ru/tinkoff/kora/java/crud/model/mapper/PetMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package ru.tinkoff.kora.java.crud.model.mapper; - -import org.mapstruct.Mapper; -import ru.tinkoff.kora.java.crud.model.dao.Pet; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetTO; - -@Mapper -public interface PetMapper { - - PetTO asDTO(Pet pet); -} diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index dae8397..b69cc9a 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -59,6 +59,22 @@ resilient { logging.level { "root": "WARN" + "root": ${?LOGGING_LEVEL_ALL} + "root": ${?LOGGING_LEVEL_ROOT} + "ru.tinkoff.kora": "INFO" - "ru.tinkoff.kora.java.crud": "INFO" + "ru.tinkoff.kora": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora": ${?LOGGING_LEVEL_KORA} + "ru.tinkoff.kora.http.server": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora.http.server": ${?LOGGING_LEVEL_KORA_HTTP_SERVER} + "ru.tinkoff.kora.database": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora.database": ${?LOGGING_LEVEL_KORA_DATABASE} + "ru.tinkoff.kora.cache": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora.cache": ${?LOGGING_LEVEL_KORA_CACHE} + "ru.tinkoff.kora.resilient": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora.resilient": ${?LOGGING_LEVEL_KORA_RESILIENT} + + "ru.tinkoff.kora.example": "INFO" + "ru.tinkoff.kora.example": ${?LOGGING_LEVEL_ALL} + "ru.tinkoff.kora.example": ${?LOGGING_LEVEL_APP} } diff --git a/src/main/resources/openapi/http-server.yaml b/src/main/resources/openapi/http-server.yaml index 73c6e2a..d610f43 100644 --- a/src/main/resources/openapi/http-server.yaml +++ b/src/main/resources/openapi/http-server.yaml @@ -131,6 +131,8 @@ paths: schema: type: integer format: int64 + nullable: false + minimum: 1 requestBody: description: Update an existent pet in the store content: @@ -189,6 +191,8 @@ paths: schema: type: integer format: int64 + nullable: false + minimum: 1 responses: '200': description: successful operation diff --git a/src/test/java/ru/tinkoff/kora/java/crud/AppContainer.java b/src/test/java/ru/tinkoff/kora/example/AppContainer.java similarity index 97% rename from src/test/java/ru/tinkoff/kora/java/crud/AppContainer.java rename to src/test/java/ru/tinkoff/kora/example/AppContainer.java index 110f24b..60864a2 100644 --- a/src/test/java/ru/tinkoff/kora/java/crud/AppContainer.java +++ b/src/test/java/ru/tinkoff/kora/example/AppContainer.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud; +package ru.tinkoff.kora.example; import java.net.URI; import java.nio.file.Paths; diff --git a/src/test/java/ru/tinkoff/kora/java/crud/BlackBoxTests.java b/src/test/java/ru/tinkoff/kora/example/BlackBoxTests.java similarity index 98% rename from src/test/java/ru/tinkoff/kora/java/crud/BlackBoxTests.java rename to src/test/java/ru/tinkoff/kora/example/BlackBoxTests.java index 787221b..51b2035 100644 --- a/src/test/java/ru/tinkoff/kora/java/crud/BlackBoxTests.java +++ b/src/test/java/ru/tinkoff/kora/example/BlackBoxTests.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud; +package ru.tinkoff.kora.example; import static org.junit.jupiter.api.Assertions.*; @@ -43,7 +43,9 @@ public static void setup(@ConnectionPostgreSQL JdbcConnection connection) { "POSTGRES_USER", params.username(), "POSTGRES_PASS", params.password(), "CACHE_MAX_SIZE", "0", - "RETRY_ATTEMPTS", "0")); + "RETRY_ATTEMPTS", "0", + "LOGGING_LEVEL_KORA", "DEBUG", + "LOGGING_LEVEL_APP", "DEBUG")); container.start(); } diff --git a/src/test/java/ru/tinkoff/kora/java/crud/UnitTests.java b/src/test/java/ru/tinkoff/kora/example/UnitTests.java similarity index 90% rename from src/test/java/ru/tinkoff/kora/java/crud/UnitTests.java rename to src/test/java/ru/tinkoff/kora/example/UnitTests.java index e43917c..2f8bc81 100644 --- a/src/test/java/ru/tinkoff/kora/java/crud/UnitTests.java +++ b/src/test/java/ru/tinkoff/kora/example/UnitTests.java @@ -1,4 +1,4 @@ -package ru.tinkoff.kora.java.crud; +package ru.tinkoff.kora.example; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; @@ -9,11 +9,11 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Mockito; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetCreateTO; -import ru.tinkoff.kora.java.crud.openapi.http.server.model.PetUpdateTO; -import ru.tinkoff.kora.java.crud.repository.PetRepository; -import ru.tinkoff.kora.java.crud.service.PetCache; -import ru.tinkoff.kora.java.crud.service.PetService; +import ru.tinkoff.kora.example.openapi.http.server.model.PetCreateTO; +import ru.tinkoff.kora.example.openapi.http.server.model.PetUpdateTO; +import ru.tinkoff.kora.example.repository.PetRepository; +import ru.tinkoff.kora.example.service.PetCache; +import ru.tinkoff.kora.example.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; diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 6b3018c..43db022 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -17,7 +17,7 @@ - +