Merge branch 'documentation_fixes' of https://github.com/acoburn/incubator-tamaya
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4af00a3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4af00a3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4af00a3b Branch: refs/heads/master Commit: 4af00a3b85ebb2f7f07adcf29600f3f528408fb7 Parents: 99ea556 904ce25 Author: Phil Ottlinger <pottlin...@apache.org> Authored: Mon Mar 19 21:22:51 2018 +0100 Committer: Phil Ottlinger <pottlin...@apache.org> Committed: Mon Mar 19 21:22:51 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/tamaya/ConfigOperator.java | 6 +-- .../java/org/apache/tamaya/ConfigQuery.java | 4 +- .../java/org/apache/tamaya/Configuration.java | 6 +-- .../apache/tamaya/ConfigurationProvider.java | 4 +- .../java/org/apache/tamaya/TypeLiteral.java | 2 +- .../apache/tamaya/spi/ConfigurationBuilder.java | 30 ++++++------- .../apache/tamaya/spi/ConfigurationContext.java | 46 ++++++++++---------- .../tamaya/core/internal/CoreConfiguration.java | 2 + .../core/internal/CoreConfigurationBuilder.java | 1 + .../internal/converters/DoubleConverter.java | 4 ++ .../core/internal/converters/FileConverter.java | 2 +- .../internal/converters/FloatConverter.java | 4 ++ .../internal/converters/InstantConverter.java | 2 +- .../internal/converters/LocalDateConverter.java | 2 +- .../converters/LocalDateTimeConverter.java | 2 +- .../internal/converters/LocalTimeConverter.java | 2 +- .../converters/OffsetDateTimeConverter.java | 2 +- .../converters/OffsetTimeConverter.java | 2 +- .../internal/converters/OptionalConverter.java | 2 +- .../core/internal/converters/PathConverter.java | 2 +- .../internal/converters/SupplierConverter.java | 2 +- .../core/internal/converters/URLConverter.java | 2 +- .../tamaya/spisupport/ConfigValueEvaluator.java | 2 +- .../tamaya/spisupport/ConfigurationBuilder.java | 28 ++++++------ .../spisupport/DefaultConfigValueEvaluator.java | 2 +- .../tamaya/spisupport/DefaultConfiguration.java | 12 ++--- .../spisupport/DefaultConfigurationBuilder.java | 2 +- .../spisupport/DefaultConfigurationContext.java | 2 +- .../DefaultConfigurationContextBuilder.java | 4 +- .../apache/tamaya/spisupport/EnumConverter.java | 2 +- .../spisupport/PriorityServiceComparator.java | 2 +- .../spisupport/PropertyConverterManager.java | 22 +++++----- .../spisupport/PropertyFilterComparator.java | 2 +- .../tamaya/spisupport/PropertyFiltering.java | 4 +- .../spisupport/PropertySourceComparator.java | 6 +-- .../propertysource/BasePropertySource.java | 6 +-- .../propertysource/CLIPropertySource.java | 4 +- .../propertysource/MapPropertySource.java | 4 +- .../PropertiesResourcePropertySource.java | 3 +- .../propertysource/SimplePropertySource.java | 3 +- 40 files changed, 129 insertions(+), 112 deletions(-) ----------------------------------------------------------------------
