ACCUMULO-3167 Remove warnings. Added SuppresDeprecation to a few classes. Will address them in ACCUMULO-3368
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09a761b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09a761b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09a761b8 Branch: refs/heads/metrics2 Commit: 09a761b82eecaac1f37dbfffff207f8706b78543 Parents: 865c9bf Author: Josh Elser <[email protected]> Authored: Tue Nov 25 19:33:40 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Tue Nov 25 19:33:40 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/test/ArbitraryTablePropertiesIT.java | 4 ++++ .../org/apache/accumulo/test/MultiTableBatchWriterIT.java | 2 -- .../java/org/apache/accumulo/test/SplitCancelsMajCIT.java | 6 ++++-- .../org/apache/accumulo/test/functional/BulkFileIT.java | 1 - .../test/functional/DeletedTablesDontFlushIT.java | 7 ++++--- .../accumulo/test/replication/CyclicReplicationIT.java | 3 ++- .../test/replication/MultiInstanceReplicationIT.java | 10 +++++----- .../accumulo/test/replication/StatusCombinerMacIT.java | 1 + .../replication/UnorderedWorkAssignerReplicationIT.java | 8 ++++---- 9 files changed, 24 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java index 7d2f184..7cc136f 100644 --- a/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ArbitraryTablePropertiesIT.java @@ -25,11 +25,15 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.test.functional.SimpleMacIT; +import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Test; +@SuppressWarnings("deprecation") public class ArbitraryTablePropertiesIT extends SimpleMacIT { + private static final Logger log = Logger.getLogger(ArbitraryTablePropertiesIT.class); + @Override protected int defaultTimeoutSeconds() { return 30; }; http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java index ce56472..e30ef98 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java @@ -16,7 +16,6 @@ */ package org.apache.accumulo.test; -import java.io.FileNotFoundException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -43,7 +42,6 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.harness.AccumuloClusterIT; -import org.apache.commons.configuration.ConfigurationException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java index 609e1af..4d8855d 100644 --- a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java +++ b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java @@ -37,8 +37,9 @@ import org.apache.hadoop.io.Text; import org.junit.Test; // ACCUMULO-2862 +@SuppressWarnings("deprecation") public class SplitCancelsMajCIT extends SimpleMacIT{ - + @Test(timeout = 2 * 60 * 1000) public void test() throws Exception { final String tableName = getUniqueNames(1)[0]; @@ -58,6 +59,7 @@ public class SplitCancelsMajCIT extends SimpleMacIT{ // start majc final AtomicReference<Exception> ex = new AtomicReference<Exception>(); Thread thread = new Thread() { + @Override public void run() { try { c.tableOperations().compact(tableName, null, null, true, true); @@ -69,7 +71,7 @@ public class SplitCancelsMajCIT extends SimpleMacIT{ thread.start(); long now = System.currentTimeMillis(); - UtilWaitThread.sleep(10 * 1000); + UtilWaitThread.sleep(10 * 1000); // split the table, interrupts the compaction SortedSet<Text> partitionKeys = new TreeSet<Text>(); partitionKeys.add(new Text("10")); http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java index 13c4d32..7aabdca 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java @@ -26,7 +26,6 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.conf.AccumuloConfiguration; -import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.file.FileOperations; http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java index be1347e..d342bc2 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java @@ -29,8 +29,9 @@ import org.apache.accumulo.fate.util.UtilWaitThread; import org.junit.Test; // ACCUMULO-2880 +@SuppressWarnings("deprecation") public class DeletedTablesDontFlushIT extends SimpleMacIT { - + @Test(timeout = 60 * 1000) public void test() throws Exception { Connector c = getConnector(); @@ -41,7 +42,7 @@ public class DeletedTablesDontFlushIT extends SimpleMacIT { c.tableOperations().attachIterator(tableName, setting, EnumSet.of(IteratorScope.minc)); // let the configuration change propagate through zookeeper UtilWaitThread.sleep(1000); - + Mutation m = new Mutation("xyzzy"); for (int i = 0; i < 100; i++) { m.put("cf", "" + i, new Value(new byte[]{})); @@ -52,5 +53,5 @@ public class DeletedTablesDontFlushIT extends SimpleMacIT { // should go fast c.tableOperations().delete(tableName); } - + } http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java index 002ac97..a85f9fb 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java @@ -200,7 +200,8 @@ public class CyclicReplicationIT { } try { - Connector connMaster1 = master1Cluster.getConnector("root", password), connMaster2 = master2Cluster.getConnector("root", password); + Connector connMaster1 = master1Cluster.getConnector("root", new PasswordToken(password)), connMaster2 = master2Cluster.getConnector("root", + new PasswordToken(password)); String master1UserName = "master1", master1Password = "foo"; String master2UserName = "master2", master2Password = "bar"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index e78ba13..cc9a4e2 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -161,10 +161,10 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { try { final Connector connMaster = getConnector(); - final Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); + final Connector connPeer = peerCluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); ReplicationTable.setOnline(connMaster); - + String peerUserName = "peer", peerPassword = "foo"; String peerClusterName = "peer"; @@ -314,7 +314,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { try { Connector connMaster = getConnector(); - Connector connPeer = peer1Cluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peer1Cluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerClusterName = "peer"; String peerUserName = "peer", peerPassword = "foo"; @@ -455,7 +455,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { peerCluster.start(); Connector connMaster = getConnector(); - Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peerCluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerUserName = "repl"; String peerPassword = "passwd"; @@ -555,7 +555,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { try { Connector connMaster = getConnector(); - Connector connPeer = peer1Cluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peer1Cluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerClusterName = "peer"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java index a667c37..68e57d1 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/StatusCombinerMacIT.java @@ -49,6 +49,7 @@ import com.google.common.collect.Iterables; /** * */ +@SuppressWarnings("deprecation") public class StatusCombinerMacIT extends SimpleMacIT { @Test http://git-wip-us.apache.org/repos/asf/accumulo/blob/09a761b8/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java index 73acf7e..1c8c031 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java @@ -165,7 +165,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { try { final Connector connMaster = getConnector(); - final Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); + final Connector connPeer = peerCluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); ReplicationTable.setOnline(connMaster); @@ -318,7 +318,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { try { Connector connMaster = getConnector(); - Connector connPeer = peer1Cluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peer1Cluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerClusterName = "peer"; String peerUserName = "peer", peerPassword = "foo"; @@ -479,7 +479,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { peerCluster.start(); Connector connMaster = getConnector(); - Connector connPeer = peerCluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peerCluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerUserName = "repl"; String peerPassword = "passwd"; @@ -582,7 +582,7 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT { try { Connector connMaster = getConnector(); - Connector connPeer = peer1Cluster.getConnector("root", ROOT_PASSWORD); + Connector connPeer = peer1Cluster.getConnector("root", new PasswordToken(ROOT_PASSWORD)); String peerClusterName = "peer";
