BUG-1382: eliminate QName.getPrefix()

QName should not be carrying a prefix entry. Its presence is a
historical leak from yang parser, where it was used as a hack to have aa
QName before a module import was resolved. This is an invalid case, as
an uresolved QName should never be leaked. The parser no longer needs
this and it has been deprecated in the last release -- so prune it.

Change-Id: I467cc9afb65609d160e67d47fa94cd0332b98025
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/wadl/generator/WadlRestconfGenerator.xtend b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/wadl/generator/WadlRestconfGenerator.xtend
index 3a39b85229e14f5e051bed202bb93d61d7b07182..e860fc12ccd3936c8ee968498f216d1389b905bb 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/wadl/generator/WadlRestconfGenerator.xtend
+++ b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/yang/wadl/generator/WadlRestconfGenerator.xtend
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.wadl.generator
 import java.io.BufferedWriter
 import java.io.File
 import java.io.OutputStreamWriter
+import java.net.URI
 import java.util.ArrayList
 import java.util.HashSet
 import java.util.List
@@ -157,8 +158,11 @@ class WadlRestconfGenerator {
                if (schemaNode instanceof ListSchemaNode) {
                        val listKeys = (schemaNode as ListSchemaNode).keyDefinition
                        for (listKey : listKeys) {
-                               pathListParams.add((schemaNode as DataNodeContainer).getDataChildByName(listKey) as LeafSchemaNode) 
-                               path.append(PATH_DELIMETER + "{" + listKey.localName + "}")
+                               pathListParams.add((schemaNode as DataNodeContainer).getDataChildByName(listKey) as LeafSchemaNode)
+                               path.append(PATH_DELIMETER)
+                               path.append('{')
+                               path.append(listKey.localName)
+                               path.append('}')
                        }
                }
                return path.toString
@@ -185,8 +189,7 @@ class WadlRestconfGenerator {
        private def resourceParams() '''
                «FOR pathParam : pathListParams»
                    «IF pathParam != null»
-                       «val prefix = pathParam.type.QName.prefix»
-                       «val type = if (prefix.nullOrEmpty) pathParam.type.QName.localName else prefix + ":" + pathParam.type.QName.localName»
+                       «val type = pathParam.type.QName.localName»
                        <param required="true" style="template" name="«pathParam.QName.localName»" type="«type»"/>
                        «ENDIF»
                «ENDFOR»
@@ -195,7 +198,7 @@ class WadlRestconfGenerator {
        private def methodGet(DataSchemaNode schemaNode) '''
                <method name="GET">
                        <response>
-                               «representation(schemaNode.QName.prefix, schemaNode.QName.localName)»
+                               «representation(schemaNode.QName.namespace, schemaNode.QName.localName)»
                        </response>
                </method>
        '''
@@ -203,7 +206,7 @@ class WadlRestconfGenerator {
        private def mehodPut(DataSchemaNode schemaNode) '''
                <method name="PUT">
                        <request>
-                               «representation(schemaNode.QName.prefix, schemaNode.QName.localName)»
+                               «representation(schemaNode.QName.namespace, schemaNode.QName.localName)»
                        </request>
                </method>
        '''
@@ -211,7 +214,7 @@ class WadlRestconfGenerator {
        private def mehodPost(DataSchemaNode schemaNode) '''
                <method name="POST">
                        <request>
-                               «representation(schemaNode.QName.prefix, schemaNode.QName.localName)»
+                               «representation(schemaNode.QName.namespace, schemaNode.QName.localName)»
                        </request>
                </method>
        '''
@@ -235,8 +238,8 @@ class WadlRestconfGenerator {
                <method name="DELETE" />
        '''
 
-       private def representation(String prefix, String name) '''
-               «val elementData = if (prefix.nullOrEmpty) name else prefix + ":" + name»
+       private def representation(URI prefix, String name) '''
+               «val elementData = name»
                <representation mediaType="application/xml" element="«elementData»"/>
                <representation mediaType="text/xml" element="«elementData»"/>
                <representation mediaType="application/json" element="«elementData»"/>