TAMAYA-318 Moved spi-support as API base implementation package to remove code duplicates.
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/c0740730 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/c0740730 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/c0740730 Branch: refs/heads/master Commit: c07407308eb41b5ea5513de9043e591a04f04ebb Parents: 2d0ef4b Author: Anatole Tresch <anat...@apache.org> Authored: Tue Nov 14 10:25:15 2017 +0100 Committer: Anatole Tresch <anat...@apache.org> Committed: Tue Nov 14 10:27:18 2017 +0100 ---------------------------------------------------------------------- .../apache/tamaya/filter/ProgrammableFilterTest.java | 4 ++-- .../tamaya/functions/CombinedConfigurationTest.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c0740730/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java index 9b25bb6..57d5efb 100644 --- a/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java +++ b/modules/filter/src/test/java/org/apache/tamaya/filter/ProgrammableFilterTest.java @@ -21,7 +21,7 @@ package org.apache.tamaya.filter; import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.PropertyFilter; import org.apache.tamaya.spi.PropertyValue; -import org.apache.tamaya.core.internal.DefaultConfigurationContextBuilder; +import org.apache.tamaya.core.internal.CoreConfigurationContextBuilder; import org.apache.tamaya.spisupport.RegexPropertyFilter; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.junit.Assert.*; */ public class ProgrammableFilterTest { - private static ConfigurationContext context = new DefaultConfigurationContextBuilder().build(); + private static ConfigurationContext context = new CoreConfigurationContextBuilder().build(); private static PropertyValue test1Property = PropertyValue.of("test1","test1","test"); private static PropertyValue test2Property = PropertyValue.of("test2","test2","test"); private static PropertyValue test3Property = PropertyValue.of("test.test3","test.test3","test"); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/c0740730/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java ---------------------------------------------------------------------- diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java index bb65d69..cb56e9b 100644 --- a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java +++ b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java @@ -24,7 +24,7 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spisupport.DefaultConfiguration; -import org.apache.tamaya.core.internal.DefaultConfigurationContextBuilder; +import org.apache.tamaya.core.internal.CoreConfigurationContextBuilder; import org.apache.tamaya.spisupport.propertysource.SimplePropertySource; import org.assertj.core.api.ThrowableAssert; import org.junit.Test; @@ -57,15 +57,15 @@ public class CombinedConfigurationTest { SimplePropertySource sourceWithKeyC = new SimplePropertySource("C", singletonMap("c", "c")); SimplePropertySource sourceWithoutKeys = new SimplePropertySource("NONE", Collections.<String, String>emptyMap()); - ConfigurationContext ccWithA1 = new DefaultConfigurationContextBuilder().addPropertySources(sourceWithKeyA1) + ConfigurationContext ccWithA1 = new CoreConfigurationContextBuilder().addPropertySources(sourceWithKeyA1) .build(); - ConfigurationContext ccWithA2 = new DefaultConfigurationContextBuilder().addPropertySources(sourceWithKeyA2) + ConfigurationContext ccWithA2 = new CoreConfigurationContextBuilder().addPropertySources(sourceWithKeyA2) .build(); - ConfigurationContext ccWithB = new DefaultConfigurationContextBuilder().addPropertySources(sourceWithKeyB) + ConfigurationContext ccWithB = new CoreConfigurationContextBuilder().addPropertySources(sourceWithKeyB) .build(); - ConfigurationContext ccWithC = new DefaultConfigurationContextBuilder().addPropertySources(sourceWithKeyC) + ConfigurationContext ccWithC = new CoreConfigurationContextBuilder().addPropertySources(sourceWithKeyC) .build(); - ConfigurationContext ccWithoutEntries = new DefaultConfigurationContextBuilder().addPropertySources(sourceWithoutKeys) + ConfigurationContext ccWithoutEntries = new CoreConfigurationContextBuilder().addPropertySources(sourceWithoutKeys) .build(); configWithA1 = new DefaultConfiguration(ccWithA1);
