[ONOS-3906],[ONOS-3910] Implementation of YANG module and leaf/leaf-list translator.
Change-Id: If1a8a991ffafa14b51211f97c435176ee1bf856f
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangAugment.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangAugment.java
index 16735c2..073db3b 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangAugment.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangAugment.java
@@ -76,8 +76,7 @@
/**
* Data model node to maintain information defined in YANG augment.
*/
-public class YangAugment extends YangNode
- implements YangLeavesHolder, YangCommonInfo, Parsable {
+public class YangAugment extends YangNode implements YangLeavesHolder, YangCommonInfo, Parsable {
/**
* Augment target node.
@@ -92,14 +91,12 @@
/**
* List of leaves.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf-lists.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* reference.
@@ -141,6 +138,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -150,6 +148,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -159,8 +158,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -169,8 +168,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -179,10 +177,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -193,8 +191,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -203,8 +201,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -213,10 +210,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -227,6 +224,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -236,6 +234,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -245,6 +244,7 @@
*
* @return the status.
*/
+ @Override
public YangStatusType getStatus() {
return status;
}
@@ -254,6 +254,7 @@
*
* @param status the status to set.
*/
+ @Override
public void setStatus(YangStatusType status) {
this.status = status;
}
@@ -263,6 +264,7 @@
*
* @return returns AUGMENT_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.AUGMENT_DATA;
}
@@ -272,6 +274,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -281,6 +284,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -324,6 +328,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeEntry()
*/
+ @Override
public void generateJavaCodeEntry() {
// TODO Auto-generated method stub
@@ -332,6 +337,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeExit()
*/
+ @Override
public void generateJavaCodeExit() {
// TODO Auto-generated method stub
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangCase.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangCase.java
index b3a17bd..76b8ca2 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangCase.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangCase.java
@@ -88,8 +88,7 @@
/**
* Data model node to maintain information defined in YANG case.
*/
-public class YangCase extends YangNode
- implements YangLeavesHolder, YangCommonInfo, Parsable {
+public class YangCase extends YangNode implements YangLeavesHolder, YangCommonInfo, Parsable {
/**
* Case name.
@@ -106,14 +105,12 @@
/**
* List of leaves.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf lists.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* Reference of the module.
@@ -153,6 +150,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -162,6 +160,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -171,8 +170,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -181,8 +180,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -191,10 +189,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -205,8 +203,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -215,8 +213,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -225,10 +222,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -239,6 +236,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -248,6 +246,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -257,6 +256,7 @@
*
* @return the status.
*/
+ @Override
public YangStatusType getStatus() {
return status;
}
@@ -266,6 +266,7 @@
*
* @param status the status to set.
*/
+ @Override
public void setStatus(YangStatusType status) {
this.status = status;
}
@@ -275,6 +276,7 @@
*
* @return returns CASE_DATA
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.CASE_DATA;
}
@@ -284,6 +286,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -293,6 +296,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -318,6 +322,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeEntry()
*/
+ @Override
public void generateJavaCodeEntry() {
// TODO Auto-generated method stub
@@ -326,6 +331,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeExit()
*/
+ @Override
public void generateJavaCodeExit() {
// TODO Auto-generated method stub
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangContainer.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangContainer.java
index 388360a..cb54cca 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangContainer.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangContainer.java
@@ -16,13 +16,17 @@
package org.onosproject.yangutils.datamodel;
+import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.parser.Parsable;
import org.onosproject.yangutils.parser.ParsableDataType;
-import org.onosproject.yangutils.utils.io.CachedFileHandle;
+import org.onosproject.yangutils.translator.CachedFileHandle;
+import org.onosproject.yangutils.translator.GeneratedFileType;
+import org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax;
+import org.onosproject.yangutils.utils.io.impl.FileSystemUtil;
/*-
* Reference RFC 6020.
*
@@ -105,14 +109,12 @@
/**
* List of leaves contained.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf-lists contained.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* If it is a presence container, then the textual documentation of presence
@@ -186,6 +188,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -195,6 +198,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -204,8 +208,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -214,8 +218,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -224,10 +227,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -238,8 +241,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -248,8 +251,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -258,10 +260,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -290,6 +292,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -299,6 +302,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -308,6 +312,7 @@
*
* @return the status.
*/
+ @Override
public YangStatusType getStatus() {
return status;
}
@@ -317,6 +322,7 @@
*
* @param status the status to set.
*/
+ @Override
public void setStatus(YangStatusType status) {
this.status = status;
}
@@ -344,6 +350,7 @@
*
* @return returns CONTAINER_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.CONTAINER_DATA;
}
@@ -353,6 +360,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -362,6 +370,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -388,17 +397,62 @@
/**
* Generate the java code corresponding to YANG container.
+ *
+ * @throws IOException when fails to generate the source files.
*/
- public void generateJavaCodeEntry() {
- //TODO: autogenerated method stub, to be implemented
- return;
+ @Override
+ public void generateJavaCodeEntry() throws IOException {
+ YangNode parent = getParent();
+ String modPkg = JavaIdentifierSyntax.getPackageFromParent(parent.getPackage(), getName());
+ setPackage(modPkg);
+
+ CachedFileHandle handle = null;
+ try {
+ FileSystemUtil.createPackage(getPackage(), getName());
+ handle = FileSystemUtil.createSourceFiles(getPackage(), getName(), GeneratedFileType.ALL);
+ } catch (IOException e) {
+ throw new IOException("Failed to create the source files.");
+ }
+ setFileHandle(handle);
+ addLavesAttributes();
+ addLeafListAttributes();
+ }
+
+ /**
+ * Adds leaf attributes in generated files.
+ */
+ private void addLavesAttributes() {
+
+ List<YangLeaf<?>> leaves = getListOfLeaf();
+ if (leaves != null) {
+ for (YangLeaf<?> leaf : leaves) {
+ getFileHandle().addAttributeInfo(leaf.getDataType(), leaf.getLeafName(), false);
+ }
+ }
+ }
+
+ /**
+ * Adds leaf list's attributes in generated files.
+ */
+ private void addLeafListAttributes() {
+ List<YangLeafList<?>> leavesList = getListOfLeafList();
+ if (leavesList != null) {
+ for (YangLeafList<?> leafList : leavesList) {
+ getFileHandle().addAttributeInfo(leafList.getDataType(), leafList.getLeafName(), true);
+ }
+ }
+ return;
+
}
/**
* Free resources used to generate code.
+ *
+ * @throws IOException when fails to generate source files.
*/
- public void generateJavaCodeExit() {
- //TODO: autogenerated method stub, to be implemented
+ @Override
+ public void generateJavaCodeExit() throws IOException {
+ getFileHandle().close();
return;
}
}
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
index 9d9ffd3..27d7dc0 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
@@ -75,8 +75,7 @@
/**
* Data model node to maintain information defined in YANG grouping.
*/
-public class YangGrouping extends YangNode
- implements YangLeavesHolder, YangCommonInfo, Parsable {
+public class YangGrouping extends YangNode implements YangLeavesHolder, YangCommonInfo, Parsable {
/**
* Name of the grouping.
@@ -91,14 +90,12 @@
/**
* List of leaves.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf lists.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* Reference of the module.
@@ -138,6 +135,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -147,6 +145,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -156,8 +155,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -166,8 +165,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -176,10 +174,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -190,8 +188,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -200,8 +198,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -210,10 +207,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -224,6 +221,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -233,6 +231,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -242,6 +241,7 @@
*
* @return the status.
*/
+ @Override
public YangStatusType getStatus() {
return status;
}
@@ -251,6 +251,7 @@
*
* @param status the status to set.
*/
+ @Override
public void setStatus(YangStatusType status) {
this.status = status;
}
@@ -260,6 +261,7 @@
*
* @return returns GROUPING_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.GROUPING_DATA;
}
@@ -269,6 +271,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -278,6 +281,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -285,6 +289,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeEntry()
*/
+ @Override
public void generateJavaCodeEntry() {
// TODO Auto-generated method stub
@@ -293,6 +298,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeExit()
*/
+ @Override
public void generateJavaCodeExit() {
// TODO Auto-generated method stub
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangLeavesHolder.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangLeavesHolder.java
index 917d591..ba42bfc 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangLeavesHolder.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangLeavesHolder.java
@@ -27,8 +27,7 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf();
+ public List<YangLeaf<?>> getListOfLeaf();
/**
* Add a leaf in data holder like container / list.
@@ -42,8 +41,7 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- List<YangLeafList> getListOfLeafList();
+ List<YangLeafList<?>> getListOfLeafList();
/**
* Add a leaf-list in data holder like container / list.
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangList.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
index d75c09d..e09b94c 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
@@ -65,8 +65,7 @@
/**
* List data represented in YANG.
*/
-public class YangList extends YangNode
- implements YangLeavesHolder, YangCommonInfo, Parsable {
+public class YangList extends YangNode implements YangLeavesHolder, YangCommonInfo, Parsable {
/**
* name of the YANG list.
@@ -113,14 +112,12 @@
/**
* List of leaves.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf-lists.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* The "max-elements" statement, which is optional, takes as an argument a
@@ -209,6 +206,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -218,6 +216,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -258,8 +257,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -268,8 +267,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -278,10 +276,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -292,8 +290,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -302,8 +300,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -312,10 +309,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -362,6 +359,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -371,6 +369,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -380,6 +379,7 @@
*
* @return the status.
*/
+ @Override
public YangStatusType getStatus() {
return status;
}
@@ -389,6 +389,7 @@
*
* @param status the status to set.
*/
+ @Override
public void setStatus(YangStatusType status) {
this.status = status;
}
@@ -398,6 +399,7 @@
*
* @return returns LIST_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.LIST_DATA;
}
@@ -407,6 +409,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -416,6 +419,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -423,6 +427,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeEntry()
*/
+ @Override
public void generateJavaCodeEntry() {
// TODO Auto-generated method stub
@@ -431,6 +436,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeExit()
*/
+ @Override
public void generateJavaCodeExit() {
// TODO Auto-generated method stub
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
index 1434363..c35fafa 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
@@ -15,14 +15,18 @@
*/
package org.onosproject.yangutils.datamodel;
+import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.parser.Parsable;
import org.onosproject.yangutils.parser.ParsableDataType;
+import org.onosproject.yangutils.translator.CachedFileHandle;
import org.onosproject.yangutils.translator.CodeGenerator;
-import org.onosproject.yangutils.utils.io.CachedFileHandle;
+import org.onosproject.yangutils.translator.GeneratedFileType;
+import org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax;
+import org.onosproject.yangutils.utils.io.impl.FileSystemUtil;
/*-
* Reference:RFC 6020.
@@ -67,8 +71,7 @@
/**
* Data model node to maintain information defined in YANG module.
*/
-public class YangModule extends YangNode
- implements YangLeavesHolder, YangDesc, YangReference, Parsable, CodeGenerator {
+public class YangModule extends YangNode implements YangLeavesHolder, YangDesc, YangReference, Parsable, CodeGenerator {
/**
* Name of the module.
@@ -109,14 +112,12 @@
/**
* List of leaves at root level in the module.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf-lists at root level in the module.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* Name space of the module.
@@ -209,6 +210,7 @@
*
* @return the description of YANG module.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -218,6 +220,7 @@
*
* @param description set the description of YANG module.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -294,8 +297,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -304,8 +307,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -314,10 +316,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -328,8 +330,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -338,8 +340,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -348,10 +349,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -416,6 +417,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -425,6 +427,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -508,6 +511,7 @@
*
* @return returns MODULE_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.MODULE_DATA;
}
@@ -517,6 +521,7 @@
*
* @throws DataModelException a violation of data model rules
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -526,24 +531,67 @@
*
* @throws DataModelException a violation of data model rules
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
/**
* Generates java code for module.
+ *
+ * @throws IOException when fails to generate the source files.
*/
- public void generateJavaCodeEntry() {
- //TODO: autogenerated method stub, to be implemented
+ @Override
+ public void generateJavaCodeEntry() throws IOException {
+ String modPkg = JavaIdentifierSyntax.getRootPackage(getVersion(), getNameSpace().getUri(),
+ getRevision().getRevDate());
+ setPackage(modPkg);
- return;
+ CachedFileHandle handle = null;
+ try {
+ FileSystemUtil.createPackage(getPackage(), getName());
+ handle = FileSystemUtil.createSourceFiles(getPackage(), getName(), GeneratedFileType.ALL);
+ } catch (IOException e) {
+ throw new IOException("Failed to create the source files.");
+ }
+ setFileHandle(handle);
+ addLavesAttributes();
+ addLeafListAttributes();
+ }
+
+ /**
+ * Adds leaf attributes in generated files.
+ */
+ private void addLavesAttributes() {
+
+ List<YangLeaf<?>> leaves = getListOfLeaf();
+ if (leaves != null) {
+ for (YangLeaf<?> leaf : leaves) {
+ getFileHandle().addAttributeInfo(leaf.getDataType(), leaf.getLeafName(), false);
+ }
+ }
+ }
+
+ /**
+ * Adds leaf list's attributes in generated files.
+ */
+ private void addLeafListAttributes() {
+ List<YangLeafList<?>> leavesList = getListOfLeafList();
+ if (leavesList != null) {
+ for (YangLeafList<?> leafList : leavesList) {
+ getFileHandle().addAttributeInfo(leafList.getDataType(), leafList.getLeafName(), true);
+ }
+ }
}
/**
* Free resources used to generate code.
+ *
+ * @throws IOException when fails to generate source files.
*/
- public void generateJavaCodeExit() {
- //TODO: autogenerated method stub, to be implemented
+ @Override
+ public void generateJavaCodeExit() throws IOException {
+ getFileHandle().close();
return;
}
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
index 163599a..36dbb23 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
@@ -72,8 +72,7 @@
/**
* Data model node to maintain information defined in YANG sub-module.
*/
-public class YangSubModule extends YangNode
- implements YangLeavesHolder, YangDesc, YangReference, Parsable {
+public class YangSubModule extends YangNode implements YangLeavesHolder, YangDesc, YangReference, Parsable {
/**
* Name of sub module.
@@ -114,14 +113,12 @@
/**
* List of leaves at root level in the sub-module.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeaf> listOfLeaf;
+ private List<YangLeaf<?>> listOfLeaf;
/**
* List of leaf-lists at root level in the sub-module.
*/
- @SuppressWarnings("rawtypes")
- private List<YangLeafList> listOfLeafList;
+ private List<YangLeafList<?>> listOfLeafList;
/**
* organization owner of the sub-module.
@@ -207,6 +204,7 @@
*
* @return the description.
*/
+ @Override
public String getDescription() {
return description;
}
@@ -216,6 +214,7 @@
*
* @param description set the description.
*/
+ @Override
public void setDescription(String description) {
this.description = description;
}
@@ -292,8 +291,8 @@
*
* @return the list of leaves.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeaf> getListOfLeaf() {
+ @Override
+ public List<YangLeaf<?>> getListOfLeaf() {
return listOfLeaf;
}
@@ -302,8 +301,7 @@
*
* @param leafsList the list of leaf to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeaf(List<YangLeaf> leafsList) {
+ private void setListOfLeaf(List<YangLeaf<?>> leafsList) {
listOfLeaf = leafsList;
}
@@ -312,10 +310,10 @@
*
* @param leaf the leaf to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeaf(YangLeaf<?> leaf) {
if (getListOfLeaf() == null) {
- setListOfLeaf(new LinkedList<YangLeaf>());
+ setListOfLeaf(new LinkedList<YangLeaf<?>>());
}
getListOfLeaf().add(leaf);
@@ -326,8 +324,8 @@
*
* @return the list of leaf-list.
*/
- @SuppressWarnings("rawtypes")
- public List<YangLeafList> getListOfLeafList() {
+ @Override
+ public List<YangLeafList<?>> getListOfLeafList() {
return listOfLeafList;
}
@@ -336,8 +334,7 @@
*
* @param listOfLeafList the list of leaf-list to set.
*/
- @SuppressWarnings("rawtypes")
- private void setListOfLeafList(List<YangLeafList> listOfLeafList) {
+ private void setListOfLeafList(List<YangLeafList<?>> listOfLeafList) {
this.listOfLeafList = listOfLeafList;
}
@@ -346,10 +343,10 @@
*
* @param leafList the leaf-list to be added.
*/
- @SuppressWarnings("rawtypes")
+ @Override
public void addLeafList(YangLeafList<?> leafList) {
if (getListOfLeafList() == null) {
- setListOfLeafList(new LinkedList<YangLeafList>());
+ setListOfLeafList(new LinkedList<YangLeafList<?>>());
}
getListOfLeafList().add(leafList);
@@ -378,6 +375,7 @@
*
* @return the reference.
*/
+ @Override
public String getReference() {
return reference;
}
@@ -387,6 +385,7 @@
*
* @param reference the reference to set.
*/
+ @Override
public void setReference(String reference) {
this.reference = reference;
}
@@ -432,6 +431,7 @@
*
* @return returns SUB_MODULE_DATA.
*/
+ @Override
public ParsableDataType getParsableDataType() {
return ParsableDataType.SUB_MODULE_DATA;
}
@@ -441,6 +441,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnEntry() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -450,6 +451,7 @@
*
* @throws DataModelException a violation of data model rules.
*/
+ @Override
public void validateDataOnExit() throws DataModelException {
// TODO auto-generated method stub, to be implemented by parser
}
@@ -457,6 +459,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeEntry()
*/
+ @Override
public void generateJavaCodeEntry() {
// TODO Auto-generated method stub
@@ -465,6 +468,7 @@
/* (non-Javadoc)
* @see org.onosproject.yangutils.translator.CodeGenerator#generateJavaCodeExit()
*/
+ @Override
public void generateJavaCodeExit() {
// TODO Auto-generated method stub