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 #141 from typesafehub/fix/havocp-140

Browse Source 
Handle a concatenation that doesn't resolve
This commit is contained in:
Havoc Pennington 2014-02-10 16:38:46 -05:00
commit 49770d9290
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/src/main/java/com/typesafe/config/impl/ConfigConcatenation.java
View File

@ -185,10 +185,15 @@ final class ConfigConcatenation extends AbstractConfigValue implements Unmergeab
// now need to concat everything
List<AbstractConfigValue> joined = consolidate(resolved);
if (joined.size() != 1)
// if unresolved is allowed we can just become another
// ConfigConcatenation
if (joined.size() > 1 && context.options().getAllowUnresolved())
return new ConfigConcatenation(this.origin(), joined);
else if (joined.size() != 1)
throw new ConfigException.BugOrBroken(
"Resolved list should always join to exactly one value, not " + joined);
return joined.get(0);
else
return joined.get(0);
}
@Override

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

@ -1122,7 +1122,7 @@ class ConfigTest extends TestUtils {
def allowUnresolvedDoesAllowUnresolved() {
val values = ConfigFactory.parseString("{ foo = 1, bar = 2, m = 3, n = 4}")
assertTrue("config with no substitutions starts as resolved", values.isResolved)
val unresolved = ConfigFactory.parseString("a = ${foo}, b = ${bar}, c { x = ${m}, y = ${n} }, alwaysResolveable=${alwaysValue}, alwaysValue=42")
val unresolved = ConfigFactory.parseString("a = ${foo}, b = ${bar}, c { x = ${m}, y = ${n}, z = foo${m}bar }, alwaysResolveable=${alwaysValue}, alwaysValue=42")
assertFalse("config with substitutions starts as not resolved", unresolved.isResolved)
// resolve() by default throws with unresolveable substs
@ -1140,6 +1140,8 @@ class ConfigTest extends TestUtils {
for (k <- Seq("a", "b", "c.x", "c.y")) {
intercept[ConfigException.NotResolved] { allowedUnresolved.getInt(k) }
}
intercept[ConfigException.NotResolved] { allowedUnresolved.getString("c.z") }
// and the partially-resolved thing is not resolved
assertFalse("partially-resolved object is not resolved", allowedUnresolved.isResolved)
@ -1150,6 +1152,7 @@ class ConfigTest extends TestUtils {
for (kv <- Seq("a" -> 1, "b" -> 2, "c.x" -> 3, "c.y" -> 4)) {
assertEquals(kv._2, resolved.getInt(kv._1))
}
assertEquals("foo3bar", resolved.getString("c.z"))
assertTrue("fully resolved object is resolved", resolved.isResolved)
}
@ -1159,6 +1162,7 @@ class ConfigTest extends TestUtils {
for (kv <- Seq("a" -> 1, "b" -> 2, "c.x" -> 3, "c.y" -> 4)) {
assertEquals(kv._2, resolved.getInt(kv._1))
}
assertEquals("foo3bar", resolved.getString("c.z"))
assertTrue("fully resolved object is resolved", resolved.isResolved)
}
}