ACCUMULO-2343 Clean up unused imports/use of deprecated constants
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0501edb9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0501edb9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0501edb9 Branch: refs/heads/master Commit: 0501edb97076f417a659ba8af1076481570b4c41 Parents: 7d60722 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 18 21:37:33 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 18 21:37:33 2014 -0400 ---------------------------------------------------------------------- .../accumulo/core/util/AsyncSocketAppender.java | 3 +-- .../accumulo/core/util/AsyncSocketAppenderTest.java | 16 ++++++++++------ .../accumulo/test/functional/MonitorLoggingIT.java | 1 - 3 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0501edb9/core/src/main/java/org/apache/accumulo/core/util/AsyncSocketAppender.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/AsyncSocketAppender.java b/core/src/main/java/org/apache/accumulo/core/util/AsyncSocketAppender.java index baae9ba..07c2b6c 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/AsyncSocketAppender.java +++ b/core/src/main/java/org/apache/accumulo/core/util/AsyncSocketAppender.java @@ -17,9 +17,8 @@ package org.apache.accumulo.core.util; import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.log4j.AsyncAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.apache.log4j.net.SocketAppender; import org.apache.log4j.spi.LoggingEvent; http://git-wip-us.apache.org/repos/asf/accumulo/blob/0501edb9/core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java b/core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java index 414125a..f7040f0 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/AsyncSocketAppenderTest.java @@ -16,15 +16,19 @@ */ package org.apache.accumulo.core.util; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.apache.log4j.Priority; import org.apache.log4j.net.SocketAppender; import org.apache.log4j.spi.LoggingEvent; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; -import org.easymock.Capture; -import static org.easymock.EasyMock.*; public class AsyncSocketAppenderTest { private SocketAppender sa; @@ -63,8 +67,8 @@ public class AsyncSocketAppenderTest { public void testAppend() { asa = new AsyncSocketAppender(sa); assertFalse(asa.isAttached(sa)); - LoggingEvent event1 = new LoggingEvent("java.lang.String", Logger.getRootLogger(), Priority.INFO, "event1", null); - LoggingEvent event2 = new LoggingEvent("java.lang.Integer", Logger.getRootLogger(), Priority.WARN, "event2", null); + LoggingEvent event1 = new LoggingEvent("java.lang.String", Logger.getRootLogger(), Level.INFO, "event1", null); + LoggingEvent event2 = new LoggingEvent("java.lang.Integer", Logger.getRootLogger(), Level.WARN, "event2", null); sa.activateOptions(); sa.doAppend(event1); sa.doAppend(event2); http://git-wip-us.apache.org/repos/asf/accumulo/blob/0501edb9/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java index c4a2e3d..331a546 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java @@ -30,7 +30,6 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.monitor.Monitor; import org.apache.accumulo.server.util.Admin; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Logger; import org.apache.zookeeper.KeeperException; import org.junit.Test;
