github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-02-19 15:50:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #309 from fpringvaldsen/maint/bugfixes

Browse Source 
Fix bug with ConfigDocument.setValue
This commit is contained in:
Havoc Pennington 2015-04-09 20:31:26 -04:00
commit 462181578a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/main/java/com/typesafe/config/impl/SimpleConfigDocument.java
View File

@ -27,7 +27,7 @@ final class SimpleConfigDocument implements ConfigDocument {
} }
public ConfigDocument setValue(String path, ConfigValue newValue) { public ConfigDocument setValue(String path, ConfigValue newValue) {
return setValue(path, newValue.render()); return setValue(path, newValue.render().trim());
} }
public ConfigDocument removeValue(String path) { public ConfigDocument removeValue(String path) {

15
config/src/test/scala/com/typesafe/config/impl/ConfigDocumentTest.scala
View File

@ -1,7 +1,6 @@
package com.typesafe.config.impl package com.typesafe.config.impl
import java.io.{ BufferedReader, FileReader } import java.io.{ BufferedReader, FileReader }
import java.nio.charset.StandardCharsets
import java.nio.file.{ Paths, Files } import java.nio.file.{ Paths, Files }
import com.typesafe.config._ import com.typesafe.config._
@ -9,6 +8,8 @@ import com.typesafe.config.parser._
import org.junit.Assert._ import org.junit.Assert._
import org.junit.Test import org.junit.Test
import scala.collection.JavaConverters._
class ConfigDocumentTest extends TestUtils { class ConfigDocumentTest extends TestUtils {
private def configDocumentReplaceJsonTest(origText: String, finalText: String, newValue: String, replacePath: String) { private def configDocumentReplaceJsonTest(origText: String, finalText: String, newValue: String, replacePath: String) {
val configDocument = ConfigDocumentFactory.parseString(origText, ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON)) val configDocument = ConfigDocumentFactory.parseString(origText, ConfigParseOptions.defaults().setSyntax(ConfigSyntax.JSON))
@ -437,4 +438,16 @@ class ConfigDocumentTest extends TestUtils {
assertEquals(" a : 1", configDocument.setValue("a", "1").render) assertEquals(" a : 1", configDocument.setValue("a", "1").render)
} }
@Test
def configDocumentConfigObjectInsertion {
val origText = "{ a : b }"
val configDocument = ConfigDocumentFactory.parseString(origText)
val configVal = ConfigValueFactory.fromAnyRef(Map("a" -> 1, "b" -> 2).asJava)
assertEquals("{ a : {\n # hardcoded value\n \"a\" : 1,\n # hardcoded value\n \"b\" : 2\n } }",
configDocument.setValue("a", configVal).render)
}
} }