log4j vulnerability fix

Reverted back log4j fix changes and merged with
actual fix by upgrading the version

Change-Id: Ica392c7f8307a1ecaeac57bf55a45b215ae9840c
Issue-ID: VFC-1598
Signed-off-by: Prakash.E <prakash.e@huawei.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/service/src/test/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/TestRestHttpContentExchange.java b/service/src/test/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/TestRestHttpContentExchange.java
index d407081..75e7c25 100644
--- a/service/src/test/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/TestRestHttpContentExchange.java
+++ b/service/src/test/java/org/onap/vfc/nfvo/multivimproxy/common/util/restclient/TestRestHttpContentExchange.java
@@ -30,8 +30,10 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+/*import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;*/
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
 import org.eclipse.jetty.client.Address;
 import org.eclipse.jetty.client.CachedExchange;
 import org.eclipse.jetty.client.HttpDestination;
@@ -111,7 +113,7 @@ public class TestRestHttpContentExchange {
      */
     @After
     public void tearDown() throws Exception {
-        LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.ERROR);
+        LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.ERROR);
     }
 
     /**
@@ -128,7 +130,7 @@ public class TestRestHttpContentExchange {
         exchange.setRequestURI("/the/request/uri");
         exchange.onRequestCommitted();
 
-        LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG);
+        LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG);
         exchange.onRequestCommitted();
     }
 
@@ -146,7 +148,7 @@ public class TestRestHttpContentExchange {
         exchange.setRequestURI("/the/request/uri");
         exchange.onRequestComplete();
 
-        LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG);
+        LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG);
         exchange.onRequestComplete();
     }
 
@@ -164,7 +166,7 @@ public class TestRestHttpContentExchange {
         exchange.setRequestURI("/the/request/uri");
         exchange.onResponseComplete();
 
-        LogManager.getLogger(RestHttpContentExchange.class).setLevel(Level.DEBUG);
+        LogManager.getLogger(RestHttpContentExchange.class).atLevel(Level.DEBUG);
         exchange.onResponseComplete();
 
         final AtomicInteger isCallback = new AtomicInteger(0);