diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 7080870..00c996c 100755 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -5,7 +5,6 @@ "UnstableApiUsage", ) -import org.gradle.api.JavaVersion.VERSION_21 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -33,8 +32,6 @@ plugins { id("io.spring.dependency-management") } - - group = properties["artifact.group"].toString() version = properties["artifact.version"].toString() diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index accbfa0..97a2085 100755 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -60,7 +60,7 @@ spring: problemdetails: enabled: true web: - locale: en + locale: fr_FR ############################################################################## logging: @@ -73,5 +73,5 @@ logging: ############################################################################## server: - port: 8080 + port: 8880 ############################################################################## diff --git a/base/build.gradle.kts b/base/build.gradle.kts index b92e0d1..489d2bf 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -8,6 +8,21 @@ plugins { `java-library` } +version = ("artifact.version" to "artifact.version.key").artifactVersion + +val Pair.artifactVersion: String + get() = first.run( + Properties().apply { + second.run(properties::get).let { + "user.home" + .run(System::getProperty) + .run { "$this$it" } + }.run(::File) + .inputStream() + .use(::load) + }::get + ).toString() + repositories { mavenCentral() } dependencies { @@ -20,18 +35,4 @@ dependencies { implementation(libs.guava) } -version = "artifact.version".run( - Properties().apply { - "artifact.version.key" - .run(properties::get) - .let { - "user.home" - .run(System::getProperty) - .run { "$this$it" } - }.run(::File) - .inputStream() - .use(::load) - }::get -).toString() - -tasks.named("test") { useJUnitPlatform() } \ No newline at end of file +tasks.named("test") { useJUnitPlatform() } diff --git a/base/src/main/kotlin/base/User.kt b/base/src/main/kotlin/base/User.kt new file mode 100755 index 0000000..31b56cb --- /dev/null +++ b/base/src/main/kotlin/base/User.kt @@ -0,0 +1,40 @@ +package base + +//import com.fasterxml.jackson.annotation.JsonIgnore +//import jakarta.validation.constraints.NotNull +//import jakarta.validation.constraints.Pattern +//import jakarta.validation.constraints.Size +//import webapp.core.model.EntityModel +//import webapp.core.property.ANONYMOUS_USER +//import webapp.core.property.EMPTY_STRING +//import webapp.users.UserDao.Constraints.LOGIN_REGEX +//import webapp.users.security.Role +//import java.util.* +//import jakarta.validation.constraints.Email as EmailConstraint + +data class User( +// override val id: UUID? = null, + +// @field:NotNull +// @field:Pattern(regexp = LOGIN_REGEX) +// @field:Size(min = 1, max = 50) + val login: String, + +// @JsonIgnore +// @field:NotNull +// @field:Size(min = 60, max = 60) +// val password: String = EMPTY_STRING, + +// @field:EmailConstraint +// @field:Size(min = 5, max = 254) +// val email: String = EMPTY_STRING, + +// @JsonIgnore +// val roles: MutableSet = mutableSetOf(Role(ANONYMOUS_USER)), + +// @field:Size(min = 2, max = 10) +// val langKey: String = EMPTY_STRING, + +// @JsonIgnore + val version: Long = -1, +) //: EntityModel() \ No newline at end of file diff --git a/base/src/main/kotlin/org/example/Library.kt b/base/src/main/kotlin/org/example/Library.kt index bd7ce06..92085dc 100644 --- a/base/src/main/kotlin/org/example/Library.kt +++ b/base/src/main/kotlin/org/example/Library.kt @@ -1,16 +1,12 @@ package org.example class Library { - fun someLibraryMethod(): Boolean { - return true - } + fun someLibraryMethod(): Boolean = true companion object { @JvmStatic - fun main(args: Array): Unit { - Library() - .run(Library::someLibraryMethod) - .let(::println) - } + fun main(args: Array) = Library() + .run(Library::someLibraryMethod) + .let(::println) } }