commenting RPC code generation
Change-Id: Id4a45a9c51a170e333fb77dfb21e49ed0ed94266
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaModuleTranslator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaModuleTranslator.java
index 562c551..909dcc8 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaModuleTranslator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaModuleTranslator.java
@@ -30,7 +30,6 @@
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_ALL_EVENT_CLASS_MASK;
-import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_ALL_RPC_CLASS_MASK;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
import static org.onosproject.yang.compiler.translator.tojava.YangJavaModelUtils.generateCodeOfRootNode;
@@ -180,8 +179,10 @@
if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_SERVICE_AND_MANAGER, this);
- getTempJavaCodeFragmentFiles()
+ // TODO : code generation for rpc at module level
+ /*getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_ALL_RPC_CLASS_MASK, this);
+ */
}
}
}
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaRpcTranslator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaRpcTranslator.java
index fdf032a..4962077 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaRpcTranslator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaRpcTranslator.java
@@ -34,9 +34,7 @@
import java.io.IOException;
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.getParentNodeInGenCode;
-import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_RPC_COMMAND_CLASS;
-import static org.onosproject.yang.compiler.translator.tojava.YangJavaModelUtils.generateCodeOfNode;
-import static org.onosproject.yang.compiler.translator.tojava.YangJavaModelUtils.generateJava;
+import static org.onosproject.yang.compiler.translator.tojava.YangJavaModelUtils.updatePackageInfo;
import static org.onosproject.yang.compiler.translator.tojava.utils.TranslatorErrorType.FAIL_AT_EXIT;
import static org.onosproject.yang.compiler.translator.tojava.utils.TranslatorErrorType.INVALID_CHILD_NODE;
import static org.onosproject.yang.compiler.translator.tojava.utils.TranslatorErrorType.INVALID_PARENT_NODE;
@@ -61,7 +59,7 @@
*/
public YangJavaRpcTranslator() {
setJavaFileInfo(new JavaFileInfoTranslator());
- getJavaFileInfo().setGeneratedFileTypes(GENERATE_RPC_COMMAND_CLASS);
+ //getJavaFileInfo().setGeneratedFileTypes(GENERATE_RPC_COMMAND_CLASS);
}
/**
@@ -110,8 +108,8 @@
public void generateCodeEntry(YangPluginConfig yangPlugin)
throws TranslatorException {
- // Add package information for RPC and create corresponding folder.
- try {
+ // TODO: code generation for each RPC
+ /*try {
generateCodeOfNode(this, yangPlugin);
} catch (IOException e) {
throw new TranslatorException(
@@ -120,7 +118,10 @@
getLineNumber() + " at " +
getCharPosition()
+ " in " + getFileName() + " " + e.getLocalizedMessage());
- }
+ }*/
+
+ // Add package information for RPC and create corresponding folder.
+ updatePackageInfo(this, yangPlugin);
}
/**
@@ -188,7 +189,7 @@
}
// generate RPC command file
- try {
+ /*try {
generateJava(GENERATE_RPC_COMMAND_CLASS, this);
} catch (IOException e) {
throw new TranslatorException("Failed to generate code for RPC node " +
@@ -196,6 +197,6 @@
getLineNumber() + " at " +
getCharPosition()
+ " in " + getFileName() + " " + e.getLocalizedMessage());
- }
+ }*/
}
}
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaSubModuleTranslator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaSubModuleTranslator.java
index 74eddb7..39d7004 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaSubModuleTranslator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaSubModuleTranslator.java
@@ -31,7 +31,6 @@
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_ALL_EVENT_CLASS_MASK;
-import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_ALL_RPC_CLASS_MASK;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
import static org.onosproject.yang.compiler.translator.tojava.YangJavaModelUtils.generateCodeOfRootNode;
@@ -190,8 +189,10 @@
if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles().generateJavaFile(
GENERATE_SERVICE_AND_MANAGER, this);
- getTempJavaCodeFragmentFiles()
+ // TODO : code generation for rpc at module level
+ /*getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_ALL_RPC_CLASS_MASK, this);
+ */
}
}
}