fix invalid json files (duplicate keys)

rbx · ktf · commit 7ce75f76f53a · 2018-02-03T21:22:53.000+01:00
diff --git a/CCDB/config/conditions-client.json b/CCDB/config/conditions-client.json
@@ -1,36 +1,34 @@
 {
     "fairMQOptions":
     {
-        "device":
-        {
+        "devices":
+        [{
             "id": "parmq-client",
-            "channel":
-            {
+            "channels":
+            [{
                 "name": "data-put",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "push",
                     "method": "connect",
                     "address": "tcp://localhost:25005",
                     "sndBufSize": "200",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            },
-            "channel":
-            {
+                }]
+            },{
                 "name": "data-get",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "req",
                     "method": "connect",
                     "address": "tcp://localhost:25006",
                     "sndBufSize": "1000",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            }
-        }
+                }]
+            }]
+        }]
     }
 }
 
diff --git a/CCDB/config/conditions-server.json b/CCDB/config/conditions-server.json
@@ -1,61 +1,55 @@
 {
     "fairMQOptions":
     {
-        "device":
-        {
+        "devices":
+        [{
             "id": "parmq-server",
-            "channel":
-            {
+            "channels":
+            [{
                 "name": "data-put",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "pull",
                     "method": "bind",
                     "address": "tcp://*:25005",
                     "sndBufSize": "1000",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            },
-            "channel":
-            {
+                }]
+            },{
                 "name": "data-get",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "rep",
                     "method": "bind",
                     "address": "tcp://*:25006",
                     "sndBufSize": "1000",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            },
-            "channel":
-            {
+                }]
+            },{
                 "name": "broker-put",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "push",
                     "method": "connect",
                     "address": "tcp://127.0.0.1:5558",
                     "sndBufSize": "1000",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            },
-            "channel":
-            {
+                }]
+            },{
                 "name": "broker-get",
-                "socket":
-                {
+                "sockets":
+                [{
                     "type": "req",
                     "method": "connect",
                     "address": "tcp://127.0.0.1:5559",
                     "sndBufSize": "1000",
                     "rcvBufSize": "1000",
                     "rateLogging": "0"
-                }
-            }
-        }
+                }]
+            }]
+        }]
     }
 }
diff --git a/Examples/flp2epn/src/flp2epn.json b/Examples/flp2epn/src/flp2epn.json
@@ -4,8 +4,8 @@
         "devices":
         [{
             "id": "flpEx",
-            "channel":
-            {
+            "channels":
+            [{
                 "name": "data",
                 "socket":
                 {
@@ -16,7 +16,7 @@
                     "rcvBufSize": "1000",
                     "rateLogging": "1"
                 }
-            }
+            }]
         },
         {
             "id": "proxy",
@@ -47,8 +47,8 @@
         },
         {
             "id": "epnEx",
-            "channel":
-            {
+            "channels":
+            [{
                 "name": "data",
                 "socket":
                 {
@@ -59,7 +59,7 @@
                     "rcvBufSize": "1000",
                     "rateLogging": "1"
                 }
-            }
+            }]
         }]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`"devices":`
`5`	`5`	`[{`
`6`	`6`	`"id": "flpEx",`
`7`		`- "channel":`
`8`		`- {`
	`7`	`+ "channels":`
	`8`	`+ [{`
`9`	`9`	`"name": "data",`
`10`	`10`	`"socket":`
`11`	`11`	`{`
`@@ -16,7 +16,7 @@`
`16`	`16`	`"rcvBufSize": "1000",`
`17`	`17`	`"rateLogging": "1"`
`18`	`18`	`}`
`19`		`- }`
	`19`	`+ }]`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"id": "proxy",`
`@@ -47,8 +47,8 @@`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"id": "epnEx",`
`50`		`- "channel":`
`51`		`- {`
	`50`	`+ "channels":`
	`51`	`+ [{`
`52`	`52`	`"name": "data",`
`53`	`53`	`"socket":`
`54`	`54`	`{`
`@@ -59,7 +59,7 @@`
`59`	`59`	`"rcvBufSize": "1000",`
`60`	`60`	`"rateLogging": "1"`
`61`	`61`	`}`
`62`		`- }`
	`62`	`+ }]`
`63`	`63`	`}]`
`64`	`64`	`}`
`65`	`65`	`}`