Commit Graph

1041 Commits

Author SHA1 Message Date
Mike
89afa77574
Update config/src/main/java/com/typesafe/config/impl/SimpleConfig.java
Co-Authored-By: Havoc Pennington <hp@pobox.com>
2020-01-17 23:29:29 +03:00
mpryahin
b29fdd4a8b fixed contract violation which stems from incorect exception thrown when reading bytes and memorysize values 2020-01-11 21:59:42 +03:00
mpryahin
0b4c9e81ab fixed code formating to reduce diffs 2020-01-09 12:22:19 +03:00
mpryahin
179e6d647a Code review improvements 2020-01-09 12:03:24 +03:00
mpryahin
db6b6dcaf6 removed a redundant method 2019-12-26 23:18:48 +03:00
mpryahin
a789d3884c added Javadocs 2019-12-26 23:09:05 +03:00
mpryahin
50c86cf309 fixed code format 2019-12-26 22:52:48 +03:00
mpryahin
9f29aa5cb0 added support for memory units which don't fit in a long when transformed to bytes 2019-12-26 22:46:08 +03:00
Johan Andrén
e3ec7d3490
Release 1.4.0 (#655) 2019-10-14 10:53:41 +02:00
Havoc Pennington
edf2eaef20
Merge pull request #648 from widgetii/master
Performance fix: added capacity parameter in ArrayLists
2019-09-03 16:46:26 -04:00
Dmitry Ilyin
44daaf87fa Performance fix: added capacity parameter in ArrayLists contructor when adding elements 2019-09-03 21:35:07 +03:00
James Roper
ab890103dd Allow application.conf to override variables in reference.conf (#619)
* Allow application.conf to override variables in reference.conf

Fixes #167

This only affects the output of `ConfigFactory.load`. It does not change
`ConfigFactory.defaultReference`. This uses the unresolved
`reference.conf` in the building of configuration in
`ConfigFactory.load`, effectively allowing `application.conf` properties
to override variable substitutions in `reference.conf`.

However, it still requires `reference.conf` to be fully resolvable, if
it isn't, an exception will be thrown. So two resolves are still done
during load, it's just that the output of the resolve of
`reference.conf` isn't used in building the final configuration. The
documentation has been updated to reflect this behavior.

The reasoning behind this change can be read about in #167, but
essentially, it is not uncommon for configuration properties to depend
on each other by default, a good example of this is directory
hierarchies, where you might have a configuration option for a base
directory, and then a configuration for the log directory that by
default is under the base directory, and within that a configuration for
individual log files which by default are under the log directory.
Without allowing variable substitutions in `reference.conf` from
`application.conf`, there is no point in defining a configuration option
for the base directory since changing it won't have any impact, and each
path defined that depends on it will have to be manually overridden.
This limitation is contrary to convention over configuration best
practices, and hence not desirable in a configuration library.

* Renamed public method to defaultReferenceUnresolved

Also added the methods to ConfigFactory, as requested in code review.
2019-08-20 15:02:50 +02:00
Marcos Pereira
558c1e22f5
Merge pull request #632 from raboof/jdk11
Test on JDK 11
2019-06-23 17:08:26 -04:00
Havoc Pennington
8fc33c856d Note in README that substitutions don’t work inside quotes (#634)
* Note in README that substitutions don’t work inside quotes

There’s more on this in HOCON.md but can’t hurt to repeat, people do miss it.
2019-05-23 14:11:21 +03:00
Martynas Mickevičius
46daf99ac4
Update README to include sconfig supported platforms (#635)
Update README to include sconfig supported platforms
2019-05-23 13:32:54 +03:00
Martynas Mickevičius
6584b66ca3
Merge pull request #636 from lightbend/havocp-maintenance-typo
Fix spelling typo in readme
2019-05-23 13:20:53 +03:00
Havoc Pennington
a4cd739bc1
Fix spelling typo in readme 2019-05-23 06:14:00 -04:00
Eric Richardson
83ebfdd870 Update README to include sconfig supported platforms 2019-05-22 11:13:09 -07:00
Marcos Pereira
8d51f67d85
Fix formatting detail 2019-05-07 10:24:03 -04:00
Marcos Pereira
547aa7af8e
Use latest jdk11
Co-Authored-By: raboof <github@bzzt.net>
2019-05-07 16:20:31 +02:00
Marcos Pereira
ad979226c7
Use latest jdk8
Co-Authored-By: raboof <github@bzzt.net>
2019-05-07 16:20:09 +02:00
Marcos Pereira
0d86b45209
Use latest jabba
Co-Authored-By: raboof <github@bzzt.net>
2019-05-07 16:19:51 +02:00
Marcos Pereira
d11e574586
Newer jdk8
Co-Authored-By: raboof <github@bzzt.net>
2019-05-07 16:19:36 +02:00
Marcos Pereira
6409251395
newer jdk11
Co-Authored-By: raboof <github@bzzt.net>
2019-05-07 16:19:25 +02:00
Arnout Engelen
2f053f9288
Test on JDK 11 2019-05-07 15:21:54 +02:00
Havoc Pennington
68cebfde5e
Merge pull request #631 from mcornejo/patch-1
Typo in the NEWS.md
2019-04-26 12:13:49 -04:00
Mario Cornejo
4430a89b85
Update NEWS.md
Typo in the year
2019-04-26 16:53:53 +02:00
Martynas Mickevičius
74bdd9f9e5
Merge pull request #629 from 2m/wip-latest-sbt-pgp
Update to the latest sbt-pgp
2019-04-18 14:11:47 +00:00
Martynas Mickevičius
f6e7ac1191
Update to the latest sbt-pgp 2019-04-18 15:57:40 +03:00
Martynas Mickevičius
692edecb51
Add release notes for 1.3.4 (#628)
* Add release notes for 1.3.4
2019-04-18 12:29:27 +00:00
Martynas Mickevičius
f40183404b
Merge pull request #625 from aaronp/master
Added reference to args4c for command-line-to-config utils
2019-04-18 11:42:55 +00:00
Havoc Pennington
e24ff57f47
Merge pull request #620 from andreaTP/envConfigLoading
Add a config.strategy to enable overwrite of properties from env vars
2019-04-03 19:27:10 -04:00
Andrea Peruffo
4fad11380b fix again XML 2019-03-21 10:54:31 +00:00
Andrea Peruffo
fd0e4188af minor fix 2019-03-21 10:53:10 +00:00
Andrea Peruffo
4937ee41ab Move env mangling to ConfigImplUtil 2019-03-21 10:50:48 +00:00
Andrea Peruffo
90e2465f34 Remove Puppy Crawl references 2019-03-21 10:01:27 +00:00
Andrea Peruffo
3a9a1d8333 Bump sbt version 2019-03-21 09:02:48 +00:00
Andrea Peruffo
87dc17d55e Move rationale to code and implement invalidate cache 2019-03-21 08:52:42 +00:00
Aaron Pritzlaff
215a23a340 Added reference to args4c for command-line-to-config utils 2019-03-19 17:34:49 +00:00
Andrea Peruffo
4571c79b51 Detail resons for _ sustitutions 2019-03-15 16:40:59 +00:00
Andrea Peruffo
c14bb77acd Added a description of the new property in Readme 2019-03-08 14:53:14 +00:00
Andrea Peruffo
e302b9a34d fixed review comments 2019-03-08 14:26:47 +00:00
Havoc Pennington
64c60f0713
Merge pull request #621 from mockersf/master
add new Rust port to Other APIs section
2019-03-08 09:01:52 -05:00
François
02d614b96d
add new Rust port to README.md 2019-03-08 08:54:37 +01:00
Andrea Peruffo
7fe47888d2 Env variables resolution moved to defaultOverrides 2019-03-04 14:43:12 +00:00
Andrea Peruffo
30b65568eb Trailing blank line 2019-02-27 12:41:15 +00:00
Andrea Peruffo
5c04377293 Fix suppressions doctype 2019-02-27 12:39:46 +00:00
Andrea Peruffo
d9d1f0a3fc Add a config strategy to load from environment variables first. 2019-02-27 12:37:37 +00:00
Havoc Pennington
d6023a111d
Merge pull request #613 from ekrich/topic/doc
Add new Scala port to README.md
2019-02-14 18:21:25 -05:00
Eric Richardson
dfb2454bb8 Update Shocon entry 2019-02-14 15:48:15 -05:00