DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Lint project

Browse Source
This commit is contained in:
Fabrice Lecomte
2019-10-10 22:50:24 +02:00
parent 194620e15b
commit f76f6f83bb
36 changed files with 81 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/fr/dcproject/security/voter/ArticleVoter.kt
View File

@@ -6,8 +6,8 @@ import fr.dcproject.entity.Article as ArticleEntity
import fr.dcproject.entity.Comment as CommentEntity
import fr.dcproject.entity.Vote as VoteEntity
class ArticleVoter: Voter {
enum class Action: ActionI {
class ArticleVoter : Voter {
enum class Action : ActionI {
CREATE,
UPDATE,
VIEW,
@@ -16,8 +16,7 @@ class ArticleVoter: Voter {
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
&&
(subject is List<*> || subject is ArticleEntity? || subject is VoteEntity<*> || subject is CommentEntity<*>)
.and(subject is List<*> || subject is ArticleEntity? || subject is VoteEntity<*> || subject is CommentEntity<*>)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {

9
src/main/kotlin/fr/dcproject/security/voter/CitizenVoter.kt
View File

@@ -6,8 +6,8 @@ import io.ktor.application.ApplicationCall
import io.ktor.locations.KtorExperimentalLocationsAPI
@KtorExperimentalLocationsAPI
class CitizenVoter: Voter {
enum class Action: ActionI {
class CitizenVoter : Voter {
enum class Action : ActionI {
CREATE,
UPDATE,
VIEW,
@@ -17,10 +17,7 @@ class CitizenVoter: Voter {
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action)
&& (
subject is List<*> ||
subject is Citizen?
)
.and(subject is List<*> || subject is Citizen?)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {

8
src/main/kotlin/fr/dcproject/security/voter/CommentVoter.kt
View File

@@ -3,8 +3,8 @@ package fr.dcproject.security.voter
import fr.dcproject.entity.Comment
import io.ktor.application.ApplicationCall
class CommentVoter: Voter {
enum class Action: ActionI {
class CommentVoter : Voter {
enum class Action : ActionI {
CREATE,
UPDATE,
VIEW,
@@ -12,8 +12,8 @@ class CommentVoter: Voter {
}
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action) &&
(subject is Comment<*>? || subject is List<*>)
return (action is Action)
.and(subject is Comment<*>? || subject is List<*>)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {

7
src/main/kotlin/fr/dcproject/security/voter/ConstitutionVoter.kt
View File

@@ -6,8 +6,8 @@ import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Constitution as ConstitutionEntity
import fr.dcproject.entity.Vote as VoteEntity
class ConstitutionVoter: Voter {
enum class Action: ActionI {
class ConstitutionVoter : Voter {
enum class Action : ActionI {
CREATE,
UPDATE,
VIEW,
@@ -16,8 +16,7 @@ class ConstitutionVoter: Voter {
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action || action is CommentVoter.Action || action is VoteVoter.Action)
&&
(subject is List<*> || subject is ConstitutionEntity? || subject is VoteEntity<*> || subject is Comment<*>)
.and(subject is List<*> || subject is ConstitutionEntity? || subject is VoteEntity<*> || subject is Comment<*>)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {

8
src/main/kotlin/fr/dcproject/security/voter/FollowVoter.kt
View File

@@ -4,16 +4,16 @@ import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Follow as FollowEntity
import fr.dcproject.entity.User as UserEntity
class FollowVoter: Voter {
enum class Action: ActionI {
class FollowVoter : Voter {
enum class Action : ActionI {
CREATE,
DELETE,
VIEW
}
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return (action is Action) &&
(subject is List<*> || subject is FollowEntity<*>?)
return (action is Action)
.and(subject is List<*> || subject is FollowEntity<*>?)
}
override fun vote(action: ActionI, call: ApplicationCall, subject: Any?): Vote {

8
src/main/kotlin/fr/dcproject/security/voter/VoteVoter.kt
View File

@@ -3,16 +3,16 @@ package fr.dcproject.security.voter
import io.ktor.application.ApplicationCall
import fr.dcproject.entity.Vote as VoteEntity
class VoteVoter: Voter {
enum class Action: ActionI {
class VoteVoter : Voter {
enum class Action : ActionI {
CREATE,
VIEW
}
override fun supports(action: ActionI, call: ApplicationCall, subject: Any?): Boolean {
return action is Action && (
subject is VoteEntity<*>?
|| subject is List<*>
subject is VoteEntity<*>? ||
subject is List<*>
)
}