You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/16 17:19:21 UTC
git commit: ACCUMULO-1751 fixed remaining warnings seen in eclipse,
added license
Updated Branches:
refs/heads/master 01e5296d5 -> 544d0f30c
ACCUMULO-1751 fixed remaining warnings seen in eclipse, added license
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/544d0f30
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/544d0f30
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/544d0f30
Branch: refs/heads/master
Commit: 544d0f30cc5b58009fa8e7a1749f5525037346d0
Parents: 01e5296
Author: Eric Newton <er...@gmail.com>
Authored: Wed Oct 16 11:19:29 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Oct 16 11:19:29 2013 -0400
----------------------------------------------------------------------
.../accumulo/core/client/IsolatedScanner.java | 1 -
.../client/mapreduce/AccumuloRowInputFormat.java | 3 ---
.../core/client/mapreduce/BatchScanConfig.java | 1 -
.../apache/accumulo/core/util/ArgumentChecker.java | 2 +-
.../core/security/ColumnVisibilityTest.java | 1 -
.../org/apache/accumulo/server/util/Initialize.java | 13 -------------
.../test/functional/AccumuloInputFormatIT.java | 16 ++++++++++++++++
7 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
index 4acea76..2e99abf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.impl.IsolationException;
import org.apache.accumulo.core.client.impl.ScannerOptions;
import org.apache.accumulo.core.data.ByteSequence;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
index 92ceec1..992990d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
@@ -17,12 +17,9 @@
package org.apache.accumulo.core.client.mapreduce;
import java.io.IOException;
-import java.util.List;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.RowIterator;
-import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/core/src/main/java/org/apache/accumulo/core/client/mapreduce/BatchScanConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/BatchScanConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/BatchScanConfig.java
index 985df55..470b460 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/BatchScanConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/BatchScanConfig.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.Range;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/core/src/main/java/org/apache/accumulo/core/util/ArgumentChecker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/ArgumentChecker.java b/core/src/main/java/org/apache/accumulo/core/util/ArgumentChecker.java
index 2379873..8966299 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/ArgumentChecker.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/ArgumentChecker.java
@@ -61,7 +61,7 @@ public class ArgumentChecker {
throw new IllegalArgumentException("integer should be > 0, was " + i);
}
- public static final void notEmpty(Iterable arg) {
+ public static final void notEmpty(Iterable<? extends Object> arg) {
if (!arg.iterator().hasNext())
throw new IllegalArgumentException("Argument should not be empty");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
index 260df5f..5c4ee3c 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
@@ -20,7 +20,6 @@ import static org.apache.accumulo.core.security.ColumnVisibility.quote;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static org.junit.Assert.*;
import org.apache.accumulo.core.security.ColumnVisibility.Node;
import org.apache.accumulo.core.security.ColumnVisibility.NodeType;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index a952686..f7ff87a 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -18,10 +18,8 @@ package org.apache.accumulo.server.util;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import java.util.UUID;
@@ -214,17 +212,6 @@ public class Initialize {
return result;
}
- private static <T> T[] concat(T[] a, T[] b) {
- List<T> result = new ArrayList<T>(a.length + b.length);
- for (int i = 0; i < a.length; i++) {
- result.add(a[i]);
- }
- for (int i = 0; i < b.length; i++) {
- result.add(b[i]);
- }
- return result.toArray(a);
- }
-
private static void initFileSystem(Opts opts, VolumeManager fs, UUID uuid) throws IOException {
FileStatus fstat;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/544d0f30/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index 67895d8..f2b3527 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.accumulo.test.functional;
import static java.lang.System.currentTimeMillis;