summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
efc5fff)
YangTemplate's private static Module is necessarily always null, so this
is dead code, and it should be perfectly safe, and clearer, to remove
this.
Full disclosure: I actually have absolutely no idea what writeIdentityNs
was originally good for, but don't think I'm breaking anything with this
clean up, because the way the code is now there is no way that this can
ever be anything else than null.
Change-Id: Ib08112c836efdc1c72443a5f93549a96f954dae8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
(cherry picked from commit
24522e1ea2cbc45350697265fa90cf419fcb5689)
- // FIXME: this is not thread-safe and seems to be unused!
- private static var Module module = null
-
def static String generateYangSnipet(SchemaNode schemaNode) {
if (schemaNode == null)
return ''
def static String generateYangSnipet(SchemaNode schemaNode) {
if (schemaNode == null)
return ''
'''
identity «identity.QName.localName» {
«IF identity.baseIdentity != null»
'''
identity «identity.QName.localName» {
«IF identity.baseIdentity != null»
- base "(«writeIdentityNs(identity.baseIdentity)»)«identity.baseIdentity»";
+ base "()«identity.baseIdentity»";
«ENDIF»
«IF !identity.description.nullOrEmpty»
description
«ENDIF»
«IF !identity.description.nullOrEmpty»
description
- def private static writeIdentityNs(IdentitySchemaNode identity) {
- if(module == null)
- return ''
-
- val identityNs = identity.QName.namespace
-
- if(!module.namespace.equals(identityNs))
- return identityNs + ":"
- return ''
- }
-
def private static writeFeatures(Set<FeatureDefinition> features) {
'''
«FOR feature : features»
def private static writeFeatures(Set<FeatureDefinition> features) {
'''
«FOR feature : features»