Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C4C5200B90 for ; Sun, 25 Sep 2016 23:23:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B0BF160AE8; Sun, 25 Sep 2016 21:23:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CB3C0160ACE for ; Sun, 25 Sep 2016 23:23:54 +0200 (CEST) Received: (qmail 36988 invoked by uid 500); 25 Sep 2016 21:23:54 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 36977 invoked by uid 99); 25 Sep 2016 21:23:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Sep 2016 21:23:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 96088C00B6 for ; Sun, 25 Sep 2016 21:23:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id qPB5nm-lCnUD for ; Sun, 25 Sep 2016 21:23:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id AB20E60DE4 for ; Sun, 25 Sep 2016 21:23:50 +0000 (UTC) Received: (qmail 36542 invoked by uid 99); 25 Sep 2016 21:23:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Sep 2016 21:23:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BEADE17B1; Sun, 25 Sep 2016 21:23:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plexus@apache.org To: commits@tamaya.incubator.apache.org Date: Sun, 25 Sep 2016 21:23:56 -0000 Message-Id: <6b4f0a4744024a7d93a465e21bc5ea49@git.apache.org> In-Reply-To: <52a24ee3fa43434897c8fbb3b85ab5f9@git.apache.org> References: <52a24ee3fa43434897c8fbb3b85ab5f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-tamaya-sandbox git commit: TAMAYA-60 Changed method signatures. archived-at: Sun, 25 Sep 2016 21:23:55 -0000 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 Authored: Tue Mar 24 08:24:38 2015 +0100 Committer: Oliver B. Fischer 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);} * * - * @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");} * * - * @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())