From 763b680bea3f5c14e70453845d7670f7ae691e87 Mon Sep 17 00:00:00 2001 From: fkrzywka Date: Tue, 5 Jun 2018 14:51:36 +0200 Subject: Duplicate code removal Change-Id: Iee19bce0ba18746d0570337c5317ccdd63552d56 Signed-off-by: fkrzywka Issue-ID: DCAEGEN2-601 --- .../org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'hv-collector-core/src/main/kotlin') diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt index b0f877f0..9cade1cc 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/VesHvCollector.kt @@ -59,13 +59,7 @@ internal class VesHvCollector( return valid } - private fun findRoute(msg: VesMessage): Mono { - val routedMessage = router.findDestination(msg) - return if (routedMessage == null) - Mono.empty() - else - Mono.just(routedMessage) - } + private fun findRoute(msg: VesMessage): Mono = omitWhenNull(msg, router::findDestination) private fun releaseMemory(msg: VesMessage) { msg.rawMessage.release() @@ -73,8 +67,7 @@ internal class VesHvCollector( - private fun omitWhenNull(input: ByteBuf, mapper: (ByteBuf) -> T?): Mono = - Mono.justOrEmpty(mapper(input)) + private fun omitWhenNull(input: T, mapper: (T) -> V?): Mono = Mono.justOrEmpty(mapper(input)) private fun releaseWhenNull(input: ByteBuf, mapper: (ByteBuf) -> T?): Mono { val result = mapper(input) -- cgit 1.2.3-korg