[ONOS-4955] Defect fixes
Change-Id: Ib12eabac2536e3a0e9871afdbb593e6efb4ddca7
diff --git a/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java b/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
index f40f6ff..f0d4608 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/linker/impl/YangResolutionInfoImpl.java
@@ -1256,13 +1256,13 @@
} else {
throw new LinkerException("Invalid target node type " + targetNode.getNodeType() + " for "
+ augment.getName() + " for " + targetNode.getName() +
- "in " + targetNode.getLineNumber()
+ " in " + targetNode.getLineNumber()
+ " at " + targetNode.getCharPosition() +
" in " + targetNode.getFileName());
}
} else {
throw new LinkerException("Failed to link " + augment.getName() +
- "in " + augment.getLineNumber()
+ " in " + augment.getLineNumber()
+ " at " + augment.getCharPosition() +
" in " + augment.getFileName());
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
index 2717e74..124f275 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
@@ -115,7 +115,7 @@
detectCollidingChildUtil(listener, line, charPositionInLine, "", AUGMENT_DATA);
Parsable curData = listener.getParsedDataStack().peek();
- if (curData instanceof YangModule || curData instanceof YangSubModule || curData instanceof YangUses) {
+ if (curData instanceof YangModule || curData instanceof YangSubModule) {
YangNode curNode = (YangNode) curData;
YangAugment yangAugment = getYangAugmentNode(JAVA_GENERATION);
yangAugment.setLineNumber(line);
@@ -141,7 +141,11 @@
charPositionInLine);
addToResolutionList(resolutionInfo, ctx);
- } else {
+ } else if (curData instanceof YangUses) {
+ throw new ParserException(constructListenerErrorMessage(UNHANDLED_PARSED_DATA, AUGMENT_DATA,
+ ctx.augment().getText(), ENTRY));
+ }
+ else {
throw new ParserException(constructListenerErrorMessage(INVALID_HOLDER, AUGMENT_DATA,
ctx.augment().getText(), ENTRY));
}