From e74b9eb4125311fd34aceaa7e5c57a9207669240 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 30 Sep 2021 00:52:09 +0200 Subject: [PATCH 1/3] Rename findVersionsByVersionId to findSiblingVersions --- .../fr/dcproject/component/article/ArticleAccessControl.kt | 2 +- .../component/article/database/ArticleRepository.kt | 5 +++-- src/test/kotlin/unit/security/Article Access Control.kt | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt index 90604a0..31a5ed3 100644 --- a/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt +++ b/src/main/kotlin/fr/dcproject/component/article/ArticleAccessControl.kt @@ -37,7 +37,7 @@ class ArticleAccessControl(private val articleRepo: ArticleRepository) : AccessC if (subject.createdBy.id == citizen.id) { /* The creator must be the same of the creator of preview version of article */ val lastVersionId = articleRepo - .findVersionsByVersionId(1, 1, subject.versionId) + .findSiblingVersions(1, 1, subject) .result .firstOrNull()?.createdBy?.id diff --git a/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt index 37d54eb..4f78cb3 100644 --- a/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt +++ b/src/main/kotlin/fr/dcproject/component/article/database/ArticleRepository.kt @@ -1,5 +1,6 @@ package fr.dcproject.component.article.database +import fr.dcproject.common.entity.VersionableId import fr.postgresjson.connexion.Paginated import fr.postgresjson.connexion.Requester import fr.postgresjson.entity.Parameter @@ -19,10 +20,10 @@ class ArticleRepository(override var requester: Requester) : RepositoryI { .select(page, limit, "id" to id) } - fun findVersionsByVersionId(page: Int = 1, limit: Int = 50, versionId: UUID): Paginated { + fun findSiblingVersions(page: Int = 1, limit: Int = 50, article: A): Paginated where A : VersionableId, A : ArticleI { return requester .getFunction("find_articles_versions_by_version_id") - .select(page, limit, "version_id" to versionId) + .select(page, limit, "version_id" to article.versionId) } fun find( diff --git a/src/test/kotlin/unit/security/Article Access Control.kt b/src/test/kotlin/unit/security/Article Access Control.kt index bddb1d0..9f9389b 100644 --- a/src/test/kotlin/unit/security/Article Access Control.kt +++ b/src/test/kotlin/unit/security/Article Access Control.kt @@ -4,6 +4,7 @@ import fr.dcproject.common.security.AccessDecision.DENIED import fr.dcproject.common.security.AccessDecision.GRANTED import fr.dcproject.component.article.ArticleAccessControl import fr.dcproject.component.article.database.ArticleForListing +import fr.dcproject.component.article.database.ArticleForUpdate import fr.dcproject.component.article.database.ArticleForView import fr.dcproject.component.auth.database.User import fr.dcproject.component.auth.database.UserCreator @@ -48,7 +49,7 @@ internal class `Article Access Control` { private fun getRepo(article: ArticleForListing): ArticleRepo { return mockk { every { find(1, 1, any()) } returns Paginated(listOf(article), 0, 1, 1) - every { findVersionsByVersionId(1, 1, any()) } returns Paginated(listOf(article), 0, 1, 1) + every { findSiblingVersions(1, 1, any()) } returns Paginated(listOf(article), 0, 1, 1) } } -- 2.49.1 From e21c5d318f453460a4c42be02fec257eea64d3cf Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 30 Sep 2021 00:50:54 +0200 Subject: [PATCH 2/3] Update gradle --- .github/workflows/tests.yml | 22 +- build.gradle.kts | 4 +- gradle.lockfile | 375 +++++++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 268 insertions(+), 135 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9b14933..0625b20 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: - name: Build uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: build -x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck -x detekt - name: Cleanup Gradle Cache # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions. @@ -46,12 +46,12 @@ jobs: - name: processResources uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: processResources - name: processTestResources uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: processResources - uses: actions/upload-artifact@v2 with: @@ -76,13 +76,13 @@ jobs: - name: Composer Up uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: testSqlComposeUp - name: TestSql uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: testSql test: @@ -105,19 +105,19 @@ jobs: - name: Composer Up uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: testComposeUp - name: Test uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: test - name: Coverage uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: coveralls env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} @@ -132,7 +132,7 @@ jobs: - name: Test uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: test - name: Build and analyze @@ -141,7 +141,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: sonarqube --info lint: @@ -161,5 +161,5 @@ jobs: - name: Lint uses: eskatos/gradle-command-action@v1 with: - gradle-version: '7.0' + gradle-version: '7.2' arguments: ktlintCheck diff --git a/build.gradle.kts b/build.gradle.kts index df8a3ee..f1835cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ import org.owasp.dependencycheck.reporting.ReportGenerator import org.slf4j.LoggerFactory val ktorVersion = "+" -val kotlinVersion = "1.4.+" +val kotlinVersion = "1.5.+" val coroutinesVersion = "+" group = "com.github.flecomte" @@ -418,7 +418,7 @@ dependencies { implementation("org.elasticsearch.client:elasticsearch-rest-client:6+") implementation("com.jayway.jsonpath:json-path:+") implementation("com.avast.gradle:gradle-docker-compose-plugin:+") - implementation("io.konform:konform-jvm:+") + implementation("io.konform:konform:+") testImplementation("io.ktor:ktor-server-tests:$ktorVersion") testImplementation("io.ktor:ktor-client-mock:$ktorVersion") diff --git a/gradle.lockfile b/gradle.lockfile index 35c296d..0415b3a 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,131 +1,264 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -ch.qos.logback:logback-classic:1.3.0-alpha5=compileClasspath -ch.qos.logback:logback-core:1.3.0-alpha5=compileClasspath -com.auth0:java-jwt:3.15.0=compileClasspath -com.auth0:jwks-rsa:0.9.0=compileClasspath -com.avast.gradle:gradle-docker-compose-plugin:0.14.3=compileClasspath -com.fasterxml.jackson.core:jackson-annotations:2.12.3=compileClasspath -com.fasterxml.jackson.core:jackson-core:2.12.3=compileClasspath -com.fasterxml.jackson.core:jackson-databind:2.12.3=compileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.3=compileClasspath -com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3=compileClasspath -com.fasterxml.jackson:jackson-bom:2.12.3=compileClasspath -com.github.flecomte:postgres-json:2.1.2=compileClasspath -com.github.jasync-sql:jasync-common:1.1.7=compileClasspath -com.github.jasync-sql:jasync-pool:1.1.7=compileClasspath -com.github.jasync-sql:jasync-postgresql:1.1.7=compileClasspath -com.googlecode.json-simple:json-simple:1.1.1=compileClasspath -com.jayway.jsonpath:json-path:2.5.0=compileClasspath -com.ongres.scram:client:2.1=compileClasspath -com.ongres.scram:common:2.1=compileClasspath -com.ongres.stringprep:saslprep:1.1=compileClasspath -com.ongres.stringprep:stringprep:1.1=compileClasspath -com.rabbitmq:amqp-client:5.12.0=compileClasspath -com.sendgrid:java-http-client:4.3.6=compileClasspath -com.sendgrid:sendgrid-java:4.7.1=compileClasspath -com.typesafe:config:1.3.1=compileClasspath -commons-codec:commons-codec:1.11=compileClasspath -commons-logging:commons-logging:1.2=compileClasspath -edu.washington.cs.types.checker:checker-framework:1.7.0=compileClasspath -io.github.microutils:kotlin-logging:1.7.6=compileClasspath -io.insert-koin:koin-core-ext:3.0.1=compileClasspath -io.insert-koin:koin-core-jvm:3.0.1=compileClasspath -io.insert-koin:koin-core:3.0.1=compileClasspath -io.insert-koin:koin-ktor:3.0.1=compileClasspath -io.konform:konform-jvm:0.3.0-RC1=compileClasspath -io.ktor:ktor-auth-jwt:1.5.3=compileClasspath -io.ktor:ktor-auth-kotlinMultiplatform:1.5.3=compileClasspath -io.ktor:ktor-auth:1.5.3=compileClasspath -io.ktor:ktor-client-core-jvm:1.5.3=compileClasspath -io.ktor:ktor-client-core:1.5.3=compileClasspath -io.ktor:ktor-client-jetty:1.5.3=compileClasspath -io.ktor:ktor-http-cio-jvm:1.5.3=compileClasspath -io.ktor:ktor-http-cio:1.5.3=compileClasspath -io.ktor:ktor-http-jvm:1.5.3=compileClasspath -io.ktor:ktor-http:1.5.3=compileClasspath -io.ktor:ktor-io-jvm:1.5.3=compileClasspath -io.ktor:ktor-io:1.5.3=compileClasspath -io.ktor:ktor-jackson:1.5.3=compileClasspath -io.ktor:ktor-locations:1.5.3=compileClasspath -io.ktor:ktor-network-jvm:1.5.3=compileClasspath -io.ktor:ktor-network:1.5.3=compileClasspath -io.ktor:ktor-server-core-kotlinMultiplatform:1.5.3=compileClasspath -io.ktor:ktor-server-core:1.5.3=compileClasspath -io.ktor:ktor-server-host-common-kotlinMultiplatform:1.5.3=compileClasspath -io.ktor:ktor-server-host-common:1.5.3=compileClasspath -io.ktor:ktor-server-jetty:1.5.3=compileClasspath -io.ktor:ktor-server-servlet-kotlinMultiplatform:1.5.3=compileClasspath -io.ktor:ktor-server-servlet:1.5.3=compileClasspath -io.ktor:ktor-utils-jvm:1.5.3=compileClasspath -io.ktor:ktor-utils:1.5.3=compileClasspath -io.ktor:ktor-websockets:1.5.3=compileClasspath -io.lettuce:lettuce-core:5.3.6.RELEASE=compileClasspath -io.netty:netty-buffer:4.1.56.Final=compileClasspath -io.netty:netty-codec:4.1.56.Final=compileClasspath -io.netty:netty-common:4.1.56.Final=compileClasspath -io.netty:netty-handler:4.1.56.Final=compileClasspath -io.netty:netty-resolver:4.1.56.Final=compileClasspath -io.netty:netty-transport:4.1.56.Final=compileClasspath -io.projectreactor:reactor-core:3.4.1=compileClasspath -javax.servlet:javax.servlet-api:3.1.0=compileClasspath -joda-time:joda-time:2.10.8=compileClasspath -net.minidev:accessors-smart:1.2=compileClasspath -net.minidev:json-smart:2.3=compileClasspath -net.pearx.kasechange:kasechange-jvm:1.3.0=compileClasspath -org.apache.httpcomponents:httpasyncclient:4.1.2=compileClasspath -org.apache.httpcomponents:httpclient:4.5.12=compileClasspath -org.apache.httpcomponents:httpcore-nio:4.4.5=compileClasspath -org.apache.httpcomponents:httpcore:4.4.13=compileClasspath -org.bouncycastle:bcprov-jdk15on:1.67=compileClasspath -org.eclipse.jetty.http2:http2-client:9.4.31.v20200723=compileClasspath -org.eclipse.jetty.http2:http2-common:9.4.31.v20200723=compileClasspath -org.eclipse.jetty.http2:http2-hpack:9.4.31.v20200723=compileClasspath -org.eclipse.jetty.http2:http2-server:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-client:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-java-client:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-java-server:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-openjdk8-client:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-openjdk8-server:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-alpn-server:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-continuation:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-http:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-io:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-server:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-servlets:9.4.31.v20200723=compileClasspath -org.eclipse.jetty:jetty-util:9.4.31.v20200723=compileClasspath -org.elasticsearch.client:elasticsearch-rest-client:6.8.15=compileClasspath -org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath +ch.qos.logback:logback-classic:1.3.0-alpha10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +ch.qos.logback:logback-core:1.3.0-alpha10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.auth0:java-jwt:3.18.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.auth0:jwks-rsa:0.17.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.avast.gradle:gradle-docker-compose-plugin:0.14.9=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.beust:jcommander:1.81=detekt +com.fasterxml.jackson.core:jackson-annotations:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0-rc1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-kotlin:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.13.0-rc1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.flecomte:postgres-json:2.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.jasync-sql:jasync-common:2.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.jasync-sql:jasync-pool:2.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.jasync-sql:jasync-postgresql:2.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.shyiko.klob:klob:0.2.1=ktlint +com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.3.4=runtimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:30.0-jre=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath,testRuntimeClasspath +com.googlecode.json-simple:json-simple:1.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.6.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.ongres.scram:client:2.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.ongres.scram:common:2.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.ongres.stringprep:saslprep:1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.ongres.stringprep:stringprep:1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.pinterest.ktlint:ktlint-core:0.42.1=ktlint,ktlintBaselineReporter +com.pinterest.ktlint:ktlint-reporter-baseline:0.42.1=ktlint,ktlintBaselineReporter +com.pinterest.ktlint:ktlint-reporter-checkstyle:0.42.1=ktlint +com.pinterest.ktlint:ktlint-reporter-html:0.42.1=ktlint +com.pinterest.ktlint:ktlint-reporter-json:0.42.1=ktlint +com.pinterest.ktlint:ktlint-reporter-plain:0.42.1=ktlint +com.pinterest.ktlint:ktlint-reporter-sarif:0.42.1=ktlint +com.pinterest.ktlint:ktlint-ruleset-experimental:0.42.1=ktlint +com.pinterest.ktlint:ktlint-ruleset-standard:0.42.1=ktlint +com.pinterest.ktlint:ktlint-ruleset-test:0.42.1=ktlint +com.pinterest:ktlint:0.42.1=ktlint +com.rabbitmq:amqp-client:5.13.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.sendgrid:java-http-client:4.3.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.sendgrid:sendgrid-java:4.7.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.thedeanda:lorem:2.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.typesafe:config:1.3.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +commons-codec:commons-codec:1.11=compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata +commons-codec:commons-codec:1.15=runtimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +info.picocli:picocli:3.9.6=ktlint +io.github.detekt.sarif4k:sarif4k:0.0.1=detekt,ktlint +io.github.microutils:kotlin-logging:1.7.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.gitlab.arturbosch.detekt:detekt-api:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-bom:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-cli:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-core:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-metrics:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-parser:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-psi-utils:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-report-html:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-report-sarif:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-report-txt:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-report-xml:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-empty:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-naming:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-performance:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules-style:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-rules:1.18.1=detekt +io.gitlab.arturbosch.detekt:detekt-tooling:1.18.1=detekt +io.insert-koin:koin-core-jvm:3.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.insert-koin:koin-core:3.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.insert-koin:koin-ktor:3.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.insert-koin:koin-test-jvm:3.1.2=testCompileClasspath,testRuntimeClasspath +io.insert-koin:koin-test:3.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.konform:konform-jvm:0.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.konform:konform:0.3.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-auth-jwt:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-auth-kotlinMultiplatform:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-auth:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-client-cio-jvm:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-client-cio:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-client-core-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-client-core:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-client-jetty-kotlinMultiplatform:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-client-jetty:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-client-mock-jvm:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-client-mock:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-http-cio-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-http-cio:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-http-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-http:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-io-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-io:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-jackson:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-locations:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-network-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-network-tls-certificates-kotlinMultiplatform:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-network-tls-certificates:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-network-tls-jvm:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-network-tls:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-network:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-server-core-kotlinMultiplatform:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-core:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-host-common-kotlinMultiplatform:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-host-common:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-server-jetty:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-servlet-kotlinMultiplatform:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-servlet:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-server-test-host-kotlinMultiplatform:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-server-test-host:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-server-tests:1.6.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-utils-jvm:1.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-utils:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.ktor:ktor-websockets-kotlinMultiplatform:1.6.3=testCompileClasspath,testRuntimeClasspath +io.ktor:ktor-websockets:1.6.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.lettuce:lettuce-core:5.3.6.RELEASE=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-agent-api:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-agent-common:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-agent-jvm:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-common:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-dsl-jvm:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk-dsl:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.mockk:mockk:1.12.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-buffer:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-codec:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-common:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-handler:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-resolver:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.netty:netty-transport:4.1.56.Final=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +io.projectreactor:reactor-core:3.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +joda-time:joda-time:2.10.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +junit:junit:4.13.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testImplementationDependenciesMetadata +junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.11.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.11.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.5.0=testRuntimeClasspath +net.java.dev.jna:jna:5.5.0=testRuntimeClasspath +net.minidev:accessors-smart:2.4.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.minidev:json-smart:2.4.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.pearx.kasechange:kasechange-jvm:1.3.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.pearx.kasechange:kasechange-metadata:1.3.0=implementationDependenciesMetadata,testImplementationDependenciesMetadata +org.amshove.kluent:kluent-common:1.68=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.amshove.kluent:kluent:1.68=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents:httpasyncclient:4.1.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents:httpcore-nio:4.4.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.14=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.bouncycastle:bcprov-jdk15on:1.69=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.checkerframework:checker-qual:3.5.0=runtimeClasspath,testRuntimeClasspath +org.ec4j.core:ec4j-core:0.3.0=ktlint,ktlintBaselineReporter +org.eclipse.jetty.http2:http2-client:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty.http2:http2-common:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty.http2:http2-hpack:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty.http2:http2-http-client-transport:9.4.42.v20210604=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:http2-server:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-client:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-java-server:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-openjdk8-client:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-openjdk8-server:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-alpn-server:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-client:9.4.42.v20210604=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-continuation:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-http:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-servlets:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.42.v20210604=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.elasticsearch.client:elasticsearch-rest-client:6.8.19=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.6=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.6=jacocoAnt +org.jacoco:org.jacoco.core:0.8.6=jacocoAnt +org.jacoco:org.jacoco.report:0.8.6=jacocoAnt +org.jetbrains.intellij.deps:trove4j:1.0.20181211=detekt,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.21=detekt +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.21=detekt org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.32=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-reflect:1.4.32=compileClasspath,kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.32=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.4.32=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.5.20=compileClasspath,implementationDependenciesMetadata,ktlint,ktlintBaselineReporter,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-reflect:1.5.21=detekt +org.jetbrains.kotlin:kotlin-script-runtime:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-script-runtime:1.5.21=detekt org.jetbrains.kotlin:kotlin-scripting-common:1.4.32=kotlinCompilerPluginClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.32=kotlinCompilerPluginClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.32=kotlinCompilerPluginClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.32=kotlinCompilerPluginClasspath +org.jetbrains.kotlin:kotlin-serialization-unshaded:1.4.32=kotlinNativeCompilerPluginClasspath org.jetbrains.kotlin:kotlin-serialization:1.4.32=kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.0=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.0=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.5.0=compileClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0-RC=compileClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.21=detekt +org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.4.32=kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.5.20=ktlint,ktlintBaselineReporter +org.jetbrains.kotlin:kotlin-stdlib:1.5.21=detekt +org.jetbrains.kotlin:kotlin-stdlib:1.5.30=implementationDependenciesMetadata,testImplementationDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:1.5.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test-annotations-common:1.5.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test-common:1.5.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test-junit:1.5.10=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-test:1.5.10=testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8=kotlinCompilerPluginClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC=compileClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.4.3-native-mt=compileClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.5.0-RC=compileClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.5.0-RC=compileClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.2.0=compileClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.0=compileClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.2.0=compileClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0=compileClasspath -org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspath -org.joda:joda-convert:1.8.1=compileClasspath -org.ow2.asm:asm:5.0.4=compileClasspath -org.reactivestreams:reactive-streams:1.0.3=compileClasspath -org.slf4j:slf4j-api:2.0.0-alpha1=compileClasspath -empty= +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.5.2=testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.0-native-mt=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.5.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.5.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3=detekt +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains:annotations:13.0=compileClasspath,detekt,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspath,kotlinKlibCommonizerClasspath,ktlint,ktlintBaselineReporter,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.7.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.7.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.7.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.7.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.7.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.7.2=testRuntimeClasspath +org.junit:junit-bom:5.7.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.objenesis:objenesis:3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.openapi4j:openapi-core:1.0.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.openapi4j:openapi-operation-validator:1.0.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.openapi4j:openapi-parser:1.0.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.openapi4j:openapi-schema-validator:1.0.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.ow2.asm:asm-analysis:8.0.1=jacocoAnt +org.ow2.asm:asm-commons:8.0.1=jacocoAnt +org.ow2.asm:asm-tree:8.0.1=jacocoAnt +org.ow2.asm:asm:8.0.1=jacocoAnt +org.ow2.asm:asm:9.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0-alpha4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.threeten:threeten-extra:1.6.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.yaml:snakeyaml:1.28=testCompileClasspath,testImplementationDependenciesMetadata +org.yaml:snakeyaml:1.29=detekt,runtimeClasspath,testRuntimeClasspath +empty=annotationProcessor,apiDependenciesMetadata,compile,compileOnly,compileOnlyDependenciesMetadata,detektPlugins,kotlinScriptDef,kotlinScriptDefExtensions,ktlintReporter,ktlintRuleset,runtime,runtimeOnlyDependenciesMetadata,shadow,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime,testRuntimeOnlyDependenciesMetadata diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- 2.49.1 From f9eaa0b843e444caf9d80ffbcf85520adf4a2ab8 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 30 Sep 2021 01:27:14 +0200 Subject: [PATCH 3/3] Lint --- src/test/kotlin/integration/Article routes.kt | 14 +++++++------- src/test/kotlin/integration/Citizen routes.kt | 10 +++++----- .../integration/Comment articles routes.kt | 12 ++++++------ .../Comment constitutions routes.kt | 18 +++++++++--------- src/test/kotlin/integration/Comment routes.kt | 12 ++++++------ .../kotlin/integration/Constitution routes.kt | 14 +++++++------- .../integration/Follow articles routes.kt | 6 +++--- .../integration/Follow citizen routes.kt | 6 +++--- .../integration/Follow constitutions routes.kt | 6 +++--- src/test/kotlin/integration/Login routes.kt | 6 +++--- .../kotlin/integration/Notification routes.kt | 2 +- src/test/kotlin/integration/Opinion routes.kt | 12 ++++++------ src/test/kotlin/integration/Register routes.kt | 6 +++--- src/test/kotlin/integration/Vote routes.kt | 12 ++++++------ .../integration/Workgroup Members routes.kt | 10 +++++----- .../kotlin/integration/Workgroup routes.kt | 16 ++++++++-------- .../kotlin/integration/steps/then/request.kt | 2 +- 17 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/test/kotlin/integration/Article routes.kt b/src/test/kotlin/integration/Article routes.kt index 22e6123..0b41315 100644 --- a/src/test/kotlin/integration/Article routes.kt +++ b/src/test/kotlin/integration/Article routes.kt @@ -2,26 +2,26 @@ package integration import fr.dcproject.common.utils.toUUID import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.Validate -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`with body` -import integration.steps.given.`Given I have article created by workgroup` import integration.steps.given.`Given I have article` +import integration.steps.given.`Given I have article created by workgroup` import integration.steps.given.`Given I have articles` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have draft article` import integration.steps.given.`Given I have workgroup` import integration.steps.given.`authenticated as` import integration.steps.then.`And have property` +import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should contain pattern` -import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`And the response should not contain` import integration.steps.then.`Then the response should be` -import integration.steps.then.`which contains` import integration.steps.then.and +import integration.steps.then.`which contains` +import integration.steps.`when`.Validate +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Forbidden import io.ktor.http.HttpStatusCode.Companion.NotFound diff --git a/src/test/kotlin/integration/Citizen routes.kt b/src/test/kotlin/integration/Citizen routes.kt index 95c445e..6539b5d 100644 --- a/src/test/kotlin/integration/Citizen routes.kt +++ b/src/test/kotlin/integration/Citizen routes.kt @@ -1,16 +1,16 @@ package integration -import integration.steps.`when`.Validate -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have citizen` import integration.steps.given.`authenticated as` import integration.steps.then.`And have property` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` -import integration.steps.then.`which contains` import integration.steps.then.and +import integration.steps.then.`which contains` +import integration.steps.`when`.Validate +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Comment articles routes.kt b/src/test/kotlin/integration/Comment articles routes.kt index 517b04c..f0aebc6 100644 --- a/src/test/kotlin/integration/Comment articles routes.kt +++ b/src/test/kotlin/integration/Comment articles routes.kt @@ -1,12 +1,6 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.Validate.ALL -import integration.steps.`when`.Validate.REQUEST_BODY -import integration.steps.`when`.Validate.REQUEST_PARAM -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have article` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have comment on article` @@ -15,6 +9,12 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate.ALL +import integration.steps.`when`.Validate.REQUEST_BODY +import integration.steps.`when`.Validate.REQUEST_PARAM +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Comment constitutions routes.kt b/src/test/kotlin/integration/Comment constitutions routes.kt index 523a0be..dd243b8 100644 --- a/src/test/kotlin/integration/Comment constitutions routes.kt +++ b/src/test/kotlin/integration/Comment constitutions routes.kt @@ -1,21 +1,21 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name +import integration.steps.given.`Given I have citizen` +import integration.steps.given.`Given I have comment on constitution` +import integration.steps.given.`Given I have constitution` +import integration.steps.given.`authenticated as` +import integration.steps.then.`And the response should contain` +import integration.steps.then.`And the response should contain list` +import integration.steps.then.`And the response should not be null` +import integration.steps.then.`Then the response should be` +import integration.steps.then.and import integration.steps.`when`.Validate import integration.steps.`when`.Validate.ALL import integration.steps.`when`.Validate.REQUEST_BODY import integration.steps.`when`.`When I send a GET request` import integration.steps.`when`.`When I send a POST request` import integration.steps.`when`.`with body` -import integration.steps.given.`Given I have citizen` -import integration.steps.given.`Given I have comment on constitution` -import integration.steps.given.`Given I have constitution` -import integration.steps.given.`authenticated as` -import integration.steps.then.`And the response should contain list` -import integration.steps.then.`And the response should contain` -import integration.steps.then.`And the response should not be null` -import integration.steps.then.`Then the response should be` -import integration.steps.then.and import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Comment routes.kt b/src/test/kotlin/integration/Comment routes.kt index ad7cea7..8c855a7 100644 --- a/src/test/kotlin/integration/Comment routes.kt +++ b/src/test/kotlin/integration/Comment routes.kt @@ -1,12 +1,6 @@ package integration import fr.dcproject.component.citizen.database.CitizenI -import integration.steps.`when`.Validate.ALL -import integration.steps.`when`.Validate.REQUEST_BODY -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have article` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have comment on article` @@ -16,6 +10,12 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate.ALL +import integration.steps.`when`.Validate.REQUEST_BODY +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Constitution routes.kt b/src/test/kotlin/integration/Constitution routes.kt index 271ca52..29f53c2 100644 --- a/src/test/kotlin/integration/Constitution routes.kt +++ b/src/test/kotlin/integration/Constitution routes.kt @@ -1,11 +1,5 @@ package integration -import integration.steps.`when`.Validate.ALL -import integration.steps.`when`.Validate.REQUEST_BODY -import integration.steps.`when`.Validate.REQUEST_PARAM -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have constitution` import integration.steps.given.`Given I have constitutions` @@ -14,8 +8,14 @@ import integration.steps.then.`And have property` import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` -import integration.steps.then.`which contains` import integration.steps.then.and +import integration.steps.then.`which contains` +import integration.steps.`when`.Validate.ALL +import integration.steps.`when`.Validate.REQUEST_BODY +import integration.steps.`when`.Validate.REQUEST_PARAM +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Follow articles routes.kt b/src/test/kotlin/integration/Follow articles routes.kt index 1c79b9f..b3e6e71 100644 --- a/src/test/kotlin/integration/Follow articles routes.kt +++ b/src/test/kotlin/integration/Follow articles routes.kt @@ -1,8 +1,5 @@ package integration -import integration.steps.`when`.`When I send a DELETE request` -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` import integration.steps.given.`And follow article` import integration.steps.given.`Given I have article` import integration.steps.given.`Given I have citizen` @@ -13,6 +10,9 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.`When I send a DELETE request` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.NoContent import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Follow citizen routes.kt b/src/test/kotlin/integration/Follow citizen routes.kt index 108a684..8bd7541 100644 --- a/src/test/kotlin/integration/Follow citizen routes.kt +++ b/src/test/kotlin/integration/Follow citizen routes.kt @@ -1,8 +1,5 @@ package integration -import integration.steps.`when`.`When I send a DELETE request` -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` import integration.steps.given.`And follow citizen` import integration.steps.given.`Given I have citizen` import integration.steps.given.`authenticated as` @@ -12,6 +9,9 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.`When I send a DELETE request` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.NoContent import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Follow constitutions routes.kt b/src/test/kotlin/integration/Follow constitutions routes.kt index 5c28b17..48ba39a 100644 --- a/src/test/kotlin/integration/Follow constitutions routes.kt +++ b/src/test/kotlin/integration/Follow constitutions routes.kt @@ -1,8 +1,5 @@ package integration -import integration.steps.`when`.`When I send a DELETE request` -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` import integration.steps.given.`And follow constitution` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have constitution` @@ -13,6 +10,9 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.`When I send a DELETE request` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.NoContent import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Login routes.kt b/src/test/kotlin/integration/Login routes.kt index 131b278..55734ef 100644 --- a/src/test/kotlin/integration/Login routes.kt +++ b/src/test/kotlin/integration/Login routes.kt @@ -1,13 +1,13 @@ package integration -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have citizen` import integration.steps.given.`authenticated as` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` -import integration.steps.then.`and should contains` import integration.steps.then.and +import integration.steps.then.`and should contains` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.NoContent import io.ktor.http.HttpStatusCode.Companion.OK import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/integration/Notification routes.kt b/src/test/kotlin/integration/Notification routes.kt index afff34f..dfd57a5 100644 --- a/src/test/kotlin/integration/Notification routes.kt +++ b/src/test/kotlin/integration/Notification routes.kt @@ -4,8 +4,8 @@ import fr.dcproject.component.citizen.database.CitizenI.Name import fr.dcproject.component.notification.ArticleUpdateNotificationMessage import fr.dcproject.component.notification.NotificationMessage import integration.steps.given.`And follow citizen` -import integration.steps.given.`Given I have article update notification` import integration.steps.given.`Given I have article` +import integration.steps.given.`Given I have article update notification` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have follow on article` import integration.steps.given.`authenticated in url as` diff --git a/src/test/kotlin/integration/Opinion routes.kt b/src/test/kotlin/integration/Opinion routes.kt index 14e8d13..615e23a 100644 --- a/src/test/kotlin/integration/Opinion routes.kt +++ b/src/test/kotlin/integration/Opinion routes.kt @@ -1,21 +1,21 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.Validate.ALL -import integration.steps.`when`.Validate.REQUEST_PARAM -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have an opinion choice` import integration.steps.given.`Given I have article` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have opinion on article` import integration.steps.given.`authenticated as` -import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should contain` +import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate.ALL +import integration.steps.`when`.Validate.REQUEST_PARAM +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Register routes.kt b/src/test/kotlin/integration/Register routes.kt index 510d0b2..ebc852b 100644 --- a/src/test/kotlin/integration/Register routes.kt +++ b/src/test/kotlin/integration/Register routes.kt @@ -1,13 +1,13 @@ package integration -import integration.steps.`when`.Validate -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`with body` import integration.steps.then.`And the response should be null` import integration.steps.then.`And the response should contain pattern` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.OK import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/integration/Vote routes.kt b/src/test/kotlin/integration/Vote routes.kt index a01aaf7..94e19f1 100644 --- a/src/test/kotlin/integration/Vote routes.kt +++ b/src/test/kotlin/integration/Vote routes.kt @@ -1,12 +1,6 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.Validate.ALL -import integration.steps.`when`.Validate.REQUEST_BODY -import integration.steps.`when`.Validate.REQUEST_PARAM -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have article` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have comment on article` @@ -18,6 +12,12 @@ import integration.steps.then.`And the response should contain` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate.ALL +import integration.steps.`when`.Validate.REQUEST_BODY +import integration.steps.`when`.Validate.REQUEST_PARAM +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK diff --git a/src/test/kotlin/integration/Workgroup Members routes.kt b/src/test/kotlin/integration/Workgroup Members routes.kt index 49034b0..064d077 100644 --- a/src/test/kotlin/integration/Workgroup Members routes.kt +++ b/src/test/kotlin/integration/Workgroup Members routes.kt @@ -1,18 +1,18 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.`When I send a DELETE request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have workgroup` import integration.steps.given.`With members` import integration.steps.given.`authenticated as` -import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should contain` +import integration.steps.then.`And the response should contain list` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.`When I send a DELETE request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.OK import org.junit.jupiter.api.Tag diff --git a/src/test/kotlin/integration/Workgroup routes.kt b/src/test/kotlin/integration/Workgroup routes.kt index 6a7adfb..b317a65 100644 --- a/src/test/kotlin/integration/Workgroup routes.kt +++ b/src/test/kotlin/integration/Workgroup routes.kt @@ -1,13 +1,6 @@ package integration import fr.dcproject.component.citizen.database.CitizenI.Name -import integration.steps.`when`.Validate.REQUEST_BODY -import integration.steps.`when`.Validate.REQUEST_PARAM -import integration.steps.`when`.`When I send a DELETE request` -import integration.steps.`when`.`When I send a GET request` -import integration.steps.`when`.`When I send a POST request` -import integration.steps.`when`.`When I send a PUT request` -import integration.steps.`when`.`with body` import integration.steps.given.`Given I have citizen` import integration.steps.given.`Given I have workgroup` import integration.steps.given.`With members` @@ -15,11 +8,18 @@ import integration.steps.given.`authenticated as` import integration.steps.given.`with no content` import integration.steps.then.`And have property` import integration.steps.then.`And the response should be null` -import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should contain` +import integration.steps.then.`And the response should contain list` import integration.steps.then.`And the response should not be null` import integration.steps.then.`Then the response should be` import integration.steps.then.and +import integration.steps.`when`.Validate.REQUEST_BODY +import integration.steps.`when`.Validate.REQUEST_PARAM +import integration.steps.`when`.`When I send a DELETE request` +import integration.steps.`when`.`When I send a GET request` +import integration.steps.`when`.`When I send a POST request` +import integration.steps.`when`.`When I send a PUT request` +import integration.steps.`when`.`with body` import io.ktor.http.HttpStatusCode.Companion.BadRequest import io.ktor.http.HttpStatusCode.Companion.Created import io.ktor.http.HttpStatusCode.Companion.NoContent diff --git a/src/test/kotlin/integration/steps/then/request.kt b/src/test/kotlin/integration/steps/then/request.kt index cdea9e5..57dc5a3 100644 --- a/src/test/kotlin/integration/steps/then/request.kt +++ b/src/test/kotlin/integration/steps/then/request.kt @@ -7,9 +7,9 @@ import io.ktor.http.HttpStatusCode import io.ktor.server.testing.TestApplicationCall import io.ktor.server.testing.TestApplicationResponse import net.minidev.json.JSONArray +import org.amshove.kluent.`should be` import org.amshove.kluent.`should be equal to` import org.amshove.kluent.`should be null` -import org.amshove.kluent.`should be` import org.amshove.kluent.`should not be null` import org.amshove.kluent.shouldContain import org.junit.jupiter.api.assertThrows -- 2.49.1