You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2018/02/20 09:20:37 UTC
incubator-tamaya git commit: - Using Iterable instead of List for
adding ConfigSources. - Fixed tests compile issues.
Repository: incubator-tamaya
Updated Branches:
refs/heads/configjsr c3dd1c96f -> 461221aab
- Using Iterable instead of List for adding ConfigSources.
- Fixed tests compile issues.
Signed-off-by: Anatole Tresch <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/461221aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/461221aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/461221aa
Branch: refs/heads/configjsr
Commit: 461221aab28fdc26e476d43ecadc55ff78218d8e
Parents: c3dd1c9
Author: Anatole Tresch <an...@apache.org>
Authored: Tue Feb 20 10:20:16 2018 +0100
Committer: Anatole Tresch <an...@apache.org>
Committed: Tue Feb 20 10:20:16 2018 +0100
----------------------------------------------------------------------
.../base/configsource/ConfigSourceManager.java | 2 +-
.../tamaya/base/DefaultConfigBuilderTest.java | 21 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/461221aa/code/base/src/main/java/org/apache/tamaya/base/configsource/ConfigSourceManager.java
----------------------------------------------------------------------
diff --git a/code/base/src/main/java/org/apache/tamaya/base/configsource/ConfigSourceManager.java b/code/base/src/main/java/org/apache/tamaya/base/configsource/ConfigSourceManager.java
index 584b588..ef95639 100644
--- a/code/base/src/main/java/org/apache/tamaya/base/configsource/ConfigSourceManager.java
+++ b/code/base/src/main/java/org/apache/tamaya/base/configsource/ConfigSourceManager.java
@@ -104,7 +104,7 @@ public class ConfigSourceManager {
*
* @param configSources the config source, not {@code null}.
*/
- public ConfigSourceManager addSources(Collection<ConfigSource> configSources) {
+ public ConfigSourceManager addSources(Iterable<ConfigSource> configSources) {
Objects.requireNonNull(configSources);
for(ConfigSource configSource:configSources) {
if (!this.configSources.contains(configSource)) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/461221aa/code/base/src/test/java/org/apache/tamaya/base/DefaultConfigBuilderTest.java
----------------------------------------------------------------------
diff --git a/code/base/src/test/java/org/apache/tamaya/base/DefaultConfigBuilderTest.java b/code/base/src/test/java/org/apache/tamaya/base/DefaultConfigBuilderTest.java
index c279c59..1af1852 100644
--- a/code/base/src/test/java/org/apache/tamaya/base/DefaultConfigBuilderTest.java
+++ b/code/base/src/test/java/org/apache/tamaya/base/DefaultConfigBuilderTest.java
@@ -26,6 +26,7 @@ import javax.config.spi.ConfigProviderResolver;
import javax.config.spi.ConfigSource;
import javax.config.spi.Converter;
import java.util.Collections;
+import java.util.Iterator;
import java.util.Map;
import static org.junit.Assert.*;
@@ -44,9 +45,10 @@ public class DefaultConfigBuilderTest {
TamayaConfigBuilder b = new DefaultConfigBuilder()
.withSources(testPropertySource, testPS2);
ConfigContext ctx = b.getConfigContext();
- assertEquals(2, ctx.getConfigSources().size());
- assertTrue(ctx.getConfigSources().contains(testPropertySource));
- assertTrue(ctx.getConfigSources().contains(testPS2));
+ Iterator it = ctx.getConfigSources().iterator();
+ assertTrue(it.next() == testPropertySource);
+ assertTrue(it.next() == testPS2);
+ assertFalse(it.hasNext());
}
@Test
@@ -55,16 +57,17 @@ public class DefaultConfigBuilderTest {
TamayaConfigBuilder b = new DefaultConfigBuilder()
.withSources(testPropertySource, testPS2);
ConfigContext ctx = b.getConfigContext();
- assertEquals(2, ctx.getConfigSources().size());
- assertTrue(ctx.getConfigSources().contains(testPropertySource));
- assertTrue(ctx.getConfigSources().contains(testPS2));
+ Iterator it = ctx.getConfigSources().iterator();
+ assertTrue(it.next() == testPropertySource);
+ assertTrue(it.next() == testPS2);
+ assertFalse(it.hasNext());
b = new DefaultConfigBuilder()
.withSources(testPropertySource, testPS2);
b.removeSources(testPropertySource);
ctx = b.getConfigContext();
- assertEquals(1, ctx.getConfigSources().size());
- assertFalse(ctx.getConfigSources().contains(testPropertySource));
- assertTrue(ctx.getConfigSources().contains(testPS2));
+ it = ctx.getConfigSources().iterator();
+ assertTrue(it.next() == testPS2);
+ assertFalse(it.hasNext());
}
@Test