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

2
src/main/kotlin/fr/dcproject/Application.kt
View File

@@ -143,7 +143,7 @@ fun Application.module(env: Env = PROD) {
registerModule(JodaModule())
disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
configure(SerializationFeature.INDENT_OUTPUT, true)
setDefaultPrettyPrinter(DefaultPrettyPrinter().apply {
indentArraysWith(DefaultPrettyPrinter.FixedSpaceIndenter.instance)

1
src/main/kotlin/fr/dcproject/Configuration.kt
View File

@@ -50,5 +50,4 @@ object JwtConfig {
* Calculate the expiration Date based on current time + the given validity
*/
private fun getExpiration() = Date(System.currentTimeMillis() + validityInMs)
}

3
src/main/kotlin/fr/dcproject/entity/User.kt
View File

@@ -14,7 +14,6 @@ class User(
) : UuidEntity(id),
EntityCreatedAt by EntityCreatedAtImp(),
EntityUpdatedAt by EntityUpdatedAtImp(),
Principal
{
Principal {
enum class Roles { ROLE_USER, ROLE_ADMIN }
}

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -12,8 +12,8 @@ class FollowVoter: Voter {
}
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 {

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

@@ -11,8 +11,8 @@ class VoteVoter: Voter {
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<*>
)
}

30
src/test/kotlin/RepositoryTest.kt
View File

@@ -1,30 +0,0 @@
import fr.dcproject.Env
import fr.dcproject.module
import io.ktor.locations.KtorExperimentalLocationsAPI
import io.ktor.server.testing.withTestApplication
import io.ktor.util.KtorExperimentalAPI
import org.amshove.kluent.shouldBe
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance
import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
import org.koin.test.AutoCloseKoinTest
import org.koin.test.KoinTest
import org.koin.test.get
import fr.dcproject.repository.Article as RepositoryArticle
import fr.dcproject.repository.Constitution as RepositoryConstitution
@KtorExperimentalLocationsAPI
@KtorExperimentalAPI
@TestInstance(PER_CLASS)
class RepositoryTest: KoinTest, AutoCloseKoinTest() {
@Test
fun `test get repository`() {
withTestApplication({ module(Env.TEST) }) {
val repoArticle = get<RepositoryArticle>()
(repoArticle is RepositoryArticle) shouldBe true
val repoConstitution = get<RepositoryConstitution>()
(repoConstitution is RepositoryConstitution) shouldBe true
}
}
}

2
src/test/kotlin/RunCucumberTest.kt
View File

@@ -44,7 +44,7 @@ class RunCucumberTest: En, KoinTest {
unitialized = true
}
Before(-1) { scenario: Scenario ->
Before(-1) { _: Scenario ->
config.database = "test"
config.username = "test"
config.password = "test"