Commit Graph

920 Commits

Author SHA1 Message Date
Chris Price
ac2f041118 (MAINT) Add puppet module and C++ links to readme 2015-08-14 13:21:07 +01:00
Havoc Pennington
38e34fdd82 Mention invalidateCaches in the README
Fixes #341
2015-07-30 11:30:56 -04:00
Havoc Pennington
aac122ae01 Fix toString of ConfigDelayedMerge, the default render() in superclass didn't work
The superclass called unwrapped() to render, which isn't allowed here.
2015-07-22 12:26:02 -04:00
Havoc Pennington
132419918a Merge pull request #338 from fpringvaldsen/comment-fix
Stop rendering origin comments in config documents
2015-07-14 11:04:44 -04:00
Preben Ingvaldsen
70edb3f3fc Stop rendering origin comments in config documents
Previously, when setting a ConfigValue in a ConfigDocument, origin
comments would be rendered, which would cause many values to have
lots of comments stating "# hardcoded value". Remove the rendering
of origin comments when inserting a ConfigValue into a
ConfigDocument.
2015-07-13 16:15:27 -07:00
Havoc Pennington
58a4df8095 Merge pull request #336 from usermindinc-sputnik/issue-335
Removes usage of Character.isISOControl in favor of ConfigImplUtil.isC0Control
2015-07-09 11:45:21 -04:00
Cary Lee
05cbb65a31 Removed char version of isC0Control and made non public 2015-07-09 08:13:07 -07:00
Cary Lee
5db8d13694 Removes usage of Character.isISOControl in favor of ConfigImplUtil.isC0Control
Character.isISOControl returns true for C0 and C1 control characters.
Only C0 characters need to be escaped in valid JSON. This change adds a
utility method to detect C0 control characters and uses that in favor of
Character.isISOControl.
2015-07-08 21:32:26 -07:00
Havoc Pennington
6d2d965735 Merge pull request #334 from fpringvaldsen/whitespace-fix
Fix index out of bounds error
2015-06-30 17:05:23 -04:00
Preben Ingvaldsen
919c46accc Fix index out of bounds error
Fix an array index out of bounds error, which would occur if
a complex value was inserted into an empty root in a
ConfigDocument.
2015-06-30 14:01:43 -07:00
Havoc Pennington
53773f7abb Merge pull request #333 from fpringvaldsen/whitespace-fix
Fix single-line config bug
2015-06-30 12:21:28 -04:00
Preben Ingvaldsen
398406378d Fix single-line config bug
Previously, there was a bug wherein building out a config starting
from an empty ConfigDocument would cause the entire config to
exist on a single line. Fix this bug by modifying the addition
of new maps along a path to add multi-line maps instead of
single-line maps if the object is an empty root or if the
object being added to is a multi-line map.
2015-06-29 17:01:29 -07:00
Havoc Pennington
d7d0a51776 Merge pull request #329 from racc/typesafeconfig-guice
Adds the ability for ConfigBeanImpl to handle a List of Beans.
2015-06-24 08:41:55 -04:00
racc
275f53c9ec Merge pull request #1 from typesafehub/list-of-beans
Fix compile/test for list of beans support
2015-06-24 22:02:50 +09:30
Havoc Pennington
de5e01a712 Fix compile/test for list of beans support 2015-06-23 19:38:35 -04:00
jason
37e2dd3219 Adds the ability for ConfigBeanImpl to handle a List of Beans.
Add test entry to beanconfig01.conf, ArraysConfig and
ConfigBeanFactoryTest.
2015-06-24 07:08:15 +09:30
Havoc Pennington
a61bbb4a70 Merge pull request #328 from racc/typesafeconfig-guice
Add Guice integration link to README.md
2015-06-21 17:45:04 -04:00
jason
e34433b7aa Add Guice integration link to README.md 2015-06-22 06:47:51 +09:30
Havoc Pennington
b0ae5cac20 Update news/readme for 1.3.0 2015-05-08 11:44:34 -04:00
Havoc Pennington
46b4f64f2a Add CONTRIBUTING.md with release instructions 2015-05-05 16:50:50 -04:00
Havoc Pennington
df6ec1830b NEWS for 1.3.0-M3 2015-04-21 20:44:56 -04:00
Havoc Pennington
84e840eaf4 Merge pull request #310 from typesafehub/rename-doc-methods
Rename ConfigDocument methods for consistency
2015-04-21 19:40:10 -05:00
Havoc Pennington
a2d4ebfcb3 Rename ConfigDocument methods for consistency
* withValue, withoutPath, hasPath now match Config methods
 * withValueText replaces setValue(String,String)

