Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-2512: get rid of commons-io
[yangtools.git]
/
yang
/
yang-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
util
/
NamedByteArrayInputStream.java
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 9d7e599c418d4fe6fdbeafd22d77f3cb7569f163..158dce8cf3361e2517b3b3e570d6640c0cdbcb18 100644
(file)
--- 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;
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 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;
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 {
}
public static ByteArrayInputStream create(InputStream originalIS) throws IOException {
- String content = IOUtils.toString(originalIS);
+ final byte[] data = ByteStreams.toByteArray(originalIS);
+
if (originalIS instanceof NamedInputStream) {
if (originalIS instanceof NamedInputStream) {
- return new NamedByteArrayInputStream(
content.getBytes()
, originalIS.toString());
+ return new NamedByteArrayInputStream(
data
, originalIS.toString());
} else {
} else {
- return new ByteArrayInputStream(
content.getBytes()
);
+ return new ByteArrayInputStream(
data
);
}
}
}
}