commit 02f115f8c05930dc6930b947f0bf75da8b49eef8
author Vidyashree Rama <vidyashree.rama@huawei.com> Mon Apr 18 12:29:39 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 18 17:08:32 2016 +0000
tree 87908c50ab4333ed5b22bedadd3c78d4ac23b38a
parent 1c6acc42b7fa27e510679d0fccc5ae57d8763c88

Whitebox issue fix

Change-Id: I856266e26d2686affb9271c460927ba3e0e07db2

src/main/java/org/onosproject/yangutils/parser/impl/listeners/StatusListener.java

diff --git a/src/main/java/org/onosproject/yangutils/parser/impl/listeners/StatusListener.java b/src/main/java/org/onosproject/yangutils/parser/impl/listeners/StatusListener.java
index b91003b..4c2abf9 100644
--- a/src/main/java/org/onosproject/yangutils/parser/impl/listeners/StatusListener.java
+++ b/src/main/java/org/onosproject/yangutils/parser/impl/listeners/StatusListener.java
@@ -22,10 +22,10 @@
 import org.onosproject.yangutils.parser.antlrgencode.GeneratedYangParser;
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
+import org.onosproject.yangutils.utils.YangConstructType;
 
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.ENTRY;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
-import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.INVALID_CONTENT;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.INVALID_HOLDER;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.MISSING_HOLDER;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerUtil.removeQuotesAndHandleConcat;
@@ -44,7 +44,7 @@
  *                        deprecated-keyword
  *
  * ANTLR grammar rule
- * statusStatement : STATUS_KEYWORD (CURRENT_KEYWORD | OBSOLETE_KEYWORD | DEPRECATED_KEYWORD) STMTEND;
+ * statusStatement : STATUS_KEYWORD status STMTEND;
  */
 
 /**
@@ -99,14 +99,27 @@
         YangStatusType status;
 
         String value = removeQuotesAndHandleConcat(ctx.status().getText());
-        if (value.equals(CURRENT_KEYWORD)) {
-            status = YangStatusType.CURRENT;
-        } else if (value.equals(DEPRECATED_KEYWORD)) {
-            status = YangStatusType.DEPRECATED;
-        } else if (value.equals(OBSOLETE_KEYWORD)) {
-            status = YangStatusType.OBSOLETE;
-        } else {
-            throw new ParserException(constructListenerErrorMessage(INVALID_CONTENT, STATUS_DATA, value, ENTRY));
+        switch (value) {
+            case CURRENT_KEYWORD: {
+                status = YangStatusType.CURRENT;
+                break;
+            }
+            case DEPRECATED_KEYWORD: {
+                status = YangStatusType.DEPRECATED;
+                break;
+            }
+            case OBSOLETE_KEYWORD: {
+                status = YangStatusType.OBSOLETE;
+                break;
+            }
+            default: {
+                ParserException parserException = new ParserException("YANG file error : " +
+                        YangConstructType.getYangConstructType(STATUS_DATA) + " " + ctx.status().getText() +
+                        " is not valid.");
+                parserException.setLine(ctx.getStart().getLine());
+                parserException.setCharPosition(ctx.getStart().getCharPositionInLine());
+                throw parserException;
+            }
         }
 
         return status;