Flatten configuration structure

Change-Id: I9a5a53f3c4cf0973d071f2bc6962016b5613972d
Issue-ID: DCAEGEN2-710
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>

2 files changed, 19 insertions, 35 deletions

diff --git a/development/configuration/base.json b/development/configuration/base.json
index c89a8288..13c4ea19 100644
--- a/development/configuration/base.json
+++ b/development/configuration/base.json
@@ -1,20 +1,12 @@
 {
   "logLevel": "DEBUG",
-  "server": {
-    "listenPort": 6061,
-    "idleTimeoutSec": 60,
-    "maxPayloadSizeBytes": 1048576
-  },
-  "cbs": {
-    "firstRequestDelaySec": 10,
-    "requestIntervalSec": 5
-  },
-  "security": {
-    "keys": {
-      "keyStoreFile": "/etc/ves-hv/ssl/server.p12",
-      "keyStorePassword": "onaponap",
-      "trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
-      "trustStorePassword": "onaponap"
-    }
-  }
+  "server.listenPort": 6061,
+  "server.idleTimeoutSec": 60,
+  "server.maxPayloadSizeBytes": 1048576,
+  "cbs.firstRequestDelaySec": 10,
+  "cbs.requestIntervalSec": 5,
+  "security.keys.keyStoreFile": "/etc/ves-hv/ssl/server.p12",
+  "security.keys.keyStorePassword": "onaponap",
+  "security.keys.trustStoreFile": "/etc/ves-hv/ssl/trust.p12",
+  "security.keys.trustStorePassword": "onaponap"
 }
\ No newline at end of file
diff --git a/development/configuration/local.json b/development/configuration/local.json
index a1a8b533..79abe03b 100644
--- a/development/configuration/local.json
+++ b/development/configuration/local.json
@@ -1,20 +1,12 @@
 {
   "logLevel": "DEBUG",
-  "server": {
-    "listenPort": 8061,
-    "idleTimeoutSec": 60,
-    "maxPayloadSizeBytes": 1048576
-  },
-  "cbs": {
-    "firstRequestDelaySec": 10,
-    "requestIntervalSec": 5
-  },
-  "security": {
-    "keys": {
-      "keyStoreFile": "development/ssl/server.p12",
-      "keyStorePassword": "onaponap",
-      "trustStoreFile": "development/ssl/trust.p12",
-      "trustStorePassword": "onaponap"
-    }
-  }
-}
\ No newline at end of file
+  "server.listenPort": 8061,
+  "server.idleTimeoutSec": 60,
+  "server.maxPayloadSizeBytes": 1048576,
+  "cbs.firstRequestDelaySec": 10,
+  "cbs.requestIntervalSec": 5,
+  "security.keys.keyStoreFile": "development/ssl/server.p12",
+  "security.keys.keyStorePassword": "onaponap",
+  "security.keys.trustStoreFile": "development/ssl/trust.p12",
+  "security.keys.trustStorePassword": "onaponap"
+}