Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-1382: eliminate QName.getPrefix() from binding-generator-impl.
[yangtools.git]
/
code-generator
/
binding-generator-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
sal
/
binding
/
generator
/
impl
/
YangTemplate.xtend
diff --git
a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/YangTemplate.xtend
b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/YangTemplate.xtend
index 396001dbd31d95fd343f73cb47e0367f37b5cc5c..98d7ef1d9e120bc4540bf7fa7e8d910ac58cf125 100644
(file)
--- a/
code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/YangTemplate.xtend
+++ b/
code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/YangTemplate.xtend
@@
-410,7
+410,7
@@
class YangTemplate {
'''
identity «identity.QName.localName» {
«IF identity.baseIdentity != null»
'''
identity «identity.QName.localName» {
«IF identity.baseIdentity != null»
- base "
«writeIdentityPrefix(identity.baseIdentity)»
«identity.baseIdentity»";
+ base "
(«writeIdentityNs(identity.baseIdentity)»)
«identity.baseIdentity»";
«ENDIF»
«IF !identity.description.nullOrEmpty»
description
«ENDIF»
«IF !identity.description.nullOrEmpty»
description
@@
-427,17
+427,14
@@
class YangTemplate {
'''
}
'''
}
- def static writeIdentity
Prefix
(IdentitySchemaNode identity) {
+ def static writeIdentity
Ns
(IdentitySchemaNode identity) {
if(module == null)
return ''
if(module == null)
return ''
- if(identity.QName.prefix.nullOrEmpty || module.prefix.nullOrEmpty)
- return ''
-
- val identityPrefix = identity.QName.prefix
+ val identityNs = identity.QName.namespace
- if(!module.
prefix.equals(identity.QName.prefix
))
- return identity
Prefix
+ ":"
+ if(!module.
namespace.equals(identityNs
))
+ return identity
Ns
+ ":"
return ''
}
return ''
}
@@
-785,12
+782,13
@@
class YangTemplate {
val StringBuilder sb = new StringBuilder();
for(pathElement : schemaPath) {
val StringBuilder sb = new StringBuilder();
for(pathElement : schemaPath) {
- val
prefix = pathElement.prefix
+ val
ns = pathElement.namespace
val localName = pathElement.localName
sb.append("\\")
val localName = pathElement.localName
sb.append("\\")
- sb.append(prefix)
- sb.append(":")
+ sb.append('(')
+ sb.append(ns)
+ sb.append(')')
sb.append(localName)
}
return sb.toString
sb.append(localName)
}
return sb.toString