commit be2b331fd0d15ca87266601235132486f93029a7
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Wed Aug 17 18:58:17 2016 +0530
committer GauravAgrawal-Huawei <gauravjbp3ster@gmail.com> Fri Aug 19 13:02:56 2016 +0000
tree 9e5c3251dd50e85186a8a216e1ded230f79d3b1e
parent ade77aebcbe420759296fc6be7436ba3b87dfa58

[ONOS-5102] Value validation in YANG utils for YMS + schema node map changes

Change-Id: I9aafe857e50e06e57d0ab254dbe44c365052b65d

plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListener.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListener.java
index f32a4ed..ee2cb3d 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NamespaceListener.java
@@ -17,7 +17,6 @@
 package org.onosproject.yangutils.parser.impl.listeners;
 
 import java.net.URI;
-
 import org.onosproject.yangutils.datamodel.YangModule;
 import org.onosproject.yangutils.datamodel.YangNameSpace;
 import org.onosproject.yangutils.datamodel.utils.Parsable;
@@ -30,6 +29,7 @@
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
 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;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation.checkStackIsNotEmpty;
 
 /*
@@ -71,10 +71,10 @@
      * (namespace), perform validations and update the data model tree.
      *
      * @param listener Listener's object
-     * @param ctx context object of the grammar rule
+     * @param ctx      context object of the grammar rule
      */
     public static void processNamespaceEntry(TreeWalkListener listener,
-            GeneratedYangParser.NamespaceStatementContext ctx) {
+                                             GeneratedYangParser.NamespaceStatementContext ctx) {
 
         // Check for stack to be non empty.
         checkStackIsNotEmpty(listener, MISSING_HOLDER, NAMESPACE_DATA, ctx.string().getText(), ENTRY);
@@ -92,7 +92,7 @@
             case MODULE_DATA: {
                 YangModule module = (YangModule) tmpNode;
                 YangNameSpace uri = new YangNameSpace();
-                uri.setUri(ctx.string().getText());
+                uri.setUri(removeQuotesAndHandleConcat(ctx.string().getText()));
                 module.setNameSpace(uri);
                 break;
             }