Commit Graph

517 Commits

Author SHA1 Message Date
Havoc Pennington
b696dbee38 Fix semantics of references from _inside_ a field value to that field
vs. the value itself being a reference to the field.

So this looks "backward":

  a : ${a}

vs. this does not:

  a : { b : ${a} }
2012-04-05 14:16:42 -04:00
Havoc Pennington
06ed4d24e1 fix error message for type errors mid-path
If you looked up "a.b.c" and b is not an object, it said
"a.b.c is a FOO and not an OBJECT"
now it says
"a.b is a FOO and not an OBJECT"
2012-04-05 14:02:37 -04:00
Havoc Pennington
683e72cbbe Clean up code and semantics around self-referential handling
The basic idea in this patch is to unify on the "replacer"
(modifying the tree in which we lookup substitutions)
mechanism for detecting cycles.

Drop the "traverse" method, instead keeping a trace of expressions
we've passed through for nice error messages.

There is now only one internal checked exception possible,
NotPossibleToResolve which is thrown when a cycle is detected;
this checked exception is always caught by ConfigReference
so cannot "escape" from the library. The exception exists
because we want to get the traceString debug info out
of the spot that detected the cycle, if we didn't want that
debug info we could just return null as usual for undefined.

As part of simplifying this (which should also simplify the
spec), resolutions which require double-traverse of the same
reference are no longer supported:
   a=1, b=${a}, a=${b}

Also, cycles now always throw UnresolvedSubstitution rather
than BadValue. This was needed for consistency since
conceptually a single a=${a} is going to "look back" earlier
in the merge stack, discover there is no earlier value of a,
and fail; it should be the same exception as a=${a},a={b:1},
and in both cases referring to these cycles via ${?} should
hide the exception.
2012-04-05 09:39:39 -04:00
Havoc Pennington
006777c062 Split ConfigSubstitution into ConfigConcatenation and ConfigReference
This makes the code a good bit simpler to reason about, the old
ConfigSubstitution really mixed two things into one class.

Unfortunately old ConfigSubstitution is hanging around as a compat
shim so we can deserialize stuff from the old version of the library.

The old version will not be able to deserialize unresolved configs
from this new version.

In retrospect it might have been better to forbid serialization
of unresolved configs and only support serializing resolved configs.
2012-03-31 22:09:05 -04:00
Havoc Pennington
27d92bec46 make ResolveSource.replacements use the value, not MemoKey, as key
The MemoKey stuff here was leftover from some earlier version of
the code, and was no longer used (the restrictToChild was always
null in the MemoKey).
2012-03-30 21:40:18 -04:00
Havoc Pennington
0f712f423b move "replacement" handling from ResolveContext to ResolveSource
this is where it belongs conceptually
2012-03-30 21:36:50 -04:00
Havoc Pennington
15bcfc984d move the "replacements" functionality to ResolveSource from Context
Conceptually, a "replacement" is a transformation of ResolveSource
2012-03-30 21:00:01 -04:00
Havoc Pennington
a22924de6d Delete SubstitutionResolver, so it's all in ResolveContext now 2012-03-30 20:46:26 -04:00
Havoc Pennington
0101d9ef37 move the memoizing functionality out of SubstitutionResolver 2012-03-30 20:10:05 -04:00
Havoc Pennington
d6b27c839a split 'ResolveSource' from SubstitutionResolver and ConfigSubstitution.
this is part of a plan to remove SubstitutionResolver (moving the
memoized hash to ResolveContext) and to move the "replacements"
functionality to ResolveSource. Should be clearer.
2012-03-30 19:24:44 -04:00
Havoc Pennington
e438dfc8c2 remove NeedsFullResolver internal checked exception
I think this was a relic of some earlier idea about how to do
things. It was used in one place that could just use the
public NotResolved exception, since it was converted to that
later anyhow.

To avoid error-message regression, we still catch NotResolved
and change it into a NotResolved with a different message in
certain cases.

