From 6cdc526335ef7bb77f68cd9a2262a1f818afb060 Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Mon, 18 Jan 2021 17:23:16 +0100
Subject: [PATCH] upgrade klint and format code (remove wildcard import

---
 .idea/codeStyles/Project.xml                  | 12 +++++
 build.gradle.kts                              |  2 +-
 src/main/kotlin/application/Application.kt    | 51 ++++++++++++++-----
 src/main/kotlin/application/Converters.kt     |  7 +--
 src/main/kotlin/application/KoinModule.kt     | 12 +++--
 src/main/kotlin/component/article/Article.kt  | 29 +++++++++--
 .../component/article/ArticleRepository.kt    |  2 +-
 .../component/article/ArticleViewManager.kt   |  2 +-
 .../article/routes/FindArticleVersions.kt     | 10 ++--
 .../component/article/routes/FindArticles.kt  |  9 ++--
 .../component/article/routes/GetOneArticle.kt | 22 +++++---
 .../component/article/routes/UpsertArticle.kt | 15 +++---
 .../kotlin/component/auth/CitizenContext.kt   |  8 +--
 .../kotlin/component/auth/PasswordlessAuth.kt |  2 +-
 src/main/kotlin/component/auth/User.kt        | 11 ++--
 .../kotlin/component/auth/UserRepository.kt   |  4 +-
 .../kotlin/component/auth/jwt/JwtConfig.kt    |  2 +-
 .../component/auth/jwt/JwtInstallation.kt     | 12 ++---
 .../kotlin/component/auth/routes/Login.kt     | 19 ++++---
 .../kotlin/component/auth/routes/Register.kt  | 19 ++++---
 src/main/kotlin/component/auth/routes/Sso.kt  | 16 +++---
 src/main/kotlin/component/citizen/Citizen.kt  |  9 +++-
 .../component/citizen/CitizenRepository.kt    |  2 +-
 .../citizen/routes/ChangeMyPassword.kt        | 16 +++---
 .../component/citizen/routes/FindCitizens.kt  | 10 ++--
 .../citizen/routes/GetCurrentCitizen.kt       | 12 +++--
 .../component/citizen/routes/GetOneCitizen.kt | 10 ++--
 .../article/CommentArticleRepository.kt       |  2 +-
 .../article/routes/CreateCommentArticle.kt    | 15 +++---
 .../article/routes/GetArticleComments.kt      | 12 +++--
 .../routes/GetCitizenArticleComments.kt       | 10 ++--
 .../component/comment/generic/Comment.kt      | 18 +++++--
 .../comment/generic/CommentRepository.kt      |  2 +-
 .../routes/CreateCommentChildrenRequest.kt    | 18 ++++---
 .../comment/generic/routes/EditComment.kt     | 18 ++++---
 .../routes/GetCommentChildrenRequest.kt       | 16 +++---
 .../comment/generic/routes/GetOneComment.kt   | 16 +++---
 .../kotlin/component/workgroup/Workgroup.kt   | 13 ++++-
 .../workgroup/WorkgroupRepository.kt          |  2 +-
 .../workgroup/routes/CreateWorkgroup.kt       | 16 +++---
 .../workgroup/routes/DeleteWorkgroup.kt       | 14 ++---
 .../workgroup/routes/EditWorkgroup.kt         | 16 +++---
 .../workgroup/routes/GetWorkgroup.kt          | 14 ++---
 .../workgroup/routes/GetWorkgroups.kt         | 12 +++--
 .../routes/members/AddMemberToWorkgroup.kt    | 17 ++++---
 .../members/DeleteMembersOfWorkgroup.kt       | 17 ++++---
 .../routes/members/UpdateMemberOfWorkgroup.kt | 17 ++++---
 src/main/kotlin/dto/Versionable.kt            |  2 +-
 src/main/kotlin/entity/Constitution.kt        | 12 ++++-
 src/main/kotlin/entity/EntityI.kt             |  2 +-
 src/main/kotlin/entity/Extra.kt               |  2 +-
 src/main/kotlin/entity/Follow.kt              |  8 ++-
 src/main/kotlin/entity/Opinion.kt             |  8 ++-
 src/main/kotlin/entity/OpinionChoice.kt       |  8 ++-
 src/main/kotlin/entity/Versionable.kt         |  2 +-
 src/main/kotlin/entity/Vote.kt                | 11 +++-
 src/main/kotlin/event/EventNotification.kt    | 14 +++--
 src/main/kotlin/event/EventSubscriber.kt      |  9 +++-
 .../messages/NotificationEmailSender.kt       |  2 +-
 .../CommentConstitutionRepository.kt          |  2 +-
 src/main/kotlin/repository/Constitution.kt    |  2 +-
 src/main/kotlin/repository/Follow.kt          |  2 +-
 src/main/kotlin/repository/Opinion.kt         |  2 +-
 src/main/kotlin/repository/Vote.kt            |  7 ++-
 src/main/kotlin/routes/CommentConstitution.kt | 15 +++---
 src/main/kotlin/routes/Constitution.kt        | 16 +++---
 src/main/kotlin/routes/FollowArticle.kt       | 14 +++--
 src/main/kotlin/routes/FollowConstitution.kt  | 14 +++--
 src/main/kotlin/routes/Notification.kt        | 11 ++--
 src/main/kotlin/routes/OpenAPI.kt             | 13 ++---
 src/main/kotlin/routes/OpinionArticle.kt      | 23 +++++----
 src/main/kotlin/routes/OpinionChoice.kt       | 10 ++--
 src/main/kotlin/routes/VoteArticle.kt         | 17 ++++---
 src/main/kotlin/routes/VoteConstitution.kt    | 14 ++---
 src/main/kotlin/utils/Uuid.kt                 |  2 +-
 src/test/kotlin/CucumberTest.kt               |  2 +-
 src/test/kotlin/functional/MailerTest.kt      |  8 +--
 src/test/kotlin/functional/ResourcesKtTest.kt |  2 +-
 src/test/kotlin/functional/ViewTest.kt        |  8 +--
 src/test/kotlin/steps/ArticleSteps.kt         |  4 +-
 src/test/kotlin/steps/CitizenSteps.kt         |  4 +-
 src/test/kotlin/steps/ConstitutionSteps.kt    |  4 +-
 src/test/kotlin/steps/FollowSteps.kt          |  2 +-
 src/test/kotlin/steps/KtorServerAuthSteps.kt  |  4 +-
 src/test/kotlin/steps/KtorServerContext.kt    |  9 ++--
 .../kotlin/steps/KtorServerRequestSteps.kt    |  9 ++--
 src/test/kotlin/steps/KtorServerRestSteps.kt  |  7 ++-
 src/test/kotlin/steps/OpinionSteps.kt         |  4 +-
 src/test/kotlin/steps/VoteSteps.kt            |  4 +-
 src/test/kotlin/steps/WorkgroupSteps.kt       | 18 ++++---
 .../kotlin/unit/voter/ArticleVoterTest.kt     |  4 +-
 .../kotlin/unit/voter/CitizenVoterTest.kt     |  2 +-
 .../kotlin/unit/voter/CommentVoterTest.kt     |  4 +-
 src/test/kotlin/unit/voter/FollowVoterTest.kt |  5 +-
 .../unit/voter/OpinionChoiceVoterTest.kt      |  4 +-
 .../kotlin/unit/voter/OpinionVoterTest.kt     |  4 +-
 src/test/kotlin/unit/voter/VoteVoterTest.kt   |  5 +-
 .../kotlin/unit/voter/WorkgroupVoterTest.kt   |  4 +-
 98 files changed, 595 insertions(+), 360 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 03bc4ca..68b07cb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,6 +2,18 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <PostgresCodeStyleSettings version="5">
diff --git a/build.gradle.kts b/build.gradle.kts
index 92bab4e..d73d5cc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,7 +30,7 @@ plugins {
     kotlin("plugin.serialization") version "1.4.21"
 
     id("com.github.johnrengelman.shadow") version "5.2.0"
-    id("org.jlleitschuh.gradle.ktlint") version "8.2.0"
+    id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
     id("org.owasp.dependencycheck") version "5.1.0"
     id("org.sonarqube") version "2.7"
     id("net.nemerosa.versioning") version "2.13.1"
diff --git a/src/main/kotlin/application/Application.kt b/src/main/kotlin/application/Application.kt
index 363979e..15348a0 100644
--- a/src/main/kotlin/application/Application.kt
+++ b/src/main/kotlin/application/Application.kt
@@ -40,23 +40,46 @@ import fr.dcproject.component.workgroup.routes.members.DeleteMembersOfWorkgroup.
 import fr.dcproject.component.workgroup.routes.members.UpdateMemberOfWorkgroup.updateMemberOfWorkgroup
 import fr.dcproject.event.EventNotification
 import fr.dcproject.event.EventSubscriber
-import fr.dcproject.routes.*
+import fr.dcproject.routes.commentConstitution
+import fr.dcproject.routes.constitution
+import fr.dcproject.routes.definition
+import fr.dcproject.routes.followArticle
+import fr.dcproject.routes.followConstitution
+import fr.dcproject.routes.notificationArticle
+import fr.dcproject.routes.opinionArticle
+import fr.dcproject.routes.opinionChoice
+import fr.dcproject.routes.voteArticle
+import fr.dcproject.routes.voteConstitution
 import fr.dcproject.voter.VoterDeniedException
 import fr.postgresjson.migration.Migrations
-import io.ktor.application.*
-import io.ktor.auth.*
-import io.ktor.client.*
+import io.ktor.application.Application
+import io.ktor.application.call
+import io.ktor.application.install
+import io.ktor.auth.Authentication
+import io.ktor.auth.authenticate
+import io.ktor.client.HttpClient
 import io.ktor.client.engine.jetty.Jetty
-import io.ktor.features.*
-import io.ktor.http.*
-import io.ktor.http.cio.websocket.*
-import io.ktor.jackson.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.server.jetty.*
-import io.ktor.util.*
-import io.ktor.websocket.*
+import io.ktor.features.AutoHeadResponse
+import io.ktor.features.CORS
+import io.ktor.features.CallLogging
+import io.ktor.features.ContentNegotiation
+import io.ktor.features.DataConversion
+import io.ktor.features.NotFoundException
+import io.ktor.features.StatusPages
+import io.ktor.features.maxAge
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpMethod
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.cio.websocket.pingPeriod
+import io.ktor.http.cio.websocket.timeout
+import io.ktor.jackson.jackson
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Locations
+import io.ktor.response.respond
+import io.ktor.routing.Routing
+import io.ktor.server.jetty.EngineMain
+import io.ktor.util.KtorExperimentalAPI
+import io.ktor.websocket.WebSockets
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.eclipse.jetty.util.log.Slf4jLog
 import org.koin.core.qualifier.named
diff --git a/src/main/kotlin/application/Converters.kt b/src/main/kotlin/application/Converters.kt
index bb2900d..ba651ce 100644
--- a/src/main/kotlin/application/Converters.kt
+++ b/src/main/kotlin/application/Converters.kt
@@ -14,12 +14,13 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.entity.Constitution
 import fr.dcproject.entity.ConstitutionRef
 import fr.dcproject.repository.OpinionChoice
-import io.ktor.features.*
-import io.ktor.util.*
+import io.ktor.features.DataConversion
+import io.ktor.features.NotFoundException
+import io.ktor.util.KtorExperimentalAPI
 import org.koin.core.context.GlobalContext
 import org.koin.core.parameter.ParametersDefinition
 import org.koin.core.qualifier.Qualifier
-import java.util.*
+import java.util.UUID
 
 private typealias ConverterDeclaration = DataConversion.Configuration.() -> Unit
 private inline fun <reified T> DataConversion.Configuration.get(
diff --git a/src/main/kotlin/application/KoinModule.kt b/src/main/kotlin/application/KoinModule.kt
index 1bb7bb9..f4942ca 100644
--- a/src/main/kotlin/application/KoinModule.kt
+++ b/src/main/kotlin/application/KoinModule.kt
@@ -23,13 +23,17 @@ import fr.dcproject.event.publisher.Publisher
 import fr.dcproject.messages.Mailer
 import fr.dcproject.messages.NotificationEmailSender
 import fr.dcproject.repository.CommentConstitutionRepository
-import fr.dcproject.security.voter.*
+import fr.dcproject.security.voter.ConstitutionVoter
+import fr.dcproject.security.voter.FollowVoter
+import fr.dcproject.security.voter.OpinionChoiceVoter
+import fr.dcproject.security.voter.OpinionVoter
+import fr.dcproject.security.voter.VoteVoter
 import fr.postgresjson.connexion.Connection
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.migration.Migrations
-import io.ktor.client.*
-import io.ktor.client.features.websocket.*
-import io.ktor.util.*
+import io.ktor.client.HttpClient
+import io.ktor.client.features.websocket.WebSockets
+import io.ktor.util.KtorExperimentalAPI
 import io.lettuce.core.RedisClient
 import io.lettuce.core.api.async.RedisAsyncCommands
 import org.apache.http.HttpHost
diff --git a/src/main/kotlin/component/article/Article.kt b/src/main/kotlin/component/article/Article.kt
index ae5d5a0..eef9729 100644
--- a/src/main/kotlin/component/article/Article.kt
+++ b/src/main/kotlin/component/article/Article.kt
@@ -1,14 +1,35 @@
 package fr.dcproject.component.article
 
-import fr.dcproject.component.citizen.*
+import fr.dcproject.component.citizen.CitizenBasic
+import fr.dcproject.component.citizen.CitizenBasicI
+import fr.dcproject.component.citizen.CitizenCart
+import fr.dcproject.component.citizen.CitizenCartI
+import fr.dcproject.component.citizen.CitizenI
+import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.workgroup.WorkgroupCart
 import fr.dcproject.component.workgroup.WorkgroupCartI
 import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.component.workgroup.WorkgroupSimple
-import fr.dcproject.entity.*
-import fr.postgresjson.entity.*
+import fr.dcproject.entity.CreatedBy
+import fr.dcproject.entity.CreatedByImp
+import fr.dcproject.entity.Opinionable
+import fr.dcproject.entity.OpinionableImp
+import fr.dcproject.entity.Opinions
+import fr.dcproject.entity.TargetI
+import fr.dcproject.entity.TargetRef
+import fr.dcproject.entity.VersionableRef
+import fr.dcproject.entity.VersionableRefImp
+import fr.dcproject.entity.Votable
+import fr.dcproject.entity.VotableImp
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
+import fr.postgresjson.entity.EntityVersioning
+import fr.postgresjson.entity.UuidEntityI
+import fr.postgresjson.entity.UuidEntityVersioning
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
 data class ArticleForView(
     override val id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/component/article/ArticleRepository.kt b/src/main/kotlin/component/article/ArticleRepository.kt
index 4d6cb65..157c922 100644
--- a/src/main/kotlin/component/article/ArticleRepository.kt
+++ b/src/main/kotlin/component/article/ArticleRepository.kt
@@ -5,7 +5,7 @@ import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.Parameter
 import fr.postgresjson.repository.RepositoryI
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
+import java.util.UUID
 
 class ArticleRepository(override var requester: Requester) : RepositoryI {
     fun findById(id: UUID): ArticleForView? {
diff --git a/src/main/kotlin/component/article/ArticleViewManager.kt b/src/main/kotlin/component/article/ArticleViewManager.kt
index 60a4a11..ab49dbb 100644
--- a/src/main/kotlin/component/article/ArticleViewManager.kt
+++ b/src/main/kotlin/component/article/ArticleViewManager.kt
@@ -10,7 +10,7 @@ import org.elasticsearch.client.Request
 import org.elasticsearch.client.Response
 import org.elasticsearch.client.RestClient
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
 /**
  * Wrapper for manage views with elasticsearch
diff --git a/src/main/kotlin/component/article/routes/FindArticleVersions.kt b/src/main/kotlin/component/article/routes/FindArticleVersions.kt
index 38e3c90..5fd5c66 100644
--- a/src/main/kotlin/component/article/routes/FindArticleVersions.kt
+++ b/src/main/kotlin/component/article/routes/FindArticleVersions.kt
@@ -6,10 +6,12 @@ import fr.dcproject.component.article.ArticleVoter
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.voter.assert
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/articles/{article}/versions")
diff --git a/src/main/kotlin/component/article/routes/FindArticles.kt b/src/main/kotlin/component/article/routes/FindArticles.kt
index ba4dfdb..c115220 100644
--- a/src/main/kotlin/component/article/routes/FindArticles.kt
+++ b/src/main/kotlin/component/article/routes/FindArticles.kt
@@ -7,10 +7,11 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.voter.assert
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @Location("/articles")
 class ArticlesRequest(
diff --git a/src/main/kotlin/component/article/routes/GetOneArticle.kt b/src/main/kotlin/component/article/routes/GetOneArticle.kt
index a1d677e..48b311b 100644
--- a/src/main/kotlin/component/article/routes/GetOneArticle.kt
+++ b/src/main/kotlin/component/article/routes/GetOneArticle.kt
@@ -6,18 +6,24 @@ import fr.dcproject.component.article.ArticleViewManager
 import fr.dcproject.component.article.ArticleVoter
 import fr.dcproject.component.article.routes.ArticleRequest.Output
 import fr.dcproject.component.auth.citizenOrNull
-import fr.dcproject.dto.*
+import fr.dcproject.dto.CreatedAt
+import fr.dcproject.dto.Opinionable
+import fr.dcproject.dto.Versionable
+import fr.dcproject.dto.Viewable
+import fr.dcproject.dto.Votable
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.features.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.launch
 import org.koin.core.KoinComponent
 import org.koin.core.inject
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 @Location("/articles/{articleId}")
diff --git a/src/main/kotlin/component/article/routes/UpsertArticle.kt b/src/main/kotlin/component/article/routes/UpsertArticle.kt
index cdba467..799e378 100644
--- a/src/main/kotlin/component/article/routes/UpsertArticle.kt
+++ b/src/main/kotlin/component/article/routes/UpsertArticle.kt
@@ -12,12 +12,15 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.event.ArticleUpdate
 import fr.dcproject.event.raiseEvent
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 @Location("/articles")
diff --git a/src/main/kotlin/component/auth/CitizenContext.kt b/src/main/kotlin/component/auth/CitizenContext.kt
index a384410..ee05e6a 100644
--- a/src/main/kotlin/component/auth/CitizenContext.kt
+++ b/src/main/kotlin/component/auth/CitizenContext.kt
@@ -1,10 +1,10 @@
 package fr.dcproject.component.auth
 
 import fr.dcproject.component.citizen.CitizenRepository
-import io.ktor.application.*
-import io.ktor.auth.*
-import io.ktor.util.*
-import io.ktor.util.pipeline.*
+import io.ktor.application.ApplicationCall
+import io.ktor.auth.authentication
+import io.ktor.util.AttributeKey
+import io.ktor.util.pipeline.PipelineContext
 import org.koin.core.context.GlobalContext
 import fr.dcproject.component.citizen.Citizen as CitizenEntity
 
diff --git a/src/main/kotlin/component/auth/PasswordlessAuth.kt b/src/main/kotlin/component/auth/PasswordlessAuth.kt
index 15d6e4f..88c5fee 100644
--- a/src/main/kotlin/component/auth/PasswordlessAuth.kt
+++ b/src/main/kotlin/component/auth/PasswordlessAuth.kt
@@ -8,7 +8,7 @@ import fr.dcproject.component.citizen.CitizenWithEmail
 import fr.dcproject.component.citizen.CitizenWithUserI
 import fr.dcproject.makeToken
 import fr.dcproject.messages.Mailer
-import io.ktor.http.*
+import io.ktor.http.URLBuilder
 
 /**
  * Send a connexion link by email
diff --git a/src/main/kotlin/component/auth/User.kt b/src/main/kotlin/component/auth/User.kt
index 66a0b7d..4646198 100644
--- a/src/main/kotlin/component/auth/User.kt
+++ b/src/main/kotlin/component/auth/User.kt
@@ -1,10 +1,15 @@
 package fr.dcproject.component.auth
 
 import fr.dcproject.component.auth.UserI.Roles
-import fr.postgresjson.entity.*
-import io.ktor.auth.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedAtImp
+import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.UuidEntityI
+import io.ktor.auth.Principal
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
 class User(
     id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/component/auth/UserRepository.kt b/src/main/kotlin/component/auth/UserRepository.kt
index c9455cf..26ace7d 100644
--- a/src/main/kotlin/component/auth/UserRepository.kt
+++ b/src/main/kotlin/component/auth/UserRepository.kt
@@ -2,8 +2,8 @@ package fr.dcproject.component.auth
 
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.auth.*
-import java.util.*
+import io.ktor.auth.UserPasswordCredential
+import java.util.UUID
 import fr.dcproject.component.auth.User as UserEntity
 
 class UserRepository(override var requester: Requester) : RepositoryI {
diff --git a/src/main/kotlin/component/auth/jwt/JwtConfig.kt b/src/main/kotlin/component/auth/jwt/JwtConfig.kt
index 0148e2c..237cedc 100644
--- a/src/main/kotlin/component/auth/jwt/JwtConfig.kt
+++ b/src/main/kotlin/component/auth/jwt/JwtConfig.kt
@@ -3,7 +3,7 @@ package fr.dcproject.component.auth.jwt
 import com.auth0.jwt.JWT
 import com.auth0.jwt.JWTVerifier
 import com.auth0.jwt.algorithms.Algorithm
-import java.util.*
+import java.util.Date
 
 object JwtConfig {
     private const val secret = "zAP5MBA4B4Ijz0MZaS48"
diff --git a/src/main/kotlin/component/auth/jwt/JwtInstallation.kt b/src/main/kotlin/component/auth/jwt/JwtInstallation.kt
index b7a75f0..a7122bd 100644
--- a/src/main/kotlin/component/auth/jwt/JwtInstallation.kt
+++ b/src/main/kotlin/component/auth/jwt/JwtInstallation.kt
@@ -3,12 +3,12 @@ package component.auth.jwt
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.component.auth.jwt.JwtConfig
-import io.ktor.application.*
-import io.ktor.auth.*
-import io.ktor.auth.jwt.*
-import io.ktor.http.auth.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.ApplicationCall
+import io.ktor.auth.Authentication
+import io.ktor.auth.jwt.jwt
+import io.ktor.http.auth.HttpAuthHeader
+import io.ktor.routing.Routing
+import java.util.UUID
 
 fun jwtInstallation(userRepo: UserRepository): Authentication.Configuration.() -> Unit = {
     /**
diff --git a/src/main/kotlin/component/auth/routes/Login.kt b/src/main/kotlin/component/auth/routes/Login.kt
index 435847d..3701faf 100644
--- a/src/main/kotlin/component/auth/routes/Login.kt
+++ b/src/main/kotlin/component/auth/routes/Login.kt
@@ -3,14 +3,17 @@ package fr.dcproject.component.auth.routes
 import com.fasterxml.jackson.databind.exc.MismatchedInputException
 import fr.dcproject.component.auth.UserRepository
 import fr.dcproject.makeToken
-import io.ktor.application.*
-import io.ktor.auth.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.auth.UserPasswordCredential
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @Location("/login")
diff --git a/src/main/kotlin/component/auth/routes/Register.kt b/src/main/kotlin/component/auth/routes/Register.kt
index f126260..23fc92f 100644
--- a/src/main/kotlin/component/auth/routes/Register.kt
+++ b/src/main/kotlin/component/auth/routes/Register.kt
@@ -8,14 +8,17 @@ import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.makeToken
-import io.ktor.application.*
-import io.ktor.features.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.features.BadRequestException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.response.respondText
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 import org.joda.time.DateTime
 
 @KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/component/auth/routes/Sso.kt b/src/main/kotlin/component/auth/routes/Sso.kt
index 6469ac0..cbe3ef6 100644
--- a/src/main/kotlin/component/auth/routes/Sso.kt
+++ b/src/main/kotlin/component/auth/routes/Sso.kt
@@ -2,13 +2,15 @@ package fr.dcproject.component.auth.routes
 
 import fr.dcproject.component.auth.PasswordlessAuth
 import fr.dcproject.component.auth.routes.PasswordlessRequest.Input
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @Location("/auth/passwordless")
diff --git a/src/main/kotlin/component/citizen/Citizen.kt b/src/main/kotlin/component/citizen/Citizen.kt
index e22cad0..f1a3dc5 100644
--- a/src/main/kotlin/component/citizen/Citizen.kt
+++ b/src/main/kotlin/component/citizen/Citizen.kt
@@ -5,9 +5,14 @@ import fr.dcproject.component.auth.UserI
 import fr.dcproject.component.auth.UserRef
 import fr.dcproject.component.citizen.CitizenI.Name
 import fr.dcproject.component.workgroup.WorkgroupSimple
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
+import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.UuidEntityI
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
 class Citizen(
     override val id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/component/citizen/CitizenRepository.kt b/src/main/kotlin/component/citizen/CitizenRepository.kt
index e0a67e7..220e2c3 100644
--- a/src/main/kotlin/component/citizen/CitizenRepository.kt
+++ b/src/main/kotlin/component/citizen/CitizenRepository.kt
@@ -5,7 +5,7 @@ import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
+import java.util.UUID
 
 class CitizenRepository(override var requester: Requester) : RepositoryI {
     fun findById(id: UUID): Citizen? = requester
diff --git a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
index 8f82ef5..78d9ba4 100644
--- a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
+++ b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt
@@ -7,13 +7,15 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.auth.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.auth.UserPasswordCredential
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 
diff --git a/src/main/kotlin/component/citizen/routes/FindCitizens.kt b/src/main/kotlin/component/citizen/routes/FindCitizens.kt
index 3a5286b..987893f 100644
--- a/src/main/kotlin/component/citizen/routes/FindCitizens.kt
+++ b/src/main/kotlin/component/citizen/routes/FindCitizens.kt
@@ -5,10 +5,12 @@ import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/citizens")
diff --git a/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt b/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt
index cb7e5b6..1e828e0 100644
--- a/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt
+++ b/src/main/kotlin/component/citizen/routes/GetCurrentCitizen.kt
@@ -4,11 +4,13 @@ import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/citizens/current")
diff --git a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt
index e09de48..1276aaf 100644
--- a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt
+++ b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt
@@ -4,10 +4,12 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/citizens/{citizen}")
diff --git a/src/main/kotlin/component/comment/article/CommentArticleRepository.kt b/src/main/kotlin/component/comment/article/CommentArticleRepository.kt
index ecc583e..52f1372 100644
--- a/src/main/kotlin/component/comment/article/CommentArticleRepository.kt
+++ b/src/main/kotlin/component/comment/article/CommentArticleRepository.kt
@@ -10,7 +10,7 @@ import fr.dcproject.entity.TargetI
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.UuidEntityI
-import java.util.*
+import java.util.UUID
 
 class CommentArticleRepository(requester: Requester) : CommentRepositoryAbs<ArticleForView>(requester) {
     override fun findById(id: UUID): CommentForView<ArticleForView, CitizenRef>? {
diff --git a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt
index a93bf7c..48333bb 100644
--- a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt
+++ b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt
@@ -7,12 +7,15 @@ import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentForUpdate
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/articles/{article}/comments")
diff --git a/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt
index 7fdcfd5..7e2d718 100644
--- a/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt
+++ b/src/main/kotlin/component/comment/article/routes/GetArticleComments.kt
@@ -5,11 +5,13 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/articles/{article}/comments")
diff --git a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
index a458025..2b108a4 100644
--- a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
+++ b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt
@@ -5,10 +5,12 @@ import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.comment.article.CommentArticleRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 @Location("/citizens/{citizen}/comments/articles")
diff --git a/src/main/kotlin/component/comment/generic/Comment.kt b/src/main/kotlin/component/comment/generic/Comment.kt
index d04403b..8bf8b34 100644
--- a/src/main/kotlin/component/comment/generic/Comment.kt
+++ b/src/main/kotlin/component/comment/generic/Comment.kt
@@ -1,11 +1,23 @@
 package fr.dcproject.component.comment.generic
 
 import fr.dcproject.component.citizen.CitizenRef
-import fr.dcproject.entity.*
 import fr.dcproject.entity.EntityI
-import fr.postgresjson.entity.*
+import fr.dcproject.entity.ExtraI
+import fr.dcproject.entity.HasTarget
+import fr.dcproject.entity.TargetI
+import fr.dcproject.entity.TargetRef
+import fr.dcproject.entity.Votable
+import fr.dcproject.entity.VotableImp
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedAtImp
 import org.joda.time.DateTime
-import java.util.*
+import java.util.UUID
 
 class CommentForView<T : TargetI, C : CitizenRef>(
     id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/component/comment/generic/CommentRepository.kt b/src/main/kotlin/component/comment/generic/CommentRepository.kt
index f562888..00680a6 100644
--- a/src/main/kotlin/component/comment/generic/CommentRepository.kt
+++ b/src/main/kotlin/component/comment/generic/CommentRepository.kt
@@ -9,7 +9,7 @@ import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.UuidEntityI
 import fr.postgresjson.repository.RepositoryI
-import java.util.*
+import java.util.UUID
 
 abstract class CommentRepositoryAbs<T : TargetI>(override var requester: Requester) : RepositoryI {
     abstract fun findById(id: UUID): CommentForView<T, CitizenRef>?
diff --git a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildrenRequest.kt b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildrenRequest.kt
index c63a343..a539ba4 100644
--- a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildrenRequest.kt
+++ b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildrenRequest.kt
@@ -7,14 +7,16 @@ import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.features.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @Location("/comments/{comment}/children")
diff --git a/src/main/kotlin/component/comment/generic/routes/EditComment.kt b/src/main/kotlin/component/comment/generic/routes/EditComment.kt
index 21c6fcf..84392c5 100644
--- a/src/main/kotlin/component/comment/generic/routes/EditComment.kt
+++ b/src/main/kotlin/component/comment/generic/routes/EditComment.kt
@@ -5,14 +5,16 @@ import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.features.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.request.receiveText
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @Location("/comments/{comment}")
diff --git a/src/main/kotlin/component/comment/generic/routes/GetCommentChildrenRequest.kt b/src/main/kotlin/component/comment/generic/routes/GetCommentChildrenRequest.kt
index 4c4e874..3a7bfaf 100644
--- a/src/main/kotlin/component/comment/generic/routes/GetCommentChildrenRequest.kt
+++ b/src/main/kotlin/component/comment/generic/routes/GetCommentChildrenRequest.kt
@@ -4,13 +4,15 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 @Location("/comments/{comment}/children")
diff --git a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt
index 23585d4..82608d7 100644
--- a/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt
+++ b/src/main/kotlin/component/comment/generic/routes/GetOneComment.kt
@@ -5,13 +5,15 @@ import fr.dcproject.component.comment.generic.CommentRef
 import fr.dcproject.component.comment.generic.CommentRepository
 import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.features.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.features.NotFoundException
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @Location("/comments/{comment}")
diff --git a/src/main/kotlin/component/workgroup/Workgroup.kt b/src/main/kotlin/component/workgroup/Workgroup.kt
index 14983e1..b7810b2 100644
--- a/src/main/kotlin/component/workgroup/Workgroup.kt
+++ b/src/main/kotlin/component/workgroup/Workgroup.kt
@@ -6,9 +6,18 @@ import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenWithUserI
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member.Role
-import fr.postgresjson.entity.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
 import fr.postgresjson.entity.EntityI
-import java.util.*
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedAtImp
+import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.UuidEntityI
+import java.util.UUID
 
 @Deprecated("")
 data class Workgroup <C : CitizenBasicI>(
diff --git a/src/main/kotlin/component/workgroup/WorkgroupRepository.kt b/src/main/kotlin/component/workgroup/WorkgroupRepository.kt
index 5084faa..051e927 100644
--- a/src/main/kotlin/component/workgroup/WorkgroupRepository.kt
+++ b/src/main/kotlin/component/workgroup/WorkgroupRepository.kt
@@ -10,7 +10,7 @@ import fr.postgresjson.repository.RepositoryI
 import fr.postgresjson.repository.RepositoryI.Direction
 import fr.postgresjson.serializer.serialize
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.workgroup.Workgroup as WorkgroupEntity
 
 class WorkgroupRepository(override var requester: Requester) : RepositoryI {
diff --git a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt
index 5f4ded5..199e24b 100644
--- a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt
@@ -7,13 +7,15 @@ import fr.dcproject.component.workgroup.WorkgroupSimple
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.component.workgroup.routes.CreateWorkgroup.PostWorkgroupRequest.Input
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object CreateWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt
index 90f7589..ca15b08 100644
--- a/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/DeleteWorkgroup.kt
@@ -4,12 +4,14 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object DeleteWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt
index 0a6c34b..c805056 100644
--- a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt
@@ -5,14 +5,16 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.component.workgroup.routes.EditWorkgroup.PutWorkgroupRequest.Input
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import org.koin.core.KoinComponent
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object EditWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt
index 8fff870..2ec6098 100644
--- a/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/GetWorkgroup.kt
@@ -4,12 +4,14 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object GetWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt b/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt
index 4f8e4dd..62b5da8 100644
--- a/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt
+++ b/src/main/kotlin/component/workgroup/routes/GetWorkgroups.kt
@@ -6,11 +6,13 @@ import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.utils.toUUID
 import fr.dcproject.voter.assert
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object GetWorkgroups {
diff --git a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt
index 16c618b..78e2319 100644
--- a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt
@@ -6,14 +6,17 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import org.koin.core.KoinComponent
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object AddMemberToWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt
index fa3e315..f324ffe 100644
--- a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt
@@ -6,14 +6,17 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import org.koin.core.KoinComponent
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object DeleteMembersOfWorkgroup {
diff --git a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt
index 607659f..fa14be7 100644
--- a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt
+++ b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt
@@ -6,14 +6,17 @@ import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupVoter
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import org.koin.core.KoinComponent
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 object UpdateMemberOfWorkgroup {
diff --git a/src/main/kotlin/dto/Versionable.kt b/src/main/kotlin/dto/Versionable.kt
index 82a54ac..12376b5 100644
--- a/src/main/kotlin/dto/Versionable.kt
+++ b/src/main/kotlin/dto/Versionable.kt
@@ -1,7 +1,7 @@
 package fr.dcproject.dto
 
 import fr.postgresjson.entity.EntityVersioning
-import java.util.*
+import java.util.UUID
 
 interface Versionable {
     val versionId: UUID
diff --git a/src/main/kotlin/entity/Constitution.kt b/src/main/kotlin/entity/Constitution.kt
index 8eef621..84a25c4 100644
--- a/src/main/kotlin/entity/Constitution.kt
+++ b/src/main/kotlin/entity/Constitution.kt
@@ -4,8 +4,16 @@ import fr.dcproject.component.article.ArticleI
 import fr.dcproject.component.article.ArticleSimple
 import fr.dcproject.component.citizen.CitizenSimple
 import fr.dcproject.component.citizen.CitizenWithUserI
-import fr.postgresjson.entity.*
-import java.util.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
+import fr.postgresjson.entity.EntityVersioning
+import fr.postgresjson.entity.UuidEntity
+import fr.postgresjson.entity.UuidEntityVersioning
+import java.util.UUID
 
 class Constitution(
     id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/entity/EntityI.kt b/src/main/kotlin/entity/EntityI.kt
index 52e6aa1..3f660fa 100644
--- a/src/main/kotlin/entity/EntityI.kt
+++ b/src/main/kotlin/entity/EntityI.kt
@@ -1,7 +1,7 @@
 package fr.dcproject.entity
 
 import fr.postgresjson.entity.EntityI
-import java.util.*
+import java.util.UUID
 
 interface EntityI : EntityI {
     val id: UUID
diff --git a/src/main/kotlin/entity/Extra.kt b/src/main/kotlin/entity/Extra.kt
index eb8af8e..2d82146 100644
--- a/src/main/kotlin/entity/Extra.kt
+++ b/src/main/kotlin/entity/Extra.kt
@@ -7,7 +7,7 @@ import fr.postgresjson.entity.EntityCreatedAt
 import fr.postgresjson.entity.EntityCreatedBy
 import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.entity.UuidEntityI
-import java.util.*
+import java.util.UUID
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
diff --git a/src/main/kotlin/entity/Follow.kt b/src/main/kotlin/entity/Follow.kt
index 7b3d50f..997c53b 100644
--- a/src/main/kotlin/entity/Follow.kt
+++ b/src/main/kotlin/entity/Follow.kt
@@ -3,8 +3,12 @@ package fr.dcproject.entity
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenBasicI
 import fr.dcproject.component.citizen.CitizenI
-import fr.postgresjson.entity.*
-import java.util.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.UuidEntityI
+import java.util.UUID
 
 @Deprecated("")
 class Follow<T : TargetI>(
diff --git a/src/main/kotlin/entity/Opinion.kt b/src/main/kotlin/entity/Opinion.kt
index 2fa7c7d..ec5bbbc 100644
--- a/src/main/kotlin/entity/Opinion.kt
+++ b/src/main/kotlin/entity/Opinion.kt
@@ -5,8 +5,12 @@ import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenBasicI
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRef
-import fr.postgresjson.entity.*
-import java.util.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.UuidEntityI
+import java.util.UUID
 
 @Deprecated("")
 open class Opinion<T : TargetI>(
diff --git a/src/main/kotlin/entity/OpinionChoice.kt b/src/main/kotlin/entity/OpinionChoice.kt
index a2aeec7..2a50da5 100644
--- a/src/main/kotlin/entity/OpinionChoice.kt
+++ b/src/main/kotlin/entity/OpinionChoice.kt
@@ -1,7 +1,11 @@
 package fr.dcproject.entity
 
-import fr.postgresjson.entity.*
-import java.util.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityDeletedAt
+import fr.postgresjson.entity.EntityDeletedAtImp
+import fr.postgresjson.entity.UuidEntity
+import java.util.UUID
 
 class OpinionChoice(
     id: UUID? = null,
diff --git a/src/main/kotlin/entity/Versionable.kt b/src/main/kotlin/entity/Versionable.kt
index c6e4b51..5b30d7b 100644
--- a/src/main/kotlin/entity/Versionable.kt
+++ b/src/main/kotlin/entity/Versionable.kt
@@ -1,7 +1,7 @@
 package fr.dcproject.entity
 
 import fr.postgresjson.entity.EntityVersioning
-import java.util.*
+import java.util.UUID
 
 interface VersionableRef {
     val versionId: UUID
diff --git a/src/main/kotlin/entity/Vote.kt b/src/main/kotlin/entity/Vote.kt
index fcfd3b9..216223d 100644
--- a/src/main/kotlin/entity/Vote.kt
+++ b/src/main/kotlin/entity/Vote.kt
@@ -3,8 +3,15 @@ package fr.dcproject.entity
 import fr.dcproject.component.citizen.CitizenBasic
 import fr.dcproject.component.citizen.CitizenBasicI
 import fr.dcproject.component.citizen.CitizenI
-import fr.postgresjson.entity.*
-import java.util.*
+import fr.postgresjson.entity.EntityCreatedAt
+import fr.postgresjson.entity.EntityCreatedAtImp
+import fr.postgresjson.entity.EntityCreatedBy
+import fr.postgresjson.entity.EntityCreatedByImp
+import fr.postgresjson.entity.EntityUpdatedAt
+import fr.postgresjson.entity.EntityUpdatedAtImp
+import fr.postgresjson.entity.UuidEntityI
+import java.util.UUID
+
 @Deprecated("")
 class Vote<T : TargetI>(
     id: UUID = UUID.randomUUID(),
diff --git a/src/main/kotlin/event/EventNotification.kt b/src/main/kotlin/event/EventNotification.kt
index 1e29839..1832dc0 100644
--- a/src/main/kotlin/event/EventNotification.kt
+++ b/src/main/kotlin/event/EventNotification.kt
@@ -1,7 +1,11 @@
 package fr.dcproject.event
 
-import com.rabbitmq.client.*
+import com.rabbitmq.client.AMQP
 import com.rabbitmq.client.BuiltinExchangeType.DIRECT
+import com.rabbitmq.client.ConnectionFactory
+import com.rabbitmq.client.Consumer
+import com.rabbitmq.client.DefaultConsumer
+import com.rabbitmq.client.Envelope
 import fr.dcproject.application.Configuration
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.citizen.CitizenRef
@@ -11,9 +15,11 @@ import fr.dcproject.event.publisher.Publisher
 import fr.dcproject.messages.NotificationEmailSender
 import fr.dcproject.repository.Follow
 import fr.postgresjson.serializer.deserialize
-import io.ktor.application.*
-import io.ktor.util.pipeline.*
-import io.ktor.utils.io.errors.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.EventDefinition
+import io.ktor.application.application
+import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.errors.IOException
 import io.lettuce.core.api.async.RedisAsyncCommands
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.collect
diff --git a/src/main/kotlin/event/EventSubscriber.kt b/src/main/kotlin/event/EventSubscriber.kt
index 4284c76..638eb04 100644
--- a/src/main/kotlin/event/EventSubscriber.kt
+++ b/src/main/kotlin/event/EventSubscriber.kt
@@ -2,8 +2,13 @@ package fr.dcproject.event
 
 import fr.postgresjson.entity.Serializable
 import fr.postgresjson.entity.UuidEntity
-import io.ktor.application.*
-import io.ktor.util.*
+import io.ktor.application.Application
+import io.ktor.application.ApplicationEvents
+import io.ktor.application.ApplicationFeature
+import io.ktor.application.EventDefinition
+import io.ktor.application.EventHandler
+import io.ktor.util.AttributeKey
+import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.DisposableHandle
 import org.joda.time.DateTime
 import kotlin.random.Random.Default.nextInt
diff --git a/src/main/kotlin/messages/NotificationEmailSender.kt b/src/main/kotlin/messages/NotificationEmailSender.kt
index 110bf62..5621c1a 100644
--- a/src/main/kotlin/messages/NotificationEmailSender.kt
+++ b/src/main/kotlin/messages/NotificationEmailSender.kt
@@ -11,7 +11,7 @@ import fr.dcproject.component.citizen.CitizenRepository
 import fr.dcproject.entity.FollowSimple
 import fr.dcproject.entity.TargetRef
 import fr.postgresjson.entity.UuidEntityI
-import java.util.*
+import java.util.UUID
 
 class NotificationEmailSender(
     private val mailer: Mailer,
diff --git a/src/main/kotlin/repository/CommentConstitutionRepository.kt b/src/main/kotlin/repository/CommentConstitutionRepository.kt
index 2015d85..c6fb75a 100644
--- a/src/main/kotlin/repository/CommentConstitutionRepository.kt
+++ b/src/main/kotlin/repository/CommentConstitutionRepository.kt
@@ -10,7 +10,7 @@ import fr.dcproject.entity.TargetI
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.entity.UuidEntityI
-import java.util.*
+import java.util.UUID
 
 class CommentConstitutionRepository(requester: Requester) : CommentRepositoryAbs<ConstitutionRef>(requester) {
     override fun findById(id: UUID): CommentForView<ConstitutionRef, CitizenRef>? {
diff --git a/src/main/kotlin/repository/Constitution.kt b/src/main/kotlin/repository/Constitution.kt
index 44e65f1..3736bf6 100644
--- a/src/main/kotlin/repository/Constitution.kt
+++ b/src/main/kotlin/repository/Constitution.kt
@@ -8,7 +8,7 @@ import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import fr.postgresjson.repository.RepositoryI.Direction
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
+import java.util.UUID
 import fr.dcproject.entity.Constitution as ConstitutionEntity
 
 class Constitution(override var requester: Requester) : RepositoryI {
diff --git a/src/main/kotlin/repository/Follow.kt b/src/main/kotlin/repository/Follow.kt
index eaf7000..7de1a74 100644
--- a/src/main/kotlin/repository/Follow.kt
+++ b/src/main/kotlin/repository/Follow.kt
@@ -14,7 +14,7 @@ import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.repository.RepositoryI
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import java.util.*
+import java.util.UUID
 import fr.dcproject.entity.Constitution as ConstitutionEntity
 import fr.dcproject.entity.Follow as FollowEntity
 
diff --git a/src/main/kotlin/repository/Opinion.kt b/src/main/kotlin/repository/Opinion.kt
index b25f4aa..eac1f93 100644
--- a/src/main/kotlin/repository/Opinion.kt
+++ b/src/main/kotlin/repository/Opinion.kt
@@ -8,7 +8,7 @@ import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
 import net.pearx.kasechange.toSnakeCase
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.citizen.Citizen as CitizenEntity
 import fr.dcproject.entity.Opinion as OpinionEntity
 import fr.dcproject.entity.OpinionArticle as OpinionArticleEntity
diff --git a/src/main/kotlin/repository/Vote.kt b/src/main/kotlin/repository/Vote.kt
index 0ab1071..96382c0 100644
--- a/src/main/kotlin/repository/Vote.kt
+++ b/src/main/kotlin/repository/Vote.kt
@@ -4,12 +4,15 @@ import com.fasterxml.jackson.core.type.TypeReference
 import fr.dcproject.component.article.ArticleForView
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.comment.generic.CommentForView
-import fr.dcproject.entity.*
 import fr.dcproject.entity.Constitution
+import fr.dcproject.entity.TargetI
+import fr.dcproject.entity.TargetRef
+import fr.dcproject.entity.VoteAggregation
+import fr.dcproject.entity.VoteForUpdateI
 import fr.postgresjson.connexion.Paginated
 import fr.postgresjson.connexion.Requester
 import fr.postgresjson.repository.RepositoryI
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.citizen.Citizen as CitizenEntity
 import fr.dcproject.entity.Vote as VoteEntity
 
diff --git a/src/main/kotlin/routes/CommentConstitution.kt b/src/main/kotlin/routes/CommentConstitution.kt
index 208cc31..7b49b4e 100644
--- a/src/main/kotlin/routes/CommentConstitution.kt
+++ b/src/main/kotlin/routes/CommentConstitution.kt
@@ -8,12 +8,15 @@ import fr.dcproject.component.comment.generic.CommentVoter
 import fr.dcproject.entity.ConstitutionRef
 import fr.dcproject.repository.CommentConstitutionRepository
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receiveText
+import io.ktor.response.respond
+import io.ktor.routing.Route
 
 @KtorExperimentalLocationsAPI
 object CommentConstitutionPaths {
diff --git a/src/main/kotlin/routes/Constitution.kt b/src/main/kotlin/routes/Constitution.kt
index 66c6e1b..03e552e 100644
--- a/src/main/kotlin/routes/Constitution.kt
+++ b/src/main/kotlin/routes/Constitution.kt
@@ -10,12 +10,16 @@ import fr.dcproject.security.voter.ConstitutionVoter
 import fr.dcproject.voter.assert
 import fr.postgresjson.entity.UuidEntity
 import fr.postgresjson.repository.RepositoryI
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.ApplicationCall
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 import fr.dcproject.entity.Constitution as ConstitutionEntity
 import fr.dcproject.repository.Constitution as ConstitutionRepository
 
diff --git a/src/main/kotlin/routes/FollowArticle.kt b/src/main/kotlin/routes/FollowArticle.kt
index 7209383..95dc982 100644
--- a/src/main/kotlin/routes/FollowArticle.kt
+++ b/src/main/kotlin/routes/FollowArticle.kt
@@ -7,11 +7,15 @@ import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.entity.FollowForUpdate
 import fr.dcproject.security.voter.FollowVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import fr.dcproject.repository.FollowArticle as FollowArticleRepository
 
 @KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/routes/FollowConstitution.kt b/src/main/kotlin/routes/FollowConstitution.kt
index c0be813..a6b39d8 100644
--- a/src/main/kotlin/routes/FollowConstitution.kt
+++ b/src/main/kotlin/routes/FollowConstitution.kt
@@ -7,11 +7,15 @@ import fr.dcproject.entity.ConstitutionRef
 import fr.dcproject.entity.FollowForUpdate
 import fr.dcproject.security.voter.FollowVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.delete
+import io.ktor.locations.get
+import io.ktor.locations.post
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import fr.dcproject.repository.FollowConstitution as FollowConstitutionRepository
 
 @KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/routes/Notification.kt b/src/main/kotlin/routes/Notification.kt
index 0dc33c0..930b5d9 100644
--- a/src/main/kotlin/routes/Notification.kt
+++ b/src/main/kotlin/routes/Notification.kt
@@ -3,11 +3,12 @@ package fr.dcproject.routes
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.event.Event
 import fr.postgresjson.serializer.deserialize
-import io.ktor.client.*
-import io.ktor.http.cio.websocket.*
-import io.ktor.locations.*
-import io.ktor.routing.*
-import io.ktor.websocket.*
+import io.ktor.client.HttpClient
+import io.ktor.http.cio.websocket.Frame
+import io.ktor.http.cio.websocket.readText
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.routing.Route
+import io.ktor.websocket.webSocket
 import io.lettuce.core.Range
 import io.lettuce.core.api.async.RedisAsyncCommands
 import kotlinx.coroutines.ExperimentalCoroutinesApi
diff --git a/src/main/kotlin/routes/OpenAPI.kt b/src/main/kotlin/routes/OpenAPI.kt
index 5845daa..7db42ea 100644
--- a/src/main/kotlin/routes/OpenAPI.kt
+++ b/src/main/kotlin/routes/OpenAPI.kt
@@ -1,12 +1,13 @@
 package fr.dcproject.routes
 
 import fr.dcproject.utils.readResource
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.http.ContentType
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.response.respondText
+import io.ktor.routing.Route
+import io.ktor.routing.get
+import io.ktor.util.KtorExperimentalAPI
 
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
diff --git a/src/main/kotlin/routes/OpinionArticle.kt b/src/main/kotlin/routes/OpinionArticle.kt
index e398fcf..6c7e6af 100644
--- a/src/main/kotlin/routes/OpinionArticle.kt
+++ b/src/main/kotlin/routes/OpinionArticle.kt
@@ -5,20 +5,25 @@ import fr.dcproject.component.article.ArticleRef
 import fr.dcproject.component.auth.citizen
 import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.component.citizen.CitizenRef
-import fr.dcproject.entity.*
+import fr.dcproject.entity.Opinion
+import fr.dcproject.entity.OpinionChoiceRef
+import fr.dcproject.entity.OpinionForUpdate
 import fr.dcproject.security.voter.OpinionVoter
 import fr.dcproject.utils.toUUID
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import io.ktor.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import io.ktor.util.KtorExperimentalAPI
 import org.koin.core.KoinComponent
 import org.koin.core.get
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.citizen.Citizen as CitizenEntity
 import fr.dcproject.repository.OpinionArticle as OpinionArticleRepository
 
diff --git a/src/main/kotlin/routes/OpinionChoice.kt b/src/main/kotlin/routes/OpinionChoice.kt
index bc7e2c7..da13cd4 100644
--- a/src/main/kotlin/routes/OpinionChoice.kt
+++ b/src/main/kotlin/routes/OpinionChoice.kt
@@ -4,10 +4,12 @@ import fr.dcproject.component.auth.citizenOrNull
 import fr.dcproject.entity.OpinionChoice
 import fr.dcproject.security.voter.OpinionChoiceVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.locations.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
 
 @KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/routes/VoteArticle.kt b/src/main/kotlin/routes/VoteArticle.kt
index 0f854e6..cafd95b 100644
--- a/src/main/kotlin/routes/VoteArticle.kt
+++ b/src/main/kotlin/routes/VoteArticle.kt
@@ -12,13 +12,16 @@ import fr.dcproject.routes.VoteArticlePaths.CommentVoteRequest
 import fr.dcproject.security.voter.VoteVoter
 import fr.dcproject.utils.toUUID
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
-import java.util.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.get
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
+import java.util.UUID
 import fr.dcproject.repository.VoteArticle as VoteArticleRepository
 
 @KtorExperimentalLocationsAPI
diff --git a/src/main/kotlin/routes/VoteConstitution.kt b/src/main/kotlin/routes/VoteConstitution.kt
index 85b2a2f..2733d73 100644
--- a/src/main/kotlin/routes/VoteConstitution.kt
+++ b/src/main/kotlin/routes/VoteConstitution.kt
@@ -7,12 +7,14 @@ import fr.dcproject.entity.VoteForUpdate
 import fr.dcproject.routes.VoteConstitutionPaths.ConstitutionVoteRequest.Content
 import fr.dcproject.security.voter.VoteVoter
 import fr.dcproject.voter.assert
-import io.ktor.application.*
-import io.ktor.http.*
-import io.ktor.locations.*
-import io.ktor.request.*
-import io.ktor.response.*
-import io.ktor.routing.*
+import io.ktor.application.call
+import io.ktor.http.HttpStatusCode
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.locations.Location
+import io.ktor.locations.put
+import io.ktor.request.receive
+import io.ktor.response.respond
+import io.ktor.routing.Route
 import fr.dcproject.entity.Constitution as ConstitutionEntity
 import fr.dcproject.repository.VoteConstitution as VoteConstitutionRepository
 
diff --git a/src/main/kotlin/utils/Uuid.kt b/src/main/kotlin/utils/Uuid.kt
index f65a6ef..47f53aa 100644
--- a/src/main/kotlin/utils/Uuid.kt
+++ b/src/main/kotlin/utils/Uuid.kt
@@ -1,6 +1,6 @@
 package fr.dcproject.utils
 
-import java.util.*
+import java.util.UUID
 
 fun String.toUUID(): UUID = UUID.fromString(this.trim())
 
diff --git a/src/test/kotlin/CucumberTest.kt b/src/test/kotlin/CucumberTest.kt
index 40f8a0e..d80daba 100644
--- a/src/test/kotlin/CucumberTest.kt
+++ b/src/test/kotlin/CucumberTest.kt
@@ -9,7 +9,7 @@ import io.cucumber.java8.En
 import io.cucumber.java8.Scenario
 import io.cucumber.junit.Cucumber
 import io.cucumber.junit.CucumberOptions
-import io.ktor.server.testing.*
+import io.ktor.server.testing.withTestApplication
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.junit.runner.RunWith
 import org.koin.test.KoinTest
diff --git a/src/test/kotlin/functional/MailerTest.kt b/src/test/kotlin/functional/MailerTest.kt
index 8ee5c8b..247c256 100644
--- a/src/test/kotlin/functional/MailerTest.kt
+++ b/src/test/kotlin/functional/MailerTest.kt
@@ -6,9 +6,9 @@ import com.sendgrid.helpers.mail.objects.Email
 import fr.dcproject.application.Env.TEST
 import fr.dcproject.application.module
 import fr.dcproject.messages.Mailer
-import io.ktor.locations.*
-import io.ktor.server.testing.*
-import io.ktor.util.*
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.testing.withTestApplication
+import io.ktor.util.KtorExperimentalAPI
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
@@ -38,4 +38,4 @@ class MailerTest : KoinTest, AutoCloseKoinTest() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/functional/ResourcesKtTest.kt b/src/test/kotlin/functional/ResourcesKtTest.kt
index a857e03..67598fa 100644
--- a/src/test/kotlin/functional/ResourcesKtTest.kt
+++ b/src/test/kotlin/functional/ResourcesKtTest.kt
@@ -19,4 +19,4 @@ class ResourcesKtTest {
             assertEquals("Hello", it)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/functional/ViewTest.kt b/src/test/kotlin/functional/ViewTest.kt
index cbec0b8..2dbd4ac 100644
--- a/src/test/kotlin/functional/ViewTest.kt
+++ b/src/test/kotlin/functional/ViewTest.kt
@@ -5,16 +5,16 @@ import fr.dcproject.application.module
 import fr.dcproject.component.article.ArticleRefVersioning
 import fr.dcproject.component.article.ArticleViewManager
 import fr.dcproject.component.citizen.CitizenRef
-import io.ktor.locations.*
-import io.ktor.server.testing.*
-import io.ktor.util.*
+import io.ktor.locations.KtorExperimentalLocationsAPI
+import io.ktor.server.testing.withTestApplication
+import io.ktor.util.KtorExperimentalAPI
 import org.amshove.kluent.`should be equal to`
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.koin.ktor.ext.get
-import java.util.*
+import java.util.UUID
 
 @KtorExperimentalLocationsAPI
 @KtorExperimentalAPI
diff --git a/src/test/kotlin/steps/ArticleSteps.kt b/src/test/kotlin/steps/ArticleSteps.kt
index f7a0cc4..518d395 100644
--- a/src/test/kotlin/steps/ArticleSteps.kt
+++ b/src/test/kotlin/steps/ArticleSteps.kt
@@ -15,7 +15,7 @@ import io.cucumber.java8.En
 import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.auth.User as UserEntity
 
 class ArticleSteps : En, KoinTest {
@@ -99,4 +99,4 @@ class ArticleSteps : En, KoinTest {
         )
         get<CommentArticleRepository>().comment(comment)
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/CitizenSteps.kt b/src/test/kotlin/steps/CitizenSteps.kt
index 76829cf..fdf8540 100644
--- a/src/test/kotlin/steps/CitizenSteps.kt
+++ b/src/test/kotlin/steps/CitizenSteps.kt
@@ -9,7 +9,7 @@ import io.cucumber.java8.En
 import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 
 class CitizenSteps : En, KoinTest {
     init {
@@ -55,4 +55,4 @@ class CitizenSteps : En, KoinTest {
 
         get<CitizenRepository>().insertWithUser(citizen)
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/ConstitutionSteps.kt b/src/test/kotlin/steps/ConstitutionSteps.kt
index 1ad251d..5ffebe8 100644
--- a/src/test/kotlin/steps/ConstitutionSteps.kt
+++ b/src/test/kotlin/steps/ConstitutionSteps.kt
@@ -15,7 +15,7 @@ import io.cucumber.java8.En
 import org.joda.time.DateTime
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.auth.User as UserEntity
 import fr.dcproject.repository.Constitution as ConstitutionRepository
 
@@ -104,4 +104,4 @@ class ConstitutionSteps : En, KoinTest {
         )
         get<CommentConstitutionRepository>().comment(comment)
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/FollowSteps.kt b/src/test/kotlin/steps/FollowSteps.kt
index 269da75..bc63736 100644
--- a/src/test/kotlin/steps/FollowSteps.kt
+++ b/src/test/kotlin/steps/FollowSteps.kt
@@ -26,4 +26,4 @@ class FollowSteps : En, KoinTest {
             get<FollowConstitutionRepository>().follow(follow)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/KtorServerAuthSteps.kt b/src/test/kotlin/steps/KtorServerAuthSteps.kt
index b3b6648..ca260d7 100644
--- a/src/test/kotlin/steps/KtorServerAuthSteps.kt
+++ b/src/test/kotlin/steps/KtorServerAuthSteps.kt
@@ -4,7 +4,7 @@ import com.auth0.jwt.JWT
 import fr.dcproject.component.auth.jwt.JwtConfig
 import fr.dcproject.component.citizen.CitizenRepository
 import io.cucumber.java8.En
-import io.ktor.http.*
+import io.ktor.http.HttpHeaders
 import org.koin.test.KoinTest
 import org.koin.test.get
 
@@ -23,4 +23,4 @@ class KtorServerAuthSteps : En, KoinTest {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/KtorServerContext.kt b/src/test/kotlin/steps/KtorServerContext.kt
index b9585b7..4a480d5 100644
--- a/src/test/kotlin/steps/KtorServerContext.kt
+++ b/src/test/kotlin/steps/KtorServerContext.kt
@@ -1,8 +1,11 @@
 package steps
 
-import io.ktor.application.*
-import io.ktor.server.engine.*
-import io.ktor.server.testing.*
+import io.ktor.application.Application
+import io.ktor.server.engine.stop
+import io.ktor.server.testing.TestApplicationCall
+import io.ktor.server.testing.TestApplicationEngine
+import io.ktor.server.testing.TestApplicationRequest
+import io.ktor.server.testing.createTestEnvironment
 import java.util.concurrent.TimeUnit
 import kotlin.test.fail
 
diff --git a/src/test/kotlin/steps/KtorServerRequestSteps.kt b/src/test/kotlin/steps/KtorServerRequestSteps.kt
index 8df6b14..46d7541 100644
--- a/src/test/kotlin/steps/KtorServerRequestSteps.kt
+++ b/src/test/kotlin/steps/KtorServerRequestSteps.kt
@@ -3,9 +3,12 @@ package steps
 import com.jayway.jsonpath.JsonPath
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
-import io.ktor.http.*
-import io.ktor.server.testing.*
-import io.ktor.util.*
+import io.ktor.http.ContentType
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpMethod
+import io.ktor.http.HttpStatusCode
+import io.ktor.server.testing.setBody
+import io.ktor.util.KtorExperimentalAPI
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 
diff --git a/src/test/kotlin/steps/KtorServerRestSteps.kt b/src/test/kotlin/steps/KtorServerRestSteps.kt
index cc0d568..f103f1f 100644
--- a/src/test/kotlin/steps/KtorServerRestSteps.kt
+++ b/src/test/kotlin/steps/KtorServerRestSteps.kt
@@ -2,7 +2,12 @@ package steps
 
 import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
-import kotlinx.serialization.json.*
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.test.fail
diff --git a/src/test/kotlin/steps/OpinionSteps.kt b/src/test/kotlin/steps/OpinionSteps.kt
index 23d207a..f6a3b01 100644
--- a/src/test/kotlin/steps/OpinionSteps.kt
+++ b/src/test/kotlin/steps/OpinionSteps.kt
@@ -10,7 +10,7 @@ import io.cucumber.datatable.DataTable
 import io.cucumber.java8.En
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 import fr.dcproject.repository.OpinionArticle as OpinionRepository
 import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository
 
@@ -79,4 +79,4 @@ class OpinionSteps : En, KoinTest {
         )
         get<OpinionRepository>().updateOpinions(opinion)
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/VoteSteps.kt b/src/test/kotlin/steps/VoteSteps.kt
index 74051c8..09da5f8 100644
--- a/src/test/kotlin/steps/VoteSteps.kt
+++ b/src/test/kotlin/steps/VoteSteps.kt
@@ -7,7 +7,7 @@ import fr.dcproject.utils.toUUID
 import io.cucumber.java8.En
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 import fr.dcproject.repository.VoteArticle as VoteRepository
 
 class VoteSteps : En, KoinTest {
@@ -30,4 +30,4 @@ class VoteSteps : En, KoinTest {
         )
         get<VoteRepository>().vote(vote)
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/steps/WorkgroupSteps.kt b/src/test/kotlin/steps/WorkgroupSteps.kt
index 302c831..7f37b0e 100644
--- a/src/test/kotlin/steps/WorkgroupSteps.kt
+++ b/src/test/kotlin/steps/WorkgroupSteps.kt
@@ -1,12 +1,12 @@
 package steps
 
-import fr.dcproject.component.workgroup.Workgroup
-import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.component.auth.User
 import fr.dcproject.component.citizen.Citizen
 import fr.dcproject.component.citizen.CitizenI
 import fr.dcproject.component.citizen.CitizenRef
 import fr.dcproject.component.citizen.CitizenRepository
+import fr.dcproject.component.workgroup.Workgroup
+import fr.dcproject.component.workgroup.WorkgroupRef
 import fr.dcproject.component.workgroup.WorkgroupRepository
 import fr.dcproject.component.workgroup.WorkgroupWithMembersI.Member
 import fr.dcproject.utils.toUUID
@@ -16,16 +16,18 @@ import org.joda.time.DateTime
 import org.junit.Assert
 import org.koin.test.KoinTest
 import org.koin.test.get
-import java.util.*
+import java.util.UUID
 
 class WorkgroupSteps : En, KoinTest {
     init {
         When("I have members in workgroup {string}:") { workgroupId: String, members: DataTable ->
             val membersRefs = members.asList()
-                .map { Member(
-                    citizen = CitizenRef(it.toUUID()),
-                    roles = listOf(Member.Role.MASTER)
-                ) }
+                .map {
+                    Member(
+                        citizen = CitizenRef(it.toUUID()),
+                        roles = listOf(Member.Role.MASTER)
+                    )
+                }
 
             get<WorkgroupRepository>().addMembers(WorkgroupRef(workgroupId.toUUID()), membersRefs)
         }
@@ -71,4 +73,4 @@ class WorkgroupSteps : En, KoinTest {
             Assert.assertNull(get<WorkgroupRepository>().findById(id.toUUID()))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/ArticleVoterTest.kt b/src/test/kotlin/unit/voter/ArticleVoterTest.kt
index b96e30a..30c2409 100644
--- a/src/test/kotlin/unit/voter/ArticleVoterTest.kt
+++ b/src/test/kotlin/unit/voter/ArticleVoterTest.kt
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.article.ArticleRepository as ArticleRepo
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -157,4 +157,4 @@ internal class ArticleVoterTest {
         versionId = UUID.randomUUID(),
         versionNumber = 1
     )
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/CitizenVoterTest.kt b/src/test/kotlin/unit/voter/CitizenVoterTest.kt
index d7afe88..50a2801 100644
--- a/src/test/kotlin/unit/voter/CitizenVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CitizenVoterTest.kt
@@ -97,4 +97,4 @@ internal class CitizenVoterTest {
             .canChangePassword(subject = tesla, connectedCitizen = einstein)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/CommentVoterTest.kt b/src/test/kotlin/unit/voter/CommentVoterTest.kt
index c6d7e5e..bca6f1d 100644
--- a/src/test/kotlin/unit/voter/CommentVoterTest.kt
+++ b/src/test/kotlin/unit/voter/CommentVoterTest.kt
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.article.ArticleRepository as ArticleRepo
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -160,4 +160,4 @@ internal class CommentVoterTest {
             .canCreate(comment1, null)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/FollowVoterTest.kt b/src/test/kotlin/unit/voter/FollowVoterTest.kt
index 4d67015..66ade49 100644
--- a/src/test/kotlin/unit/voter/FollowVoterTest.kt
+++ b/src/test/kotlin/unit/voter/FollowVoterTest.kt
@@ -11,7 +11,6 @@ import fr.dcproject.entity.Follow
 import fr.dcproject.security.voter.FollowVoter
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
-import io.ktor.application.*
 import io.mockk.mockkStatic
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
@@ -20,7 +19,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
@@ -156,4 +155,4 @@ internal class FollowVoterTest {
             .canDelete(follow1, null)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt b/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
index cea2dc4..37fe255 100644
--- a/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionChoiceVoterTest.kt
@@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
@@ -73,4 +73,4 @@ internal class OpinionChoiceVoterTest {
             .canView(listOf(choice1), tesla)
             .vote `should be` GRANTED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/OpinionVoterTest.kt b/src/test/kotlin/unit/voter/OpinionVoterTest.kt
index 5653175..08f9451 100644
--- a/src/test/kotlin/unit/voter/OpinionVoterTest.kt
+++ b/src/test/kotlin/unit/voter/OpinionVoterTest.kt
@@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(CONCURRENT)
@@ -125,4 +125,4 @@ internal class OpinionVoterTest {
             .canDelete(opinion1, einstein)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/VoteVoterTest.kt b/src/test/kotlin/unit/voter/VoteVoterTest.kt
index e284141..b1cd605 100644
--- a/src/test/kotlin/unit/voter/VoteVoterTest.kt
+++ b/src/test/kotlin/unit/voter/VoteVoterTest.kt
@@ -12,7 +12,6 @@ import fr.dcproject.entity.VoteForUpdate
 import fr.dcproject.security.voter.VoteVoter
 import fr.dcproject.voter.Vote.DENIED
 import fr.dcproject.voter.Vote.GRANTED
-import io.ktor.application.*
 import io.mockk.mockkStatic
 import org.amshove.kluent.`should be`
 import org.joda.time.DateTime
@@ -21,7 +20,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 import fr.dcproject.entity.Vote as VoteEntity
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -153,4 +152,4 @@ internal class VoteVoterTest {
             .canCreate(voteOnDeleted, tesla)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt b/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
index 9579799..26a34b2 100644
--- a/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
+++ b/src/test/kotlin/unit/voter/WorkgroupVoterTest.kt
@@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT
-import java.util.*
+import java.util.UUID
 import fr.dcproject.component.workgroup.Workgroup as WorkgroupEntity
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -147,4 +147,4 @@ internal class WorkgroupVoterTest {
             .canUpdate(workgroupPublic, einstein)
             .vote `should be` DENIED
     }
-}
\ No newline at end of file
+}