You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by br...@apache.org on 2012/03/19 21:21:13 UTC
svn commit: r1302638 - in /incubator/flume/trunk/flume-ng-sdk: pom.xml
src/test/java/org/apache/flume/api/RpcTestUtils.java
src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java
Author: brock
Date: Mon Mar 19 20:21:13 2012
New Revision: 1302638
URL: http://svn.apache.org/viewvc?rev=1302638&view=rev
Log:
FLUME-1035: slf4j error in flume sdk unit tests
(Mike Percy via Brock Noland)
Modified:
incubator/flume/trunk/flume-ng-sdk/pom.xml
incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java
incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java
Modified: incubator/flume/trunk/flume-ng-sdk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sdk/pom.xml?rev=1302638&r1=1302637&r2=1302638&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sdk/pom.xml (original)
+++ incubator/flume/trunk/flume-ng-sdk/pom.xml Mon Mar 19 20:21:13 2012
@@ -77,6 +77,20 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <!-- NOTE: scope would be set to "test" in a non-reactor build. -->
+ <!-- <scope>test</scope> -->
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <!-- NOTE: scope would be set to "test" in a non-reactor build. -->
+ <!-- <scope>test</scope> -->
+ </dependency>
+
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
Modified: incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java?rev=1302638&r1=1302637&r2=1302638&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java (original)
+++ incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java Mon Mar 19 20:21:13 2012
@@ -19,8 +19,6 @@ import java.net.InetSocketAddress;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import junit.framework.Assert;
import org.apache.avro.AvroRemoteException;
import org.apache.avro.ipc.NettyServer;
@@ -34,14 +32,16 @@ import org.apache.flume.event.EventBuild
import org.apache.flume.source.avro.AvroFlumeEvent;
import org.apache.flume.source.avro.AvroSourceProtocol;
import org.apache.flume.source.avro.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Helpers for Netty Avro RPC testing
*/
public class RpcTestUtils {
- private static final Logger logger =
- Logger.getLogger(TestNettyAvroRpcClient.class.getName());
+ private static final Logger logger = LoggerFactory
+ .getLogger(RpcTestUtils.class);
private static final String localhost = "localhost";
@@ -114,7 +114,7 @@ public class RpcTestUtils {
Server server = new NettyServer(responder,
new InetSocketAddress(localhost, 0));
server.start();
- logger.log(Level.INFO, "Server started on hostname: {0}, port: {1}",
+ logger.info("Server started on hostname: {}, port: {}",
new Object[] { localhost, Integer.toString(server.getPort()) });
try {
@@ -122,7 +122,7 @@ public class RpcTestUtils {
Thread.sleep(300L);
} catch (InterruptedException ex) {
- logger.log(Level.SEVERE, "Thread interrupted. Exception follows.", ex);
+ logger.error("Thread interrupted. Exception follows.", ex);
Thread.currentThread().interrupt();
}
@@ -138,7 +138,7 @@ public class RpcTestUtils {
server.close();
server.join();
} catch (InterruptedException ex) {
- logger.log(Level.SEVERE, "Thread interrupted. Exception follows.", ex);
+ logger.error("Thread interrupted. Exception follows.", ex);
Thread.currentThread().interrupt();
}
}
@@ -150,7 +150,7 @@ public class RpcTestUtils {
@Override
public Status append(AvroFlumeEvent event) throws AvroRemoteException {
- logger.log(Level.INFO, "OK: Received event from append(): {0}",
+ logger.info("OK: Received event from append(): {}",
new String(event.getBody().array(), Charset.forName("UTF8")));
return Status.OK;
}
@@ -158,7 +158,7 @@ public class RpcTestUtils {
@Override
public Status appendBatch(List<AvroFlumeEvent> events) throws
AvroRemoteException {
- logger.log(Level.INFO, "OK: Received {0} events from appendBatch()",
+ logger.info("OK: Received {} events from appendBatch()",
events.size());
return Status.OK;
}
@@ -172,7 +172,7 @@ public class RpcTestUtils {
@Override
public Status append(AvroFlumeEvent event) throws AvroRemoteException {
- logger.log(Level.INFO, "Failed: Received event from append(): {0}",
+ logger.info("Failed: Received event from append(): {}",
new String(event.getBody().array(), Charset.forName("UTF8")));
return Status.FAILED;
}
@@ -180,7 +180,7 @@ public class RpcTestUtils {
@Override
public Status appendBatch(List<AvroFlumeEvent> events) throws
AvroRemoteException {
- logger.log(Level.INFO, "Failed: Received {0} events from appendBatch()",
+ logger.info("Failed: Received {} events from appendBatch()",
events.size());
return Status.FAILED;
}
@@ -194,7 +194,7 @@ public class RpcTestUtils {
@Override
public Status append(AvroFlumeEvent event) throws AvroRemoteException {
- logger.log(Level.INFO, "Unknown: Received event from append(): {0}",
+ logger.info("Unknown: Received event from append(): {}",
new String(event.getBody().array(), Charset.forName("UTF8")));
return Status.UNKNOWN;
}
@@ -202,7 +202,7 @@ public class RpcTestUtils {
@Override
public Status appendBatch(List<AvroFlumeEvent> events) throws
AvroRemoteException {
- logger.log(Level.INFO, "Unknown: Received {0} events from appendBatch()",
+ logger.info("Unknown: Received {} events from appendBatch()",
events.size());
return Status.UNKNOWN;
}
@@ -216,7 +216,7 @@ public class RpcTestUtils {
@Override
public Status append(AvroFlumeEvent event) throws AvroRemoteException {
- logger.log(Level.INFO, "Throwing: Received event from append(): {0}",
+ logger.info("Throwing: Received event from append(): {}",
new String(event.getBody().array(), Charset.forName("UTF8")));
throw new AvroRemoteException("Handler smash!");
}
@@ -224,7 +224,7 @@ public class RpcTestUtils {
@Override
public Status appendBatch(List<AvroFlumeEvent> events) throws
AvroRemoteException {
- logger.log(Level.INFO, "Throwing: Received {0} events from appendBatch()",
+ logger.info("Throwing: Received {} events from appendBatch()",
events.size());
throw new AvroRemoteException("Handler smash!");
}
Modified: incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java?rev=1302638&r1=1302637&r2=1302638&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java (original)
+++ incubator/flume/trunk/flume-ng-sdk/src/test/java/org/apache/flume/api/TestNettyAvroRpcClient.java Mon Mar 19 20:21:13 2012
@@ -18,8 +18,6 @@ package org.apache.flume.api;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.junit.Test;
@@ -34,14 +32,16 @@ import org.apache.flume.api.RpcTestUtils
import org.apache.flume.api.RpcTestUtils.ThrowingAvroHandler;
import org.apache.flume.api.RpcTestUtils.UnknownAvroHandler;
import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class TestNettyAvroRpcClient {
- private static final Logger logger =
- Logger.getLogger(TestNettyAvroRpcClient.class.getName());
+ private static final Logger logger = LoggerFactory
+ .getLogger(TestNettyAvroRpcClient.class);
private static final String localhost = "localhost";
@@ -123,7 +123,7 @@ public class TestNettyAvroRpcClient {
try {
server.join();
} catch (InterruptedException ex) {
- logger.log(Level.WARNING, "Thread interrupted during join()", ex);
+ logger.warn("Thread interrupted during join()", ex);
Thread.currentThread().interrupt();
}
try {
@@ -167,7 +167,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerSimpleAppendTest(new FailedAvroHandler());
- logger.severe("Failed: I should never have gotten here!");
+ logger.error("Failed: I should never have gotten here!");
}
/**
@@ -178,7 +178,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerSimpleAppendTest(new UnknownAvroHandler());
- logger.severe("Unknown: I should never have gotten here!");
+ logger.error("Unknown: I should never have gotten here!");
}
/**
@@ -189,7 +189,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerSimpleAppendTest(new ThrowingAvroHandler());
- logger.severe("Throwing: I should never have gotten here!");
+ logger.error("Throwing: I should never have gotten here!");
}
/**
@@ -200,7 +200,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerBatchAppendTest(new FailedAvroHandler());
- logger.severe("Failed: I should never have gotten here!");
+ logger.error("Failed: I should never have gotten here!");
}
/**
@@ -211,7 +211,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerBatchAppendTest(new UnknownAvroHandler());
- logger.severe("Unknown: I should never have gotten here!");
+ logger.error("Unknown: I should never have gotten here!");
}
/**
@@ -222,7 +222,7 @@ public class TestNettyAvroRpcClient {
EventDeliveryException {
RpcTestUtils.handlerBatchAppendTest(new ThrowingAvroHandler());
- logger.severe("Throwing: I should never have gotten here!");
+ logger.error("Throwing: I should never have gotten here!");
}
}