import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
import com.google.common.collect.HashBiMap;
import com.google.common.io.ByteSource;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+
import javax.annotation.concurrent.Immutable;
+
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.tree.ParseTree;
@Immutable
public final class YangParserImpl implements YangContextParser {
private static final Logger LOG = LoggerFactory.getLogger(YangParserImpl.class);
-
private static final String FAIL_DEVIATION_TARGET = "Failed to find deviation target.";
+ private static final Splitter COLON_SPLITTER = Splitter.on(':');
private static final YangParserImpl INSTANCE = new YangParserImpl();
public static YangParserImpl getInstance() {
return INSTANCE;
}
-
-
@Override
@Deprecated
public Set<Module> parseYangModels(final File yangFile, final File directory) {
DataNodeContainerBuilder usesParent = ((UsesNodeBuilder) parent).getParent();
newPath.addAll(usesParent.getPath().getPath());
- URI ns;
- Date revision;
- String prefix;
- QName baseQName = usesParent.getQName();
+ final QName baseQName = usesParent.getQName();
+ final QNameModule qnm;
+ final String prefix;
if (baseQName == null) {
ModuleBuilder m = BuilderUtils.getParentModule(usesParent);
- ns = m.getNamespace();
- revision = m.getRevision();
+ qnm = m.getQNameModule();
prefix = m.getPrefix();
} else {
- ns = baseQName.getNamespace();
- revision = baseQName.getRevision();
+ qnm = baseQName.getModule();
prefix = baseQName.getPrefix();
}
- final QNameModule qm = QNameModule.create(ns, revision);
for (QName qn : oldSchemaPath.getPathFromRoot()) {
- newPath.add(QName.create(qm, prefix, qn.getLocalName()));
+ newPath.add(QName.create(qnm, prefix, qn.getLocalName()));
}
} else {
Iterable<QName> oldPath = oldSchemaPath.getPathFromRoot();
for (QName qn : oldPath) {
- URI ns = module.getNamespace();
- Date rev = module.getRevision();
+ QNameModule qnm = module.getQNameModule();
String localPrefix = qn.getPrefix();
- if (localPrefix != null && !("".equals(localPrefix))) {
+ if (localPrefix != null && !localPrefix.isEmpty()) {
ModuleBuilder currentModule = BuilderUtils.findModuleFromBuilders(modules, module, localPrefix,
augment.getLine());
if (currentModule == null) {
throw new YangParseException(module.getName(), augment.getLine(), "Module with prefix "
+ localPrefix + " not found.");
}
- ns = m.getNamespace();
- rev = m.getRevision();
+ qnm = m.getQNameModule();
} else {
- ns = currentModule.getNamespace();
- rev = currentModule.getRevision();
+ qnm = currentModule.getQNameModule();
}
}
- newPath.add(new QName(ns, rev, localPrefix, qn.getLocalName()));
+ newPath.add(new QName(qnm.getNamespace(), qnm.getRevision(), localPrefix, qn.getLocalName()));
}
}
augment.setTargetNodeSchemaPath(SchemaPath.create(newPath, true));
ModuleBuilder targetModule;
String prefix = qname.getPrefix();
- if (prefix == null || prefix.equals("")) {
+ if (prefix == null || prefix.isEmpty()) {
targetModule = module;
} else {
targetModule = findModuleFromBuilders(modules, module, qname.getPrefix(), line);
if (baseIdentityName != null) {
IdentitySchemaNodeBuilder result = null;
- if (baseIdentityName.contains(":")) {
- String[] splittedBase = baseIdentityName.split(":");
- if (splittedBase.length > 2) {
+ if (baseIdentityName.indexOf(':') != -1) {
+ final Iterator<String> split = COLON_SPLITTER.split(baseIdentityName).iterator();
+ final String prefix = split.next();
+ final String name = split.next();
+ if (split.hasNext()) {
throw new YangParseException(module.getName(), line,
"Failed to parse identityref base: " + baseIdentityName);
}
- String prefix = splittedBase[0];
- String name = splittedBase[1];
+
ModuleBuilder dependentModule = findTargetModule(prefix, module, modules, context, line);
if (dependentModule != null) {
result = BuilderUtils.findIdentity(dependentModule.getAddedIdentities(), name);
DataNodeContainerBuilder parent = usesNode.getParent();
ModuleBuilder module = BuilderUtils.getParentModule(parent);
SchemaPath parentPath;
- URI ns;
- Date rev;
- String pref;
+
+ final QName parentQName;
if (parent instanceof AugmentationSchemaBuilder || parent instanceof ModuleBuilder) {
- ns = module.getNamespace();
- rev = module.getRevision();
- pref = module.getPrefix();
+ parentQName = QName.create(module.getQNameModule(), module.getPrefix(), "dummy");
if (parent instanceof AugmentationSchemaBuilder) {
parentPath = ((AugmentationSchemaBuilder) parent).getTargetNodeSchemaPath();
} else {
parentPath = parent.getPath();
}
} else {
- ns = parent.getQName().getNamespace();
- rev = parent.getQName().getRevision();
- pref = parent.getQName().getPrefix();
+ parentQName = parent.getQName();
parentPath = parent.getPath();
}
GroupingDefinition gd = usesNode.getGroupingDefinition();
Set<DataSchemaNodeBuilder> childNodes = wrapChildNodes(module.getModuleName(), line, gd.getChildNodes(),
- parentPath, ns, rev, pref);
+ parentPath, parentQName);
parent.getChildNodeBuilders().addAll(childNodes);
for (DataSchemaNodeBuilder childNode : childNodes) {
setNodeAddedByUses(childNode);
}
- Set<TypeDefinitionBuilder> typedefs = wrapTypedefs(module.getModuleName(), line, gd, parentPath, ns, rev, pref);
+ Set<TypeDefinitionBuilder> typedefs = wrapTypedefs(module.getModuleName(), line, gd, parentPath, parentQName);
parent.getTypeDefinitionBuilders().addAll(typedefs);
for (TypeDefinitionBuilder typedef : typedefs) {
setNodeAddedByUses(typedef);
}
Set<GroupingBuilder> groupings = wrapGroupings(module.getModuleName(), line, usesNode.getGroupingDefinition()
- .getGroupings(), parentPath, ns, rev, pref);
+ .getGroupings(), parentPath, parentQName);
parent.getGroupingBuilders().addAll(groupings);
for (GroupingBuilder gb : groupings) {
setNodeAddedByUses(gb);
}
List<UnknownSchemaNodeBuilderImpl> unknownNodes = wrapUnknownNodes(module.getModuleName(), line,
- gd.getUnknownSchemaNodes(), parentPath, ns, rev, pref);
+ gd.getUnknownSchemaNodes(), parentPath, parentQName);
parent.getUnknownNodes().addAll(unknownNodes);
for (UnknownSchemaNodeBuilder un : unknownNodes) {
un.setAddedByUses(true);
Code Review / yangtools.git / blobdiff