From 33b77f6e588bc3a4e9e9a8291987a45ded5589b5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 13 Mar 2015 11:44:35 +0100 Subject: [PATCH] BUG-2512: get rid of commons-io Guava/JDK give us everything we need, no need to have yet another library in the dependencies. Change-Id: I3f5e21a3b41bee099a13cb21e972ee4ddb77b77e Signed-off-by: Robert Varga --- .../yangtools/bundle/test/BundleStartTest.java | 1 - yang/yang-parser-impl/pom.xml | 8 ++------ .../yangtools/yang/parser/builder/impl/BuilderUtils.java | 8 ++++---- .../yang/parser/builder/impl/ModuleBuilder.java | 7 ++----- .../yang/parser/util/NamedByteArrayInputStream.java | 9 +++++---- .../yang/parser/repo/SharedSchemaRepositoryTest.java | 4 ++-- 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java index 932ed416bb..721d844fd6 100644 --- a/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java +++ b/integration-test/bundle-test/src/test/java/org/opendaylight/yangtools/bundle/test/BundleStartTest.java @@ -38,7 +38,6 @@ public class BundleStartTest { options.add(mavenBundle("ch.qos.logback", "logback-core").versionAsInProject()); options.add(mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject()); options.add(mavenBundle("com.google.guava", "guava").versionAsInProject()); - options.add(mavenBundle("commons-io", "commons-io").versionAsInProject()); options.add(mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject()); options.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead") .versionAsInProject()); diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 6dc50de20b..6115c83b57 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -66,13 +66,9 @@ concepts - commons-io - commons-io + com.google.code.findbugs + jsr305 - - com.google.code.findbugs - jsr305 - diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java index 932dceb897..12a1f73d1a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java @@ -14,6 +14,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.io.ByteSource; +import com.google.common.io.ByteStreams; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; @@ -32,7 +33,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.commons.io.IOUtils; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Belongs_to_stmtContext; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_header_stmtsContext; import org.opendaylight.yangtools.antlrv4.code.gen.YangParser.Module_stmtContext; @@ -786,16 +786,16 @@ public final class BuilderUtils { private static final class ByteSourceImpl extends ByteSource { private final String toString; - private final ByteArrayOutputStream output = new ByteArrayOutputStream(); + private final byte[] data; private ByteSourceImpl(final InputStream input) throws IOException { toString = input.toString(); - IOUtils.copy(input, output); + data = ByteStreams.toByteArray(input); } @Override public InputStream openStream() throws IOException { - return new NamedByteArrayInputStream(output.toByteArray(), toString); + return new NamedByteArrayInputStream(data, toString); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index aa85be959c..7cac743689 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -6,10 +6,10 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; import java.io.IOException; -import java.io.InputStream; import java.net.URI; import java.util.ArrayList; import java.util.Collections; @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.io.IOUtils; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -929,9 +928,7 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im } public void setSource(final ByteSource byteSource) throws IOException { - try (InputStream stream = byteSource.openStream()) { - setSource(IOUtils.toString(stream)); - } + setSource(byteSource.asCharSource(Charsets.UTF_8).read()); } public void setSource(final String source) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java index 9d7e599c41..158dce8cf3 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java @@ -8,10 +8,10 @@ package org.opendaylight.yangtools.yang.parser.util; +import com.google.common.io.ByteStreams; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.io.IOUtils; public class NamedByteArrayInputStream extends ByteArrayInputStream implements NamedInputStream { private final String toString; @@ -21,11 +21,12 @@ public class NamedByteArrayInputStream extends ByteArrayInputStream implements N } public static ByteArrayInputStream create(InputStream originalIS) throws IOException { - String content = IOUtils.toString(originalIS); + final byte[] data = ByteStreams.toByteArray(originalIS); + if (originalIS instanceof NamedInputStream) { - return new NamedByteArrayInputStream(content.getBytes(), originalIS.toString()); + return new NamedByteArrayInputStream(data, originalIS.toString()); } else { - return new ByteArrayInputStream(content.getBytes()); + return new ByteArrayInputStream(data); } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java index 83c0a8f850..0a94e342cf 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java @@ -30,13 +30,13 @@ import com.google.common.io.Files; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; -import org.apache.commons.io.IOUtils; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; @@ -276,7 +276,7 @@ public class SharedSchemaRepositoryTest { @Override public InputStream openStream() throws IOException { - return IOUtils.toInputStream("running"); + return new ByteArrayInputStream("running".getBytes(Charsets.UTF_8)); } }); } -- 2.36.6