Commit Graph

1008 Commits

Author SHA1 Message Date
Brian Baldino
f3baf1dfba use ensureClassLoader 2020-09-23 09:15:17 -07:00
Brian Baldino
83349ecbfa add parseApplicationReplacement overrides 2020-09-23 09:15:17 -07:00
Brian Baldino
1428ebb894 remove accidentally committed files 2020-09-23 09:13:05 -07:00
Brian Baldino
bba56f2e98 return an Optional from parseApplicationReplacement 2020-09-23 09:00:03 -07:00
Brian Baldino
7e1c64c9d4 don't use wildcard imports 2020-09-23 08:54:00 -07:00
Brian Baldino
3be726d918 rename method 2020-09-23 08:51:31 -07:00
Brian Baldino
af6b7b8a6a remove unused imports 2020-09-23 08:50:31 -07:00
Brian Baldino
09e2d57e18 Split out a helper method for parsing only application overrides 2020-09-22 15:52:47 -07:00
Havoc Pennington
001e6c3b82
Merge pull request #701 from lightbend/fix-stack-overflow-in-resolve-context
Remove unmodifiable collection wrappers in ResolveContext
2020-09-18 08:18:39 -04:00
Havoc Pennington
4739cba0bd Remove unmodifiable collection wrappers in ResolveContext
This fixes #700 (Java is unhelpful and the Collections.unmodifiableList etc
methods don't check whether the thing is already wrapped).

These were just an assertion basically intended to find any accidental
modification of these collections, so not essential.
2020-07-24 11:20:07 -04:00
Havoc Pennington
e0984d41b0
Merge pull request #686 from andreaTP/fix-playframework-10206
Fix: Avoid loading all the environment variables as configurations
2020-06-24 10:59:25 -04:00
Andrea Peruffo
379a1f056c Fix: Avoid loading all the environment variables as configurations when override_with_env_vars = true 2020-05-07 18:28:56 +01:00
Havoc Pennington
44f21c31b9
Merge pull request #675 from gurkankaymak/patch-1
added go port to the README
2020-03-28 15:33:35 -04:00
Gürkan Kaymak
3e6f6bbf1d
added go port to the README 2020-03-28 21:35:27 +03:00
Adriaan Moors
7486006f07
Merge pull request #666 from roldevg/maven_central_501_error
Fixed 501 error for the maven central link, using of https
2020-02-20 16:16:13 +01:00
Havoc Pennington
d0271d4be7
Merge pull request #663 from mpryahin/master
Support for huge memory units
2020-02-17 11:16:42 -05:00
Evgeniy Roldukhin
ae846e2cab Fixed 501 error for the maven central link, using of https 2020-02-03 13:06:50 +03:00
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