[ONOS-3906],[ONOS-3910] Implementation of YANG module and leaf/leaf-list translator.
Change-Id: If1a8a991ffafa14b51211f97c435176ee1bf856f
diff --git a/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java b/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
index 163599a..36dbb23 100644
--- a/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
+++ b/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