Also clean up the wording of NotResolved in various places.
Probably NotResolved could just have a zero-parameters constructor.
2012-03-30 18:54:47 -04:00
Havoc Pennington
f6b1458169 couple of typo / formatting fixes 2012-03-30 17:26:54 -04:00
Havoc Pennington
44ce684985 Allow self-referential fields.
With this patch, you can write:

    path="a🅱️c"
    path=${path}":d"

The semantics are somewhat complicated to specify and
implement, but hopefully not complicated to use for
any reasonable usage that makes any sense.

This patch is technically backward incompatible,
illustrated by a change to existing unit tests,
but the changed behavior is in a bizarre corner case:
cyclical self-references where the cycle could be broken
by only partially resolving an object.

This corner case just threw an exception in the version
of this lib included with Akka/Play 2.0, but in commit
a59e31f744 we tried to handle the case. So the behavior
changes since that commit.

The partial resolution case now has the same consistent
defined semantics we use for all self-reference
resolution, that is it "looks back." In the previous
code it would "look forward."
2012-03-29 14:25:28 -04:00
Havoc Pennington
d9c9adc39f combine three resolveSubstitutions() parameters into ResolveContext
This makes it easier to mess with the parameters needed without
changing every resolveSubstitutions() all over the place.

Really the SubstitutionResolver and ResolveContext should maybe
be merged, but keeping this patch more incremental.
2012-03-29 09:51:58 -04:00
Havoc Pennington
6de4a991d4 In ConfigSubstitution, never ignoreFallbacks
Because the upcoming "allow self-references" behavior will
require looking at fallbacks.
2012-03-29 08:54:52 -04:00
Havoc Pennington
5566a091af Print problem object if merging an object yields non-object 2012-03-29 08:52:01 -04:00
Havoc Pennington
450a91ac22 add /bin-test-lib to .gitignore
This is a separate eclipse output folder for test-lib, because it
has test01.conf and so does the main src/test/resources
2012-03-28 23:34:47 -04:00
Havoc Pennington
5187a7ad4d To detect cycles, track visited MemoKey not visited nodes
Otherwise we can get a fake cycle when we try to do a partial
resolve on a node we are currently doing a full resolve on.
2012-03-28 23:07:00 -04:00
Havoc Pennington
db85e5ec8a Reimplement cycle detection with a traversed-node-set
This is probably not different from the depth counter
in practical situations, but it does guarantee 100%
that we are only detecting true cycles. Since we want
true cycles to have different semantics (in a following
patch), I feel better about this implementation.
2012-03-28 19:50:27 -04:00
Havoc Pennington
16871b597e add a future todo item about including URLs 2012-03-28 14:23:04 -04:00
Havoc Pennington
ef79b804e7 Link to the Typesafe CLA web form from the README 2012-03-27 07:53:13 -04:00
Havoc Pennington
4bee83c8a8 if -Dconfig.resource resource name starts with "/", drop the "/"
this is for compatibility with previous behavior.
2012-03-02 10:14:36 -05:00
Havoc Pennington
f497419970 minor clarifications and typo fixes in the spec 2012-03-01 19:47:14 -05:00
Havoc Pennington
08229c85b3 update NEWS for 0.3.0 2012-03-01 14:07:02 -05:00
Havoc Pennington
830df6b055 update version in README 2012-03-01 12:12:05 -05:00
Havoc Pennington
e96850c3b3 put -SNAPSHOT back in version 2012-03-01 12:10:03 -05:00
Havoc Pennington
b6759fcd0f 0.3.0 2012-03-01 12:09:17 -05:00
Havoc Pennington
27bdc06346 cache the default config and default reference config per-classloader
this is intended to avoid reparsing files over and over if you
load a few libraries that all use the default config.
2012-02-29 15:53:03 -05:00
Havoc Pennington
30bdac884b Add ConfigFactory.load variants that let you supply a ClassLoader 2012-02-29 12:05:35 -05:00
Havoc Pennington
9733578ebb Do not cache default config, and use context class loader to load it
So we get any reference.conf from the context class loader.

