Bug 8002 - Fixing and cleanup of templates for binding2

[mdsal.git] / binding2 / mdsal-binding2-generator-impl / src / main / twirl / org / opendaylight / mdsal / binding / javav2 / generator / impl / yangTemplateWriteRPC.scala.txt

diff --git a/binding2/mdsal-binding2-generator-impl/src/main/twirl/org/opendaylight/mdsal/binding/javav2/generator/impl/yangTemplateWriteRPC.scala.txt b/binding2/mdsal-binding2-generator-impl/src/main/twirl/org/opendaylight/mdsal/binding/javav2/generator/impl/yangTemplateWriteRPC.scala.txt
index 2436b722d47bef11bf43cee1d44eb6e8ea433592..0f522aa310dbe08f8625303ae6967b581f79a830 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/src/main/twirl/org/opendaylight/mdsal/binding/javav2/generator/impl/yangTemplateWriteRPC.scala.txt
+++ b/binding2/mdsal-binding2-generator-impl/src/main/twirl/org/opendaylight/mdsal/binding/javav2/generator/impl/yangTemplateWriteRPC.scala.txt
@@ -11,33 +11,28 @@
 * Twirl is transformed to Scala and compiled. Then,       *
 * it can be called from Java with particular input        *
 * parameters to render desired output code.               *
-*                                                         *
-* Note: we should introduce our own format instead of txt *
 ***********************************************************@
 
 @import org.opendaylight.yangtools.yang.model.api.RpcDefinition
+@import org.opendaylight.yangtools.yang.model.api.Module
 @import org.opendaylight.yangtools.yang.model.api.Status
 
-@(rpc: RpcDefinition)
+@(rpc: RpcDefinition, module: Module)
 rpc @{rpc.getQName().getLocalName()} {
     @if(rpc.getDescription() != null && !rpc.getDescription().isEmpty()) {
         "@{rpc.getDescription()}";
     }
     @if(rpc.getGroupings() != null && !rpc.getGroupings().isEmpty()) {
-        @yangTemplateWriteGroupingDefs(rpc.getGroupings())
+        @yangTemplateWriteGroupingDefs(rpc.getGroupings(), module)
     }
-    @if(rpc.getInput() != null) {
+    @if(rpc.getInput() != null && rpc.getInput().getChildNodes != null && !rpc.getInput().getChildNodes().isEmpty()) {
         input {
-            @if(rpc.getInput().getChildNodes != null && !rpc.getInput().getChildNodes().isEmpty()) {
-                @yangTemplateWriteDataSchemaNodes(rpc.getInput().getChildNodes)
-            }
+            @yangTemplateWriteDataSchemaNodes(rpc.getInput().getChildNodes, module)
         }
     }
-    @if(rpc.getOutput() != null) {
+    @if(rpc.getOutput() != null && rpc.getOutput().getChildNodes != null && !rpc.getOutput().getChildNodes().isEmpty()) {
         output {
-            @if(rpc.getOutput().getChildNodes != null && !rpc.getOutput().getChildNodes().isEmpty()) {
-                @yangTemplateWriteDataSchemaNodes(rpc.getOutput().getChildNodes)
-            }
+            @yangTemplateWriteDataSchemaNodes(rpc.getOutput().getChildNodes, module)
         }
     }
     @if(rpc.getReference() != null && !rpc.getReference().isEmpty()) {