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

clean warnings

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-03-03 03:14:04 +01:00
parent d9deb4836e
commit 9fc21f5459
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/fr/dcproject/application/Application.kt
View File

@@ -53,7 +53,6 @@ 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
@@ -205,7 +204,7 @@ fun Application.module(env: Env = PROD) {
}
allowCredentials = true
allowSameOrigin = true
maxAge = Duration.ofDays(1)
maxAgeInSeconds = Duration.ofDays(1).seconds
}
if (env == PROD) {

4
src/main/kotlin/fr/dcproject/application/KoinModule.kt
View File

@@ -2,7 +2,7 @@ package fr.dcproject.application
import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.PropertyNamingStrategy
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.SerializationFeature
import com.fasterxml.jackson.databind.module.SimpleModule
import com.fasterxml.jackson.datatype.joda.JodaModule
@@ -68,7 +68,7 @@ val KoinModule = module {
single<ObjectMapper> {
jacksonObjectMapper().apply {
registerModule(SimpleModule())
propertyNamingStrategy = PropertyNamingStrategy.SNAKE_CASE
propertyNamingStrategy = PropertyNamingStrategies.LOWER_CAMEL_CASE
registerModule(JodaModule())
disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)

2
src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt
View File

@@ -94,7 +94,7 @@ class NotificationConsumer(
private suspend fun followersFromMessage(body: ByteArray, action: suspend (DecodedMessage) -> Unit) {
val rawMessage: String = body.toString(Charsets.UTF_8)
val notification: EntityNotification = Notification.fromString<EntityNotification>(rawMessage) ?: error("Unable to deserialize notification message from rabbit")
val notification: EntityNotification = Notification.fromString(rawMessage)
val follows = when (notification.type) {
"article" -> followArticleRepo.findFollowsByTarget(notification.target)
"constitution" -> followConstitutionRepo.findFollowsByTarget(notification.target)

6
src/test/kotlin/functional/NotificationConsumerTest.kt
View File

@@ -114,9 +114,9 @@ class NotificationConsumerTest {
).await()
/* Check if notifications sent */
verify(timeout = 1000) { followArticleRepo.findFollowsByTarget(any()) }
verify(timeout = 1000) { emailSender.sendEmail(any()) }
verify(timeout = 1000) { asyncCommand.zadd(any<String>(), any<Double>(), any<String>()) }
verify(timeout = 2000) { followArticleRepo.findFollowsByTarget(any()) }
verify(timeout = 2000) { emailSender.sendEmail(any()) }
verify(timeout = 2000) { asyncCommand.zadd(any<String>(), any<Double>(), any<String>()) }
consumer.close()
}

4
src/test/kotlin/integration/steps/given/Comment.kt
View File

@@ -78,10 +78,10 @@ fun createCommentOnTarget(
content: String? = null
) {
val commentRepository: CommentRepository by lazy { GlobalContext.get().koin.get() }
val createdBy = createCitizen(createdBy)
val creator = createCitizen(createdBy)
val comment = CommentForUpdate(
id = id ?: UUID.randomUUID(),
createdBy = createdBy,
createdBy = creator,
target = target,
content = content ?: LoremIpsum().getParagraphs(1, 3)
)