Removal of event, eventListener and subject file generation for notification
Change-Id: I283b4b954b79bbc5fab6db6a48d8230b599c5eab
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/TempJavaServiceFragmentFiles.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/TempJavaServiceFragmentFiles.java
index 5162b34..fd99fb1 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/TempJavaServiceFragmentFiles.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/TempJavaServiceFragmentFiles.java
@@ -23,8 +23,6 @@
import org.onosproject.yang.compiler.datamodel.YangOutput;
import org.onosproject.yang.compiler.datamodel.YangRpc;
import org.onosproject.yang.compiler.translator.exception.TranslatorException;
-import org.onosproject.yang.compiler.translator.tojava.javamodel.YangJavaModuleTranslator;
-import org.onosproject.yang.compiler.translator.tojava.javamodel.YangJavaSubModuleTranslator;
import org.onosproject.yang.compiler.translator.tojava.utils.JavaExtendsListHolder;
import java.io.File;
@@ -34,7 +32,6 @@
import static org.onosproject.yang.compiler.translator.tojava.GeneratedTempFileType.RPC_INTERFACE_MASK;
import static org.onosproject.yang.compiler.translator.tojava.JavaAttributeInfo.getAttributeInfoForTheData;
import static org.onosproject.yang.compiler.translator.tojava.JavaQualifiedTypeInfoTranslator.getQualifiedTypeInfoOfCurNode;
-import static org.onosproject.yang.compiler.translator.tojava.utils.JavaCodeSnippetGen.addListenersImport;
import static org.onosproject.yang.compiler.translator.tojava.utils.JavaFileGenerator.generateServiceInterfaceFile;
import static org.onosproject.yang.compiler.translator.tojava.utils.JavaFileGeneratorUtils.addResolvedAugmentedDataNodeImports;
import static org.onosproject.yang.compiler.translator.tojava.utils.JavaIdentifierSyntax.createPackage;
@@ -43,7 +40,6 @@
import static org.onosproject.yang.compiler.utils.UtilConstants.HYPHEN;
import static org.onosproject.yang.compiler.utils.UtilConstants.INPUT;
import static org.onosproject.yang.compiler.utils.UtilConstants.OUTPUT;
-import static org.onosproject.yang.compiler.utils.UtilConstants.Operation.ADD;
import static org.onosproject.yang.compiler.utils.UtilConstants.RPC_INPUT_VAR_NAME;
import static org.onosproject.yang.compiler.utils.UtilConstants.SERVICE;
import static org.onosproject.yang.compiler.utils.UtilConstants.VOID;
@@ -118,7 +114,7 @@
.getTempJavaCodeFragmentFiles().getServiceTempFiles()
.getJavaImportData().getImports(true);
createPackage(curNode);
- boolean notification = false;
+ /*boolean notification = false;
if (curNode instanceof YangJavaModuleTranslator) {
if (!((YangJavaModuleTranslator) curNode).getNotificationNodes()
.isEmpty()) {
@@ -133,7 +129,7 @@
if (notification) {
addListenersImport(curNode, imports, ADD);
- }
+ } */
serviceJavaFileHandle = getJavaFileHandle(getJavaClassName(SERVICE));
generateServiceInterfaceFile(serviceJavaFileHandle, curNode, imports);
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/YangJavaModelUtils.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/YangJavaModelUtils.java
index 520cba2..e321595 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/YangJavaModelUtils.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/YangJavaModelUtils.java
@@ -52,7 +52,7 @@
import java.util.Map;
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.getParentNodeInGenCode;
-import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcNotificationPresent;
+import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS;
import static org.onosproject.yang.compiler.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
import static org.onosproject.yang.compiler.translator.tojava.TempJavaFragmentFiles.addCurNodeInfoInParentTempFile;
@@ -501,7 +501,7 @@
}
updatePackageInfo(info, config, rootPkg);
- if (isRpcNotificationPresent((YangNode) info)) {
+ if (isRpcChildNodePresent((YangNode) info)) {
info.getJavaFileInfo().addGeneratedFileTypes(GENERATE_SERVICE_AND_MANAGER);
}
generateTempFiles(info, config);
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 f27a50b..cbf121c 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
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
-import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcNotificationPresent;
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;
@@ -128,11 +127,11 @@
getRevision(),
yangPlugin.getConflictResolver());
- if (isNotificationChildNodePresent(this)) {
+ /*if (isNotificationChildNodePresent(this)) {
getJavaFileInfo().setGeneratedFileTypes(
getJavaFileInfo().getGeneratedFileTypes()
| GENERATE_ALL_EVENT_CLASS_MASK);
- }
+ }*/
try {
generateCodeOfRootNode(this, yangPlugin, modulePkg);
//Add augmented rpc name
@@ -178,11 +177,9 @@
.getCodeGenerateForSbi() == null ||
!getJavaFileInfo().getPluginConfig()
.getCodeGenerateForSbi().equals(SBI)) {
- if (isRpcNotificationPresent(this)) {
+ if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_SERVICE_AND_MANAGER, this);
- }
- if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_ALL_RPC_CLASS_MASK, this);
}
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaNotificationTranslator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaNotificationTranslator.java
index 5d37e5a..1043a5e 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaNotificationTranslator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/javamodel/YangJavaNotificationTranslator.java
@@ -143,7 +143,7 @@
// with builder class.
try {
generateCodeOfAugmentableNode(this, yangPlugin);
- addNotificationToExtendsList();
+ //addNotificationToExtendsList();
} catch (IOException e) {
throw new TranslatorException(getErrorMsg(FAIL_AT_ENTRY, this,
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 b84a03e..094b796 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
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
-import static org.onosproject.yang.compiler.datamodel.utils.DataModelUtils.isRpcNotificationPresent;
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;
@@ -141,11 +140,11 @@
getVersion(), getNameSpaceFromModule(), getRevision(),
yangPlugin.getConflictResolver());
- if (isNotificationChildNodePresent(this)) {
+ /*if (isNotificationChildNodePresent(this)) {
getJavaFileInfo().setGeneratedFileTypes(
getJavaFileInfo().getGeneratedFileTypes()
| GENERATE_ALL_EVENT_CLASS_MASK);
- }
+ } */
try {
generateCodeOfRootNode(this, yangPlugin, subModulePkg);
if (isRpcChildNodePresent(this)) {
@@ -188,11 +187,9 @@
.getCodeGenerateForSbi() == null ||
!getJavaFileInfo().getPluginConfig()
.getCodeGenerateForSbi().equals(SBI)) {
- if (isRpcNotificationPresent(this)) {
+ if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles().generateJavaFile(
GENERATE_SERVICE_AND_MANAGER, this);
- }
- if (isRpcChildNodePresent(this)) {
getTempJavaCodeFragmentFiles()
.generateJavaFile(GENERATE_ALL_RPC_CLASS_MASK, this);
}