Closes #303
2015-04-16 16:17:03 -04:00
Havoc Pennington
462181578a Merge pull request #309 from fpringvaldsen/maint/bugfixes
Fix bug with ConfigDocument.setValue
2015-04-09 20:31:26 -04:00
Preben Ingvaldsen
087a00c7ab Fix bug with ConfigDocument.setValue
Fix a bug in the setValue method in SimpleConfigDocument wherein
a rendered ConfigValue could have leading or trailing whitespace,
leading to an issue with setting a value on a ConfigDocument.
2015-04-09 16:36:08 -07:00
Havoc Pennington
924ee2e4e4 Merge pull request #308 from fpringvaldsen/maint/empty-config-document-test
Add test for empty document insertion
2015-04-09 17:05:23 -04:00
Preben Ingvaldsen
78c0612190 Add test for empty document insertion
Add a test for inserting a value into an empty ConfigDocument.
2015-04-09 13:54:46 -07:00
Havoc Pennington
b60b37bb9c Merge pull request #307 from typesafehub/ref-resolve
README: Discuss FAQ on how reference.conf gets resolved
2015-04-09 13:03:16 -04:00
Havoc Pennington
acca3b5c6d README: Discuss FAQ on how reference.conf gets resolved
Closes #306, relates to #167
2015-04-09 12:33:01 -04:00
Havoc Pennington
20dd869b51 Merge pull request #304 from fpringvaldsen/task/update-configdocumentparser
Update ConfigDocumentParser and various tests
2015-04-08 14:42:25 -04:00
Havoc Pennington
357de0deac Merge pull request #305 from fpringvaldsen/task/configparser-cleanup
Cleanup ConfigParser comments
2015-04-08 14:40:29 -04:00
Preben Ingvaldsen
b1eadee1d0 Cleanup ConfigParser comments
Remove/reword comments on ConfigParser so that they reflect
what the Parser is actually doing.
2015-04-08 09:46:03 -07:00
Preben Ingvaldsen
c2b2c10d38 Clean up ConfigDocument tests
Clean up the ConfigDocument tests by renaming certain tests and
modifying all exception testing to use the intercept method.
2015-04-07 14:13:21 -07:00
Preben Ingvaldsen
6c011b5e4a Cleanup of ConfigDocumentParser and tests
Clean up ConfigDocumentParser tests by using the `intercept`
method to handle exception testing, moving some tests, and
removing a test that was re-testing already tested functionality.

Fix bug wherein parsing of a single value would throw an exception
when the value is a map with a key that has an object value and no
separator if the default ConfParserOptions where used. Add a test
to validate this fix.
2015-04-06 15:29:59 -07:00
Havoc Pennington
7107ec05b0 Merge pull request #301 from fpringvaldsen/task/update-confignode-tests
Update/cleanup ConfigNodeTests
2015-04-06 12:53:56 -04:00
Preben Ingvaldsen
9ca0729fde Update/cleanup ConfigNodeTests
Update the ConfigNodeTests to reflect the changes to the way
various types of ConfigNode work, including removing all
leading/trailing whitespace from ConfigNodeFields and adding in
ConfigNodeComments in place of ConfigNodeSingleTokens containing
comment tokens.
2015-04-03 14:04:17 -07:00
Havoc Pennington
d6f7f4c0cb Put parser package in the public API javadoc group 2015-04-01 22:02:45 -04:00
Havoc Pennington
3d6401ce77 Update NEWS for 1.3.0-M2 2015-04-01 21:55:58 -04:00
Havoc Pennington
8ec5784e32 Fix a bunch of compile-time warnings, minor doc tweaks 2015-04-01 21:43:31 -04:00
Havoc Pennington
ea78c17381 Merge pull request #298 from fpringvaldsen/task/improve-indentation
Improve indentation
2015-04-01 21:08:24 -04:00
Preben Ingvaldsen
deb32bcab0 Change parent class of ConfigNodeInclude
Modify the parent class of ConfigNodeInclude to be
AbstractConfigNode instead of ConfigNodeComplexValue, as an
include statement is not a value.
2015-04-01 16:06:02 -07:00
Preben Ingvaldsen
dc567e8489 Look at includes when finding indentation
Modify the indentation calculation algorithm to also look at the
indentation before include nodes.
2015-04-01 13:20:33 -07:00
Preben Ingvaldsen
1b257fd426 Address PR feedback and add new test
Cleanup the indentText() method on ConfigNodeComplexValue as per
PR feedback. Add a test for indentation when inserting a value
with an include statement.
2015-04-01 13:20:33 -07:00
Preben Ingvaldsen
a29475ba4a Indent multi-line values on replacement
Indent multi-line values when they replace a value in a
ConfigDocument.
2015-04-01 13:20:33 -07:00
Preben Ingvaldsen
7ec3777c25 Improve indentation when adding a setting
Modify the algorithm for adding a new value into a ConfigDocument
so that it will attempt to indent the new setting properly.
2015-04-01 13:20:33 -07:00
Havoc Pennington
2dcefc006b Merge pull request #296 from fpringvaldsen/task/removeValue-fix
Fix removeValue test failures
2015-03-30 19:12:24 -04:00
Preben Ingvaldsen
33fed067b6 Fix removeValue test failures 2015-03-30 15:51:43 -07:00
Havoc Pennington
dcab6e7158 Add some failing tests for ConfigDocument.removeValue 2015-03-30 16:29:35 -04:00
Havoc Pennington
ed004d47e7 Merge pull request #294 from fpringvaldsen/task/more-ConfigDocument-methods
Add new ConfigDocument API methods
2015-03-30 16:18:56 -04:00
Preben Ingvaldsen
e959e2c8a9 Address PR feedback
Reduce cast noise in the `hasValue` method in the
ConfigNodeObject class. Cleanup exception testing in
ConfigDocument array tests.
2015-03-30 13:09:05 -07:00