Refactored YANG types resolving.

[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 6e6206594cc419acab737c26fa281868386d3046..6d51868d98be3e025976c2f46366a1a882a8d5c4 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
@@ -17,7 +17,6 @@ import java.util.Collections;
 import java.util.Date;\r
 import java.util.List;\r
 import java.util.Stack;\r
-import java.util.TreeMap;\r
 \r
 import org.antlr.v4.runtime.tree.ParseTree;\r
 import org.opendaylight.controller.antlrv4.code.gen.YangParser;\r
@@ -81,13 +80,12 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
     private String moduleName;\r
     private URI namespace;\r
     private String yangModelPrefix;\r
-    private Date revision;\r
+    private Date revision = new Date(0L);\r
 \r
     private final DateFormat simpleDateFormat = new SimpleDateFormat(\r
             "yyyy-mm-dd");\r
     private final Stack<String> actualPath = new Stack<String>();\r
 \r
-\r
     @Override\r
     public void enterModule_stmt(YangParser.Module_stmtContext ctx) {\r
         moduleName = stringFromNode(ctx);\r
@@ -123,6 +121,7 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
     public void enterModule_header_stmts(final Module_header_stmtsContext ctx) {\r
         super.enterModule_header_stmts(ctx);\r
 \r
+        String yangVersion = null;\r
         for (int i = 0; i < ctx.getChildCount(); ++i) {\r
             final ParseTree treeNode = ctx.getChild(i);\r
             if (treeNode instanceof Namespace_stmtContext) {\r
@@ -133,10 +132,14 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
                 yangModelPrefix = stringFromNode(treeNode);\r
                 moduleBuilder.setPrefix(yangModelPrefix);\r
             } else if (treeNode instanceof Yang_version_stmtContext) {\r
-                final String yangVersion = stringFromNode(treeNode);\r
-                moduleBuilder.setYangVersion(yangVersion);\r
+                yangVersion = stringFromNode(treeNode);\r
             }\r
         }\r
+\r
+        if (yangVersion == null) {\r
+            yangVersion = "1";\r
+        }\r
+        moduleBuilder.setYangVersion(yangVersion);\r
     }\r
 \r
     @Override\r
@@ -168,33 +171,34 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
 \r
     @Override\r
     public void enterRevision_stmts(Revision_stmtsContext ctx) {\r
-        TreeMap<Date, Revision_stmtContext> revisions = new TreeMap<Date, Revision_stmtContext>();\r
-\r
-        for (int i = 0; i < ctx.getChildCount(); ++i) {\r
-            final ParseTree treeNode = ctx.getChild(i);\r
-            if (treeNode instanceof Revision_stmtContext) {\r
-                final String revisionDateStr = stringFromNode(treeNode);\r
-                try {\r
-                    Date revision = simpleDateFormat.parse(revisionDateStr);\r
-                    revisions.put(revision, (Revision_stmtContext)treeNode);\r
-\r
-                } catch (ParseException e) {\r
-                    final String message = "Failed to parse revision string: "+ revisionDateStr;\r
-                    logger.warn(message);\r
+        if (ctx != null) {\r
+            for (int i = 0; i < ctx.getChildCount(); ++i) {\r
+                final ParseTree treeNode = ctx.getChild(i);\r
+                if (treeNode instanceof Revision_stmtContext) {\r
+                    updateRevisionForRevisionStatement(treeNode);\r
                 }\r
             }\r
         }\r
-        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
-                if(child instanceof Reference_stmtContext) {\r
-                    moduleBuilder.setReference(stringFromNode(child));\r
+    }\r
+\r
+    private void updateRevisionForRevisionStatement(final ParseTree treeNode) {\r
+        final String revisionDateStr = stringFromNode(treeNode);\r
+        try {\r
+            final Date revision = simpleDateFormat.parse(revisionDateStr);\r
+            if ((revision != null) && (this.revision.compareTo(revision) < 0)) {\r
+                this.revision = revision;\r
+                moduleBuilder.setRevision(this.revision);\r
+                for (int i = 0; i < treeNode.getChildCount(); ++i) {\r
+                    ParseTree child = treeNode.getChild(i);\r
+                    if (child instanceof Reference_stmtContext) {\r
+                        moduleBuilder.setReference(stringFromNode(child));\r
+                    }\r
                 }\r
             }\r
+        } catch (ParseException e) {\r
+            final String message = "Failed to parse revision string: "\r
+                    + revisionDateStr;\r
+            logger.warn(message);\r
         }\r
     }\r
 \r
@@ -260,11 +264,11 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
 \r
         String argument = null;\r
         boolean yin = false;\r
-        for(int i = 0; i < ctx.getChildCount(); i++) {\r
+        for (int i = 0; i < ctx.getChildCount(); i++) {\r
             ParseTree child = ctx.getChild(i);\r
-            if(child instanceof Argument_stmtContext) {\r
+            if (child instanceof Argument_stmtContext) {\r
                 argument = stringFromNode(child);\r
-                yin = parseYinValue((Argument_stmtContext)child);\r
+                yin = parseYinValue((Argument_stmtContext) child);\r
                 break;\r
             }\r
         }\r
@@ -308,24 +312,25 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
         }\r
 \r
         // if this is base yang type...\r
-        if(YangTypesConverter.isBaseYangType(typeName)) {\r
+        if (YangTypesConverter.isBaseYangType(typeName)) {\r
             if (typeBody == null) {\r
                 // if there are no constraints, just grab default base yang type\r
                 type = YangTypesConverter.javaTypeForBaseYangType(typeName);\r
-                moduleBuilder.setType(type, actualPath);\r
+                moduleBuilder.setType(type, getActualPath());\r
             } else {\r
-                if(typeName.equals("union")) {\r
-                    moduleBuilder.addUnionType(actualPath);\r
+                if ("union".equals(typeName)) {\r
+                    moduleBuilder.addUnionType(getActualPath());\r
                 } else {\r
-                    type = parseTypeBody(typeName, typeBody, actualPath, namespace, revision, yangModelPrefix);\r
-                    moduleBuilder.setType(type, actualPath);\r
+                    type = parseTypeBody(typeName, typeBody, getActualPath(),\r
+                            namespace, revision, yangModelPrefix);\r
+                    moduleBuilder.setType(type, getActualPath());\r
                 }\r
             }\r
         } else {\r
             type = parseUnknownTypeBody(typeQName, typeBody);\r
             // mark parent node of this type statement as dirty\r
-            moduleBuilder.addDirtyNode(actualPath);\r
-            moduleBuilder.setType(type, actualPath);\r
+            moduleBuilder.addDirtyNode(getActualPath());\r
+            moduleBuilder.setType(type, getActualPath());\r
         }\r
 \r
         updatePath(typeName);\r
@@ -695,5 +700,5 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
     private List<String> getActualPath() {\r
         return Collections.unmodifiableList(actualPath);\r
     }\r
-
-}
+\r
+}\r