From c775e8677cdbf69f2b1c1390d225329c658c0ee2 Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Wed, 3 Apr 2019 15:07:22 +0200
Subject: Get rid of arrow-effects usage

Also clean-up dependencies + use Kotlin BOM to force single
kotlin-stdlib on classpath.

Issue-ID: DCAEGEN2-1392
Change-Id: I447c4686707de81f35f7734255ce0b13c997c4a4
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---
 sources/hv-collector-main/pom.xml                                     | 2 +-
 .../src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt       | 2 +-
 .../org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt  | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'sources/hv-collector-main')

diff --git a/sources/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml
index 57f21a66..3fe8932f 100644
--- a/sources/hv-collector-main/pom.xml
+++ b/sources/hv-collector-main/pom.xml
@@ -93,7 +93,7 @@
         </dependency>
         <dependency>
             <groupId>io.arrow-kt</groupId>
-            <artifactId>arrow-core</artifactId>
+            <artifactId>arrow-core-data</artifactId>
         </dependency>
         <dependency>
             <groupId>io.arrow-kt</groupId>
diff --git a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt
index 8b0a38bb..dfb388d8 100644
--- a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt
+++ b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/main.kt
@@ -50,7 +50,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    HealthCheckServer.start(configurationModule.healthCheckPort(args))
+    HealthCheckServer.start(configurationModule.healthCheckPort(args)).block()
     configurationModule
             .hvVesConfigurationUpdates(args, configStateListener, ServiceContext::mdc)
             .publishOn(Schedulers.single(Schedulers.elastic()))
diff --git a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt
index 9b58dcc9..c970e5c8 100644
--- a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt
+++ b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/servers/HealthCheckServer.kt
@@ -24,7 +24,6 @@ import org.onap.dcae.collectors.veshv.healthcheck.factory.HealthCheckApiServer
 import org.onap.dcae.collectors.veshv.main.metrics.MicrometerMetrics
 import org.onap.dcae.collectors.veshv.model.ServiceContext
 import org.onap.dcae.collectors.veshv.utils.ServerHandle
-import org.onap.dcae.collectors.veshv.utils.arrow.then
 import org.onap.dcae.collectors.veshv.utils.logging.Logger
 import java.net.InetSocketAddress
 
@@ -39,8 +38,7 @@ object HealthCheckServer {
     fun start(port: Int) =
             createHealthCheckServer(port)
                     .start()
-                    .then(::logServerStarted)
-                    .unsafeRunSync()
+                    .doOnSuccess(::logServerStarted)
 
     private fun createHealthCheckServer(listenPort: Int) =
             HealthCheckApiServer(
-- 
cgit 1.2.3-korg