From 82b27ff5bccc925fe03d05f259cf881fafc8a1ce Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Fri, 15 Feb 2019 12:59:26 +0100
Subject: Use SDK/SSL in HV-VES

Issue-ID: DCAEGEN2-1226
Change-Id: I7cfc09001f7315c1b6f4fcf150ad631630c810ef
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---
 .../kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt  |  6 +++++-
 .../collectors/veshv/utils/commandline/CommandLineOption.kt    | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'sources/hv-collector-utils/src/main/kotlin/org/onap')

diff --git a/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt
index cb1c6222..bedc2fcd 100644
--- a/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt
+++ b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/arrow/core.kt
@@ -52,4 +52,8 @@ fun <A, B> Either<A, B>.doOnLeft(action: () -> Unit): Either<A, B> = apply { if
 
 fun <A> Option<A>.doOnEmpty(action: () -> Unit): Option<A> = apply { if (isEmpty()) action() }
 
-fun <A> Try<A>.doOnFailure(action: () -> Unit): Try<A> = apply { if (isFailure()) action() }
+fun <A> Try<A>.doOnFailure(action: (Throwable) -> Unit): Try<A> = apply {
+    if (this is Try.Failure) {
+        action(exception)
+    }
+}
diff --git a/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
index e869901d..aaa8ff83 100644
--- a/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
+++ b/sources/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
@@ -106,11 +106,11 @@ enum class CommandLineOption(val option: Option, val required: Boolean = false)
             .build()
     ),
     KEY_STORE_PASSWORD(
-        Option.builder("kp")
-            .longOpt("key-store-password")
-            .hasArg()
-            .desc("Key store password")
-            .build()
+            Option.builder("kp")
+                    .longOpt("key-store-password")
+                    .hasArg()
+                    .desc("Key store password")
+                    .build()
     ),
     TRUST_STORE_FILE(
         Option.builder("t")
-- 
cgit 1.2.3-korg