This does NOT fix loading non-default configs, we need new API
to allow passing in a class loader for that. It also makes
things a bit less efficient since it no longer caches;
in the future we could do a per-class-loader cache.
2012-02-29 10:44:24 -05:00
Havoc Pennington
e2c0979422 Some formatting changes
(basically change from 80 to 100 column wrap)
2012-02-28 13:03:02 -05:00
Havoc Pennington
1310bc258a Add -Dconfig.trace=loads feature to log where config is loaded from to stderr 2012-02-28 13:02:34 -05:00
Havoc Pennington
d32ba9aee8 add tests for resolving mutually-referring objects 2012-02-25 10:31:45 -05:00
Havoc Pennington
7ed9eee67e add test coverage on ConfigDelayedMerge render(), relativized() 2012-02-25 00:17:21 -05:00
Havoc Pennington
fb17706961 add check to SimpleConfigList that resolveStatus is correct 2012-02-24 23:49:43 -05:00
Havoc Pennington
7844f13dfa Maintain SimpleConfigObject.resolveStatus when adding/removing keys
withOnlyKey, withoutKey were buggy and didn't correctly update the
resolved status.
2012-02-24 23:47:51 -05:00
Havoc Pennington
a59e31f744 Redo substitution resolving to better handle complex cases.
The main idea of this patch is to introduce "partial resolution"
which means resolving only the minimum branch of the object tree
to get to a desired value. By using partial resolution whenever
possible, more interdependencies between substitutions are permitted.

ConfigDelayedMergeObject was a big problem because a lot of the
code in AbstractConfigObject really didn't work on it, because
it assumed a resolved object; much of that code now moves down
to SimpleConfigObject.
2012-02-24 23:22:25 -05:00
Havoc Pennington
021a958a93 Add a set of failing tests involving resolve() and ConfigDelayedMerge, ConfigDelayedMergeObject 2012-02-24 19:36:06 -05:00
Havoc Pennington
d946c794ef ConfigSubstitution was missing serialVersionUID. Fix. 2012-02-24 17:26:30 -05:00
Havoc Pennington
982dee4047 switch from lift-json 2.4-SNAPSHOT to 2.4 2012-02-24 16:53:54 -05:00
Havoc Pennington
3051608186 add withOnlyKey, withOnlyPath, withoutKey, withoutPath methods
These allow easily pruning a Config or ConfigObject.
Previously would have required some sort of tedious recursive
copying of the nodes in the tree.
2012-02-20 11:15:20 -05:00
Havoc Pennington
71d209070a add some missing serialVersionUID
All the most-derived classes need to have it, not just base classes.

Update expected serializations in the tests to reflect new serialVersionUID.
2012-02-20 11:13:49 -05:00
Havoc Pennington
dc2f52aa24 Merge branch 'serializable' 2012-02-09 13:46:10 -05:00
Havoc Pennington
4979b1345f Merge pull request #4 from brianm/typesafe-master
update readme to include information about unofficial releases in maven central
2012-02-09 10:45:47 -08:00
Brian McCallister
093c19ee0e update readme to include information about unofficial releases in maven central 2012-02-09 10:23:27 -07:00
Havoc Pennington
fdd3eeec16 correct javadoc that claimed Config had a Map interface 2012-02-09 08:57:26 -05:00
Havoc Pennington
682fdbf772 fix a syntax glitch in ConfigFactory.load javadoc 2012-02-09 08:44:36 -05:00
Havoc Pennington
190bf12ebf add serialVersionUID to serializable classes
Also add tests to detect any incompatible change in serialization
format, to be sure such changes are deliberate.
2012-02-06 17:46:03 -05:00
Roland
277e4ca3a2 update copyright headers for 2012 2012-02-03 14:56:54 +01:00
Havoc Pennington
ab4edcfaf8 When serializing lists, convert to LinkedList
ArrayList and emptyList() don't seem to serialize correctly on JDK 1.6.0 betas.
Unknown which other JDKs are affected.
Speculating that the problem is http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6446627
2012-02-01 12:56:26 -05:00