BUG-576: modified parser to handle refinement of extension instances.

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / GroupingUtils.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java
index 8b41ac4f53ad3477b6b796640655d12f7b39d37c..6eb400c483ce7b622b1504ee87ace10c1912db93 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/GroupingUtils.java
@@ -23,8 +23,13 @@ import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.RefineBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class GroupingUtils {
+    private static final Logger LOG = LoggerFactory.getLogger(GroupingUtils.class);
+
+    private static final Splitter COLON_SPLITTER = Splitter.on(':');
     private static final Splitter SLASH_SPLITTER = Splitter.on('/');
 
     private GroupingUtils() {
@@ -116,8 +121,15 @@ public final class GroupingUtils {
 
             DataSchemaNodeBuilder nodeToRefine = (DataSchemaNodeBuilder) currentNode;
             if (nodeToRefine == null) {
-                throw new YangParseException(refine.getModuleName(), refine.getLine(), "Refine target node '"
-                        + refine.getTargetPathString() + "' not found");
+                // FIXME: exception replaced with log to avoid breakage when
+                // user tries to refine instance of extension (unknown node)
+
+                // throw new YangParseException(refine.getModuleName(),
+                // refine.getLine(), "Refine target node '" +
+                // refine.getTargetPathString() + "' not found");
+                LOG.warn("Error in module {} at line {}: Refine target node {} not found.", refine.getModuleName(),
+                        refine.getLine(), refine.getTargetPathString());
+                continue;
             }
             RefineUtils.performRefine(nodeToRefine, refine);
             usesNode.addRefineNode(nodeToRefine);