Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert yanglib to new web API
[netconf.git]
/
netconf
/
yanglib
/
src
/
main
/
java
/
org
/
opendaylight
/
yanglib
/
impl
/
YangLibServiceImpl.java
diff --git
a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java
b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java
index e75776f84b533c6f7baefa94ab5d0b198ffce754..d856ac7bdb5f62b083602d4a449d8cbbea4a46f6 100644
(file)
--- a/
netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java
+++ b/
netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/YangLibServiceImpl.java
@@
-12,6
+12,7
@@
import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.ListenableFuture;
import java.io.IOException;
import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.ListenableFuture;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.util.concurrent.ExecutionException;
import org.opendaylight.yanglib.api.YangLibService;
import org.opendaylight.yangtools.yang.common.Revision;
import java.util.concurrent.ExecutionException;
import org.opendaylight.yanglib.api.YangLibService;
import org.opendaylight.yangtools.yang.common.Revision;
@@
-28,14
+29,9
@@
import org.slf4j.LoggerFactory;
public class YangLibServiceImpl implements YangLibService {
private static final Logger LOG = LoggerFactory.getLogger(YangLibServiceImpl.class);
public class YangLibServiceImpl implements YangLibService {
private static final Logger LOG = LoggerFactory.getLogger(YangLibServiceImpl.class);
- private
volatile
SchemaRepository schemaRepository;
+ private
final
SchemaRepository schemaRepository;
- public YangLibServiceImpl() {
-
- }
-
- public void setSchemaRepository(final SchemaRepository schemaRepository) {
- LOG.debug("Setting schema repository {}", schemaRepository);
+ public YangLibServiceImpl(final SchemaRepository schemaRepository) {
this.schemaRepository = schemaRepository;
}
this.schemaRepository = schemaRepository;
}
@@
-51,7
+47,7
@@
public class YangLibServiceImpl implements YangLibService {
try {
final YangTextSchemaSource source = sourceFuture.get();
try {
final YangTextSchemaSource source = sourceFuture.get();
- return new String(ByteStreams.toByteArray(source.openStream()));
+ return new String(ByteStreams.toByteArray(source.openStream())
, Charset.defaultCharset()
);
} catch (InterruptedException | ExecutionException | IOException e) {
throw new IllegalStateException("Unable to get schema " + sourceId, e);
}
} catch (InterruptedException | ExecutionException | IOException e) {
throw new IllegalStateException("Unable to get schema " + sourceId, e);
}