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 2016/09/25 21:23:56 UTC
[08/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-60
Changed method signatures.
TAMAYA-60 Changed method signatures.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/f34d77dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f34d77dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f34d77dc
Branch: refs/heads/master
Commit: f34d77dc195f7956626c8150e0145aa79107e5ea
Parents: f78f6a1
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-sandbox/blob/f34d77dc/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
index 51abbcf..21d6cf7 100644
--- a/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ b/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())