X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2FYangModelInputStreamAdapter.java;h=23892e18bd4e171d41437c2b40a3ec058f4f317a;hp=a34aaff757074794cde5c4caac24670450016e74;hb=0c108e1b6b108b55b79c5b6dcdb0b4261ac510ba;hpb=9303b14b9dba1a940f0d0a6fe1604bfcd0f9e294 diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/YangModelInputStreamAdapter.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/YangModelInputStreamAdapter.java index a34aaff757..23892e18bd 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/YangModelInputStreamAdapter.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/YangModelInputStreamAdapter.java @@ -7,16 +7,17 @@ */ package org.opendaylight.controller.sal.connect.netconf; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.StringBufferInputStream; -import java.io.StringReader; import org.opendaylight.yangtools.concepts.Delegator; import org.opendaylight.yangtools.yang.common.QName; +import com.google.common.base.Charsets; + /** - * + * * */ public class YangModelInputStreamAdapter extends InputStream implements Delegator { @@ -24,9 +25,7 @@ public class YangModelInputStreamAdapter extends InputStream implements Delegato final String source; final QName moduleIdentifier; final InputStream delegate; - - - + private YangModelInputStreamAdapter(String source, QName moduleIdentifier, InputStream delegate) { super(); this.source = source; @@ -34,46 +33,57 @@ public class YangModelInputStreamAdapter extends InputStream implements Delegato this.delegate = delegate; } + @Override public int read() throws IOException { return delegate.read(); } + @Override public int hashCode() { return delegate.hashCode(); } + @Override public int read(byte[] b) throws IOException { return delegate.read(b); } + @Override public boolean equals(Object obj) { return delegate.equals(obj); } + @Override public int read(byte[] b, int off, int len) throws IOException { return delegate.read(b, off, len); } + @Override public long skip(long n) throws IOException { return delegate.skip(n); } + @Override public int available() throws IOException { return delegate.available(); } + @Override public void close() throws IOException { delegate.close(); } + @Override public void mark(int readlimit) { delegate.mark(readlimit); } + @Override public void reset() throws IOException { delegate.reset(); } + @Override public boolean markSupported() { return delegate.markSupported(); } @@ -89,7 +99,6 @@ public class YangModelInputStreamAdapter extends InputStream implements Delegato } public static YangModelInputStreamAdapter create(QName name, String module) { - InputStream stringInput = new StringBufferInputStream(module); - return new YangModelInputStreamAdapter(null, name, stringInput ); + return new YangModelInputStreamAdapter(null, name, new ByteArrayInputStream(module.getBytes(Charsets.UTF_8))); } }