Remove environment variables and program arguments

- Move all command line program arguments to json file.
- Reorganize configuration classes and the way they are passed through application
- Implement HV VES configuration stream
- Create concrete configuration from partial one
- Modify main HV-VES server starting pipeline

Change-Id: I6cf874b6904ed768e4820b8132f5f760299c929e
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1340

5 files changed, 265 insertions, 239 deletions

diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/api/ArgVesHvConfigurationTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/api/ArgVesHvConfigurationTest.kt
deleted file mode 100644
index 0f8d8d0e..00000000
--- a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/api/ArgVesHvConfigurationTest.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * dcaegen2-collectors-veshv
- * ================================================================================
- * Copyright (C) 2018-2019 NOKIA
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.onap.dcae.collectors.veshv.config.api
-
-import org.assertj.core.api.Assertions.assertThat
-import org.jetbrains.spek.api.Spek
-import org.jetbrains.spek.api.dsl.describe
-import org.jetbrains.spek.api.dsl.given
-import org.jetbrains.spek.api.dsl.it
-import org.jetbrains.spek.api.dsl.on
-import org.onap.dcae.collectors.veshv.commandline.WrongArgumentError
-import org.onap.dcae.collectors.veshv.config.api.model.ServerConfiguration
-import org.onap.dcae.collectors.veshv.config.impl.ArgVesHvConfiguration
-import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingFailure
-import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingSuccess
-import org.onap.dcae.collectors.veshv.utils.logging.LogLevel
-import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys
-import java.time.Duration
-import kotlin.test.assertNotNull
-
-/**
- * @author Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
- * @since May 2018
- */
-object ArgVesHvConfigurationTest : Spek({
-    lateinit var cut: ArgVesHvConfiguration
-    val kafkaBootstrapServers = "dmaap-mr-wro:6666,dmaap-mr-gda:6666"
-    val healthCheckApiPort = "6070"
-    val firstRequestDelay = "10"
-    val requestInterval = "5"
-    val listenPort = "6969"
-    val keyStorePassword = "kspass"
-    val trustStorePassword = "tspass"
-    val logLevel = LogLevel.DEBUG.name
-
-    beforeEachTest {
-        cut = ArgVesHvConfiguration()
-    }
-
-    describe("parsing arguments") {
-        given("all parameters are present in the long form") {
-            lateinit var result: ServerConfiguration
-
-            beforeEachTest {
-                result = cut.parseExpectingSuccess(
-                        "--kafka-bootstrap-servers", kafkaBootstrapServers,
-                        "--health-check-api-port", healthCheckApiPort,
-                        "--listen-port", listenPort,
-                        "--first-request-delay", firstRequestDelay,
-                        "--request-interval", requestInterval,
-                        "--key-store", "/tmp/keys.p12",
-                        "--trust-store", "/tmp/trust.p12",
-                        "--key-store-password", keyStorePassword,
-                        "--trust-store-password", trustStorePassword,
-                        "--log-level", logLevel
-                )
-            }
-
-            it("should set proper kafka bootstrap servers") {
-                assertThat(result.kafkaConfiguration.bootstrapServers).isEqualTo(kafkaBootstrapServers)
-            }
-
-            it("should set proper listen port") {
-                assertThat(result.serverListenAddress.port).isEqualTo(listenPort.toInt())
-            }
-
-
-            it("should set default listen address") {
-                assertThat(result.serverListenAddress.address.hostAddress).isEqualTo("0.0.0.0")
-            }
-
-            it("should set proper health check api port") {
-                assertThat(result.healthCheckApiListenAddress.port).isEqualTo(healthCheckApiPort.toInt())
-            }
-
-            it("should set default health check api address") {
-                assertThat(result.healthCheckApiListenAddress.address.hostAddress).isEqualTo("0.0.0.0")
-            }
-
-            it("should set proper first request delay") {
-                assertThat(result.configurationProviderParams.firstRequestDelay)
-                        .isEqualTo(Duration.ofSeconds(firstRequestDelay.toLong()))
-            }
-
-            it("should set proper request interval") {
-                assertThat(result.configurationProviderParams.requestInterval)
-                        .isEqualTo(Duration.ofSeconds(requestInterval.toLong()))
-            }
-
-            it("should set proper security configuration") {
-                assertThat(result.securityConfiguration.keys.isEmpty()).isFalse()
-
-                val keys = result.securityConfiguration.keys.orNull() as SecurityKeys
-                assertNotNull(keys.keyStore())
-                assertNotNull(keys.trustStore())
-                keys.keyStorePassword().useChecked {
-                    assertThat(it).isEqualTo(keyStorePassword.toCharArray())
-
-                }
-                keys.trustStorePassword().useChecked {
-                    assertThat(it).isEqualTo(trustStorePassword.toCharArray())
-                }
-            }
-
-            it("should set proper log level") {
-                assertThat(result.logLevel).isEqualTo(LogLevel.DEBUG)
-            }
-        }
-
-        describe("required parameter is absent") {
-            on("missing listen port") {
-                it("should throw exception") {
-                    assertThat(
-                            cut.parseExpectingFailure(
-                                    "--ssl-disable",
-                                    "--first-request-delay", firstRequestDelay,
-                                    "--request-interval", requestInterval
-                            )
-                    ).isInstanceOf(WrongArgumentError::class.java)
-                }
-            }
-            on("missing configuration url") {
-                it("should throw exception") {
-                    assertThat(
-                            cut.parseExpectingFailure(
-                                    "--listen-port", listenPort,
-                                    "--ssl-disable",
-                                    "--first-request-delay", firstRequestDelay,
-                                    "--request-interval", requestInterval
-                            )
-                    ).isInstanceOf(WrongArgumentError::class.java)
-                }
-            }
-        }
-
-        describe("correct log level not provided") {
-            on("missing log level") {
-                it("should set default INFO value") {
-                    val config = cut.parseExpectingSuccess(
-                            "--kafka-bootstrap-servers", kafkaBootstrapServers,
-                            "--health-check-api-port", healthCheckApiPort,
-                            "--listen-port", listenPort,
-                            "--first-request-delay", firstRequestDelay,
-                            "--request-interval", requestInterval,
-                            "--key-store", "/tmp/keys.p12",
-                            "--trust-store", "/tmp/trust.p12",
-                            "--key-store-password", keyStorePassword,
-                            "--trust-store-password", trustStorePassword
-                    )
-
-                    assertThat(config.logLevel).isEqualTo(LogLevel.INFO)
-                }
-            }
-
-            on("incorrect log level") {
-                it("should set default INFO value") {
-                    val config = cut.parseExpectingSuccess(
-                            "--kafka-bootstrap-servers", kafkaBootstrapServers,
-                            "--health-check-api-port", healthCheckApiPort,
-                            "--listen-port", listenPort,
-                            "--first-request-delay", firstRequestDelay,
-                            "--request-interval", requestInterval,
-                            "--key-store", "/tmp/keys.p12",
-                            "--trust-store", "/tmp/trust.p12",
-                            "--key-store-password", keyStorePassword,
-                            "--trust-store-password", trustStorePassword,
-                            "--log-level", "1"
-                    )
-
-                    assertThat(config.logLevel).isEqualTo(LogLevel.INFO)
-                }
-            }
-        }
-    }
-})
diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ArgHvVesConfigurationTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ArgHvVesConfigurationTest.kt
new file mode 100644
index 00000000..dbe757c4
--- /dev/null
+++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ArgHvVesConfigurationTest.kt
@@ -0,0 +1,73 @@
+/*
+ * ============LICENSE_START=======================================================
+ * dcaegen2-collectors-veshv
+ * ================================================================================
+ * Copyright (C) 2018-2019 NOKIA
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.collectors.veshv.config.impl
+
+import org.assertj.core.api.Assertions.assertThat
+import org.jetbrains.spek.api.Spek
+import org.jetbrains.spek.api.dsl.describe
+import org.jetbrains.spek.api.dsl.given
+import org.jetbrains.spek.api.dsl.it
+import org.jetbrains.spek.api.dsl.on
+import org.onap.dcae.collectors.veshv.commandline.WrongArgumentError
+import org.onap.dcae.collectors.veshv.tests.utils.absoluteResourcePath
+import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingFailure
+import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingSuccess
+import java.io.File
+
+/**
+ * @author Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
+ * @since May 2018
+ */
+object ArgVesHvConfigurationTest : Spek({
+    lateinit var cut: ArgHvVesConfiguration
+    val configFilePath = javaClass.absoluteResourcePath("sampleConfig.json")
+
+    beforeEachTest {
+        cut = ArgHvVesConfiguration()
+    }
+
+    describe("parsing arguments") {
+        given("all parameters are present in the long form") {
+            lateinit var result: File
+
+            beforeEachTest {
+                result = cut.parseExpectingSuccess(
+                        "--configuration-file", configFilePath
+                )
+            }
+
+            it("should read proper configuration file") {
+                assertThat(result.exists()).isTrue()
+            }
+        }
+
+        describe("required parameter is absent") {
+            on("missing configuration file path") {
+                it("should throw exception") {
+                    assertThat(
+                            cut.parseExpectingFailure(
+                                    "--non-existing-option", ""
+                            )
+                    ).isInstanceOf(WrongArgumentError::class.java)
+                }
+            }
+        }
+    }
+})
\ No newline at end of file
diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt
new file mode 100644
index 00000000..12396d23
--- /dev/null
+++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/ConfigurationValidatorTest.kt
@@ -0,0 +1,138 @@
+/*
+ * ============LICENSE_START=======================================================
+ * dcaegen2-collectors-veshv
+ * ================================================================================
+ * Copyright (C) 2019 NOKIA
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.dcae.collectors.veshv.config.impl
+
+import arrow.core.None
+import arrow.core.Some
+import com.nhaarman.mockitokotlin2.mock
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.fail
+import org.jetbrains.spek.api.Spek
+import org.jetbrains.spek.api.dsl.describe
+import org.jetbrains.spek.api.dsl.it
+import org.onap.dcae.collectors.veshv.config.api.model.routing
+import org.onap.dcae.collectors.veshv.config.impl.ConfigurationValidator.Companion.DEFAULT_LOG_LEVEL
+import org.onap.dcae.collectors.veshv.utils.logging.LogLevel
+import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys
+import java.time.Duration
+
+internal object ConfigurationValidatorTest : Spek({
+    describe("ConfigurationValidator") {
+        val cut = ConfigurationValidator()
+
+        describe("validating partial configuration with missing fields") {
+            val config = PartialConfiguration(
+                    Some(PartialServerConfig(listenPort = Some(1)))
+            )
+
+            it("should return ValidationError") {
+                val result = cut.validate(config)
+                assertThat(result.isLeft()).isTrue()
+            }
+        }
+
+        describe("validating configuration with empty log level") {
+            val config = PartialConfiguration(
+                    Some(PartialServerConfig(
+                            Some(1),
+                            Some(2),
+                            Some(3)
+                    )),
+                    Some(PartialCbsConfig(
+                            Some(5),
+                            Some(3)
+                    )),
+                    Some(PartialSecurityConfig(
+                            Some(mock())
+                    )),
+                    Some(PartialCollectorConfig(
+                            Some(true),
+                            Some(4),
+                            Some(emptyList()),
+                            Some(routing { }.build())
+                    )),
+                    None
+            )
+
+            it("should use default log level") {
+                val result = cut.validate(config)
+                result.fold(
+                        {
+                            fail("Configuration should have been created successfully")
+                        },
+                        {
+                            assertThat(it.logLevel).isEqualTo(DEFAULT_LOG_LEVEL)
+                        }
+                )
+            }
+        }
+
+        describe("validating complete configuration") {
+            val idleTimeoutSec = 10
+            val firstReqDelaySec = 10
+            val securityKeys = Some(mock<SecurityKeys>())
+            val routing = routing { }.build()
+
+            val config = PartialConfiguration(
+                    Some(PartialServerConfig(
+                            Some(1),
+                            Some(idleTimeoutSec),
+                            Some(2)
+                    )),
+                    Some(PartialCbsConfig(
+                            Some(firstReqDelaySec),
+                            Some(3)
+                    )),
+                    Some(PartialSecurityConfig(
+                            securityKeys
+                    )),
+                    Some(PartialCollectorConfig(
+                            Some(true),
+                            Some(4),
+                            Some(emptyList()),
+                            Some(routing)
+                    )),
+                    Some(LogLevel.INFO)
+            )
+
+            it("should create valid configuration") {
+                val result = cut.validate(config)
+                result.fold(
+                        {
+                            fail("Configuration should have been created successfully")
+                        },
+                        {
+                            assertThat(it.server.idleTimeout)
+                                    .isEqualTo(Duration.ofSeconds(idleTimeoutSec.toLong()))
+
+                            assertThat(it.security.keys)
+                                    .isEqualTo(securityKeys)
+
+                            assertThat(it.cbs.firstRequestDelay)
+                                    .isEqualTo(Duration.ofSeconds(firstReqDelaySec.toLong()))
+
+                            assertThat(it.collector.routing)
+                                    .isEqualTo(routing)
+                        }
+                )
+            }
+        }
+    }
+})
diff --git a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/api/FileConfigurationReaderTest.kt b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/FileConfigurationReaderTest.kt
index 55da7d02..ab99f13c 100644
--- a/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/api/FileConfigurationReaderTest.kt
+++ b/sources/hv-collector-configuration/src/test/kotlin/org/onap/dcae/collectors/veshv/config/impl/FileConfigurationReaderTest.kt
@@ -17,21 +17,16 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.collectors.veshv.config.api
+package org.onap.dcae.collectors.veshv.config.impl
 
 import arrow.core.Some
-import org.jetbrains.spek.api.Spek
 import org.assertj.core.api.Assertions.assertThat
+import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
 import org.jetbrains.spek.api.dsl.it
 import org.onap.dcae.collectors.veshv.config.api.model.Routing
-import org.onap.dcae.collectors.veshv.config.impl.FileConfigurationReader
-import org.onap.dcae.collectors.veshv.config.impl.PartialCbsConfig
-import org.onap.dcae.collectors.veshv.config.impl.PartialKafkaConfig
-import org.onap.dcae.collectors.veshv.config.impl.PartialSecurityConfig
-import org.onap.dcae.collectors.veshv.config.impl.PartialServerConfig
+import org.onap.dcae.collectors.veshv.tests.utils.resourceAsStream
 import org.onap.dcae.collectors.veshv.utils.logging.LogLevel
-import java.io.InputStreamReader
 import java.io.StringReader
 import java.net.InetSocketAddress
 
@@ -41,12 +36,13 @@ import java.net.InetSocketAddress
  */
 internal object FileConfigurationReaderTest : Spek({
     describe("A configuration loader utility") {
+        val cut = FileConfigurationReader()
 
         describe("partial configuration loading") {
             it("parses enumerations") {
                 val input = """{"logLevel":"ERROR"}"""
 
-                val config = FileConfigurationReader().loadConfig(StringReader(input))
+                val config = cut.loadConfig(StringReader(input))
                 assertThat(config.logLevel).isEqualTo(Some(LogLevel.ERROR))
             }
 
@@ -58,14 +54,13 @@ internal object FileConfigurationReaderTest : Spek({
                 }
             }
             """.trimIndent()
-                val config = FileConfigurationReader().loadConfig(StringReader(input))
+                val config = cut.loadConfig(StringReader(input))
                 assertThat(config.server.nonEmpty()).isTrue()
-                assertThat(config.server.orNull()?.healthCheckApiPort).isEqualTo(Some(12002))
                 assertThat(config.server.orNull()?.listenPort).isEqualTo(Some(12003))
             }
 
             it("parses ip address") {
-                val input = """{  "kafka" : {
+                val input = """{  "collector" : {
                     "kafkaServers": [
                       "192.168.255.1:5005",
                       "192.168.255.26:5006"
@@ -73,13 +68,13 @@ internal object FileConfigurationReaderTest : Spek({
                   }
                 }"""
 
-                val config = FileConfigurationReader().loadConfig(StringReader(input))
-                assertThat(config.kafka.nonEmpty()).isTrue()
-                val kafka = config.kafka.orNull() as PartialKafkaConfig
-                assertThat(kafka.kafkaServers.nonEmpty()).isTrue()
-                val addresses = kafka.kafkaServers.orNull() as Array<InetSocketAddress>
+                val config = cut.loadConfig(StringReader(input))
+                assertThat(config.collector.nonEmpty()).isTrue()
+                val collector = config.collector.orNull() as PartialCollectorConfig
+                assertThat(collector.kafkaServers.nonEmpty()).isTrue()
+                val addresses = collector.kafkaServers.orNull() as List<InetSocketAddress>
                 assertThat(addresses)
-                        .isEqualTo(arrayOf(
+                        .isEqualTo(listOf(
                                 InetSocketAddress("192.168.255.1", 5005),
                                 InetSocketAddress("192.168.255.26", 5006)
                         ))
@@ -87,7 +82,7 @@ internal object FileConfigurationReaderTest : Spek({
 
             it("parses routing array with RoutingAdapter") {
                 val input = """{
-                    "kafka" : {
+                    "collector" : {
                         "routing" : [
                             {
                               "fromDomain": "perf3gpp",
@@ -96,30 +91,38 @@ internal object FileConfigurationReaderTest : Spek({
                         ]
                     }
                 }""".trimIndent()
-                val config = FileConfigurationReader().loadConfig(StringReader(input))
-                assertThat(config.kafka.nonEmpty()).isTrue()
-                val kafka = config.kafka.orNull() as PartialKafkaConfig
-                assertThat(kafka.routing.nonEmpty()).isTrue()
-                val routing = kafka.routing.orNull() as Routing
+                val config = cut.loadConfig(StringReader(input))
+                assertThat(config.collector.nonEmpty()).isTrue()
+                val collector = config.collector.orNull() as PartialCollectorConfig
+                assertThat(collector.routing.nonEmpty()).isTrue()
+                val routing = collector.routing.orNull() as Routing
                 routing.run {
                     assertThat(routes.size).isEqualTo(1)
                     assertThat(routes[0].domain).isEqualTo("perf3gpp")
                     assertThat(routes[0].targetTopic).isEqualTo("HV_VES_PERF3GPP")
                 }
             }
+
+            it("parses invalid log level string to empty option") {
+                val input = """{
+                    "logLevel": something
+                }""".trimMargin()
+                val config = cut.loadConfig(input.reader())
+
+                assertThat(config.logLevel.isEmpty())
+            }
         }
 
         describe("complete file loading") {
             it("loads actual file") {
-                val config = FileConfigurationReader().loadConfig(
-                        InputStreamReader(
-                                FileConfigurationReaderTest.javaClass.getResourceAsStream("/sampleConfig.json")))
+                val config = cut.loadConfig(
+                        javaClass.resourceAsStream("/sampleConfig.json"))
+
                 assertThat(config).isNotNull
                 assertThat(config.logLevel).isEqualTo(Some(LogLevel.ERROR))
 
                 assertThat(config.security.nonEmpty()).isTrue()
                 val security = config.security.orNull() as PartialSecurityConfig
-                assertThat(security.sslDisable.orNull()).isFalse()
                 assertThat(security.keys.nonEmpty()).isTrue()
 
                 assertThat(config.cbs.nonEmpty()).isTrue()
@@ -127,21 +130,24 @@ internal object FileConfigurationReaderTest : Spek({
                 assertThat(cbs.firstRequestDelaySec).isEqualTo(Some(7))
                 assertThat(cbs.requestIntervalSec).isEqualTo(Some(900))
 
-                assertThat(config.kafka.nonEmpty()).isTrue()
-                val kafka = config.kafka.orNull() as PartialKafkaConfig
-                assertThat(kafka.kafkaServers.nonEmpty()).isTrue()
-                assertThat(kafka.routing.nonEmpty()).isTrue()
+                assertThat(config.collector.nonEmpty()).isTrue()
+                val collector = config.collector.orNull() as PartialCollectorConfig
+                collector.run {
+                    assertThat(dummyMode).isEqualTo(Some(false))
+                    assertThat(maxRequestSizeBytes).isEqualTo(Some(512000))
+                    assertThat(kafkaServers.nonEmpty()).isTrue()
+                    assertThat(routing.nonEmpty()).isTrue()
+                }
 
                 assertThat(config.server.nonEmpty()).isTrue()
                 val server = config.server.orNull() as PartialServerConfig
                 server.run {
-                    assertThat(dummyMode).isEqualTo(Some(false))
-                    assertThat(healthCheckApiPort).isEqualTo(Some(5000))
                     assertThat(idleTimeoutSec).isEqualTo(Some(1200))
                     assertThat(listenPort).isEqualTo(Some(6000))
-                    assertThat(maximumPayloadSizeBytes).isEqualTo(Some(512000))
+                    assertThat(maxPayloadSizeBytes).isEqualTo(Some(512000))
                 }
             }
         }
     }
-})
\ No newline at end of file
+})
+
diff --git a/sources/hv-collector-configuration/src/test/resources/sampleConfig.json b/sources/hv-collector-configuration/src/test/resources/sampleConfig.json
index b64df05a..b49085e8 100644
--- a/sources/hv-collector-configuration/src/test/resources/sampleConfig.json
+++ b/sources/hv-collector-configuration/src/test/resources/sampleConfig.json
@@ -1,16 +1,16 @@
 {
-  "server" : {
-    "healthCheckApiPort" : 5000,
-    "listenPort" : 6000,
-    "idleTimeoutSec" : 1200,
-    "maximumPayloadSizeBytes" : 512000,
-    "dummyMode" : false
+  "logLevel": "ERROR",
+  "server": {
+    "healthCheckApiPort": 5000,
+    "listenPort": 6000,
+    "idleTimeoutSec": 1200,
+    "maxPayloadSizeBytes": 512000
   },
-  "cbs" : {
+  "cbs": {
     "firstRequestDelaySec": 7,
     "requestIntervalSec": 900
   },
-  "security" : {
+  "security": {
     "sslDisable": false,
     "keys": {
       "keyStoreFile": "test.ks.pkcs12",
@@ -19,7 +19,9 @@
       "trustStorePassword": "changeMeToo"
     }
   },
-  "kafka" : {
+  "collector": {
+    "dummyMode": false,
+    "maxRequestSizeBytes": 512000,
     "kafkaServers": [
       "192.168.255.1:5005",
       "192.168.255.1:5006"
@@ -30,6 +32,5 @@
         "toTopic": "HV_VES_PERF3GPP"
       }
     ]
-  },
-  "logLevel" : "ERROR"
+  }
 }
\ No newline at end of file