Replace slf4j-log4j12

Log4j12 is not developed any more and slf4j-simple should be used
instead of slf4j-log4j12 for routing test outputs.

Also remove unnecessary stubbings detected in some test classes.

JIRA: OPNFLWPLUG-1124
Change-Id: I7b17dfae58125523a3f3c570dd02d0323a3066ab
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml
index 7754f4d260eca5f7c944652c4a9d774722ee6617..435cbd4bffef2fdee25f10f2a139741e96864e77 100644 (file)
--- a/applications/forwardingrules-sync/pom.xml
+++ b/applications/forwardingrules-sync/pom.xml
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index 74406b455e1dc4b31d744807ca19b712f812177e..801b189829a7325a29a5f45af9b36cc7329e06ef 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/extension/openflowjava-extension-eric/pom.xml b/extension/openflowjava-extension-eric/pom.xml
index bbc340a379694b22880efd94fd6a1fd66b1c6e4c..3fcd5ef66f592f13e6eda020bddb838c2abb70f8 100644 (file)
--- a/extension/openflowjava-extension-eric/pom.xml
+++ b/extension/openflowjava-extension-eric/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index 0447217813cb0a7f1360e4732ca7c4b7fa6db819..2a9243ac283ec1a70ba5480da25e77656aad815a 100644 (file)
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/extension/openflowplugin-extension-eric/pom.xml b/extension/openflowplugin-extension-eric/pom.xml
index 0029754664c14e6d901e8dc72cdebb04aebdefd3..e5d19eb2dce532472bbbbc016fe0242e2264f690 100644 (file)
--- a/extension/openflowplugin-extension-eric/pom.xml
+++ b/extension/openflowplugin-extension-eric/pom.xml
@@ -46,7 +46,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 592ddb275ce0ec8d915e07ae7652f2a8ee1de8a5..71b4a47f1f5a7074cb43a990431b8cb1e62fa9a2 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -50,7 +50,7 @@
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/libraries/liblldp/pom.xml b/libraries/liblldp/pom.xml
index db702e6d64cb5d5b18ef3d5cb176bec71fea5789..c8b68c7f8dc246404c2417c93c9368e430a75b40 100644 (file)
--- a/libraries/liblldp/pom.xml
+++ b/libraries/liblldp/pom.xml
@@ -24,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml
index a8d5d36c87f99f1958e230cc202b3a0a57f300b9..5c0f51b16b297d2c890b4a907cd4cc57473b8209 100644 (file)
--- a/openflowjava/openflow-protocol-impl/pom.xml
+++ b/openflowjava/openflow-protocol-impl/pom.xml
@@ -84,9 +84,8 @@
         </dependency>
 
         <dependency>
-            <!-- FIXME: configure slf4j-simple instead -->
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/openflowjava/openflow-protocol-it/pom.xml b/openflowjava/openflow-protocol-it/pom.xml
index 20560fc74dbe17f0eb7cfd93b258768cf147a6e5..fd89b4f686ff43ea65683a6bb3377c305b4691df 100644 (file)
--- a/openflowjava/openflow-protocol-it/pom.xml
+++ b/openflowjava/openflow-protocol-it/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/openflowplugin-common/pom.xml b/openflowplugin-common/pom.xml
index e869f47afa7df26752f2d08600e714db88d268ca..1f1f2d0997099f393cc4516502ba0c49a2377cd8 100644 (file)
--- a/openflowplugin-common/pom.xml
+++ b/openflowplugin-common/pom.xml
@@ -24,7 +24,7 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index d368486d21666491c90dad1238eeb9a64de7a174..413ea83ee63cdfb677cca5f1c1d7c96f4bd1d757 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -106,7 +106,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImplTest.java
index 42c89b5f99934fe066ae45b71c07ffd9072e1bca..abd6fbe6ff4fb9dbd28bf2eb920c01693b4e4527 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImplTest.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.openflowplugin.impl.connection;
 
-import java.net.InetSocketAddress;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,8 +47,6 @@ public class ConnectionContextImplTest {
 
     @Before
     public void setUp() {
-        Mockito.when(connetionAdapter.getRemoteAddress())
-                .thenReturn(InetSocketAddress.createUnresolved("ofp-ut.example.org", 4242));
         Mockito.when(connetionAdapter.isAlive()).thenReturn(true);
 
         connectionContext = new ConnectionContextImpl(connetionAdapter, deviceConnectionStatusProvider);
@@ -110,4 +107,4 @@ public class ConnectionContextImplTest {
         connectionContext.changeStateToWorking();
         Assert.assertEquals(ConnectionContext.CONNECTION_STATE.WORKING, connectionContext.getConnectionState());
     }
-}
\ No newline at end of file
+}

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java
index 3528ed4dc7b766140a89ce4f0dcaa246c6fc15f9..2cb43deaa399ccaabcdb54f2b09c13e487254f27 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/connection/listener/HandshakeListenerImplTest.java
@@ -14,7 +14,6 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.net.InetSocketAddress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -100,11 +99,9 @@ public class HandshakeListenerImplTest {
 
     @Test
     public void testOnHandshakeFailure2() {
-        when(connectionAdapter.getRemoteAddress())
-                .thenReturn(InetSocketAddress.createUnresolved("ut-ofp.example.org", 4242));
         connectionContextSpy.setNodeId(new NodeId("openflow:1"));
         handshakeListener.onHandshakeFailure();
         verify(handshakeContext).close();
         verify(connectionContextSpy).closeConnection(false);
     }
-}
\ No newline at end of file
+}

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
index 30afdaa2de4b0eee400498ffde9dc17e79a3546e..9762a21a35bf533ba269649080ed0fdfca898198 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
@@ -158,7 +158,6 @@ public class RpcContextImplTest {
 
     @Test
     public void testClose() {
-        when(routedRpcReg.getInstance()).thenReturn(serviceInstance);
         rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance);
         rpcContext.close();
         assertTrue(rpcContext.isEmptyRpcRegistrations());

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 474ece849757e4d92b8c5b7ad2d5b7175da59246..974ba99840ab04f08c5de7b322eb490a9948a4f7 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -157,7 +157,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index f5891210433cc6d88fe1659f52f7c1bdedf9ba05..7601a3c0214cdc6c42a7a1803166b243fd912b20 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/samples/simple-client/pom.xml b/samples/simple-client/pom.xml
index efc62ec038ab1627a1b64440ab31b539eb3903a1..802c10b1208a74330dde03cf00c4bbf66eae428b 100644 (file)
--- a/samples/simple-client/pom.xml
+++ b/samples/simple-client/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>