BUG-2839: remove dependencies on commons-io

Replaces uses of IOUtils methods with guava/JDK equivalents.

Change-Id: I16ece0feec2f4dc84c3be91ec675a0294cffcffb
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml
index 2b297fbadd348bdafa6bf2f874c583a6410b5bcc..9d0fdc0e87e86f70f6c9ff21cbf2514a5d7b0b73 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/pom.xml
@@ -51,11 +51,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-persister-directory-xml-adapter</artifactId>

diff --git a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
index b22924a722878ca455ee1631793cb4aa9466cbe7..554e13487ba52468a664ff0babeaf577d2c2c061 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
+++ b/opendaylight/netconf/config-persister-impl/src/test/java/org/opendaylight/controller/netconf/persist/impl/CapabilityStrippingConfigSnapshotHolderTest.java
@@ -8,12 +8,12 @@
 package org.opendaylight.controller.netconf.persist.impl;
 
 import static org.junit.Assert.assertEquals;
-
+import com.google.common.base.Charsets;
 import com.google.common.collect.Sets;
+import com.google.common.io.Resources;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
 import org.w3c.dom.Element;
@@ -36,11 +36,11 @@ public class CapabilityStrippingConfigSnapshotHolderTest {
     }
 
     private Set<String> readLines(String fileName) throws IOException {
-        return new HashSet<>(IOUtils.readLines(getClass().getResourceAsStream(fileName)));
+        return new HashSet<>(Resources.readLines(getClass().getResource(fileName), Charsets.UTF_8));
     }
 
     private String readToString(String fileName) throws IOException {
-        return IOUtils.toString(getClass().getResourceAsStream(fileName));
+        return Resources.toString(getClass().getResource(fileName), Charsets.UTF_8);
     }
 
 }

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 6f19731f016a36f814029f46288c1532666fc70d..5d880c52c9920d42d7c0a3a037201dd5797e7a13 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -89,11 +89,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>xmlunit</groupId>

diff --git a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java
index 512a127d224f80190757d85d98b5682e91e038a7..f20bbda75e4ac795d037f29d43be7b01b0dabc06 100644 (file)
--- a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java
+++ b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java
@@ -16,10 +16,10 @@ import static org.mockito.Matchers.anySetOf;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import com.google.common.io.ByteStreams;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -42,7 +42,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -330,11 +329,11 @@ public class ConcurrentClientsTest {
             }
             LOG.info(sb.toString());
 
-            outToServer.write(IOUtils.toByteArray(clientHello));
+            outToServer.write(ByteStreams.toByteArray(clientHello));
             outToServer.write("]]>]]>".getBytes());
             outToServer.flush();
             // Thread.sleep(100);
-            outToServer.write(IOUtils.toByteArray(getConfig));
+            outToServer.write(ByteStreams.toByteArray(getConfig));
             outToServer.write("]]>]]>".getBytes());
             outToServer.flush();
             Thread.sleep(100);

diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
index c2812dbf61af7241323941a9317780dd4e7df100..7cdcb1bd28b916716f5f7b50ce4955605e56a3f0 100644 (file)
--- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
+++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/AbstractNetconfConfigTest.java
@@ -14,7 +14,7 @@ import static org.mockito.Matchers.anySetOf;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
-
+import com.google.common.io.ByteStreams;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.EventLoopGroup;
@@ -34,7 +34,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
@@ -262,7 +261,7 @@ public abstract class AbstractNetconfConfigTest extends AbstractConfigTest {
                 assertNotNull(inputStream);
                 final byte[] content;
                 try {
-                    content = IOUtils.toByteArray(inputStream);
+                    content = ByteStreams.toByteArray(inputStream);
                 } catch (IOException e) {
                     throw new IllegalStateException("Cannot read " + inputStream, e);
                 }

diff --git a/opendaylight/netconf/netconf-tcp/pom.xml b/opendaylight/netconf/netconf-tcp/pom.xml
index cf230831b537b5d9d89e586e3d9d10bc5020d7fa..0a3ea5485dd1e74ed84b4f28a6d11536691e4f16 100644 (file)
--- a/opendaylight/netconf/netconf-tcp/pom.xml
+++ b/opendaylight/netconf/netconf-tcp/pom.xml
@@ -27,10 +27,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>netconf-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>