From 8c228f666fe76c991bbfcd0c8de7375e08818bd0 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Sat, 6 Feb 2021 00:56:02 +0100 Subject: [PATCH] Lint --- src/main/kotlin/application/Converters.kt | 8 -------- src/main/kotlin/component/article/routes/UpsertArticle.kt | 1 - src/main/kotlin/component/auth/routes/Login.kt | 1 - src/main/kotlin/component/auth/routes/Register.kt | 1 - src/main/kotlin/component/auth/routes/Sso.kt | 1 - .../kotlin/component/citizen/routes/ChangeMyPassword.kt | 4 ---- src/main/kotlin/component/citizen/routes/GetOneCitizen.kt | 1 - .../comment/article/routes/CreateCommentArticle.kt | 1 - .../comment/article/routes/GetCitizenArticleComments.kt | 1 - .../constitution/routes/GetCitizenCommentConstitution.kt | 1 - .../comment/generic/routes/CreateCommentChildren.kt | 1 - .../component/constitution/ConstitutionAccessControl.kt | 2 +- .../component/constitution/routes/CreateConstitution.kt | 1 - .../follow/routes/article/GetMyFollowsArticle.kt | 1 - src/main/kotlin/component/opinion/OpinionAccessControl.kt | 6 ++---- .../component/opinion/OpinionChoiceAccessControl.kt | 2 -- .../kotlin/component/opinion/routes/GetCitizenOpinions.kt | 2 -- .../component/opinion/routes/GetMyOpinionsArticle.kt | 3 +-- .../kotlin/component/opinion/routes/GetOpinionChoices.kt | 1 + .../kotlin/component/opinion/routes/OpinionArticle.kt | 1 - src/main/kotlin/component/vote/routes/GetCitizenVotes.kt | 1 - .../component/vote/routes/GetCitizenVotesOnArticle.kt | 1 - src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt | 1 - src/main/kotlin/component/vote/routes/PutVoteOnComment.kt | 1 - src/main/kotlin/component/vote/routes/VoteConstitution.kt | 2 -- .../kotlin/component/workgroup/routes/CreateWorkgroup.kt | 1 - .../kotlin/component/workgroup/routes/EditWorkgroup.kt | 1 - .../workgroup/routes/members/AddMemberToWorkgroup.kt | 1 - .../workgroup/routes/members/DeleteMembersOfWorkgroup.kt | 1 - .../workgroup/routes/members/UpdateMemberOfWorkgroup.kt | 1 - src/main/kotlin/utils/Request.kt | 6 ++---- 31 files changed, 7 insertions(+), 50 deletions(-) diff --git a/src/main/kotlin/application/Converters.kt b/src/main/kotlin/application/Converters.kt index 5bcb880..84752dc 100644 --- a/src/main/kotlin/application/Converters.kt +++ b/src/main/kotlin/application/Converters.kt @@ -1,14 +1,6 @@ package fr.dcproject.application -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenBasic -import fr.dcproject.component.citizen.CitizenRef -import fr.dcproject.component.citizen.CitizenRepository -import fr.dcproject.component.constitution.Constitution -import fr.dcproject.component.constitution.ConstitutionRef -import fr.dcproject.component.constitution.ConstitutionRepository -import fr.dcproject.component.opinion.OpinionChoiceRepository -import fr.dcproject.component.opinion.entity.OpinionChoice import fr.dcproject.component.workgroup.Workgroup import fr.dcproject.component.workgroup.WorkgroupRef import fr.dcproject.component.workgroup.WorkgroupRepository diff --git a/src/main/kotlin/component/article/routes/UpsertArticle.kt b/src/main/kotlin/component/article/routes/UpsertArticle.kt index 2020cea..7c38b51 100644 --- a/src/main/kotlin/component/article/routes/UpsertArticle.kt +++ b/src/main/kotlin/component/article/routes/UpsertArticle.kt @@ -17,7 +17,6 @@ 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 diff --git a/src/main/kotlin/component/auth/routes/Login.kt b/src/main/kotlin/component/auth/routes/Login.kt index 57ed358..a8e0e58 100644 --- a/src/main/kotlin/component/auth/routes/Login.kt +++ b/src/main/kotlin/component/auth/routes/Login.kt @@ -10,7 +10,6 @@ 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 diff --git a/src/main/kotlin/component/auth/routes/Register.kt b/src/main/kotlin/component/auth/routes/Register.kt index 3699591..7dd2147 100644 --- a/src/main/kotlin/component/auth/routes/Register.kt +++ b/src/main/kotlin/component/auth/routes/Register.kt @@ -15,7 +15,6 @@ 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 diff --git a/src/main/kotlin/component/auth/routes/Sso.kt b/src/main/kotlin/component/auth/routes/Sso.kt index 6ac2d86..abf1f2a 100644 --- a/src/main/kotlin/component/auth/routes/Sso.kt +++ b/src/main/kotlin/component/auth/routes/Sso.kt @@ -8,7 +8,6 @@ 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 diff --git a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt index fbbff6c..9402728 100644 --- a/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt +++ b/src/main/kotlin/component/citizen/routes/ChangeMyPassword.kt @@ -1,10 +1,8 @@ package fr.dcproject.component.citizen.routes -import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException import fr.dcproject.component.auth.UserRepository import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.security.assert @@ -16,8 +14,6 @@ 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.request.receiveOrNull import io.ktor.response.respond import io.ktor.routing.Route import java.util.UUID diff --git a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt index 32f8b35..a32259c 100644 --- a/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt +++ b/src/main/kotlin/component/citizen/routes/GetOneCitizen.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.citizen.routes import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenAccessControl import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.citizen.CitizenRepository diff --git a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt index 5eff6d4..7521d5e 100644 --- a/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt +++ b/src/main/kotlin/component/comment/article/routes/CreateCommentArticle.kt @@ -15,7 +15,6 @@ 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 diff --git a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt index da1c213..7dc4dbb 100644 --- a/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt +++ b/src/main/kotlin/component/comment/article/routes/GetCitizenArticleComments.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.comment.article.routes import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.comment.article.CommentArticleRepository import fr.dcproject.component.comment.generic.CommentAccessControl diff --git a/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt b/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt index 1bb0f75..2511bed 100644 --- a/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt +++ b/src/main/kotlin/component/comment/constitution/routes/GetCitizenCommentConstitution.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.comment.constitution.routes import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.comment.constitution.CommentConstitutionRepository import fr.dcproject.component.comment.generic.CommentAccessControl diff --git a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt index 6a1e1ee..1760837 100644 --- a/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt +++ b/src/main/kotlin/component/comment/generic/routes/CreateCommentChildren.kt @@ -14,7 +14,6 @@ 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 diff --git a/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt b/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt index e5611af..cf520fd 100644 --- a/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt +++ b/src/main/kotlin/component/constitution/ConstitutionAccessControl.kt @@ -15,7 +15,7 @@ class ConstitutionAccessControl : AccessControl() { fun > canView(subjects: List, citizen: CitizenI?): AccessResponse = canAll(subjects) { canView(it, citizen) } - fun canView(subject: S, citizen: CitizenI?): AccessResponse where S: EntityDeletedAt, S: ConstitutionS = when { + fun canView(subject: S, citizen: CitizenI?): AccessResponse where S : EntityDeletedAt, S : ConstitutionS = when { subject.isDeleted() -> denied("You cannot view a deleted constitution", "constitution.view.deleted") else -> granted() } diff --git a/src/main/kotlin/component/constitution/routes/CreateConstitution.kt b/src/main/kotlin/component/constitution/routes/CreateConstitution.kt index c1d8652..2668546 100644 --- a/src/main/kotlin/component/constitution/routes/CreateConstitution.kt +++ b/src/main/kotlin/component/constitution/routes/CreateConstitution.kt @@ -18,7 +18,6 @@ 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 diff --git a/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt b/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt index 201a242..e1d600e 100644 --- a/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt +++ b/src/main/kotlin/component/follow/routes/article/GetMyFollowsArticle.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.follow.routes.article import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.follow.FollowAccessControl import fr.dcproject.component.follow.FollowArticleRepository diff --git a/src/main/kotlin/component/opinion/OpinionAccessControl.kt b/src/main/kotlin/component/opinion/OpinionAccessControl.kt index f8ff669..fa39dfe 100644 --- a/src/main/kotlin/component/opinion/OpinionAccessControl.kt +++ b/src/main/kotlin/component/opinion/OpinionAccessControl.kt @@ -1,9 +1,7 @@ package fr.dcproject.component.opinion import fr.dcproject.common.entity.HasTarget -import fr.dcproject.common.entity.TargetRef import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.opinion.entity.Opinion import fr.dcproject.component.opinion.entity.OpinionI import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse @@ -24,10 +22,10 @@ class OpinionAccessControl : AccessControl() { } } - fun , C: CitizenI> canView(subjects: SS, citizen: CitizenI?): AccessResponse where S : OpinionI, S : EntityCreatedBy = + fun , C : CitizenI> canView(subjects: SS, citizen: CitizenI?): AccessResponse where S : OpinionI, S : EntityCreatedBy = canAll(subjects) { canView(it, citizen) } - fun canView(subject: S, citizen: CitizenI?): AccessResponse where S : OpinionI, S : EntityCreatedBy = when { + fun canView(subject: S, citizen: CitizenI?): AccessResponse where S : OpinionI, S : EntityCreatedBy = when { citizen == null -> denied("You must be connected to delete opinion", "opinion.delete.notConnected") subject.createdBy.id != citizen.id -> denied("You cannot view opinions of other citizen", "opinion.view.otherCitizen") else -> granted() diff --git a/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt b/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt index a609c4b..f936a3b 100644 --- a/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt +++ b/src/main/kotlin/component/opinion/OpinionChoiceAccessControl.kt @@ -1,9 +1,7 @@ package fr.dcproject.component.opinion import fr.dcproject.component.citizen.CitizenI -import fr.dcproject.component.opinion.entity.OpinionChoice import fr.dcproject.component.opinion.entity.OpinionChoiceI -import fr.dcproject.component.opinion.entity.OpinionChoiceRef import fr.dcproject.security.AccessControl import fr.dcproject.security.AccessResponse diff --git a/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt b/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt index bc06c88..ec3fb06 100644 --- a/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt +++ b/src/main/kotlin/component/opinion/routes/GetCitizenOpinions.kt @@ -13,9 +13,7 @@ import io.ktor.locations.Location import io.ktor.locations.get import io.ktor.response.respond import io.ktor.routing.Route -import org.koin.core.KoinComponent import java.util.UUID -import fr.dcproject.component.citizen.Citizen as CitizenEntity import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository @KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt b/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt index fd2011a..22fdcc0 100644 --- a/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt +++ b/src/main/kotlin/component/opinion/routes/GetMyOpinionsArticle.kt @@ -3,7 +3,6 @@ package fr.dcproject.component.opinion.routes import fr.dcproject.common.entity.TargetRef import fr.dcproject.component.auth.citizen import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.CitizenBasicI import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.opinion.OpinionAccessControl import fr.dcproject.component.opinion.entity.Opinion @@ -17,8 +16,8 @@ import io.ktor.locations.Location import io.ktor.locations.get import io.ktor.response.respond import io.ktor.routing.Route -import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository import java.util.UUID +import fr.dcproject.component.opinion.OpinionRepositoryArticle as OpinionArticleRepository @KtorExperimentalLocationsAPI object GetMyOpinionsArticle { diff --git a/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt b/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt index 85134c3..3d1bc9b 100644 --- a/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt +++ b/src/main/kotlin/component/opinion/routes/GetOpinionChoices.kt @@ -4,6 +4,7 @@ import fr.dcproject.component.auth.citizenOrNull import fr.dcproject.component.opinion.OpinionChoiceAccessControl import fr.dcproject.component.opinion.OpinionChoiceRepository import fr.dcproject.security.assert +import fr.dcproject.utils.toUUID import io.ktor.application.call import io.ktor.locations.KtorExperimentalLocationsAPI import io.ktor.locations.Location diff --git a/src/main/kotlin/component/opinion/routes/OpinionArticle.kt b/src/main/kotlin/component/opinion/routes/OpinionArticle.kt index ab2a37d..c7b0be3 100644 --- a/src/main/kotlin/component/opinion/routes/OpinionArticle.kt +++ b/src/main/kotlin/component/opinion/routes/OpinionArticle.kt @@ -14,7 +14,6 @@ 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 java.util.UUID diff --git a/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt b/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt index d2cb3ae..8d80b82 100644 --- a/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt +++ b/src/main/kotlin/component/vote/routes/GetCitizenVotes.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.vote.routes import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteRepository diff --git a/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt b/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt index 96488d2..c4bf4e2 100644 --- a/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt +++ b/src/main/kotlin/component/vote/routes/GetCitizenVotesOnArticle.kt @@ -1,7 +1,6 @@ package fr.dcproject.component.vote.routes import fr.dcproject.component.auth.citizenOrNull -import fr.dcproject.component.citizen.Citizen import fr.dcproject.component.citizen.CitizenRef import fr.dcproject.component.vote.VoteAccessControl import fr.dcproject.component.vote.VoteArticleRepository diff --git a/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt b/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt index 3c2adbe..cabd780 100644 --- a/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt +++ b/src/main/kotlin/component/vote/routes/PutVoteOnArticle.kt @@ -15,7 +15,6 @@ 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 java.util.UUID diff --git a/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt b/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt index 745032c..3fbfdef 100644 --- a/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt +++ b/src/main/kotlin/component/vote/routes/PutVoteOnComment.kt @@ -13,7 +13,6 @@ 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 java.util.UUID diff --git a/src/main/kotlin/component/vote/routes/VoteConstitution.kt b/src/main/kotlin/component/vote/routes/VoteConstitution.kt index 6a7dd0d..074f888 100644 --- a/src/main/kotlin/component/vote/routes/VoteConstitution.kt +++ b/src/main/kotlin/component/vote/routes/VoteConstitution.kt @@ -16,10 +16,8 @@ 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.component.constitution.Constitution as ConstitutionEntity import java.util.UUID @KtorExperimentalLocationsAPI diff --git a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt index fe02e0d..44a1e3d 100644 --- a/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/CreateWorkgroup.kt @@ -13,7 +13,6 @@ 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 diff --git a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt index 04325d9..bd51854 100644 --- a/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/EditWorkgroup.kt @@ -11,7 +11,6 @@ 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 diff --git a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt index a6ee8b5..4255c57 100644 --- a/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/AddMemberToWorkgroup.kt @@ -13,7 +13,6 @@ 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 diff --git a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt index 49ed4d2..584564a 100644 --- a/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/DeleteMembersOfWorkgroup.kt @@ -13,7 +13,6 @@ 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 diff --git a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt index c177714..11e4cd7 100644 --- a/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt +++ b/src/main/kotlin/component/workgroup/routes/members/UpdateMemberOfWorkgroup.kt @@ -13,7 +13,6 @@ 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 diff --git a/src/main/kotlin/utils/Request.kt b/src/main/kotlin/utils/Request.kt index 06d01a3..e144b6e 100644 --- a/src/main/kotlin/utils/Request.kt +++ b/src/main/kotlin/utils/Request.kt @@ -5,21 +5,19 @@ import io.ktor.application.ApplicationCall import io.ktor.application.log import io.ktor.features.BadRequestException import io.ktor.request.receive -import kotlin.reflect.KType import kotlin.reflect.typeOf - /** * Receives content for this request. * @param type instance of `KClass` specifying type to be received. * @return instance of [T] received from this call, or `null` if content cannot be transformed to the requested type.. */ @OptIn(ExperimentalStdlibApi::class) -public suspend inline fun ApplicationCall.receiveOrBadRequest(message: String = "Bad Request, wrong body request"): T { +public suspend inline fun ApplicationCall.receiveOrBadRequest(message: String = "Bad Request, wrong body request"): T { return try { receive(typeOf()) } catch (cause: MissingKotlinParameterException) { application.log.debug("Conversion failed, throw bad exeption", cause) throw BadRequestException(message, cause) } -} \ No newline at end of file +}