From commits-return-22066-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Aug 31 18:13:50 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 88C23180663 for ; Fri, 31 Aug 2018 18:13:49 +0200 (CEST) Received: (qmail 32115 invoked by uid 500); 31 Aug 2018 16:13:48 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 32106 invoked by uid 99); 31 Aug 2018 16:13:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Aug 2018 16:13:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2B160851FB; Fri, 31 Aug 2018 16:13:48 +0000 (UTC) Date: Fri, 31 Aug 2018 16:13:48 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: Fixes build after it was broken by #614 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153573202809.16160.6156738647813378327@gitbox.apache.org> From: mwalch@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 82661b605452a9c2f738c5960bda0d3c9981887a X-Git-Newrev: c0b5fd27b706af52928013085a340ce522260291 X-Git-Rev: c0b5fd27b706af52928013085a340ce522260291 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. mwalch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new c0b5fd2 Fixes build after it was broken by #614 c0b5fd2 is described below commit c0b5fd27b706af52928013085a340ce522260291 Author: Mike Walch AuthorDate: Fri Aug 31 11:40:54 2018 -0400 Fixes build after it was broken by #614 * Due to API change from commons-configuration 1.6 to 1.10 --- .../org/apache/accumulo/core/conf/SiteConfiguration.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java index f9553c9..8a9be74 100644 --- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java @@ -44,10 +44,10 @@ import com.google.common.base.Preconditions; * the -o option) and then from accumulo.properties. This implementation supports defaulting * undefined property values to a parent configuration's definitions. *

- * The system property "accumulo.properties" can be used to specify the location of the - * properties file on the classpath or filesystem if the path is prefixed with 'file://'. If the - * system property is not defined, it defaults to "accumulo.properties" and will look on classpath - * for file. + * The system property "accumulo.properties" can be used to specify the location of the properties + * file on the classpath or filesystem if the path is prefixed with 'file://'. If the system + * property is not defined, it defaults to "accumulo.properties" and will look on classpath for + * file. *

* This class is a singleton. *

@@ -95,7 +95,7 @@ public class SiteConfiguration extends AccumuloConfiguration { internalConfig.addConfiguration(config); Map temp = StreamSupport - .stream(((Iterable) internalConfig::getKeys).spliterator(), false).map(String::valueOf) + .stream(((Iterable) internalConfig::getKeys).spliterator(), false) .collect(Collectors.toMap(Function.identity(), internalConfig::getString)); /* @@ -227,9 +227,8 @@ public class SiteConfiguration extends AccumuloConfiguration { parent.getProperties(props, filter); } - StreamSupport.stream(((Iterable) getConfiguration()::getKeys).spliterator(), false) - .map(String::valueOf).filter(filter) - .forEach(k -> props.put(k, getConfiguration().getString(k))); + StreamSupport.stream(((Iterable) getConfiguration()::getKeys).spliterator(), false) + .filter(filter).forEach(k -> props.put(k, getConfiguration().getString(k))); // CredentialProvider should take precedence over site org.apache.hadoop.conf.Configuration hadoopConf = getHadoopConfiguration();