Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master dc2cd7d38 -> 26a5414e4
Added missing abstract methods from core. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/26a5414e Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/26a5414e Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/26a5414e Branch: refs/heads/master Commit: 26a5414e45b79f451125f41263a71bd65f4a10a0 Parents: dc2cd7d Author: Anatole Tresch <[email protected]> Authored: Thu Nov 17 23:33:33 2016 +0100 Committer: Anatole Tresch <[email protected]> Committed: Thu Nov 17 23:33:33 2016 +0100 ---------------------------------------------------------------------- .../DefaultConfigurationContextBuilder.java | 14 +++++++------- .../spisupport/DefaultConfigurationContextTest.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/26a5414e/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java index edf8173..3ed8946 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java @@ -128,7 +128,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB return this; } - protected DefaultConfigurationContextBuilder loadDefaultPropertyFilters() { + public DefaultConfigurationContextBuilder addDefaultPropertyFilters() { checkBuilderState(); for(PropertyFilter pf:ServiceContextManager.getServiceContext().getServices(PropertyFilter.class)){ addPropertyFilters(pf); @@ -136,7 +136,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB return this; } - protected DefaultConfigurationContextBuilder loadDefaultPropertySources() { + public DefaultConfigurationContextBuilder addDefaultPropertySources() { checkBuilderState(); for(PropertySource ps:ServiceContextManager.getServiceContext().getServices(PropertySource.class)){ addPropertySources(ps); @@ -149,7 +149,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB return this; } - protected DefaultConfigurationContextBuilder loadDefaultPropertyConverters() { + public DefaultConfigurationContextBuilder addDefaultPropertyConverters() { checkBuilderState(); for(Map.Entry<TypeLiteral, Collection<PropertyConverter>> en:getDefaultPropertyConverters().entrySet()){ for(PropertyConverter pc: en.getValue()) { @@ -344,9 +344,9 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB protected ConfigurationContextBuilder loadDefaults() { checkBuilderState(); this.combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_COLLECTOR; - loadDefaultPropertySources(); - loadDefaultPropertyFilters(); - loadDefaultPropertyConverters(); + addDefaultPropertySources(); + addDefaultPropertyFilters(); + addDefaultPropertyConverters(); return this; } @@ -370,7 +370,7 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB /** * Builds a new configuration based on the configuration of this builder instance. * - * @return a new {@link Configuration configuration instance}, + * @return a new {@link org.apache.tamaya.Configuration configuration instance}, * never {@code null}. */ @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/26a5414e/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationContextTest.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationContextTest.java b/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationContextTest.java index 0e08be4..5b23897 100644 --- a/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationContextTest.java +++ b/modules/spi-support/src/test/java/org/apache/tamaya/spisupport/DefaultConfigurationContextTest.java @@ -57,7 +57,7 @@ public class DefaultConfigurationContextTest { ConfigurationContext ctx = new DefaultConfigurationContextBuilder().build(); assertNotNull(ctx.getPropertySources()); assertEquals(ctx.getPropertySources().size(), 0); - ctx = new DefaultConfigurationContextBuilder().loadDefaultPropertySources().build(); + ctx = new DefaultConfigurationContextBuilder().addDefaultPropertySources().build(); assertNotNull(ctx.getPropertySources()); assertEquals(3, ctx.getPropertySources().size()); }
