YANG model parser refactoring

[controller.git] / opendaylight / sal / yang-prototype / code-generator / yang-model-parser-impl / src / main / java / org / opendaylight / controller / yang / model / parser / impl / YangModelParserListenerImpl.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
index 7e64c6e41cc82fd27cd6b8a61125e60a863755f9..6e6206594cc419acab737c26fa281868386d3046 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
@@ -13,7 +13,6 @@ import java.net.URI;
 import java.text.DateFormat;\r
 import java.text.ParseException;\r
 import java.text.SimpleDateFormat;\r
-import java.util.ArrayList;\r
 import java.util.Collections;\r
 import java.util.Date;\r
 import java.util.List;\r
@@ -22,6 +21,7 @@ import java.util.TreeMap;
 \r
 import org.antlr.v4.runtime.tree.ParseTree;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser;\r
+import org.opendaylight.controller.antlrv4.code.gen.YangParser.Argument_stmtContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Base_stmtContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Contact_stmtContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Container_stmtContext;\r
@@ -47,7 +47,6 @@ import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtCont
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Revision_stmtsContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Status_stmtContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Type_body_stmtsContext;\r
-import org.opendaylight.controller.antlrv4.code.gen.YangParser.Union_specificationContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser.Yang_version_stmtContext;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParserBaseListener;\r
 import org.opendaylight.controller.yang.common.QName;\r
@@ -188,6 +187,7 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
         if(revisions.size() > 0) {\r
             Revision_stmtContext revisionCtx = revisions.firstEntry().getValue();\r
             moduleBuilder.setRevision(revisions.firstKey());\r
+            revision = revisions.firstKey();\r
 \r
             for(int i = 0; i < revisionCtx.getChildCount(); i++) {\r
                 ParseTree child = revisionCtx.getChild(i);\r
@@ -253,10 +253,23 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
 \r
     @Override\r
     public void enterExtension_stmt(YangParser.Extension_stmtContext ctx) {\r
-        String argument = stringFromNode(ctx);\r
-        QName qname = new QName(namespace, revision, yangModelPrefix, argument);\r
+        String extName = stringFromNode(ctx);\r
+        QName qname = new QName(namespace, revision, yangModelPrefix, extName);\r
         ExtensionBuilder builder = moduleBuilder.addExtension(qname);\r
         parseSchemaNodeArgs(ctx, builder);\r
+\r
+        String argument = null;\r
+        boolean yin = false;\r
+        for(int i = 0; i < ctx.getChildCount(); i++) {\r
+            ParseTree child = ctx.getChild(i);\r
+            if(child instanceof Argument_stmtContext) {\r
+                argument = stringFromNode(child);\r
+                yin = parseYinValue((Argument_stmtContext)child);\r
+                break;\r
+            }\r
+        }\r
+        builder.setArgument(argument);\r
+        builder.setYinElement(yin);\r
     }\r
 \r
     @Override\r
@@ -283,20 +296,7 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
     @Override\r
     public void enterType_stmt(YangParser.Type_stmtContext ctx) {\r
         String typeName = stringFromNode(ctx);\r
-        QName typeQName;\r
-        if (typeName.contains(":")) {\r
-            String[] splittedName = typeName.split(":");\r
-            String prefix = splittedName[0];\r
-            String name = splittedName[1];\r
-            if (prefix.equals(yangModelPrefix)) {\r
-                typeQName = new QName(namespace, revision, prefix, name);\r
-            } else {\r
-                typeQName = new QName(null, null, prefix, name);\r
-            }\r
-        } else {\r
-            typeQName = new QName(namespace, revision, yangModelPrefix,\r
-                    typeName);\r
-        }\r
+        QName typeQName = parseQName(typeName);\r
 \r
         TypeDefinition<?> type = null;\r
         Type_body_stmtsContext typeBody = null;\r
@@ -315,16 +315,6 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
                 moduleBuilder.setType(type, actualPath);\r
             } else {\r
                 if(typeName.equals("union")) {\r
-                    List<String> types = new ArrayList<String>();\r
-                    for(int i = 0; i < typeBody.getChildCount(); i++) {\r
-                        ParseTree unionSpec = typeBody.getChild(i);\r
-                        if(unionSpec instanceof Union_specificationContext) {\r
-                            for(int j = 0; j < unionSpec.getChildCount(); j++) {\r
-                                ParseTree typeSpec = unionSpec.getChild(j);\r
-                                types.add(stringFromNode(typeSpec));\r
-                            }\r
-                        }\r
-                    }\r
                     moduleBuilder.addUnionType(actualPath);\r
                 } else {\r
                     type = parseTypeBody(typeName, typeBody, actualPath, namespace, revision, yangModelPrefix);\r
@@ -339,7 +329,24 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
         }\r
 \r
         updatePath(typeName);\r
+    }\r
 \r
+    private QName parseQName(String typeName) {\r
+        QName typeQName;\r
+        if (typeName.contains(":")) {\r
+            String[] splittedName = typeName.split(":");\r
+            String prefix = splittedName[0];\r
+            String name = splittedName[1];\r
+            if (prefix.equals(yangModelPrefix)) {\r
+                typeQName = new QName(namespace, revision, prefix, name);\r
+            } else {\r
+                typeQName = new QName(null, null, prefix, name);\r
+            }\r
+        } else {\r
+            typeQName = new QName(namespace, revision, yangModelPrefix,\r
+                    typeName);\r
+        }\r
+        return typeQName;\r
     }\r
 \r
     @Override\r