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

In ConfigSubstitution, never ignoreFallbacks

Browse Source 
Because the upcoming "allow self-references" behavior will
require looking at fallbacks.
This commit is contained in:
Havoc Pennington 2012-03-29 08:54:52 -04:00
parent 5566a091af
commit 6de4a991d4
1 changed files with 17 additions and 8 deletions

25
config/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java
View File

@ -32,7 +32,10 @@ final class ConfigSubstitution extends AbstractConfigValue implements
final private List<Object> pieces;
// the length of any prefixes added with relativized()
final private int prefixLength;
final private boolean ignoresFallbacks;
// this is just here to avoid breaking serialization;
// it is always false at the moment.
final private boolean ignoresFallbacks = false;
ConfigSubstitution(ConfigOrigin origin, List<Object> pieces) {
this(origin, pieces, 0, false);
@ -43,11 +46,14 @@ final class ConfigSubstitution extends AbstractConfigValue implements
super(origin);
this.pieces = pieces;
this.prefixLength = prefixLength;
this.ignoresFallbacks = ignoresFallbacks;
for (Object p : pieces) {
if (p instanceof Path)
throw new RuntimeException("broken here");
}
if (ignoresFallbacks)
throw new ConfigException.BugOrBroken("ConfigSubstitution may never ignore fallbacks");
}
@Override
@ -108,12 +114,15 @@ final class ConfigSubstitution extends AbstractConfigValue implements
@Override
protected AbstractConfigValue mergedWithNonObject(AbstractConfigValue fallback) {
// if the optional substitution ends up getting deleted (because it is
// not present), we'll have to use the fallback. So delay the merge.
if (pieces.size() == 1 && ((SubstitutionExpression) pieces.get(0)).optional())
return mergedLater(fallback);
else
return super.mergedWithNonObject(fallback);
// We may need the fallback for two reasons:
// 1. if an optional substitution ends up getting deleted
// because it is not defined
// 2. if the substitution is self-referential
//
// we can't easily detect the self-referential case since the cycle
// may involve more than one step, so we have to wait and
// merge later when resolving.
return mergedLater(fallback);
}
@Override