From 38cb61bd70b01673df70540481b0f694e23bf152 Mon Sep 17 00:00:00 2001 From: John Leach Date: Wed, 30 Nov 2016 08:44:44 -0600 Subject: [PATCH] HBASE-17209 Manual Array to Collection Copy: Automated --- .../java/org/apache/hadoop/hbase/client/ClientScanner.java | 4 +--- .../src/main/java/org/apache/hadoop/hbase/client/Result.java | 12 ++---------- .../java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java | 9 ++------- .../hadoop/hbase/rest/filter/RestCsrfPreventionFilter.java | 9 ++------- .../org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 4 +--- 5 files changed, 8 insertions(+), 30 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index c4c86a6..a36a553 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -716,9 +716,7 @@ public abstract class ClientScanner extends AbstractClientScanner { private void addResultsToList(List outputList, Result[] inputArray, int start, int end) { if (inputArray == null || start < 0 || end > inputArray.length) return; - for (int i = start; i < end; i++) { - outputList.add(inputArray[i]); - } + outputList.addAll(Arrays.asList(inputArray).subList(start, end)); } @Override diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java index 9220f12..fde8f75 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java @@ -22,13 +22,7 @@ package org.apache.hadoop.hbase.client; import java.io.IOException; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.NavigableMap; -import java.util.TreeMap; +import java.util.*; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; @@ -835,9 +829,7 @@ public class Result implements CellScannable, CellScanner { } prevRow = currentRow; stale = stale || r.isStale(); - for (Cell c : r.rawCells()) { - cells.add(c); - } + Collections.addAll(cells, r.rawCells()); } } diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java index b5beaae..b57f54c 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java @@ -17,10 +17,7 @@ package org.apache.hadoop.hbase.util; import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; +import java.util.*; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; @@ -117,9 +114,7 @@ public abstract class AbstractHBaseTool implements Tool, Configurable { CommandLine cmd; List argsList = new ArrayList<>(); - for (String arg : args) { - argsList.add(arg); - } + Collections.addAll(argsList, args); // For backward compatibility of args which can't be parsed as Option. See javadoc for // processOldArgs(..) processOldArgs(argsList); diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/RestCsrfPreventionFilter.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/RestCsrfPreventionFilter.java index dbb1447..bde4acb 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/RestCsrfPreventionFilter.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/filter/RestCsrfPreventionFilter.java @@ -18,10 +18,7 @@ package org.apache.hadoop.hbase.rest.filter; import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -102,9 +99,7 @@ public class RestCsrfPreventionFilter implements Filter { void parseMethodsToIgnore(String mti) { String[] methods = mti.split(","); methodsToIgnore = new HashSet(); - for (int i = 0; i < methods.length; i++) { - methodsToIgnore.add(methods[i]); - } + Collections.addAll(methodsToIgnore, methods); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index de5c588..793034f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -516,9 +516,7 @@ public class FSHLog extends AbstractFSWAL { void offer(final long sequence, final SyncFuture[] syncFutures, final int syncFutureCount) { // Set sequence first because the add to the queue will wake the thread if sleeping. this.sequence = sequence; - for (int i = 0; i < syncFutureCount; ++i) { - this.syncFutures.add(syncFutures[i]); - } + this.syncFutures.addAll(Arrays.asList(syncFutures).subList(0, syncFutureCount)); } /** -- 2.9.3 (Apple Git-75)