From f677cac779bc4b085102c2f3c05df00203dba9b9 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Fri, 6 Mar 2020 09:58:08 +0100 Subject: [PATCH] Lint --- src/main/kotlin/fr/dcproject/entity/Extra.kt | 2 +- src/main/kotlin/fr/dcproject/entity/Follow.kt | 2 +- src/main/kotlin/fr/dcproject/entity/Opinion.kt | 2 +- .../fr/dcproject/event/ConfigNotification.kt | 3 +-- .../fr/dcproject/event/EventSubscriber.kt | 2 +- .../fr/dcproject/event/publisher/Publisher.kt | 12 +++++++----- .../kotlin/fr/dcproject/repository/Follow.kt | 13 +++++++------ src/test/kotlin/feature/ArticleSteps.kt | 4 ++-- src/test/kotlin/feature/OpinionSteps.kt | 17 +++++++++++------ 9 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/main/kotlin/fr/dcproject/entity/Extra.kt b/src/main/kotlin/fr/dcproject/entity/Extra.kt index 6bdf4a0..8d50f54 100644 --- a/src/main/kotlin/fr/dcproject/entity/Extra.kt +++ b/src/main/kotlin/fr/dcproject/entity/Extra.kt @@ -8,7 +8,7 @@ import java.util.* import kotlin.reflect.KClass import kotlin.reflect.full.isSubclassOf -interface ExtraI : +interface ExtraI : UuidEntityI, EntityCreatedAt, EntityCreatedBy { diff --git a/src/main/kotlin/fr/dcproject/entity/Follow.kt b/src/main/kotlin/fr/dcproject/entity/Follow.kt index 9b1f3bd..5ac948f 100644 --- a/src/main/kotlin/fr/dcproject/entity/Follow.kt +++ b/src/main/kotlin/fr/dcproject/entity/Follow.kt @@ -10,7 +10,7 @@ class Follow( ) : ExtraI, FollowSimple(id, createdBy, target) -open class FollowSimple( +open class FollowSimple( id: UUID = UUID.randomUUID(), override val createdBy: C, override var target: T diff --git a/src/main/kotlin/fr/dcproject/entity/Opinion.kt b/src/main/kotlin/fr/dcproject/entity/Opinion.kt index 0950e07..cffc61d 100644 --- a/src/main/kotlin/fr/dcproject/entity/Opinion.kt +++ b/src/main/kotlin/fr/dcproject/entity/Opinion.kt @@ -11,7 +11,7 @@ open class Opinion( override val createdBy: CitizenBasic, override val target: T, val choice: OpinionChoice -) : ExtraI, +) : ExtraI, TargetRef(id), EntityCreatedAt by EntityCreatedAtImp(), EntityCreatedBy by EntityCreatedByImp(createdBy) { diff --git a/src/main/kotlin/fr/dcproject/event/ConfigNotification.kt b/src/main/kotlin/fr/dcproject/event/ConfigNotification.kt index e18da5c..50e04fd 100644 --- a/src/main/kotlin/fr/dcproject/event/ConfigNotification.kt +++ b/src/main/kotlin/fr/dcproject/event/ConfigNotification.kt @@ -17,7 +17,6 @@ import kotlinx.coroutines.runBlocking import kotlinx.io.errors.IOException import fr.dcproject.repository.FollowArticle as FollowArticleRepository - class ArticleUpdate( target: Article ) : EntityEvent(target, "article", "update") { @@ -102,4 +101,4 @@ fun EventSubscriber.Configuration.configEvent( rabbitChannel.basicConsume("push", false, consumerPush) // The front consume the redis via Websocket rabbitChannel.basicConsume("email", false, consumerEmail) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/fr/dcproject/event/EventSubscriber.kt b/src/main/kotlin/fr/dcproject/event/EventSubscriber.kt index f26a8ba..0661b42 100644 --- a/src/main/kotlin/fr/dcproject/event/EventSubscriber.kt +++ b/src/main/kotlin/fr/dcproject/event/EventSubscriber.kt @@ -32,7 +32,7 @@ abstract class EntityEvent( class EventSubscriber { class Configuration(private val monitor: ApplicationEvents) { private val subscribers = mutableListOf() - fun subscribe(definition: EventDefinition, handler: EventHandler): DisposableHandle { + fun subscribe(definition: EventDefinition, handler: EventHandler): DisposableHandle { return monitor.subscribe(definition, handler).also { subscribers.add(it) } diff --git a/src/main/kotlin/fr/dcproject/event/publisher/Publisher.kt b/src/main/kotlin/fr/dcproject/event/publisher/Publisher.kt index e181dc6..28858c4 100644 --- a/src/main/kotlin/fr/dcproject/event/publisher/Publisher.kt +++ b/src/main/kotlin/fr/dcproject/event/publisher/Publisher.kt @@ -15,12 +15,14 @@ class Publisher( private val factory: ConnectionFactory, private val logger: Logger = LoggerFactory.getLogger(Publisher::class.qualifiedName) ) { - fun publish(it: T): Job { + fun publish(it: T): Job { return GlobalScope.launch { - factory.newConnection().use { connection -> connection.createChannel().use { channel -> - channel.basicPublish(config.exchangeNotificationName, "", null, it.serialize().toByteArray()) - logger.debug("Publish message ${it.target.id}") - } } + factory.newConnection().use { connection -> + connection.createChannel().use { channel -> + channel.basicPublish(config.exchangeNotificationName, "", null, it.serialize().toByteArray()) + logger.debug("Publish message ${it.target.id}") + } + } } } diff --git a/src/main/kotlin/fr/dcproject/repository/Follow.kt b/src/main/kotlin/fr/dcproject/repository/Follow.kt index 1476211..0b74d57 100644 --- a/src/main/kotlin/fr/dcproject/repository/Follow.kt +++ b/src/main/kotlin/fr/dcproject/repository/Follow.kt @@ -27,10 +27,10 @@ sealed class Follow(override var requester: Req ): Paginated> { return requester .getFunction("find_follows_by_citizen") - .select( - page, limit, - "created_by_id" to citizenId - ) + .select( + page, limit, + "created_by_id" to citizenId + ) } fun follow(follow: FollowEntity) { @@ -74,7 +74,7 @@ sealed class Follow(override var requester: Req paginate.result.forEach { emit(it) } - nextPage = paginate.currentPage+1 + nextPage = paginate.currentPage + 1 } while (!paginate.isLastPage()) } @@ -107,7 +107,8 @@ class FollowArticle(requester: Requester) : Follow(re ): Paginated> { return requester .getFunction("find_follows_article_by_target") - .select(page, limit, + .select( + page, limit, "target_id" to target.id ) } diff --git a/src/test/kotlin/feature/ArticleSteps.kt b/src/test/kotlin/feature/ArticleSteps.kt index 05c4f92..3d086c3 100644 --- a/src/test/kotlin/feature/ArticleSteps.kt +++ b/src/test/kotlin/feature/ArticleSteps.kt @@ -47,7 +47,8 @@ class ArticleSteps : En, KoinTest { Given("I have article") { extraData: DataTable -> extraData.asMap(String::class.java, String::class.java).let { params -> - val username = params["createdBy"]?.toLowerCase()?.replace(' ', '-') ?: error("You must provide the 'createdBy' parameter") + val username = params["createdBy"]?.toLowerCase()?.replace(' ', '-') + ?: error("You must provide the 'createdBy' parameter") val citizen = get().findByUsername(username) ?: error("Citizen not exist") val id = params["id"]?.toUUID() ?: UUID.randomUUID() val article = ArticleEntity( @@ -59,7 +60,6 @@ class ArticleSteps : En, KoinTest { ) get().upsert(article) } - } Given("I have article with id {string} created by {string}") { id: String, username: String -> diff --git a/src/test/kotlin/feature/OpinionSteps.kt b/src/test/kotlin/feature/OpinionSteps.kt index 507e914..95afff3 100644 --- a/src/test/kotlin/feature/OpinionSteps.kt +++ b/src/test/kotlin/feature/OpinionSteps.kt @@ -11,13 +11,13 @@ import fr.dcproject.repository.Citizen as CitizenRepository import fr.dcproject.repository.OpinionArticle as OpinionRepository import fr.dcproject.repository.OpinionChoice as OpinionChoiceRepository - class OpinionSteps : En, KoinTest { init { Given("I have the opinion {string} on article {string} created by {string}:") { opinionChoice: String, article: String, citizen: String, extraInfo: DataTable -> extraInfo.asMap(String::class.java, String::class.java).let { val opinion = OpinionArticle( - choice = get().findOpinionsChoiceByName(opinionChoice) ?: error("Opinion Choice not exist"), + choice = get().findOpinionsChoiceByName(opinionChoice) + ?: error("Opinion Choice not exist"), target = get().findById(article.toUUID()) ?: error("Article not exist"), createdBy = get().findById(citizen.toUUID()) ?: error("Citizen not exist") ) @@ -25,12 +25,17 @@ class OpinionSteps : En, KoinTest { } } - Given("I have an opinion") { extraInfo: DataTable -> + Given("I have an opinion") { extraInfo: DataTable -> extraInfo.asMap(String::class.java, String::class.java)?.let { params -> - val username = params["createdBy"]?.toLowerCase()?.replace(' ', '-') ?: error("You must provide the 'createdBy' parameter") + val username = params["createdBy"]?.toLowerCase()?.replace(' ', '-') + ?: error("You must provide the 'createdBy' parameter") val opinion = OpinionArticle( - choice = params["opinion"]?.let { get().findOpinionsChoiceByName(it) ?: error("Opinion Choice not exist")} ?: error("You must provide the 'opinion' parameter"), - target = params["article"]?.let { get().findById(it.toUUID()) ?: error("Article not exist")} ?: error("You must provide the 'article' parameter"), + choice = params["opinion"]?.let { + get().findOpinionsChoiceByName(it) ?: error("Opinion Choice not exist") + } ?: error("You must provide the 'opinion' parameter"), + target = params["article"]?.let { + get().findById(it.toUUID()) ?: error("Article not exist") + } ?: error("You must provide the 'article' parameter"), createdBy = get().findByUsername(username) ?: error("Citizen not exist") ) get().opinion(opinion)