You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/03/24 08:24:56 UTC

incubator-tamaya git commit: TAMAYA-60 Changed method signatures.

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master a9e3923a7 -> 0375eb7cd


TAMAYA-60 Changed method signatures.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0375eb7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0375eb7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0375eb7c

Branch: refs/heads/master
Commit: 0375eb7cd87191c5d8a5598354860f15cc7df694
Parents: a9e3923
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Tue Mar 24 08:24:38 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Tue Mar 24 08:24:38 2015 +0100

----------------------------------------------------------------------
 .../apache/tamaya/builder/ConfigurationBuilder.java  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0375eb7c/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
index 51abbcf..21d6cf7 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
@@ -37,7 +37,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -180,8 +179,7 @@ public class ConfigurationBuilder {
      * builder.addPropertySources(first, second);}
      *</pre>
      *
-     * @param url first resource with properties for the the configuration to be build.
-     * @param urls list additional of resources with properties for the configuration to be
+     * @param urls list of resources with properties for the configuration to be
      *             build.
      *
      * @return the builder instance currently used
@@ -189,8 +187,8 @@ public class ConfigurationBuilder {
      * @see org.apache.tamaya.format.ConfigurationFormat
      * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
      */
-    public ConfigurationBuilder addPropertySource(URL url, URL... urls) {
-        Stream.of(Collections.singletonList(url), Arrays.asList(urls))
+    public ConfigurationBuilder addPropertySource(URL... urls) {
+        Stream.of(Arrays.asList(urls))
               .flatMap(Collection::stream)
               .filter(entry -> entry != null)
               .collect(Collectors.toList())
@@ -211,8 +209,7 @@ public class ConfigurationBuilder {
      *                            "file:/etc/defaults/values.properties");}
      *</pre>
      *
-     * @param url first resource with properties for the the configuration to be build.
-     * @param urls list additional of resources with properties for the configuration to be
+     * @param urls list of resources with properties for the configuration to be
      *             build.
      *
      * @return the builder instance currently used
@@ -220,8 +217,8 @@ public class ConfigurationBuilder {
      * @see org.apache.tamaya.format.ConfigurationFormat
      * @see org.apache.tamaya.format.ConfigurationFormats#getFormats()
      */
-    public ConfigurationBuilder addPropertySource(String url, String... urls) {
-        Stream.of(Collections.singletonList(url), Arrays.asList(urls))
+    public ConfigurationBuilder addPropertySource(String... urls) {
+        Stream.of(Arrays.asList(urls))
               .flatMap(Collection::stream)
               .filter(entry -> entry != null)
               .map(new StringToURLMapper())