[accumulo] branch master updated: Fixes build after it was broken by #614

[mw...@apache.org]

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 <mw...@apache.org>
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.
  * <p>
- * 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.
  * <p>
  * This class is a singleton.
  * <p>
@@ -95,7 +95,7 @@ public class SiteConfiguration extends AccumuloConfiguration {
     internalConfig.addConfiguration(config);
 
     Map<String,String> temp = StreamSupport
-        .stream(((Iterable<?>) internalConfig::getKeys).spliterator(), false).map(String::valueOf)
+        .stream(((Iterable<String>) 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<String>) 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();