X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-codec-gson%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fcodec%2Fgson%2FJsonParserStream.java;h=8c42de6c8884882dd872b10e1aa687fe0366b4a2;hb=ae76efb1486909a2a57102a23b4d0fc7efee95a0;hp=59fb571a278f03ab39a6c35cf7feff0d9492ea06;hpb=8f2876d895936b36aba1fc3ec65b18900e559184;p=yangtools.git diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 59fb571a27..8c42de6c88 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -27,6 +27,7 @@ import java.util.ArrayDeque; import java.util.Collections; import java.util.Deque; import java.util.HashSet; +import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; import javax.xml.transform.dom.DOMSource; @@ -304,8 +305,8 @@ public final class JsonParserStream implements Closeable, Flushable { moduleNamePart = childName.substring(0, lastIndexOfColon); nodeNamePart = childName.substring(lastIndexOfColon + 1); - final Module m = schema.findModuleByName(moduleNamePart, null); - namespace = m == null ? null : m.getNamespace(); + final Iterator m = schema.findModules(moduleNamePart).iterator(); + namespace = m.hasNext() ? m.next().getNamespace() : null; } else { nodeNamePart = childName; } @@ -334,7 +335,7 @@ public final class JsonParserStream implements Closeable, Flushable { for (final URI potentialUri : potentialUris) { builder.append('\n'); //FIXME how to get information about revision from JSON input? currently first available is used. - builder.append(schema.findModuleByNamespace(potentialUri).iterator().next().getName()); + builder.append(schema.findModules(potentialUri).iterator().next().getName()); } return builder.toString(); }