1 files changed, 15 insertions, 13 deletions
diff --git a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/factory/ClientFactory.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/factory/ClientFactory.kt
index a91fccd4..72a1165e 100644
--- a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/factory/ClientFactory.kt
+++ b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/factory/ClientFactory.kt
@@ -29,23 +29,25 @@ import org.onap.dcaegen2.services.sdk.services.hvves.client.producer.api.options
  * @author Jakub Dudycz <jakub.dudycz@nokia.com>
  * @since February 2019
  */
-class ClientFactory(configuration: ClientConfiguration) {
+class ClientFactory(private val configuration: ClientConfiguration) {
 
-    private val partialConfig = ImmutableProducerOptions
+    fun create() = hvVesClient(partialConfiguration().build())
+
+    fun create(wireFrameVersion: WireFrameVersion) = hvVesClient(
+            partialConfiguration()
+                    .wireFrameVersion(wireFrameVersion)
+                    .build())
+
+    private fun partialConfiguration() = ImmutableProducerOptions
             .builder()
             .collectorAddresses(configuration.collectorAddresses)
-            .let { producerOptions ->
-                configuration.security.keys.fold(
-                        { producerOptions },
-                        { producerOptions.securityKeys(it) })
+            .let { options ->
+                configuration.securityProvider().keys.fold(
+                        { options },
+                        { options.securityKeys(it) })
             }
 
-    fun create(wireFrameVersion: WireFrameVersion): HvVesClient =
-            buildClient(partialConfig.wireFrameVersion(wireFrameVersion))
-
-
-    fun create(): HvVesClient = buildClient(partialConfig)
+    private fun hvVesClient(producerOptions: ImmutableProducerOptions) =
+            HvVesClient(HvVesProducerFactory.create(producerOptions))
 
-    private fun buildClient(config: ImmutableProducerOptions.Builder) =
-            HvVesClient(HvVesProducerFactory.create(config.build()))
 }