Bug 4376: Fixed incorrect assumption about QName in extensions

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / effective / UnknownEffectiveStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java
index 2027a1b9cc714a1150ce1010ba5939d395398457..41ff9c96e5b481fc9d5afb7e8ebb7e04a7606d98 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java
@@ -24,14 +24,14 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
 
-public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName, UnknownStatement<QName>> implements
+public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<String, UnknownStatement<String>> implements
         UnknownSchemaNode {
 
     private boolean augmenting;
     private boolean addedByUses;
     private UnknownSchemaNode original;
 
-    private final QName qName;
+    private QName maybeQNameArgument;
     private final SchemaPath path;
     private ExtensionDefinition extension;
     private String description;
@@ -41,7 +41,7 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
     private QName nodeType;
     private final String nodeParameter;
 
-    public UnknownEffectiveStatementImpl(final StmtContext<QName, UnknownStatement<QName>, ?> ctx) {
+    public UnknownEffectiveStatementImpl(final StmtContext<String, UnknownStatement<String>, ?> ctx) {
         super(ctx);
 
         final StmtContext<?, ExtensionStatement, EffectiveStatement<QName, ExtensionStatement>> extensionInit = ctx
@@ -54,10 +54,34 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
             extension = (ExtensionEffectiveStatementImpl) extensionInit.buildEffective();
             nodeType = extension.getQName();
         }
+        
+        List<TypeOfCopy> copyTypesFromOriginal = ctx.getCopyHistory();
 
-        qName = ctx.getStatementArgument();
-        path = Utils.getSchemaPath(ctx);
+        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_AUGMENTATION)) {
+            augmenting = true;
+        }
+        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_USES)) {
+            addedByUses = true;
+        }
+        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_USES_AUGMENTATION)) {
+            addedByUses = augmenting = true;
+        }
 
+        if (ctx.getOriginalCtx() != null) {
+            original = (UnknownSchemaNode) ctx.getOriginalCtx().buildEffective();
+        }
+        
+        // FIXME: Remove following section after fixing 4380
+        if(original != null) {
+            maybeQNameArgument = original.getQName();
+        } else {
+            try {
+                maybeQNameArgument = Utils.qNameFromArgument(ctx, argument());
+            } catch (IllegalArgumentException e) {
+                maybeQNameArgument = nodeType;
+            }
+        }
+        path = Utils.getSchemaPath(ctx.getParentContext()).createChild(maybeQNameArgument);
         nodeParameter = (ctx.rawStatementArgument() == null) ? "" : ctx.rawStatementArgument();
 
         // TODO init other fields (see Bug1412Test)
@@ -73,28 +97,8 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
                 unknownNodes.add((UnknownEffectiveStatementImpl) effectiveStatement);
             }
         }
-
-        initCopyType(ctx);
     }
 
-    private void initCopyType(final StmtContext<QName, UnknownStatement<QName>, ?> ctx) {
-
-        List<TypeOfCopy> copyTypesFromOriginal = ctx.getCopyHistory();
-
-        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_AUGMENTATION)) {
-            augmenting = true;
-        }
-        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_USES)) {
-            addedByUses = true;
-        }
-        if (copyTypesFromOriginal.contains(TypeOfCopy.ADDED_BY_USES_AUGMENTATION)) {
-            addedByUses = augmenting = true;
-        }
-
-        if (ctx.getOriginalCtx() != null) {
-            original = (UnknownSchemaNode) ctx.getOriginalCtx().buildEffective();
-        }
-    }
 
     @Override
     public QName getNodeType() {
@@ -118,7 +122,7 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
 
     @Override
     public QName getQName() {
-        return qName;
+        return maybeQNameArgument;
     }
 
     @Override
@@ -150,7 +154,7 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + Objects.hashCode(qName);
+        result = prime * result + Objects.hashCode(maybeQNameArgument);
         result = prime * result + Objects.hashCode(path);
         result = prime * result + Objects.hashCode(nodeType);
         result = prime * result + Objects.hashCode(nodeParameter);
@@ -169,7 +173,7 @@ public class UnknownEffectiveStatementImpl extends EffectiveStatementBase<QName,
             return false;
         }
         UnknownEffectiveStatementImpl other = (UnknownEffectiveStatementImpl) obj;
-        if (!Objects.equals(qName, other.qName)) {
+        if (!Objects.equals(maybeQNameArgument, other.maybeQNameArgument)) {
             return false;
         }
         if (!Objects.equals(path, other.path)) {