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

Merge pull request #338 from fpringvaldsen/comment-fix

Browse Source 
Stop rendering origin comments in config documents
This commit is contained in:
Havoc Pennington 2015-07-14 11:04:44 -04:00
commit 132419918a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
package com.typesafe.config.impl; package com.typesafe.config.impl;
import com.typesafe.config.*;
import com.typesafe.config.parser.ConfigDocument; import com.typesafe.config.parser.ConfigDocument;
import com.typesafe.config.ConfigParseOptions;
import com.typesafe.config.ConfigValue;
import com.typesafe.config.ConfigException;
import java.io.StringReader; import java.io.StringReader;
import java.util.Iterator; import java.util.Iterator;
@ -34,7 +32,9 @@ final class SimpleConfigDocument implements ConfigDocument {
public ConfigDocument withValue(String path, ConfigValue newValue) { public ConfigDocument withValue(String path, ConfigValue newValue) {
if (newValue == null) if (newValue == null)
throw new ConfigException.BugOrBroken("null value for " + path + " passed to withValue"); throw new ConfigException.BugOrBroken("null value for " + path + " passed to withValue");
return withValueText(path, newValue.render().trim()); ConfigRenderOptions options = ConfigRenderOptions.defaults();
options = options.setOriginComments(false);
return withValueText(path, newValue.render(options).trim());
} }
@Override @Override

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

@ -438,11 +438,11 @@ class ConfigDocumentTest extends TestUtils {
assertEquals("a : 1", configDocument.withValueText("a", "1").render) assertEquals("a : 1", configDocument.withValueText("a", "1").render)
val mapVal = ConfigValueFactory.fromAnyRef(Map("a" -> 1, "b" -> 2).asJava) val mapVal = ConfigValueFactory.fromAnyRef(Map("a" -> 1, "b" -> 2).asJava)
assertEquals("a : {\n # hardcoded value\n \"a\" : 1,\n # hardcoded value\n \"b\" : 2\n}", assertEquals("a : {\n \"a\" : 1,\n \"b\" : 2\n}",
configDocument.withValue("a", mapVal).render) configDocument.withValue("a", mapVal).render)
val arrayVal = ConfigValueFactory.fromAnyRef(List(1, 2).asJava) val arrayVal = ConfigValueFactory.fromAnyRef(List(1, 2).asJava)
assertEquals("a : [\n # hardcoded value\n 1,\n # hardcoded value\n 2\n]", configDocument.withValue("a", arrayVal).render) assertEquals("a : [\n 1,\n 2\n]", configDocument.withValue("a", arrayVal).render)
} }
@Test @Test
@ -452,7 +452,7 @@ class ConfigDocumentTest extends TestUtils {
val configVal = ConfigValueFactory.fromAnyRef(Map("a" -> 1, "b" -> 2).asJava) 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 } }", assertEquals("{ a : {\n \"a\" : 1,\n \"b\" : 2\n } }",
configDocument.withValue("a", configVal).render) configDocument.withValue("a", configVal).render)
} }
} }