updating docs

mejuhi · Mar 28, 2018 · 43ead64 · 43ead64
1 parent 51567e9
commit 43ead64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/docs/source/corda-configuration-file.rst b/docs/source/corda-configuration-file.rst
@@ -22,6 +22,8 @@ Format
 The Corda configuration file uses the HOCON format which is superset of JSON. Please visit
 `<https://github.com/typesafehub/config/blob/master/HOCON.md>`_ for further details.
 
+Please do NOT use double quotes in configuration keys.
+
 Defaults
 --------
 A set of default configuration options are loaded from the built-in resource file ``/node/src/main/resources/reference.conf``.

diff --git a/docs/source/example-code/src/main/resources/example-node.conf b/docs/source/example-code/src/main/resources/example-node.conf
@@ -3,9 +3,9 @@ keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
 dataSourceProperties : {
     dataSourceClassName : org.h2.jdbcx.JdbcDataSource
-    "dataSource.url" : "jdbc:h2:file:"${baseDirectory}"/persistence"
-    "dataSource.user" : sa
-    "dataSource.password" : ""
+    dataSource.url : "jdbc:h2:file:"${baseDirectory}"/persistence"
+    dataSource.user : sa
+    dataSource.password : ""
 }
 p2pAddress : "my-corda-node:10002"
 rpcSettings = {

diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
@@ -10,7 +10,6 @@ import net.corda.core.internal.div
 import net.corda.core.internal.exists
 import net.corda.nodeapi.internal.*
 import net.corda.nodeapi.internal.config.SSLConfiguration
-import net.corda.nodeapi.internal.config.toProperties
 import net.corda.nodeapi.internal.crypto.X509KeyStore
 import net.corda.nodeapi.internal.crypto.loadKeyStore
 import net.corda.nodeapi.internal.crypto.save
@@ -43,7 +42,7 @@ object ConfigHelper {
         val entrySet = finalConfig.entrySet().filter { entry -> entry.key.contains("\"") }
         for (mutableEntry in entrySet) {
             val key = mutableEntry.key
-                log.error("Config files should not contain \" in property names. Please fix: ${key}")
+            log.error("Config files should not contain \" in property names. Please fix: ${key}")
         }
 
         return finalConfig