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

change test name and remove unnecessary braces

Browse Source
This commit is contained in:
Ryan O'Neill 2015-04-22 18:06:59 -07:00
parent 2506f745f7
commit b45345e3ac
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/java/com/typesafe/config/impl/SimpleConfig.java
View File

@ -75,9 +75,8 @@ final class SimpleConfig implements Config, MergeableValue, Serializable {
if (resolved == object) if (resolved == object)
return this; return this;
else { else
return new SimpleConfig((AbstractConfigObject) resolved); return new SimpleConfig((AbstractConfigObject) resolved);
}
} }
private ConfigValue hasPathPeek(String pathExpression) { private ConfigValue hasPathPeek(String pathExpression) {

2
config/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
View File

@ -802,7 +802,7 @@ class ConfParserTest extends TestUtils {
} }
@Test @Test
def includeWithSubstitutionsInArray() { def includeWithSubstitutionsFromList() {
val conf = ConfigFactory.parseString("include file(" + jsonQuotedResourceFile("include-from-list") + ")") val conf = ConfigFactory.parseString("include file(" + jsonQuotedResourceFile("include-from-list") + ")")
val resolved = conf.resolve() val resolved = conf.resolve()