TOOL bug fix for attribute name and operation type generation
Change-Id: I63eb679d69378e422a329569d1021241af5aeb26
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBinary.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBinary.java
index a43e9cd..a752a80 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBinary.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBinary.java
@@ -69,7 +69,7 @@
*/
public String toString() {
return Base64.getEncoder()
- .encodeToString(binaryData);
+ .encodeToString(binaryData);
}
@Override
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBits.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBits.java
index 3f9cd59..d383890 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBits.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangBits.java
@@ -204,7 +204,7 @@
return null;
}
if (bits.isEmpty()) {
- bits = bit.getBitName();
+ bits = bit.getBitName();
} else {
bits += " " + bit.getBitName();
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangCompilerAnnotation.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangCompilerAnnotation.java
index c7f5605..1aa2dfa 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangCompilerAnnotation.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangCompilerAnnotation.java
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.ResolvableStatus;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangEnumeration.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangEnumeration.java
index 42ffaa6..a7c6510 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangEnumeration.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangEnumeration.java
@@ -50,7 +50,7 @@
@Override
public void addToChildSchemaMap(YangSchemaNodeIdentifier schemaNodeIdentifier,
- YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
+ YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
throws DataModelException {
// Do nothing.
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangExtension.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangExtension.java
index b22f6d1..05894fb 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangExtension.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangExtension.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.datamodel;
import java.io.Serializable;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangFeature.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangFeature.java
index f8f656b..3a7557c 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangFeature.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangFeature.java
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
index e71432f..9bd7720 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangGrouping.java
@@ -124,7 +124,7 @@
@Override
public void addToChildSchemaMap(YangSchemaNodeIdentifier schemaNodeIdentifier,
- YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
+ YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
throws DataModelException {
// Do nothing, to be handled during linking.
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangIdentityRef.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangIdentityRef.java
index 692474c..dd0caf7 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangIdentityRef.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangIdentityRef.java
@@ -257,8 +257,10 @@
return isIdentityForInterFileGroupingResolution;
}
- public void setIdentityForInterFileGroupingResolution(boolean identityForInterFileGroupingResolution) {
- isIdentityForInterFileGroupingResolution = identityForInterFileGroupingResolution;
+ public void setIdentityForInterFileGroupingResolution(
+ boolean identityForInterFileGroupingResolution) {
+ isIdentityForInterFileGroupingResolution =
+ identityForInterFileGroupingResolution;
}
@Override
@@ -279,4 +281,10 @@
//TODO: throw exception
return null;
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
+
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeaf.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeaf.java
index 11132ff..77df35a 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeaf.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeaf.java
@@ -20,6 +20,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeafList.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeafList.java
index a743716..1682723 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeafList.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLeafList.java
@@ -81,32 +81,32 @@
/**
* Reference:RFC 6020.
- * <p>
+ *
* The "max-elements" statement, which is optional, takes as an argument a
* positive integer or the string "unbounded", which puts a constraint on
* valid list entries. A valid leaf-list or list always has at most
* max-elements entries.
- * <p>
+ *
* If no "max-elements" statement is present, it defaults to "unbounded".
*/
private YangMaxElement maxElement;
/**
* Reference:RFC 6020.
- * <p>
+ *
* The "min-elements" statement, which is optional, takes as an argument a
* non-negative integer that puts a constraint on valid list entries. A
* valid leaf-list or list MUST have at least min-elements entries.
- * <p>
+ *
* If no "min-elements" statement is present, it defaults to zero.
- * <p>
+ *
* The behavior of the constraint depends on the type of the leaf-list's or
* list's closest ancestor node in the schema tree that is not a non-
* presence container:
- * <p>
+ *
* o If this ancestor is a case node, the constraint is enforced if any
* other node from the case exists.
- * <p>
+ *
* o Otherwise, it is enforced if the ancestor node exists.
*/
private YangMinElement minElements;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLengthRestriction.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLengthRestriction.java
index 43780a6..e3ea833 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLengthRestriction.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangLengthRestriction.java
@@ -18,6 +18,11 @@
import java.io.Serializable;
+import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
+import org.onosproject.yangutils.datamodel.utils.Parsable;
+import org.onosproject.yangutils.datamodel.utils.YangConstructType;
+import org.onosproject.yangutils.datamodel.utils.builtindatatype.YangUint64;
+
/*-
* Reference RFC 6020.
*
@@ -25,11 +30,6 @@
*
*/
-import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
-import org.onosproject.yangutils.datamodel.utils.Parsable;
-import org.onosproject.yangutils.datamodel.utils.YangConstructType;
-import org.onosproject.yangutils.datamodel.utils.builtindatatype.YangUint64;
-
/**
* Represents the restriction for length data type.
*/
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangList.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
index 7001539..63d1790 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangList.java
@@ -90,7 +90,7 @@
/**
* Reference RFC 6020.
- * <p>
+ *
* The "key" statement, which MUST be present if the list represents
* configuration, and MAY be present otherwise, takes as an argument a
* string that specifies a space-separated list of leaf identifiers of this
@@ -98,39 +98,39 @@
* such leaf identifier MUST refer to a child leaf of the list. The leafs
* can be defined directly in sub-statements to the list, or in groupings
* used in the list.
- * <p>
+ *
* The combined values of all the leafs specified in the key are used to
* uniquely identify a list entry. All key leafs MUST be given values when a
* list entry is created. Thus, any default values in the key leafs or their
* types are ignored. It also implies that any mandatory statement in the
* key leafs are ignored.
- * <p>
+ *
* A leaf that is part of the key can be of any built-in or derived type,
* except it MUST NOT be the built-in type "empty".
- * <p>
+ *
* All key leafs in a list MUST have the same value for their "config" as
* the list itself.
- * <p>
+ *
* List of key leaf names.
*/
private List<String> keyList;
/**
* Reference RFC 6020.
- * <p>
+ *
* The "unique" statement is used to put constraints on valid list
* entries. It takes as an argument a string that contains a space-
* separated list of schema node identifiers, which MUST be given in the
* descendant form. Each such schema node identifier MUST refer to a leaf.
- * <p>
+ *
* If one of the referenced leafs represents configuration data, then
* all of the referenced leafs MUST represent configuration data.
- * <p>
+ *
* The "unique" constraint specifies that the combined values of all the
* leaf instances specified in the argument string, including leafs with
* default values, MUST be unique within all list entry instances in
* which all referenced leafs exist.
- * <p>
+ *
* List of unique leaf/leaf-list names
*/
private List<String> uniqueList;
@@ -149,32 +149,32 @@
/**
* Reference RFC 6020.
- * <p>
+ *
* The "max-elements" statement, which is optional, takes as an argument a
* positive integer or the string "unbounded", which puts a constraint on
* valid list entries. A valid leaf-list or list always has at most
* max-elements entries.
- * <p>
+ *
* If no "max-elements" statement is present, it defaults to "unbounded".
*/
private YangMaxElement maxElements;
/**
* Reference RFC 6020.
- * <p>
+ *
* The "min-elements" statement, which is optional, takes as an argument a
* non-negative integer that puts a constraint on valid list entries. A
* valid leaf-list or list MUST have at least min-elements entries.
- * <p>
+ *
* If no "min-elements" statement is present, it defaults to zero.
- * <p>
+ *
* The behavior of the constraint depends on the type of the leaf-list's or
* list's closest ancestor node in the schema tree that is not a non-
* presence container:
- * <p>
+ *
* o If this ancestor is a case node, the constraint is enforced if any
* other node from the case exists.
- * <p>
+ *
* o Otherwise, it is enforced if the ancestor node exists.
*/
private YangMinElement minElements;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
index 78f3710..c3c44fb 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangModule.java
@@ -81,7 +81,7 @@
/**
* Reference:RFC 6020.
- * <p>
+ *
* The "contact" statement provides contact information for the module. The
* argument is a string that is used to specify contact information for the
* person or persons to whom technical queries concerning this module should
@@ -92,7 +92,7 @@
/**
* Reference:RFC 6020.
- * <p>
+ *
* The "description" statement takes as an argument a string that contains a
* human-readable textual description of this definition. The text is
* provided in a language (or languages) chosen by the module developer; for
@@ -127,7 +127,7 @@
/**
* Reference:RFC 6020.
- * <p>
+ *
* The "organization" statement defines the party responsible for this
* module. The argument is a string that is used to specify a textual
* description of the organization(s) under whose auspices this module was
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
index 29322e6..b1aaf2f 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRevision.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRevision.java
index 0a5342c..6f59cf5 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRevision.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRevision.java
@@ -17,6 +17,7 @@
import java.io.Serializable;
import java.util.Date;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRpc.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRpc.java
index 3216b30..f467053 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRpc.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangRpc.java
@@ -97,7 +97,7 @@
@Override
public void addToChildSchemaMap(YangSchemaNodeIdentifier schemaNodeIdentifier,
- YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
+ YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
throws DataModelException {
/*
* This will maintain all child schema which are there inside input and
@@ -117,7 +117,7 @@
@Override
public void addToDefaultChildMap(YangSchemaNodeIdentifier yangSchemaNodeIdentifier,
- YangSchemaNode yangSchemaNode) {
+ YangSchemaNode yangSchemaNode) {
/*
* This will maintain all default child which are there inside input and
* output as input/output is non data node.
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSchemaNode.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSchemaNode.java
index b79db9e..3cac03d 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSchemaNode.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSchemaNode.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.datamodel;
import java.util.Map;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
/**
@@ -40,7 +41,8 @@
* @return YANG data node context information
* @throws DataModelException data model exception in searching the child
*/
- YangSchemaNodeContextInfo getChildSchema(YangSchemaNodeIdentifier dataNodeIdentifier)
+ YangSchemaNodeContextInfo getChildSchema(
+ YangSchemaNodeIdentifier dataNodeIdentifier)
throws DataModelException;
/**
@@ -54,8 +56,8 @@
throws DataModelException;
/**
- * Returns count of mandatory child nodes, this is used by YMS to identify whether
- * in request all mandatory child nodes are available.
+ * Returns count of mandatory child nodes, this is used by YMS to
+ * identify whether in request all mandatory child nodes are available.
*
* @return count of YANG schema nodes
* @throws DataModelException a violation in data model rule
@@ -64,18 +66,20 @@
throws DataModelException;
/**
- * Returns map of default child nodes, this is used by YMS to identify whether
- * in request all default child nodes are available.
+ * Returns map of default child nodes, this is used by YMS to identify
+ * whether in request all default child nodes are available.
*
* @param dataNodeIdentifier YANG data node identifier
* @return map of default child nodes
*/
- Map<YangSchemaNodeIdentifier, YangSchemaNode> getDefaultChild(YangSchemaNodeIdentifier dataNodeIdentifier);
+ Map<YangSchemaNodeIdentifier, YangSchemaNode> getDefaultChild(
+ YangSchemaNodeIdentifier dataNodeIdentifier);
/**
* Get Java class's package corresponding to the schema node.
*
- * @return java package, it is null, if the Java type is a built in data type
+ * @return java package, it is null, if the Java type is a built in data
+ * type
*/
String getJavaPackage();
@@ -101,6 +105,13 @@
String getName();
/**
+ * Returns Java attribute name.
+ *
+ * @return Java attribute name
+ */
+ String getJavaAttributeName();
+
+ /**
* Sets name of the node.
*
* @return name of the node
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
index b5e1d42..d41b023 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangSubModule.java
@@ -94,7 +94,7 @@
/**
* Reference RFC 6020.
- * <p>
+ *
* The "contact" statement provides contact information for the module. The
* argument is a string that is used to specify contact information for the
* person or persons to whom technical queries concerning this module should
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUnion.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUnion.java
index 070d101..efebd5d 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUnion.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUnion.java
@@ -72,7 +72,7 @@
@Override
public void addToChildSchemaMap(YangSchemaNodeIdentifier schemaNodeIdentifier,
- YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
+ YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
throws DataModelException {
// Do nothing.
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUses.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUses.java
index 71be734..28a31e5 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUses.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangUses.java
@@ -157,7 +157,7 @@
@Override
public void addToChildSchemaMap(YangSchemaNodeIdentifier schemaNodeIdentifier,
- YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
+ YangSchemaNodeContextInfo yangSchemaNodeContextInfo)
throws DataModelException {
// Do nothing.
}
@@ -170,7 +170,7 @@
@Override
public void addToDefaultChildMap(YangSchemaNodeIdentifier yangSchemaNodeIdentifier,
- YangSchemaNode yangSchemaNode) {
+ YangSchemaNode yangSchemaNode) {
// Do nothing.
// TODO
}
@@ -508,7 +508,7 @@
* @param usesHolder holder of uses
*/
private void addResolvedUsesInfoOfGrouping(YangUses usesInGrouping,
- YangLeavesHolder usesHolder)
+ YangLeavesHolder usesHolder)
throws DataModelException {
for (YangNode usesResolvedNode : usesInGrouping.getUsesResolvedNodeList()) {
addNodeOfGrouping(usesResolvedNode);
@@ -533,7 +533,7 @@
* @throws DataModelException a violation in data model rule
*/
private List<YangLeaf> cloneLeavesList(List<YangLeaf> listOfLeaves,
- YangLeavesHolder usesParentNode)
+ YangLeavesHolder usesParentNode)
throws DataModelException {
if (listOfLeaves == null || listOfLeaves.size() == 0) {
throw new DataModelException("No leaves to clone");
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangWhen.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangWhen.java
index c508681..5cfb050 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangWhen.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangWhen.java
@@ -16,6 +16,7 @@
package org.onosproject.yangutils.datamodel;
import java.io.Serializable;
+
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
import org.onosproject.yangutils.datamodel.utils.YangConstructType;
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaFileInfo.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaFileInfo.java
index 2635a5d..8182d8e 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaFileInfo.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaFileInfo.java
@@ -22,7 +22,8 @@
* Represents cached java file handle, which supports the addition of member attributes and
* methods.
*/
-public class JavaFileInfo implements Serializable {
+public class JavaFileInfo
+ implements Serializable {
private static final long serialVersionUID = 806102633L;
@@ -32,11 +33,16 @@
protected String javaName;
/**
- * Java Package of the mapped java class.
+ * Java package of the mapped java class.
*/
protected String pkg;
/**
+ * Java attribute name;
+ */
+ protected String javaAttributeName;
+
+ /**
* Returns the java name of the node.
*
* @return the java name of node
@@ -71,4 +77,23 @@
public void setPackage(String nodePackage) {
pkg = nodePackage;
}
+
+ /**
+ * Retrieve Java attribute name.
+ *
+ * @return Java attribute name
+ */
+ public String getJavaAttributeName() {
+ return javaAttributeName;
+ }
+
+ /**
+ * Assign the Java attribute Name.
+ *
+ * @param javaAttributeName Java attribute name
+ */
+ public void setJavaAttributeName(String javaAttributeName) {
+ this.javaAttributeName = javaAttributeName;
+ }
+
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaQualifiedTypeInfo.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaQualifiedTypeInfo.java
index e3d7952..863821c 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaQualifiedTypeInfo.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/JavaQualifiedTypeInfo.java
@@ -37,6 +37,10 @@
protected String classInfo;
/**
+ * attribute name being used.
+ */
+ protected String javaAttributeName;
+ /**
* Returns the imported package info.
*
* @return the imported package info
@@ -72,4 +76,21 @@
this.classInfo = classInfo;
}
+ /**
+ * Retrieve Java attribute name.
+ *
+ * @return Java attribute name
+ */
+ public String getJavaAttributeName() {
+ return javaAttributeName;
+ }
+
+ /**
+ * Assign Java attribute name.
+ *
+ * @param javaAttributeName Java attribute name
+ */
+ public void setJavaAttributeName(String javaAttributeName) {
+ this.javaAttributeName = javaAttributeName;
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaAugment.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaAugment.java
index fa11c6e..110817f 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaAugment.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaAugment.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaCase.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaCase.java
index aa6e4cf..dcb7a12 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaCase.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaCase.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.datamodel.javadatamodel;
import org.onosproject.yangutils.datamodel.YangCase;
+import org.onosproject.yangutils.datamodel.YangNode;
/**
* Represents YANG java case.
@@ -46,4 +47,14 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ YangNode parent = getParent();
+ if (parent instanceof YangJavaChoice) {
+ return ((YangJavaChoice) parent).getJavaFileInfo()
+ .getJavaAttributeName();
+ }
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaChoice.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaChoice.java
index b54013a..8cdef42 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaChoice.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaChoice.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaContainer.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaContainer.java
index e0470ed..584728d 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaContainer.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaContainer.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaEnumeration.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaEnumeration.java
index 1e9a5d5..29a2a33 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaEnumeration.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaEnumeration.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaGrouping.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaGrouping.java
index 79cfb17..bf8eb13 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaGrouping.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaGrouping.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaIdentity.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaIdentity.java
index 4a5a866..69974c1 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaIdentity.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaIdentity.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaInput.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaInput.java
index 635b51b..bd3237a 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaInput.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaInput.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeaf.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeaf.java
index 20a9517..f9b02da 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeaf.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeaf.java
@@ -21,7 +21,9 @@
/**
* Represent YANG java leaf.
*/
-public class YangJavaLeaf extends YangLeaf implements JavaQualifiedTypeInfoContainer {
+public class YangJavaLeaf
+ extends YangLeaf
+ implements JavaQualifiedTypeInfoContainer {
private static final long serialVersionUID = 208201617L;
@@ -54,4 +56,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaQualifiedInfo().getClassInfo();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaQualifiedInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeafList.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeafList.java
index 1389f8a..5ce7cec 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeafList.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaLeafList.java
@@ -21,7 +21,9 @@
/**
* Represents YANG java leaf list.
*/
-public class YangJavaLeafList extends YangLeafList implements JavaQualifiedTypeInfoContainer {
+public class YangJavaLeafList
+ extends YangLeafList
+ implements JavaQualifiedTypeInfoContainer {
private static final long serialVersionUID = 208201618L;
@@ -54,4 +56,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaQualifiedInfo().getClassInfo();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaQualifiedInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaList.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaList.java
index 00d42c1..00a4232 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaList.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaList.java
@@ -49,4 +49,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaModule.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaModule.java
index 08544f4..3a769d6 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaModule.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaModule.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaNotification.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaNotification.java
index 39a32e1..c926066 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaNotification.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaNotification.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaOutput.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaOutput.java
index 8b23fba..8d1e906 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaOutput.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaOutput.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaRpc.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaRpc.java
index 74b8f11..0cd87cc 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaRpc.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaRpc.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ return getJavaFileInfo().getJavaAttributeName();
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaSubModule.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaSubModule.java
index 15acdb8..435a182 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaSubModule.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaSubModule.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaTypeDef.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaTypeDef.java
index 3cb5841..14cff15 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaTypeDef.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaTypeDef.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUnion.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUnion.java
index a13c127..5345e9c 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUnion.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUnion.java
@@ -45,4 +45,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUses.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUses.java
index 07c1b3f..d136eec 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUses.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/javadatamodel/YangJavaUses.java
@@ -46,4 +46,9 @@
public String getJavaClassNameOrBuiltInType() {
return getJavaFileInfo().getJavaName();
}
+
+ @Override
+ public String getJavaAttributeName() {
+ throw new RuntimeException("Attribute name is not applicable ");
+ }
}
diff --git a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/utils/RestrictionResolver.java b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/utils/RestrictionResolver.java
index 7a44d1f..e3d0d1a 100644
--- a/datamodel/src/main/java/org/onosproject/yangutils/datamodel/utils/RestrictionResolver.java
+++ b/datamodel/src/main/java/org/onosproject/yangutils/datamodel/utils/RestrictionResolver.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.datamodel.utils;
import java.util.regex.Pattern;
+
import org.onosproject.yangutils.datamodel.YangRangeInterval;
import org.onosproject.yangutils.datamodel.YangRangeRestriction;
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
index 6c6a38d..375a9b8 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/AugmentListener.java
@@ -94,10 +94,10 @@
* (augment), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processAugmentEntry(TreeWalkListener listener,
- GeneratedYangParser.AugmentStatementContext ctx) {
+ GeneratedYangParser.AugmentStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, AUGMENT_DATA, ctx.augment().getText(), ENTRY);
@@ -151,10 +151,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processAugmentExit(TreeWalkListener listener,
- GeneratedYangParser.AugmentStatementContext ctx) {
+ GeneratedYangParser.AugmentStatementContext ctx) {
//Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, AUGMENT_DATA, ctx.augment().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BaseListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BaseListener.java
index 1925375..25bb595 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BaseListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BaseListener.java
@@ -58,10 +58,10 @@
* input matching the grammar rule (base).
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processBaseEntry(TreeWalkListener listener,
- GeneratedYangParser.BaseStatementContext ctx) {
+ GeneratedYangParser.BaseStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, BASE_DATA, ctx.string().getText(), ENTRY);
@@ -100,7 +100,7 @@
* Add to resolution list.
*
* @param resolutionInfo resolution information
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
private static void addToResolutionList(YangResolutionInfoImpl<YangBase> resolutionInfo,
GeneratedYangParser.BaseStatementContext ctx) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitListener.java
index 4dce199..e011fca 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitListener.java
@@ -100,10 +100,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processBitEntry(TreeWalkListener listener,
- GeneratedYangParser.BitStatementContext ctx) {
+ GeneratedYangParser.BitStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, BIT_DATA, ctx.identifier().getText(), ENTRY);
@@ -120,10 +120,10 @@
* validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processBitExit(TreeWalkListener listener,
- GeneratedYangParser.BitStatementContext ctx) {
+ GeneratedYangParser.BitStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, BIT_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
index c53a516..f2c326d 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
@@ -79,10 +79,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processBitsEntry(TreeWalkListener listener,
- GeneratedYangParser.BitsSpecificationContext ctx) {
+ GeneratedYangParser.BitsSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, BITS_DATA, "", ENTRY);
@@ -126,10 +126,10 @@
* validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processBitsExit(TreeWalkListener listener,
- GeneratedYangParser.BitsSpecificationContext ctx) {
+ GeneratedYangParser.BitsSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, BITS_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CaseListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CaseListener.java
index 3078c08..2440521 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CaseListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CaseListener.java
@@ -84,10 +84,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processCaseEntry(TreeWalkListener listener,
- GeneratedYangParser.CaseStatementContext ctx) {
+ GeneratedYangParser.CaseStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, CASE_DATA, ctx.identifier().getText(), ENTRY);
@@ -127,10 +127,10 @@
* validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processCaseExit(TreeWalkListener listener,
- GeneratedYangParser.CaseStatementContext ctx) {
+ GeneratedYangParser.CaseStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, CASE_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ChoiceListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ChoiceListener.java
index e07dca6..ff476c7 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ChoiceListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ChoiceListener.java
@@ -101,10 +101,10 @@
* (choice), perform validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processChoiceEntry(TreeWalkListener listener,
- GeneratedYangParser.ChoiceStatementContext ctx) {
+ GeneratedYangParser.ChoiceStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, CHOICE_DATA, ctx.identifier().getText(), ENTRY);
@@ -124,7 +124,7 @@
if (curData instanceof YangModule || curData instanceof YangSubModule || curData instanceof YangContainer
|| curData instanceof YangList || curData instanceof YangCase || curData instanceof YangGrouping
- || curData instanceof YangAugment || curData instanceof YangInput || curData instanceof YangOutput
+ || curData instanceof YangAugment || curData instanceof YangInput || curData instanceof YangOutput
|| curData instanceof YangNotification) {
YangChoice choiceNode = getYangChoiceNode(JAVA_GENERATION);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CompilerAnnotationListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CompilerAnnotationListener.java
index 8a5627f..d8abb31 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CompilerAnnotationListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/CompilerAnnotationListener.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.parser.impl.listeners;
import java.util.List;
+
import org.onosproject.yangutils.datamodel.YangAtomicPath;
import org.onosproject.yangutils.datamodel.YangCompilerAnnotation;
import org.onosproject.yangutils.datamodel.YangModule;
@@ -138,7 +139,7 @@
* @param ctx context object of the grammar rule
*/
private static void addToResolutionList(YangResolutionInfoImpl<YangCompilerAnnotation> resolutionInfo,
- GeneratedYangParser.CompilerAnnotationStatementContext ctx) {
+ GeneratedYangParser.CompilerAnnotationStatementContext ctx) {
try {
addResolutionInfo(resolutionInfo);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ContainerListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ContainerListener.java
index 5a89cc3..5ff73e2 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ContainerListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ContainerListener.java
@@ -103,10 +103,10 @@
* (container), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processContainerEntry(TreeWalkListener listener,
- GeneratedYangParser.ContainerStatementContext ctx) {
+ GeneratedYangParser.ContainerStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, CONTAINER_DATA, ctx.identifier().getText(), ENTRY);
@@ -158,10 +158,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processContainerExit(TreeWalkListener listener,
- GeneratedYangParser.ContainerStatementContext ctx) {
+ GeneratedYangParser.ContainerStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, CONTAINER_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/Decimal64Listener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/Decimal64Listener.java
index 45f58c8..1806c4c 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/Decimal64Listener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/Decimal64Listener.java
@@ -98,10 +98,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processDecimal64Entry(TreeWalkListener listener,
- GeneratedYangParser.Decimal64SpecificationContext ctx) {
+ GeneratedYangParser.Decimal64SpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, DECIMAL64_DATA, "", ENTRY);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/DefaultListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/DefaultListener.java
index 23c621c..bc7c060 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/DefaultListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/DefaultListener.java
@@ -71,10 +71,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processDefaultEntry(TreeWalkListener listener,
- GeneratedYangParser.DefaultStatementContext ctx) {
+ GeneratedYangParser.DefaultStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, DEFAULT_DATA, ctx.string().getText(), ENTRY);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumListener.java
index 9cfc5aa..3440e2e 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumListener.java
@@ -98,7 +98,7 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processEnumEntry(TreeWalkListener listener, GeneratedYangParser.EnumStatementContext ctx) {
@@ -123,7 +123,7 @@
* validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processEnumExit(TreeWalkListener listener, GeneratedYangParser.EnumStatementContext ctx) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumerationListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumerationListener.java
index 2db40f3..bc6dd45 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumerationListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/EnumerationListener.java
@@ -92,10 +92,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processEnumerationEntry(TreeWalkListener listener,
- GeneratedYangParser.EnumSpecificationContext ctx) {
+ GeneratedYangParser.EnumSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, ENUMERATION_DATA, "", ENTRY);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ErrorMessageListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ErrorMessageListener.java
index b6722b5..e36fe74 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ErrorMessageListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ErrorMessageListener.java
@@ -63,7 +63,7 @@
* @param ctx context object of the grammar rule
*/
public static void processErrorMessageEntry(TreeWalkListener listener,
- GeneratedYangParser.ErrorMessageStatementContext ctx) {
+ GeneratedYangParser.ErrorMessageStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, ERROR_MESSAGE_DATA, ctx.string().getText(), ENTRY);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/GroupingListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/GroupingListener.java
index d644345..4dc224f 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/GroupingListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/GroupingListener.java
@@ -90,10 +90,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processGroupingEntry(TreeWalkListener listener,
- GeneratedYangParser.GroupingStatementContext ctx) {
+ GeneratedYangParser.GroupingStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, GROUPING_DATA, ctx.identifier().getText(), ENTRY);
@@ -144,7 +144,7 @@
* @param ctx context object of the grammar rule
*/
public static void processGroupingExit(TreeWalkListener listener,
- GeneratedYangParser.GroupingStatementContext ctx) {
+ GeneratedYangParser.GroupingStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, GROUPING_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityListener.java
index d8dec2c..29443ef 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityListener.java
@@ -108,7 +108,7 @@
* @param ctx context object of the grammar rule
*/
public static void processIdentityExit(TreeWalkListener listener,
- GeneratedYangParser.IdentityStatementContext ctx) {
+ GeneratedYangParser.IdentityStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_CURRENT_HOLDER, IDENTITY_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityrefListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityrefListener.java
index 2d04602..c61eb3e 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityrefListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/IdentityrefListener.java
@@ -73,7 +73,7 @@
* @param ctx context object of the grammar rule
*/
public static void processIdentityrefEntry(TreeWalkListener listener,
- GeneratedYangParser.IdentityrefSpecificationContext ctx) {
+ GeneratedYangParser.IdentityrefSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, IDENTITYREF_DATA, "", ENTRY);
@@ -190,7 +190,7 @@
* @param ctx context object of the grammar rule
*/
public static void processIdentityrefExit(TreeWalkListener listener,
- GeneratedYangParser.IdentityrefSpecificationContext ctx) {
+ GeneratedYangParser.IdentityrefSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_CURRENT_HOLDER, IDENTITYREF_DATA, ctx.getText(), EXIT);
@@ -209,7 +209,7 @@
* @param ctx context object of the grammar rule
*/
private static void addToResolutionList(YangResolutionInfoImpl<YangIdentityRef> resolutionInfo,
- GeneratedYangParser.IdentityrefSpecificationContext ctx) {
+ GeneratedYangParser.IdentityrefSpecificationContext ctx) {
try {
addResolutionInfo(resolutionInfo);
} catch (DataModelException e) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/InputListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/InputListener.java
index 92e61f8..83e47d4 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/InputListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/InputListener.java
@@ -80,10 +80,10 @@
* (input), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processInputEntry(TreeWalkListener listener,
- GeneratedYangParser.InputStatementContext ctx) {
+ GeneratedYangParser.InputStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, INPUT_DATA, "", ENTRY);
@@ -112,10 +112,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processInputExit(TreeWalkListener listener,
- GeneratedYangParser.InputStatementContext ctx) {
+ GeneratedYangParser.InputStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, INPUT_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/LeafrefListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/LeafrefListener.java
index ef4237b..fea7f38 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/LeafrefListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/LeafrefListener.java
@@ -87,10 +87,10 @@
* (leafref), perform validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processLeafrefEntry(TreeWalkListener listener,
- GeneratedYangParser.LeafrefSpecificationContext ctx) {
+ GeneratedYangParser.LeafrefSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, LEAFREF_DATA, "", ENTRY);
@@ -189,10 +189,10 @@
* validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processLeafrefExit(TreeWalkListener listener,
- GeneratedYangParser.LeafrefSpecificationContext ctx) {
+ GeneratedYangParser.LeafrefSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_CURRENT_HOLDER, LEAFREF_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ListListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ListListener.java
index 270c9c1..5154171 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ListListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ListListener.java
@@ -108,10 +108,10 @@
* (list), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processListEntry(TreeWalkListener listener,
- GeneratedYangParser.ListStatementContext ctx) {
+ GeneratedYangParser.ListStatementContext ctx) {
YangNode curNode;
@@ -164,10 +164,10 @@
* validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processListExit(TreeWalkListener listener,
- GeneratedYangParser.ListStatementContext ctx) {
+ GeneratedYangParser.ListStatementContext ctx) {
checkStackIsNotEmpty(listener, MISSING_HOLDER, LIST_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListener.java
index 7e7ed78..64069ae 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/MinElementsListener.java
@@ -65,7 +65,7 @@
* tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processMinElementsEntry(TreeWalkListener listener,
GeneratedYangParser.MinElementsStatementContext ctx) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NotificationListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NotificationListener.java
index 4ed7493..f04862e 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NotificationListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/NotificationListener.java
@@ -86,10 +86,10 @@
* (notification), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processNotificationEntry(TreeWalkListener listener,
- GeneratedYangParser.NotificationStatementContext ctx) {
+ GeneratedYangParser.NotificationStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, NOTIFICATION_DATA, ctx.identifier().getText(), ENTRY);
@@ -128,10 +128,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processNotificationExit(TreeWalkListener listener,
- GeneratedYangParser.NotificationStatementContext ctx) {
+ GeneratedYangParser.NotificationStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, NOTIFICATION_DATA, ctx.identifier().getText(), EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/OutputListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/OutputListener.java
index d0ef568..aee77b0 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/OutputListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/OutputListener.java
@@ -80,10 +80,10 @@
* (output), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processOutputEntry(TreeWalkListener listener,
- GeneratedYangParser.OutputStatementContext ctx) {
+ GeneratedYangParser.OutputStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, OUTPUT_DATA, "", ENTRY);
@@ -112,10 +112,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processOutputExit(TreeWalkListener listener,
- GeneratedYangParser.OutputStatementContext ctx) {
+ GeneratedYangParser.OutputStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, OUTPUT_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/RpcListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/RpcListener.java
index 1c56fe5..89f7eb7 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/RpcListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/RpcListener.java
@@ -88,10 +88,10 @@
* (rpc), performs validation and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processRpcEntry(TreeWalkListener listener,
- GeneratedYangParser.RpcStatementContext ctx) {
+ GeneratedYangParser.RpcStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, RPC_DATA, ctx.identifier().getText(), ENTRY);
@@ -130,12 +130,12 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processRpcExit(TreeWalkListener listener,
- GeneratedYangParser.RpcStatementContext ctx) {
+ GeneratedYangParser.RpcStatementContext ctx) {
- //Check for stack to be non empty.
+ //Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, RPC_DATA, ctx.identifier().getText(), EXIT);
if (!(listener.getParsedDataStack().peek() instanceof YangRpc)) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ShortCaseListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ShortCaseListener.java
index 612fe3b..90b5269 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ShortCaseListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/ShortCaseListener.java
@@ -74,10 +74,10 @@
* validations and updates the data model tree.
*
* @param listener listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processShortCaseEntry(TreeWalkListener listener,
- GeneratedYangParser.ShortCaseStatementContext ctx) {
+ GeneratedYangParser.ShortCaseStatementContext ctx) {
ParseTree errorConstructContext;
@@ -128,10 +128,10 @@
* validations and update the data model tree.
*
* @param listener Listener's object
- * @param ctx context object of the grammar rule
+ * @param ctx context object of the grammar rule
*/
public static void processShortCaseExit(TreeWalkListener listener,
- GeneratedYangParser.ShortCaseStatementContext ctx) {
+ GeneratedYangParser.ShortCaseStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, SHORT_CASE_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java
index f9c4a27..a19431d 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/SubModuleListener.java
@@ -17,6 +17,7 @@
package org.onosproject.yangutils.parser.impl.listeners;
import java.util.Date;
+
import org.onosproject.yangutils.datamodel.ResolvableType;
import org.onosproject.yangutils.datamodel.YangReferenceResolver;
import org.onosproject.yangutils.datamodel.YangRevision;
@@ -154,6 +155,7 @@
LinkerException linkerException = new LinkerException(e.getMessage());
linkerException.setLine(e.getLineNumber());
linkerException.setCharPosition(e.getCharPositionInLine());
+
throw linkerException;
}
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/TypeListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/TypeListener.java
index 73b62b2..9d92018 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/TypeListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/TypeListener.java
@@ -84,7 +84,7 @@
* @param ctx context object of the grammar rule
*/
public static void processTypeEntry(TreeWalkListener listener,
- GeneratedYangParser.TypeStatementContext ctx) {
+ GeneratedYangParser.TypeStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, TYPE_DATA, ctx.string().getText(), ENTRY);
@@ -265,7 +265,7 @@
* @param ctx context object of the grammar rule
*/
public static void processTypeExit(TreeWalkListener listener,
- GeneratedYangParser.TypeStatementContext ctx) {
+ GeneratedYangParser.TypeStatementContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_CURRENT_HOLDER, TYPE_DATA, ctx.string().getText(), EXIT);
@@ -284,7 +284,7 @@
* @param ctx context object of the grammar rule
*/
private static void addToResolutionList(YangResolutionInfoImpl<YangType> resolutionInfo,
- GeneratedYangParser.TypeStatementContext ctx) {
+ GeneratedYangParser.TypeStatementContext ctx) {
try {
addResolutionInfo(resolutionInfo);
} catch (DataModelException e) {
@@ -300,7 +300,7 @@
* @param yangDataType yang data type
*/
private static void validateTypeSubStatementCardinality(GeneratedYangParser.TypeStatementContext ctx,
- YangDataTypes yangDataType) {
+ YangDataTypes yangDataType) {
if (ctx.typeBodyStatements() == null || ctx.typeBodyStatements().isEmpty()) {
ParserException parserException;
switch (yangDataType) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/UnionListener.java b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/UnionListener.java
index 32eb4d9..63a09c5 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/UnionListener.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/parser/impl/listeners/UnionListener.java
@@ -167,7 +167,7 @@
* @param ctx context object of the grammar rule
*/
public static void processUnionExit(TreeWalkListener listener,
- GeneratedYangParser.UnionSpecificationContext ctx) {
+ GeneratedYangParser.UnionSpecificationContext ctx) {
// Check for stack to be non empty.
checkStackIsNotEmpty(listener, MISSING_HOLDER, UNION_DATA, "", EXIT);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaQualifiedTypeInfoTranslator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaQualifiedTypeInfoTranslator.java
index 420dc27..a0e7b93 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaQualifiedTypeInfoTranslator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaQualifiedTypeInfoTranslator.java
@@ -123,6 +123,8 @@
}
importInfo.setClassInfo(dataTypeName);
}
+
+ leaf.getJavaQualifiedInfo().setJavaAttributeName(leaf.getJavaName(null));
}
/**
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
index 37ce7ee..14fcdc1 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
@@ -521,7 +521,7 @@
* @throws IOException IO operation exception
*/
static void addCurNodeInfoInParentTempFile(YangNode curNode,
- boolean isList, YangPluginConfig pluginConfig)
+ boolean isList, YangPluginConfig pluginConfig)
throws IOException {
YangNode parent = getParentNodeInGenCode(curNode);
if (!(parent instanceof JavaCodeGenerator)) {
@@ -554,8 +554,8 @@
* @return AttributeInfo attribute details required to add in temporary files
*/
public static JavaAttributeInfo getCurNodeAsAttributeInTarget(YangNode curNode,
- YangNode targetNode, boolean isListNode,
- TempJavaFragmentFiles tempJavaFragmentFiles) {
+ YangNode targetNode, boolean isListNode,
+ TempJavaFragmentFiles tempJavaFragmentFiles) {
String curNodeName = ((JavaFileInfoContainer) curNode).getJavaFileInfo().getJavaName();
if (curNodeName == null) {
updateJavaFileInfo(curNode, null);
@@ -632,7 +632,7 @@
* @return java attribute for leaf
*/
private static JavaAttributeInfo getJavaAttributeOfLeaf(TempJavaFragmentFiles tempJavaFragmentFiles, YangLeaf leaf,
- YangPluginConfig yangPluginConfig) {
+ YangPluginConfig yangPluginConfig) {
JavaLeafInfoContainer javaLeaf = (JavaLeafInfoContainer) leaf;
javaLeaf.setConflictResolveConfig(yangPluginConfig.getConflictResolver());
javaLeaf.updateJavaQualifiedInfo();
@@ -653,8 +653,8 @@
* @return java attribute for leaf-list
*/
private static JavaAttributeInfo getJavaAttributeOfLeafList(TempJavaFragmentFiles tempJavaFragmentFiles,
- YangLeafList leafList,
- YangPluginConfig yangPluginConfig) {
+ YangLeafList leafList,
+ YangPluginConfig yangPluginConfig) {
JavaLeafInfoContainer javaLeaf = (JavaLeafInfoContainer) leafList;
javaLeaf.setConflictResolveConfig(yangPluginConfig.getConflictResolver());
javaLeaf.updateJavaQualifiedInfo();
@@ -1301,7 +1301,7 @@
* @throws IOException when fails to append to temporary file
*/
void addFromStringMethod(JavaAttributeInfo javaAttributeInfo,
- JavaAttributeInfo fromStringAttributeInfo)
+ JavaAttributeInfo fromStringAttributeInfo)
throws IOException {
appendToFile(getFromStringImplTempFileHandle(), getFromStringMethod(javaAttributeInfo,
fromStringAttributeInfo) + NEW_LINE);
@@ -1460,7 +1460,7 @@
* @throws IOException IO operation fail
*/
private void addLeavesInfoToTempFiles(List<YangLeaf> listOfLeaves,
- YangPluginConfig yangPluginConfig, YangNode curNode)
+ YangPluginConfig yangPluginConfig, YangNode curNode)
throws IOException {
if (listOfLeaves != null) {
for (YangLeaf leaf : listOfLeaves) {
@@ -1489,7 +1489,7 @@
* @throws IOException IO operation fail
*/
private void addLeafListInfoToTempFiles(List<YangLeafList> listOfLeafList, YangPluginConfig yangPluginConfig,
- YangNode curNode)
+ YangNode curNode)
throws IOException {
if (listOfLeafList != null) {
for (YangLeafList leafList : listOfLeafList) {
@@ -1517,7 +1517,7 @@
* @throws IOException IO operation fail
*/
void addCurNodeLeavesInfoToTempFiles(YangNode curNode,
- YangPluginConfig yangPluginConfig)
+ YangPluginConfig yangPluginConfig)
throws IOException {
if (!(curNode instanceof YangLeavesHolder)) {
throw new TranslatorException("Data model node does not have any leaves");
@@ -1762,7 +1762,7 @@
* @param curNode current node
*/
private void addImportsForAugmentableClass(List<String> imports, boolean operations, boolean isInterfaceFile,
- YangNode curNode) {
+ YangNode curNode) {
if (operations) {
if (!isInterfaceFile) {
imports.add(getJavaImportData().getHashMapImport());
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/YangJavaModelUtils.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/YangJavaModelUtils.java
index 1ea7f48..f89ad3d 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/YangJavaModelUtils.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/YangJavaModelUtils.java
@@ -32,13 +32,13 @@
import org.onosproject.yangutils.datamodel.YangSubModule;
import org.onosproject.yangutils.datamodel.YangTranslatorOperatorNode;
import org.onosproject.yangutils.datamodel.YangTypeHolder;
-import org.onosproject.yangutils.utils.io.YangPluginConfig;
import org.onosproject.yangutils.datamodel.utils.DataModelUtils;
import org.onosproject.yangutils.translator.exception.TranslatorException;
import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaAugmentTranslator;
import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaEnumerationTranslator;
import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaModuleTranslator;
import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaSubModuleTranslator;
+import org.onosproject.yangutils.utils.io.YangPluginConfig;
import static org.onosproject.yangutils.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
@@ -78,6 +78,8 @@
javaCodeGeneratorInfo.getJavaFileInfo()
.setJavaName(getCamelCase(((YangNode) javaCodeGeneratorInfo).getName(),
yangPluginConfig.getConflictResolver()));
+ javaCodeGeneratorInfo.getJavaFileInfo().setJavaAttributeName(javaCodeGeneratorInfo
+ .getJavaFileInfo().getJavaName());
javaCodeGeneratorInfo.getJavaFileInfo().setPackage(getCurNodePackage((YangNode) javaCodeGeneratorInfo));
}
javaCodeGeneratorInfo.getJavaFileInfo().setPackageFilePath(
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
index ca0dd02..5c7f463 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaCodeSnippetGen.java
@@ -74,6 +74,7 @@
import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.ENUM_ATTRIBUTE;
import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.getJavaDoc;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getSmallCase;
+
import static java.util.Collections.sort;
/**
@@ -350,12 +351,13 @@
" * Specify the node specific operation in protocols like NETCONF.\n" +
" * Applicable in protocol edit operation, not applicable in query operation\n" +
" */\n" +
- " public enum OperationType {\n" +
+ " public enum OnosYangNodeOperationType {\n" +
" MERGE,\n" +
" REPLACE,\n" +
" CREATE,\n" +
" DELETE,\n" +
- " REMOVE\n" +
+ " REMOVE,\n" +
+ " NONE\n" +
" }\n";
}
@@ -387,7 +389,7 @@
" * Specify the node specific operation in protocols like NETCONF.\n" +
" * Applicable in protocol edit operation, will be ignored in query operation\n" +
" */\n" +
- " private OperationType operationType;\n" +
+ " private OnosYangNodeOperationType onosYangNodeOperationType;\n" +
"\n";
}
@@ -407,7 +409,7 @@
* @return operation type enum, leaf value set attribute and select leaf attribute for constructor
*/
static String getOperationTypeForConstructor() {
- return " this.operationType = builderObject.getOperationType();\n";
+ return " this.onosYangNodeOperationType = builderObject.onosYangNodeOperationType();\n";
}
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
index 43946f7..ec671aa 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGenerator.java
@@ -37,112 +37,197 @@
import org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorInfo;
import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
import org.onosproject.yangutils.translator.tojava.JavaFileInfoTranslator;
-import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfoTranslator;
-import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFilesContainer;
-import org.onosproject.yangutils.translator.tojava.TempJavaEnumerationFragmentFiles;
+import org.onosproject.yangutils.translator.tojava
+ .JavaQualifiedTypeInfoTranslator;
+import org.onosproject.yangutils.translator.tojava
+ .TempJavaCodeFragmentFilesContainer;
+import org.onosproject.yangutils.translator.tojava
+ .TempJavaEnumerationFragmentFiles;
import org.onosproject.yangutils.translator.tojava.TempJavaEventFragmentFiles;
import org.onosproject.yangutils.translator.tojava.TempJavaServiceFragmentFiles;
import org.onosproject.yangutils.translator.tojava.TempJavaTypeFragmentFiles;
import org.onosproject.yangutils.utils.io.YangPluginConfig;
-import static org.onosproject.yangutils.datamodel.utils.builtindatatype.YangDataTypes.BINARY;
-import static org.onosproject.yangutils.datamodel.utils.builtindatatype.YangDataTypes.BITS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_CLASS_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.DEFAULT_CLASS_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_CLASS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_SUBJECT_CLASS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_UNION_CLASS;
-import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ADD_TO_LIST_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ADD_TO_LIST_INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ATTRIBUTES_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_FOR_TYPE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ENUM_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EQUALS_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EVENT_ENUM_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EVENT_METHOD_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EVENT_SUBJECT_ATTRIBUTE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EVENT_SUBJECT_GETTER_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.EVENT_SUBJECT_SETTER_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.FROM_STRING_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.GETTER_FOR_CLASS_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.GETTER_FOR_INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.HASH_CODE_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.LEAF_IDENTIFIER_ENUM_ATTRIBUTES_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.OF_STRING_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_CLASS_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_INTERFACE_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.TO_STRING_IMPL_MASK;
-import static org.onosproject.yangutils.translator.tojava.JavaAttributeInfo.getAttributeInfoForTheData;
-import static org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfoTranslator.getQualifiedTypeInfoOfCurNode;
-import static org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles.getCurNodeAsAttributeInTarget;
-import static org.onosproject.yangutils.translator.tojava.YangJavaModelUtils.getQualifierInfoForCasesParent;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getEnumsValueAttribute;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getEventEnumTypeStart;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getOperationAttributeForConstructor;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getOperationAttributes;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getOperationTypeAttr;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getOperationTypeEnum;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getOperationTypeForConstructor;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGeneratorUtils.getDataFromTempFileHandle;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGeneratorUtils.initiateJavaFileGeneration;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.builderMethod;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getAddAugmentInfoMethodImpl;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getAddAugmentInfoMethodInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getAugmentsDataMethodForService;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getConstructorStart;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getEnumsConstructor;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getEnumsOfMethod;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getEqualsMethodClose;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getEqualsMethodOpen;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getFromStringMethodClose;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getFromStringMethodSignature;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getGetter;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getGetterForOperationType;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getGetterString;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getGettersForValueAndSelectLeaf;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getHashCodeMethodClose;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getHashCodeMethodOpen;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getInterfaceLeafIdEnumMethods;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getInterfaceLeafIdEnumSignature;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getOmitNullValueString;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getOperationAttributesGetters;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getOverRideString;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getRangeValidatorMethodForUnion;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getSetterForOperationType;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getSetterForSelectLeaf;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getSetterString;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getToStringMethodClose;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getToStringMethodOpen;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getYangAugmentInfoImpl;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getYangAugmentInfoInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getYangAugmentInfoMapImpl;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getYangAugmentInfoMapInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.isLeafValueSetInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.isSelectLeafSetInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.processSubtreeFilteringInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.setSelectLeafSetInterface;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getAugmentableSubTreeFiltering;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessChildNodeSubtreeFiltering;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessLeafListSubtreeFiltering;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessLeafSubtreeFiltering;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessSubTreeFilteringEnd;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessSubtreeFilteringStart;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator
- .getProcessSubtreeFunctionBody;
+import static org.onosproject.yangutils.datamodel.utils.builtindatatype
+ .YangDataTypes.BINARY;
+import static org.onosproject.yangutils.datamodel.utils.builtindatatype
+ .YangDataTypes.BITS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.BUILDER_CLASS_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.BUILDER_INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.DEFAULT_CLASS_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_ENUM_CLASS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_EVENT_CLASS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_EVENT_SUBJECT_CLASS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.GENERATE_UNION_CLASS;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedJavaFileType.INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.ADD_TO_LIST_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.ADD_TO_LIST_INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.ATTRIBUTES_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.CONSTRUCTOR_FOR_TYPE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.CONSTRUCTOR_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.ENUM_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EQUALS_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EVENT_ENUM_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EVENT_METHOD_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EVENT_SUBJECT_ATTRIBUTE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EVENT_SUBJECT_GETTER_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.EVENT_SUBJECT_SETTER_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.FROM_STRING_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.GETTER_FOR_CLASS_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.GETTER_FOR_INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.HASH_CODE_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.LEAF_IDENTIFIER_ENUM_ATTRIBUTES_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.OF_STRING_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.RPC_INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.SETTER_FOR_CLASS_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.SETTER_FOR_INTERFACE_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.TO_STRING_IMPL_MASK;
+import static org.onosproject.yangutils.translator.tojava.JavaAttributeInfo
+ .getAttributeInfoForTheData;
+import static org.onosproject.yangutils.translator.tojava
+ .JavaQualifiedTypeInfoTranslator.getQualifiedTypeInfoOfCurNode;
+import static org.onosproject.yangutils.translator.tojava
+ .TempJavaFragmentFiles.getCurNodeAsAttributeInTarget;
+import static org.onosproject.yangutils.translator.tojava.YangJavaModelUtils
+ .getQualifierInfoForCasesParent;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.addAugmentationAttribute;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getEnumsValueAttribute;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getEventEnumTypeStart;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getOperationAttributeForConstructor;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getOperationAttributes;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getOperationTypeAttr;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getOperationTypeEnum;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaCodeSnippetGen.getOperationTypeForConstructor;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaFileGeneratorUtils.getDataFromTempFileHandle;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaFileGeneratorUtils.initiateJavaFileGeneration;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.builderMethod;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getAddAugmentInfoMethodImpl;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getAddAugmentInfoMethodInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getAugmentsDataMethodForService;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getConstructorStart;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getEnumsConstructor;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getEnumsOfMethod;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getEqualsMethodClose;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getEqualsMethodOpen;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getFromStringMethodClose;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getFromStringMethodSignature;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getGetter;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getGetterForOperationType;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getGettersForValueAndSelectLeaf;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getHashCodeMethodClose;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getHashCodeMethodOpen;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getInterfaceLeafIdEnumMethods;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getInterfaceLeafIdEnumSignature;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getOmitNullValueString;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getOperationAttributesGetters;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getOverRideString;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getRangeValidatorMethodForUnion;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getSetterForOperationType;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getSetterForSelectLeaf;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getToStringMethodClose;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getToStringMethodOpen;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getYangAugmentInfoImpl;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getYangAugmentInfoInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getYangAugmentInfoMapImpl;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.getYangAugmentInfoMapInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.isLeafValueSetInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.isSelectLeafSetInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.processSubtreeFilteringInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .MethodsGenerator.setSelectLeafSetInterface;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getAugmentableSubTreeFiltering;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessChildNodeSubtreeFiltering;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessLeafListSubtreeFiltering;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessLeafSubtreeFiltering;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessSubTreeFilteringEnd;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessSubtreeFilteringStart;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .SubtreeFilteringMethodsGenerator.getProcessSubtreeFunctionBody;
import static org.onosproject.yangutils.utils.UtilConstants.BASE64;
import static org.onosproject.yangutils.utils.UtilConstants.BIG_INTEGER;
import static org.onosproject.yangutils.utils.UtilConstants.BUILDER;
@@ -150,18 +235,24 @@
import static org.onosproject.yangutils.utils.UtilConstants.CLOSE_PARENTHESIS;
import static org.onosproject.yangutils.utils.UtilConstants.COMMA;
import static org.onosproject.yangutils.utils.UtilConstants.DEFAULT;
-import static org.onosproject.yangutils.utils.UtilConstants.EIGHT_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .EIGHT_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.ENCODE_TO_STRING;
-import static org.onosproject.yangutils.utils.UtilConstants.EVENT_LISTENER_STRING;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .EVENT_LISTENER_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.EVENT_STRING;
-import static org.onosproject.yangutils.utils.UtilConstants.EVENT_SUBJECT_NAME_SUFFIX;
-import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .EVENT_SUBJECT_NAME_SUFFIX;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .FOUR_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.GET_ENCODER;
import static org.onosproject.yangutils.utils.UtilConstants.IMPORT;
import static org.onosproject.yangutils.utils.UtilConstants.INT;
-import static org.onosproject.yangutils.utils.UtilConstants.JAVA_UTIL_IMPORT_BASE64_CLASS;
-import static org.onosproject.yangutils.utils.UtilConstants.JAVA_UTIL_OBJECTS_IMPORT_PKG;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .JAVA_UTIL_IMPORT_BASE64_CLASS;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .JAVA_UTIL_OBJECTS_IMPORT_PKG;
import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
import static org.onosproject.yangutils.utils.UtilConstants.OPEN_CURLY_BRACKET;
import static org.onosproject.yangutils.utils.UtilConstants.OPEN_PARENTHESIS;
@@ -172,18 +263,24 @@
import static org.onosproject.yangutils.utils.UtilConstants.PUBLIC;
import static org.onosproject.yangutils.utils.UtilConstants.RETURN;
import static org.onosproject.yangutils.utils.UtilConstants.SEMI_COLAN;
-import static org.onosproject.yangutils.utils.UtilConstants.SERVICE_METHOD_STRING;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .SERVICE_METHOD_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.SPACE;
import static org.onosproject.yangutils.utils.UtilConstants.STRING_DATA_TYPE;
import static org.onosproject.yangutils.utils.UtilConstants.TO;
-import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.GETTER_METHOD;
-import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.TYPE_CONSTRUCTOR;
+import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType
+ .GETTER_METHOD;
+import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType
+ .TYPE_CONSTRUCTOR;
import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.getJavaDoc;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCapitalCase;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.insertDataIntoJavaFile;
+import static org.onosproject.yangutils.utils.io.impl.YangIoUtils
+ .getCapitalCase;
+import static org.onosproject.yangutils.utils.io.impl.YangIoUtils
+ .insertDataIntoJavaFile;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.replaceLast;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.trimAtLast;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.validateLineLength;
+import static org.onosproject.yangutils.utils.io.impl.YangIoUtils
+ .validateLineLength;
import static java.util.Collections.sort;
@@ -205,17 +302,21 @@
* @return interface file
* @throws IOException when fails to write in file
*/
- public static File generateInterfaceFile(File file, List<String> imports, YangNode curNode,
+ public static File generateInterfaceFile(File file, List<String> imports,
+ YangNode curNode,
boolean isAttrPresent)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
String path;
if (curNode instanceof YangModule || curNode instanceof YangSubModule) {
- path = javaFileInfo.getPluginConfig().getCodeGenDir() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getPluginConfig().getCodeGenDir() +
+ javaFileInfo.getPackageFilePath();
} else {
- path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
}
String className = getCapitalCase(javaFileInfo.getJavaName());
@@ -224,47 +325,67 @@
YangLeavesHolder leavesHolder;
if (curNode instanceof YangLeavesHolder) {
leavesHolder = (YangLeavesHolder) curNode;
- isLeavesPresent = leavesHolder.getListOfLeaf() != null && !leavesHolder.getListOfLeaf().isEmpty()
- || leavesHolder.getListOfLeafList() != null && !leavesHolder.getListOfLeafList().isEmpty();
+ isLeavesPresent = leavesHolder.getListOfLeaf() != null &&
+ !leavesHolder.getListOfLeaf().isEmpty()
+ || leavesHolder.getListOfLeafList() != null &&
+ !leavesHolder.getListOfLeafList().isEmpty();
} else {
isLeavesPresent = false;
}
- initiateJavaFileGeneration(file, INTERFACE_MASK, imports, curNode, className);
+ initiateJavaFileGeneration(file, INTERFACE_MASK, imports, curNode,
+ className);
List<String> methods = new ArrayList<>();
if (isAttrPresent) {
// Add getter methods to interface file.
try {
//Leaf identifier enum.
if (isLeavesPresent) {
- insertDataIntoJavaFile(file, NEW_LINE + getInterfaceLeafIdEnumSignature(className) + NEW_LINE +
- trimAtLast(replaceLast(
- getDataFromTempFileHandle(LEAF_IDENTIFIER_ENUM_ATTRIBUTES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode)
- .getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path), COMMA, SEMI_COLAN), NEW_LINE) +
- NEW_LINE + NEW_LINE + getInterfaceLeafIdEnumMethods());
+ insertDataIntoJavaFile(file, NEW_LINE +
+ getInterfaceLeafIdEnumSignature(className) +
+ NEW_LINE +
+ trimAtLast(replaceLast(getDataFromTempFileHandle(
+ LEAF_IDENTIFIER_ENUM_ATTRIBUTES_MASK,
+ ((TempJavaCodeFragmentFilesContainer)
+ curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(), path),
+ COMMA, SEMI_COLAN),
+ NEW_LINE) +
+ NEW_LINE + NEW_LINE +
+ getInterfaceLeafIdEnumMethods());
}
//Getter methods.
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(GETTER_FOR_INTERFACE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ insertDataIntoJavaFile(file, getDataFromTempFileHandle(
+ GETTER_FOR_INTERFACE_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
.getBeanTempFiles(), path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while interface file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " +
+ className
+ + " while interface file generation");
}
}
- if (curNode instanceof YangAugmentableNode && !(curNode instanceof YangChoice)) {
+ if (curNode instanceof YangAugmentableNode &&
+ !(curNode instanceof YangChoice)) {
methods.add(getYangAugmentInfoInterface());
- methods.add(getYangAugmentInfoMapInterface(javaFileInfo.getPluginConfig()));
+ methods.add(getYangAugmentInfoMapInterface(
+ javaFileInfo.getPluginConfig()));
}
+
if (curNode instanceof YangCase) {
YangNode caseParent = curNode.getParent();
- JavaQualifiedTypeInfo qualifiedTypeInfo = getQualifierInfoForCasesParent(caseParent,
- javaFileInfo.getPluginConfig());
- methods.add(NEW_LINE + processSubtreeFilteringInterface(qualifiedTypeInfo.getClassInfo()));
+ JavaQualifiedTypeInfo qualifiedTypeInfo =
+ getQualifierInfoForCasesParent(caseParent,
+ javaFileInfo
+ .getPluginConfig());
+ methods.add(NEW_LINE + processSubtreeFilteringInterface
+ (qualifiedTypeInfo.getClassInfo()));
} else {
methods.add(NEW_LINE + processSubtreeFilteringInterface(className));
}
@@ -289,18 +410,22 @@
* @return builder interface file
* @throws IOException when fails to write in file
*/
- public static File generateBuilderInterfaceFile(File file, YangNode curNode, boolean isAttrPresent)
+ public static File generateBuilderInterfaceFile(File file, YangNode curNode,
+ boolean isAttrPresent)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
boolean isLeavesPresent;
YangLeavesHolder leavesHolder;
if (curNode instanceof YangLeavesHolder) {
leavesHolder = (YangLeavesHolder) curNode;
- isLeavesPresent = leavesHolder.getListOfLeaf() != null && !leavesHolder.getListOfLeaf().isEmpty()
- || leavesHolder.getListOfLeafList() != null && !leavesHolder.getListOfLeafList().isEmpty();
+ isLeavesPresent = leavesHolder.getListOfLeaf() != null &&
+ !leavesHolder.getListOfLeaf().isEmpty()
+ || leavesHolder.getListOfLeafList() != null &&
+ !leavesHolder.getListOfLeafList().isEmpty();
} else {
isLeavesPresent = false;
}
@@ -308,43 +433,59 @@
String className = getCapitalCase(javaFileInfo.getJavaName());
String path;
if (curNode instanceof YangModule || curNode instanceof YangSubModule) {
- path = javaFileInfo.getPluginConfig().getCodeGenDir() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getPluginConfig().getCodeGenDir() +
+ javaFileInfo.getPackageFilePath();
} else {
- path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
}
- initiateJavaFileGeneration(file, BUILDER_INTERFACE_MASK, null, curNode, className);
+ initiateJavaFileGeneration(file, BUILDER_INTERFACE_MASK, null, curNode,
+ className);
List<String> methods = new ArrayList<>();
if (isAttrPresent) {
try {
//Getter methods.
- methods.add(FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(GETTER_FOR_INTERFACE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ methods.add(FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(
+ GETTER_FOR_INTERFACE_MASK,
+ ((TempJavaCodeFragmentFilesContainer)
+ curNode)
+ .getTempJavaCodeFragmentFiles()
.getBeanTempFiles(), path));
//Setter methods.
methods.add(NEW_LINE);
- methods.add(FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(SETTER_FOR_INTERFACE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ methods.add(FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(
+ SETTER_FOR_INTERFACE_MASK,
+ ((TempJavaCodeFragmentFilesContainer)
+ curNode)
+ .getTempJavaCodeFragmentFiles()
.getBeanTempFiles(), path));
//Add to list method.
methods.add(NEW_LINE);
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(ADD_TO_LIST_INTERFACE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ insertDataIntoJavaFile(file, getDataFromTempFileHandle(
+ ADD_TO_LIST_INTERFACE_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
.getBeanTempFiles(), path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while builder interface file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " +
+ className
+ + " while builder interface file generation");
}
}
- if (curNode instanceof YangAugmentableNode && !(curNode instanceof YangChoice)) {
+ if (curNode instanceof YangAugmentableNode &&
+ !(curNode instanceof YangChoice)) {
methods.add(getAddAugmentInfoMethodInterface());
methods.add(getYangAugmentInfoInterface());
- methods.add(getYangAugmentInfoMapInterface(javaFileInfo.getPluginConfig()));
+ methods.add(getYangAugmentInfoMapInterface(
+ javaFileInfo.getPluginConfig()));
}
if (isLeavesPresent) {
@@ -352,7 +493,8 @@
}
//Add build method to builder interface file.
methods.add(
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
.addBuildMethodForInterface(pluginConfig));
@@ -379,15 +521,18 @@
boolean isAttrPresent)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
boolean isLeavesPresent;
YangLeavesHolder leavesHolder;
if (curNode instanceof YangLeavesHolder) {
leavesHolder = (YangLeavesHolder) curNode;
- isLeavesPresent = leavesHolder.getListOfLeaf() != null && !leavesHolder.getListOfLeaf().isEmpty()
- || leavesHolder.getListOfLeafList() != null && !leavesHolder.getListOfLeafList().isEmpty();
+ isLeavesPresent = leavesHolder.getListOfLeaf() != null &&
+ !leavesHolder.getListOfLeaf().isEmpty()
+ || leavesHolder.getListOfLeafList() != null &&
+ !leavesHolder.getListOfLeafList().isEmpty();
} else {
isLeavesPresent = false;
}
@@ -397,28 +542,37 @@
String path;
if (curNode instanceof YangModule || curNode instanceof YangSubModule) {
isRootNode = true;
- path = javaFileInfo.getPluginConfig().getCodeGenDir() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getPluginConfig().getCodeGenDir() +
+ javaFileInfo.getPackageFilePath();
} else {
- path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
}
- initiateJavaFileGeneration(file, BUILDER_CLASS_MASK, null, curNode, className);
+ initiateJavaFileGeneration(file, BUILDER_CLASS_MASK, null, curNode,
+ className);
List<String> methods = new ArrayList<>();
if (curNode instanceof YangAugmentableNode) {
- insertDataIntoJavaFile(file, JavaCodeSnippetGen.addAugmentationAttribute());
+ insertDataIntoJavaFile(file, addAugmentationAttribute());
}
if (isAttrPresent) {
//Add attribute strings.
try {
insertDataIntoJavaFile(file,
- NEW_LINE + FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(ATTRIBUTES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ getDataFromTempFileHandle(
+ ATTRIBUTES_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while builder class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " + className +
+ " while builder class file generation");
}
insertDataIntoJavaFile(file, getOperationTypeAttr());
@@ -428,17 +582,23 @@
try {
//Getter methods.
methods.add(getDataFromTempFileHandle(GETTER_FOR_CLASS_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
// Setter methods.
methods.add(getDataFromTempFileHandle(SETTER_FOR_CLASS_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
//Add to list impl method.
methods.add(getDataFromTempFileHandle(ADD_TO_LIST_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
insertDataIntoJavaFile(file, NEW_LINE);
@@ -450,8 +610,10 @@
methods.add(getSetterForSelectLeaf(className, isRootNode));
}
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while builder class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " + className +
+ " while builder class file generation");
}
} else {
insertDataIntoJavaFile(file, NEW_LINE);
@@ -464,10 +626,13 @@
}
// Add default constructor and build method impl.
- methods.add(((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .addBuildMethodImpl(curNode));
- methods.add(((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .addDefaultConstructor(PUBLIC, BUILDER, pluginConfig, curNode));
+ methods.add(((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .addBuildMethodImpl(curNode));
+ methods.add(((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .addDefaultConstructor(PUBLIC, BUILDER,
+ pluginConfig, curNode));
//Add methods in builder class.
@@ -489,19 +654,23 @@
* @return impl class file
* @throws IOException when fails to write in file
*/
- public static File generateDefaultClassFile(File file, YangNode curNode, boolean isAttrPresent,
+ public static File generateDefaultClassFile(File file, YangNode curNode,
+ boolean isAttrPresent,
List<String> imports)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
boolean isLeavesPresent;
YangLeavesHolder leavesHolder;
if (curNode instanceof YangLeavesHolder) {
leavesHolder = (YangLeavesHolder) curNode;
- isLeavesPresent = leavesHolder.getListOfLeaf() != null && !leavesHolder.getListOfLeaf().isEmpty()
- || leavesHolder.getListOfLeafList() != null && !leavesHolder.getListOfLeafList().isEmpty();
+ isLeavesPresent = leavesHolder.getListOfLeaf() != null &&
+ !leavesHolder.getListOfLeaf().isEmpty() ||
+ leavesHolder.getListOfLeafList() != null &&
+ !leavesHolder.getListOfLeafList().isEmpty();
} else {
isLeavesPresent = false;
}
@@ -514,28 +683,37 @@
if (curNode instanceof YangModule || curNode instanceof YangSubModule) {
opParamClassName = className + OP_PARAM;
isRootNode = true;
- path = javaFileInfo.getPluginConfig().getCodeGenDir() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getPluginConfig().getCodeGenDir() +
+ javaFileInfo.getPackageFilePath();
} else {
- path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
}
- initiateJavaFileGeneration(file, DEFAULT_CLASS_MASK, imports, curNode, className);
+ initiateJavaFileGeneration(file, DEFAULT_CLASS_MASK, imports, curNode,
+ className);
List<String> methods = new ArrayList<>();
if (curNode instanceof YangAugmentableNode) {
- insertDataIntoJavaFile(file, JavaCodeSnippetGen.addAugmentationAttribute());
+ insertDataIntoJavaFile(file, addAugmentationAttribute());
}
if (isAttrPresent) {
//Add attribute strings.
try {
insertDataIntoJavaFile(file,
- NEW_LINE + FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(ATTRIBUTES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ getDataFromTempFileHandle(
+ ATTRIBUTES_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while impl class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " + className +
+ " while impl class file generation");
}
//Add operation attributes
@@ -548,37 +726,59 @@
try {
//Getter methods.
methods.add(getDataFromTempFileHandle(GETTER_FOR_CLASS_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path));
+
+ methods.add(getGetterForOperationType());
// Hash code method.
methods.add(getHashCodeMethodClose(getHashCodeMethodOpen() +
- getDataFromTempFileHandle(HASH_CODE_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path).replace(NEW_LINE, EMPTY_STRING)));
+ getDataFromTempFileHandle(
+ HASH_CODE_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path)
+ .replace(
+ NEW_LINE,
+ EMPTY_STRING)));
//Equals method.
if (isRootNode) {
- methods.add(getEqualsMethodClose(getEqualsMethodOpen(opParamClassName)
- + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path)));
+ methods.add(getEqualsMethodClose(
+ getEqualsMethodOpen(opParamClassName) +
+ getDataFromTempFileHandle(EQUALS_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path)));
} else {
- methods.add(getEqualsMethodClose(getEqualsMethodOpen(getCapitalCase(DEFAULT) + className)
- + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path)));
+ methods.add(getEqualsMethodClose(getEqualsMethodOpen(
+ getCapitalCase(DEFAULT) + className) +
+ getDataFromTempFileHandle(
+ EQUALS_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path)));
}
// To string method.
- methods.add(getToStringMethodOpen() + getDataFromTempFileHandle(TO_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path)
- + getToStringMethodClose());
+ methods.add(getToStringMethodOpen() + getDataFromTempFileHandle(
+ TO_STRING_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer)
+ curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(), path) +
+ getToStringMethodClose());
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while impl class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files " +
+ "for " + className +
+ " while impl class file generation");
}
} else {
insertDataIntoJavaFile(file, NEW_LINE);
@@ -590,38 +790,75 @@
}
try {
//Constructor.
- String constructor = getConstructorStart(className, pluginConfig, isRootNode);
- constructor = constructor + getDataFromTempFileHandle(CONSTRUCTOR_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path);
+ String constructor =
+ getConstructorStart(className, pluginConfig, isRootNode);
+ constructor = constructor +
+ getDataFromTempFileHandle(CONSTRUCTOR_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(),
+ path);
if (isAttrPresent) {
constructor = constructor + getOperationTypeForConstructor();
}
if (isLeavesPresent) {
- constructor = constructor + getOperationAttributeForConstructor();
+ constructor =
+ constructor + getOperationAttributeForConstructor();
}
- methods.add(constructor + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE);
+ methods.add(
+ constructor + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET +
+ NEW_LINE);
// add is filter content match.
String augmentableSubTreeFiltering = "";
if (curNode instanceof YangAugmentableNode) {
augmentableSubTreeFiltering = getAugmentableSubTreeFiltering();
}
+
methods.add(getProcessSubtreeFilteringStart(curNode, pluginConfig)
- + getProcessSubtreeFunctionBody()
- + augmentableSubTreeFiltering
- + getProcessSubTreeFilteringEnd()
- + getProcessLeafSubtreeFiltering(curNode, pluginConfig, path)
- + getProcessLeafListSubtreeFiltering(curNode, pluginConfig, path)
- + getProcessChildNodeSubtreeFiltering(curNode, pluginConfig, path));
+ + getProcessSubtreeFunctionBody(curNode)
+ + augmentableSubTreeFiltering
+ + getProcessSubTreeFilteringEnd());
+
+ if (curNode instanceof YangLeavesHolder) {
+ if (((YangLeavesHolder) curNode).getListOfLeaf() != null
+ && !((YangLeavesHolder) curNode).getListOfLeaf()
+ .isEmpty()) {
+ methods.add(getProcessLeafSubtreeFiltering(curNode,
+ pluginConfig,
+ path));
+ }
+ }
+
+
+ if (curNode instanceof YangLeavesHolder) {
+ if (((YangLeavesHolder) curNode).getListOfLeafList() != null
+ && !((YangLeavesHolder) curNode).getListOfLeafList()
+ .isEmpty()) {
+ methods.add(getProcessLeafListSubtreeFiltering(curNode,
+ pluginConfig,
+ path));
+ }
+ }
+
+ if (curNode.getChild() != null) {
+ methods.add(getProcessChildNodeSubtreeFiltering(curNode,
+ pluginConfig,
+ path));
+ }
+
+
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while impl class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while impl class file generation");
}
- methods.add(((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .addDefaultConstructor(PROTECTED, DEFAULT, pluginConfig, curNode));
+ methods.add(((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .addDefaultConstructor(PROTECTED, DEFAULT,
+ pluginConfig, curNode));
methods.add(builderMethod(className) + NEW_LINE);
if (isLeavesPresent) {
@@ -645,116 +882,166 @@
* @return type def class file
* @throws IOException when fails to generate class file
*/
- public static File generateTypeDefClassFile(File file, YangNode curNode, List<String> imports)
+ public static File generateTypeDefClassFile(File file, YangNode curNode,
+ List<String> imports)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
// import
String className = getCapitalCase(javaFileInfo.getJavaName());
- String path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ String path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
YangTypeDef typeDef = (YangTypeDef) curNode;
List<YangType<?>> types = typeDef.getTypeList();
YangType type = types.get(0);
YangDataTypes yangDataTypes = type.getDataType();
if (type.getDataType().equals(BINARY)) {
- imports.add(IMPORT + JAVA_UTIL_OBJECTS_IMPORT_PKG + PERIOD + JAVA_UTIL_IMPORT_BASE64_CLASS);
+ imports.add(IMPORT + JAVA_UTIL_OBJECTS_IMPORT_PKG + PERIOD +
+ JAVA_UTIL_IMPORT_BASE64_CLASS);
}
- initiateJavaFileGeneration(file, className, GENERATE_TYPEDEF_CLASS, imports, path, pluginConfig);
+ initiateJavaFileGeneration(file, className, GENERATE_TYPEDEF_CLASS,
+ imports, path, pluginConfig);
List<String> methods = new ArrayList<>();
//Add attribute strings.
try {
- insertDataIntoJavaFile(file,
- NEW_LINE + FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(ATTRIBUTES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path));
+ insertDataIntoJavaFile(file, NEW_LINE + FOUR_SPACE_INDENTATION +
+ getDataFromTempFileHandle(ATTRIBUTES_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while type def class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while type def class file " +
+ "generation");
}
//Default constructor.
- methods.add(((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .addDefaultConstructor(PRIVATE, EMPTY_STRING, pluginConfig, curNode));
+ methods.add(((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .addDefaultConstructor(PRIVATE, EMPTY_STRING,
+ pluginConfig, curNode));
try {
//Type constructor.
methods.add(getDataFromTempFileHandle(CONSTRUCTOR_FOR_TYPE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
//Of method.
methods.add(getDataFromTempFileHandle(OF_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
//Getter methods.
methods.add(getDataFromTempFileHandle(GETTER_FOR_CLASS_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
// Hash code method.
methods.add(getHashCodeMethodClose(getHashCodeMethodOpen() +
- getDataFromTempFileHandle(HASH_CODE_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)
- .replace(NEW_LINE, EMPTY_STRING)));
+ getDataFromTempFileHandle(
+ HASH_CODE_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path)
+ .replace(
+ NEW_LINE,
+ EMPTY_STRING)));
//Equals method.
- methods.add(getEqualsMethodClose(getEqualsMethodOpen(className + EMPTY_STRING)
- + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)));
+ methods.add(getEqualsMethodClose(
+ getEqualsMethodOpen(className + EMPTY_STRING)
+ + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path)));
//To string method.
if (type.getDataType().equals(BINARY)) {
- JavaQualifiedTypeInfoTranslator qualifiedTypeInfo = getQualifiedTypeInfoOfCurNode(curNode,
- getCapitalCase("binary"));
+ JavaQualifiedTypeInfoTranslator qualifiedTypeInfo =
+ getQualifiedTypeInfoOfCurNode(curNode, getCapitalCase(
+ "binary"));
- JavaAttributeInfo attr = getAttributeInfoForTheData(qualifiedTypeInfo, "binary", null, false,
- false);
+ JavaAttributeInfo attr =
+ getAttributeInfoForTheData(qualifiedTypeInfo, "binary",
+ null, false, false);
String attributeName = attr.getAttributeName();
- String bitsToStringMethod = getOverRideString() + FOUR_SPACE_INDENTATION + PUBLIC
- + SPACE + STRING_DATA_TYPE + SPACE + TO + STRING_DATA_TYPE + OPEN_PARENTHESIS
- + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE + EIGHT_SPACE_INDENTATION
- + RETURN + SPACE + BASE64 + PERIOD + GET_ENCODER + OPEN_PARENTHESIS + CLOSE_PARENTHESIS
- + PERIOD + ENCODE_TO_STRING + OPEN_PARENTHESIS + attributeName + CLOSE_PARENTHESIS
- + SEMI_COLAN + NEW_LINE + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
+ String bitsToStringMethod =
+ getOverRideString() + FOUR_SPACE_INDENTATION +
+ PUBLIC + SPACE + STRING_DATA_TYPE + SPACE + TO +
+ STRING_DATA_TYPE + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE +
+ EIGHT_SPACE_INDENTATION + RETURN + SPACE +
+ BASE64 + PERIOD + GET_ENCODER +
+ OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
+ PERIOD + ENCODE_TO_STRING + OPEN_PARENTHESIS +
+ attributeName + CLOSE_PARENTHESIS +
+ SEMI_COLAN + NEW_LINE +
+ FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET +
+ NEW_LINE;
methods.add(bitsToStringMethod);
} else if (type.getDataType().equals(BITS)) {
- JavaQualifiedTypeInfoTranslator qualifiedTypeInfo = getQualifiedTypeInfoOfCurNode(curNode,
- getCapitalCase("bits"));
+ JavaQualifiedTypeInfoTranslator qualifiedTypeInfo =
+ getQualifiedTypeInfoOfCurNode(curNode,
+ getCapitalCase(
+ "bits"));
- JavaAttributeInfo attr = getAttributeInfoForTheData(qualifiedTypeInfo, "bits", null, false, false);
+ JavaAttributeInfo attr =
+ getAttributeInfoForTheData(qualifiedTypeInfo, "bits",
+ null, false, false);
String attributeName = attr.getAttributeName();
- String bitsToStringMethod = getOverRideString() + FOUR_SPACE_INDENTATION + PUBLIC
- + SPACE + STRING_DATA_TYPE + SPACE + TO + STRING_DATA_TYPE + OPEN_PARENTHESIS
- + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE + EIGHT_SPACE_INDENTATION
- + RETURN + SPACE + attributeName + PERIOD + TO + STRING_DATA_TYPE + OPEN_PARENTHESIS
- + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET
- + NEW_LINE;
+ String bitsToStringMethod =
+ getOverRideString() + FOUR_SPACE_INDENTATION +
+ PUBLIC + SPACE + STRING_DATA_TYPE + SPACE + TO +
+ STRING_DATA_TYPE + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE +
+ EIGHT_SPACE_INDENTATION + RETURN + SPACE +
+ attributeName + PERIOD + TO +
+ STRING_DATA_TYPE + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ FOUR_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE;
methods.add(bitsToStringMethod);
} else {
- methods.add(getToStringMethodOpen() + getDataFromTempFileHandle(TO_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path) + getToStringMethodClose());
+ methods.add(getToStringMethodOpen() + getDataFromTempFileHandle(
+ TO_STRING_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer)
+ curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(), path) +
+ getToStringMethodClose());
}
JavaCodeGeneratorInfo javaGenInfo = (JavaCodeGeneratorInfo) curNode;
//From string method.
if ((type.getDataType().equals(YangDataTypes.DERIVED))
- && (((YangDerivedInfo) type.getDataTypeExtendedInfo()).getEffectiveBuiltInType()
+ && (((YangDerivedInfo) type.getDataTypeExtendedInfo())
+ .getEffectiveBuiltInType()
.equals(YangDataTypes.IDENTITYREF))) {
yangDataTypes = YangDataTypes.IDENTITYREF;
}
@@ -764,15 +1051,21 @@
}
if (!yangDataTypes.equals(YangDataTypes.IDENTITYREF)) {
- methods.add(getFromStringMethodSignature(className, pluginConfig)
- + getDataFromTempFileHandle(FROM_STRING_IMPL_MASK, javaGenInfo.getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)
- + getFromStringMethodClose());
+ methods.add(
+ getFromStringMethodSignature(className, pluginConfig) +
+ getDataFromTempFileHandle(FROM_STRING_IMPL_MASK,
+ javaGenInfo
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path) +
+ getFromStringMethodClose());
}
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while type def class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while type def class file " +
+ "generation");
}
for (String method : methods) {
@@ -792,17 +1085,21 @@
* @return type def class file
* @throws IOException when fails to generate class file
*/
- public static File generateUnionClassFile(File file, YangNode curNode, List<String> imports)
+ public static File generateUnionClassFile(File file, YangNode curNode,
+ List<String> imports)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
String className = getCapitalCase(javaFileInfo.getJavaName());
- String path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ String path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
- TempJavaTypeFragmentFiles tempJavaTypeFragmentFiles = ((JavaCodeGeneratorInfo) curNode)
- .getTempJavaCodeFragmentFiles().getTypeTempFiles();
+ TempJavaTypeFragmentFiles tempJavaTypeFragmentFiles =
+ ((JavaCodeGeneratorInfo) curNode)
+ .getTempJavaCodeFragmentFiles().getTypeTempFiles();
boolean isIntConflict = false;
boolean isLongConflict = false;
@@ -812,12 +1109,14 @@
intAttr = tempJavaTypeFragmentFiles.getUIntAttribute();
}
- JavaAttributeInfo longAttr = tempJavaTypeFragmentFiles.getLongAttribute();
+ JavaAttributeInfo longAttr =
+ tempJavaTypeFragmentFiles.getLongAttribute();
if (longAttr == null) {
longAttr = tempJavaTypeFragmentFiles.getULongAttribute();
}
- JavaAttributeInfo shortAttr = tempJavaTypeFragmentFiles.getShortAttribute();
+ JavaAttributeInfo shortAttr =
+ tempJavaTypeFragmentFiles.getShortAttribute();
if (shortAttr == null) {
shortAttr = tempJavaTypeFragmentFiles.getUInt8Attribute();
}
@@ -832,11 +1131,13 @@
isShortConflict = shortAttr.isShortConflict();
}
if (isLongConflict) {
- imports.add(tempJavaTypeFragmentFiles.getJavaImportData().getBigIntegerImport());
+ imports.add(tempJavaTypeFragmentFiles.getJavaImportData()
+ .getBigIntegerImport());
sort(imports);
}
- initiateJavaFileGeneration(file, className, GENERATE_UNION_CLASS, imports, path, pluginConfig);
+ initiateJavaFileGeneration(file, className, GENERATE_UNION_CLASS,
+ imports, path, pluginConfig);
List<String> methods = new ArrayList<>();
@@ -844,82 +1145,118 @@
// Add attribute strings.
try {
if (isIntConflict) {
- insertDataIntoJavaFile(file, JavaCodeSnippetGen.addStaticAttributeIntRange(PRIVATE,
- tempJavaTypeFragmentFiles.getIntIndex() < tempJavaTypeFragmentFiles.getUIntIndex()));
+ insertDataIntoJavaFile(file, JavaCodeSnippetGen
+ .addStaticAttributeIntRange(PRIVATE,
+ tempJavaTypeFragmentFiles
+ .getIntIndex() <
+ tempJavaTypeFragmentFiles
+ .getUIntIndex()));
}
if (isLongConflict) {
- insertDataIntoJavaFile(file, JavaCodeSnippetGen.addStaticAttributeLongRange(PRIVATE,
- tempJavaTypeFragmentFiles.getLongIndex() < tempJavaTypeFragmentFiles.getULongIndex()));
+ insertDataIntoJavaFile(file, JavaCodeSnippetGen
+ .addStaticAttributeLongRange(PRIVATE,
+ tempJavaTypeFragmentFiles
+ .getLongIndex() <
+ tempJavaTypeFragmentFiles
+ .getULongIndex()));
}
if (isShortConflict) {
- insertDataIntoJavaFile(file, JavaCodeSnippetGen.addStaticAttributeShortRange(PRIVATE,
- tempJavaTypeFragmentFiles.getShortIndex() < tempJavaTypeFragmentFiles.getUInt8Index()));
+ insertDataIntoJavaFile(file, JavaCodeSnippetGen
+ .addStaticAttributeShortRange(PRIVATE,
+ tempJavaTypeFragmentFiles
+ .getShortIndex() <
+ tempJavaTypeFragmentFiles
+ .getUInt8Index()));
}
insertDataIntoJavaFile(file,
- NEW_LINE + FOUR_SPACE_INDENTATION + getDataFromTempFileHandle(ATTRIBUTES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path));
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ getDataFromTempFileHandle(
+ ATTRIBUTES_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while union class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while union class file generation");
}
//Default constructor.
- methods.add(((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .addDefaultConstructor(PRIVATE, EMPTY_STRING, pluginConfig, curNode));
+ methods.add(((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .addDefaultConstructor(PRIVATE, EMPTY_STRING,
+ pluginConfig, curNode));
try {
//Type constructor.
methods.add(getDataFromTempFileHandle(CONSTRUCTOR_FOR_TYPE_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
// Of string method.
methods.add(getDataFromTempFileHandle(OF_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
//Getter methods.
methods.add(getDataFromTempFileHandle(GETTER_FOR_CLASS_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles().getTypeTempFiles(),
- path));
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path));
//Hash code method.
methods.add(getHashCodeMethodClose(getHashCodeMethodOpen() +
- getDataFromTempFileHandle(HASH_CODE_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)
- .replace(NEW_LINE, EMPTY_STRING)));
+ getDataFromTempFileHandle(
+ HASH_CODE_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path).replace(
+ NEW_LINE,
+ EMPTY_STRING)));
//Equals method.
- methods.add(getEqualsMethodClose(getEqualsMethodOpen(className + EMPTY_STRING)
- + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)));
+ methods.add(getEqualsMethodClose(
+ getEqualsMethodOpen(className + EMPTY_STRING)
+ + getDataFromTempFileHandle(EQUALS_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path)));
//To string method.
methods.add(getToStringMethodOpen() + getOmitNullValueString() +
- getDataFromTempFileHandle(TO_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)
- + getToStringMethodClose());
+ getDataFromTempFileHandle(TO_STRING_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path) +
+ getToStringMethodClose());
//From string method.
- methods.add(getFromStringMethodSignature(className, pluginConfig)
- + getDataFromTempFileHandle(FROM_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getTypeTempFiles(), path)
- + getFromStringMethodClose());
+ methods.add(getFromStringMethodSignature(className, pluginConfig) +
+ getDataFromTempFileHandle(FROM_STRING_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getTypeTempFiles(),
+ path) +
+ getFromStringMethodClose());
if (isIntConflict) {
methods.add(getRangeValidatorMethodForUnion(INT));
@@ -927,13 +1264,14 @@
if (isLongConflict) {
methods.add(getRangeValidatorMethodForUnion(BIG_INTEGER));
}
- if (isShortConflict) {
+ if (isShortConflict && !isIntConflict) {
methods.add(getRangeValidatorMethodForUnion(INT));
}
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while union class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while union class file generation");
}
for (String method : methods) {
@@ -955,56 +1293,82 @@
public static File generateEnumClassFile(File file, YangNode curNode)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
YangPluginConfig pluginConfig = javaFileInfo.getPluginConfig();
String className = javaFileInfo.getJavaName();
- String path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
+ String path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
- initiateJavaFileGeneration(file, getCapitalCase(className), GENERATE_ENUM_CLASS, null, path, pluginConfig);
+ initiateJavaFileGeneration(file, getCapitalCase(className),
+ GENERATE_ENUM_CLASS, null, path,
+ pluginConfig);
//Add attribute strings.
try {
JavaCodeGeneratorInfo javaGenInfo = (JavaCodeGeneratorInfo) curNode;
insertDataIntoJavaFile(file,
- trimAtLast(trimAtLast(getDataFromTempFileHandle(ENUM_IMPL_MASK, javaGenInfo
- .getTempJavaCodeFragmentFiles().getEnumerationTempFiles(), path), COMMA), NEW_LINE)
- + SEMI_COLAN + NEW_LINE);
+ trimAtLast(trimAtLast(
+ getDataFromTempFileHandle(
+ ENUM_IMPL_MASK, javaGenInfo
+ .getTempJavaCodeFragmentFiles()
+ .getEnumerationTempFiles(),
+ path), COMMA),
+ NEW_LINE) + SEMI_COLAN +
+ NEW_LINE);
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + getCapitalCase(className)
- + " while enum class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ getCapitalCase(className) + " while enum class " +
+ "file generation");
}
// Add an attribute to get the enum's values.
- insertDataIntoJavaFile(file, getEnumsValueAttribute(getCapitalCase(className)));
+ insertDataIntoJavaFile(file, getEnumsValueAttribute(
+ getCapitalCase(className)));
// Add a constructor for enum.
- insertDataIntoJavaFile(file, getJavaDoc(TYPE_CONSTRUCTOR, className, false, pluginConfig, null)
- + getEnumsConstructor(getCapitalCase(className)) + NEW_LINE);
+ insertDataIntoJavaFile(file,
+ getJavaDoc(TYPE_CONSTRUCTOR, className, false,
+ pluginConfig, null)
+ + getEnumsConstructor(
+ getCapitalCase(className)) + NEW_LINE);
- TempJavaEnumerationFragmentFiles enumFragFiles = ((TempJavaCodeFragmentFilesContainer) curNode)
- .getTempJavaCodeFragmentFiles()
- .getEnumerationTempFiles();
- insertDataIntoJavaFile(file, getEnumsOfMethod(className,
- enumFragFiles.getJavaAttributeForEnum(pluginConfig),
- enumFragFiles.getEnumSetJavaMap(),
- enumFragFiles.getEnumStringList(), pluginConfig)
- + NEW_LINE);
+ TempJavaEnumerationFragmentFiles enumFragFiles =
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getEnumerationTempFiles();
+ insertDataIntoJavaFile(file,
+ getEnumsOfMethod(className, enumFragFiles
+ .getJavaAttributeForEnum(
+ pluginConfig),
+ enumFragFiles
+ .getEnumSetJavaMap(),
+ enumFragFiles
+ .getEnumStringList(),
+ pluginConfig) + NEW_LINE);
// Add a getter method for enum.
- insertDataIntoJavaFile(file, getJavaDoc(GETTER_METHOD, className, false, pluginConfig, null)
- + getGetter(INT, className, GENERATE_ENUM_CLASS) + NEW_LINE);
+ insertDataIntoJavaFile(file, getJavaDoc(GETTER_METHOD, className, false,
+ pluginConfig, null) +
+ getGetter(INT, className, GENERATE_ENUM_CLASS) + NEW_LINE);
try {
- insertDataIntoJavaFile(file, getFromStringMethodSignature(getCapitalCase(className), pluginConfig)
- + getDataFromTempFileHandle(FROM_STRING_IMPL_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getEnumerationTempFiles(), path)
- + getFromStringMethodClose());
+ insertDataIntoJavaFile(file, getFromStringMethodSignature(
+ getCapitalCase(className), pluginConfig) +
+ getDataFromTempFileHandle(FROM_STRING_IMPL_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getEnumerationTempFiles(),
+ path) +
+ getFromStringMethodClose());
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " +
- getCapitalCase(className) + " while enum class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ getCapitalCase(className) +
+ " while enum class file generation");
}
insertDataIntoJavaFile(file, CLOSE_CURLY_BRACKET + NEW_LINE);
@@ -1021,42 +1385,48 @@
* @return rpc class file
* @throws IOException when fails to generate class file
*/
- public static File generateServiceInterfaceFile(File file, YangNode curNode, List<String> imports)
+ public static File generateServiceInterfaceFile(File file, YangNode curNode,
+ List<String> imports)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
- TempJavaServiceFragmentFiles tempJavaServiceFragmentFiles = ((JavaCodeGeneratorInfo) curNode)
- .getTempJavaCodeFragmentFiles().getServiceTempFiles();
- String className = getCapitalCase(javaFileInfo.getJavaName()) + SERVICE_METHOD_STRING;
- String path = javaFileInfo.getBaseCodeGenPath() + javaFileInfo.getPackageFilePath();
- initiateJavaFileGeneration(file, GENERATE_SERVICE_AND_MANAGER, imports, curNode, className);
+ TempJavaServiceFragmentFiles tempJavaServiceFragmentFiles =
+ ((JavaCodeGeneratorInfo) curNode)
+ .getTempJavaCodeFragmentFiles().getServiceTempFiles();
+ String className = getCapitalCase(javaFileInfo.getJavaName()) +
+ SERVICE_METHOD_STRING;
+ String path = javaFileInfo.getBaseCodeGenPath() +
+ javaFileInfo.getPackageFilePath();
+ initiateJavaFileGeneration(file, GENERATE_SERVICE_AND_MANAGER, imports,
+ curNode, className);
List<String> methods = new ArrayList<>();
- JavaAttributeInfo rootAttribute = getCurNodeAsAttributeInTarget(curNode, curNode, false,
- tempJavaServiceFragmentFiles);
+ JavaAttributeInfo rootAttribute =
+ getCurNodeAsAttributeInTarget(curNode, curNode, false,
+ tempJavaServiceFragmentFiles);
try {
- //Getter methods.
- methods.add(getGetterString(rootAttribute, GENERATE_SERVICE_AND_MANAGER,
- javaFileInfo.getPluginConfig()) + NEW_LINE);
- // Setter methods.
- methods.add(getSetterString(rootAttribute, className, GENERATE_SERVICE_AND_MANAGER,
- javaFileInfo.getPluginConfig()) + NEW_LINE);
-
methods.add(getAugmentsDataMethodForService(curNode) + NEW_LINE);
- if (((JavaCodeGeneratorInfo) curNode).getTempJavaCodeFragmentFiles().getServiceTempFiles() != null) {
- JavaCodeGeneratorInfo javaGenInfo = (JavaCodeGeneratorInfo) curNode;
+ if (((JavaCodeGeneratorInfo) curNode).getTempJavaCodeFragmentFiles()
+ .getServiceTempFiles() != null) {
+ JavaCodeGeneratorInfo javaGenInfo =
+ (JavaCodeGeneratorInfo) curNode;
// Rpc methods
methods.add(getDataFromTempFileHandle(RPC_INTERFACE_MASK,
- javaGenInfo.getTempJavaCodeFragmentFiles().getServiceTempFiles(), path));
+ javaGenInfo
+ .getTempJavaCodeFragmentFiles()
+ .getServiceTempFiles(),
+ path));
}
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while rpc class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while rpc class file generation");
}
for (String method : methods) {
@@ -1075,28 +1445,40 @@
* @param imports imports for file
* @throws IOException when fails to generate class file
*/
- public static void generateEventFile(File file, YangNode curNode, List<String> imports)
+ public static void generateEventFile(File file, YangNode curNode,
+ List<String> imports)
throws IOException {
- String className = getCapitalCase(((JavaFileInfoContainer) curNode).getJavaFileInfo().getJavaName())
+ String className = getCapitalCase(
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getJavaName())
+ EVENT_STRING;
- TempJavaEventFragmentFiles tempFiles = ((TempJavaCodeFragmentFilesContainer) curNode)
- .getTempJavaCodeFragmentFiles().getEventFragmentFiles();
+ TempJavaEventFragmentFiles tempFiles =
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles().getEventFragmentFiles();
- String path = ((JavaFileInfoContainer) curNode).getJavaFileInfo().getBaseCodeGenPath()
- + ((JavaFileInfoContainer) curNode).getJavaFileInfo().getPackageFilePath();
- initiateJavaFileGeneration(file, GENERATE_EVENT_CLASS, imports, curNode, className);
+ String path = ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getBaseCodeGenPath()
+ + ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getPackageFilePath();
+ initiateJavaFileGeneration(file, GENERATE_EVENT_CLASS, imports, curNode,
+ className);
try {
insertDataIntoJavaFile(file, NEW_LINE + getEventEnumTypeStart() +
- trimAtLast(getDataFromTempFileHandle(EVENT_ENUM_MASK, tempFiles, path), COMMA)
- + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE);
+ trimAtLast(getDataFromTempFileHandle(EVENT_ENUM_MASK,
+ tempFiles, path),
+ COMMA) + FOUR_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE);
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(EVENT_METHOD_MASK, tempFiles, path));
+ insertDataIntoJavaFile(file,
+ getDataFromTempFileHandle(EVENT_METHOD_MASK,
+ tempFiles, path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while event class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while event class file generation");
}
insertDataIntoJavaFile(file, CLOSE_CURLY_BRACKET + NEW_LINE);
@@ -1111,13 +1493,16 @@
* @param imports imports for file
* @throws IOException when fails to generate class file
*/
- public static void generateEventListenerFile(File file, YangNode curNode, List<String> imports)
+ public static void generateEventListenerFile(File file, YangNode curNode,
+ List<String> imports)
throws IOException {
- String className = getCapitalCase(((JavaFileInfoContainer) curNode).getJavaFileInfo().getJavaName())
- + EVENT_LISTENER_STRING;
+ String className = getCapitalCase(
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getJavaName()) + EVENT_LISTENER_STRING;
- initiateJavaFileGeneration(file, GENERATE_EVENT_LISTENER_INTERFACE, imports, curNode, className);
+ initiateJavaFileGeneration(file, GENERATE_EVENT_LISTENER_INTERFACE,
+ imports, curNode, className);
insertDataIntoJavaFile(file, CLOSE_CURLY_BRACKET + NEW_LINE);
validateLineLength(file);
}
@@ -1132,28 +1517,37 @@
public static void generateEventSubjectFile(File file, YangNode curNode)
throws IOException {
- String className = getCapitalCase(((JavaFileInfoContainer) curNode).getJavaFileInfo().getJavaName())
- + EVENT_SUBJECT_NAME_SUFFIX;
+ String className = getCapitalCase(
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getJavaName()) + EVENT_SUBJECT_NAME_SUFFIX;
- initiateJavaFileGeneration(file, GENERATE_EVENT_SUBJECT_CLASS, null, curNode, className);
+ initiateJavaFileGeneration(file, GENERATE_EVENT_SUBJECT_CLASS, null,
+ curNode, className);
- String path = ((JavaFileInfoContainer) curNode).getJavaFileInfo().getBaseCodeGenPath()
- + ((JavaFileInfoContainer) curNode).getJavaFileInfo().getPackageFilePath();
+ String path = ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getBaseCodeGenPath()
+ + ((JavaFileInfoContainer) curNode).getJavaFileInfo()
+ .getPackageFilePath();
- TempJavaEventFragmentFiles tempFiles = ((TempJavaCodeFragmentFilesContainer) curNode)
- .getTempJavaCodeFragmentFiles().getEventFragmentFiles();
+ TempJavaEventFragmentFiles tempFiles =
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles().getEventFragmentFiles();
insertDataIntoJavaFile(file, NEW_LINE);
try {
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(EVENT_SUBJECT_ATTRIBUTE_MASK, tempFiles, path));
+ insertDataIntoJavaFile(file, getDataFromTempFileHandle(
+ EVENT_SUBJECT_ATTRIBUTE_MASK, tempFiles, path));
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(EVENT_SUBJECT_GETTER_MASK, tempFiles, path));
+ insertDataIntoJavaFile(file, getDataFromTempFileHandle(
+ EVENT_SUBJECT_GETTER_MASK, tempFiles, path));
- insertDataIntoJavaFile(file, getDataFromTempFileHandle(EVENT_SUBJECT_SETTER_MASK, tempFiles, path));
+ insertDataIntoJavaFile(file, getDataFromTempFileHandle(
+ EVENT_SUBJECT_SETTER_MASK, tempFiles, path));
} catch (IOException e) {
- throw new IOException("No data found in temporary java code fragment files for " + className
- + " while event class file generation");
+ throw new IOException(
+ "No data found in temporary java code fragment files for " +
+ className + " while event class file generation");
}
insertDataIntoJavaFile(file, CLOSE_CURLY_BRACKET + NEW_LINE);
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGeneratorUtils.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGeneratorUtils.java
index 1c33948..a591435 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGeneratorUtils.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaFileGeneratorUtils.java
@@ -135,7 +135,7 @@
* @return file object
*/
public static File getFileObject(String filePath, String fileName, String extension,
- JavaFileInfoTranslator handler) {
+ JavaFileInfoTranslator handler) {
return new File(handler.getBaseCodeGenPath() + filePath + SLASH + fileName + extension);
}
@@ -149,7 +149,7 @@
* @throws IOException when failed to get the data from temporary file handle
*/
static String getDataFromTempFileHandle(int generatedTempFiles,
- TempJavaFragmentFiles tempJavaFragmentFiles, String absolutePath)
+ TempJavaFragmentFiles tempJavaFragmentFiles, String absolutePath)
throws IOException {
TempJavaTypeFragmentFiles typeFragmentFiles = null;
@@ -331,7 +331,7 @@
* @throws IOException when fails to generate a file
*/
public static void initiateJavaFileGeneration(File file, String className, int genType, List<String> imports,
- String pkg, YangPluginConfig pluginConfig)
+ String pkg, YangPluginConfig pluginConfig)
throws IOException {
boolean isFileCreated;
@@ -357,7 +357,7 @@
* @throws IOException when fails to generate a file
*/
public static void initiateJavaFileGeneration(File file, int genType, List<String> imports,
- YangNode curNode, String className)
+ YangNode curNode, String className)
throws IOException {
boolean isFileCreated;
@@ -383,7 +383,7 @@
* @throws IOException when fails to do IO operations
*/
private static void appendContents(File file, int genType, List<String> importsList, YangNode curNode,
- String className)
+ String className)
throws IOException {
JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
@@ -452,7 +452,7 @@
* @throws IOException when fails to append contents
*/
private static void appendContents(File file, String fileName, int genType, List<String> importsList, String pkg,
- YangPluginConfig pluginConfig)
+ YangPluginConfig pluginConfig)
throws IOException {
String pkgString = parsePackageString(pkg, importsList);
@@ -553,7 +553,7 @@
* @throws IOException when fails to write into a file
*/
private static void write(File file, String fileName, int genType, JavaDocType javaDocType,
- YangPluginConfig pluginConfig)
+ YangPluginConfig pluginConfig)
throws IOException {
insertDataIntoJavaFile(file, getJavaDoc(javaDocType, fileName, false, pluginConfig, null));
insertDataIntoJavaFile(file, generateClassDefinition(genType, fileName));
@@ -654,7 +654,7 @@
* @return qualified type info of augmented node
*/
private static JavaQualifiedTypeInfoTranslator getQualifiedTypeInfoOfAugmentedNode(YangNode augmentedNode,
- String curNodeName, YangPluginConfig pluginConfig) {
+ String curNodeName, YangPluginConfig pluginConfig) {
JavaQualifiedTypeInfoTranslator javaQualifiedTypeInfo = getQualifiedTypeInfoOfCurNode(augmentedNode,
getCapitalCase(curNodeName));
if (javaQualifiedTypeInfo.getPkgInfo() == null) {
@@ -672,7 +672,7 @@
* @return true if present in imports
*/
private static boolean validateQualifiedInfoOfAugmentedNode(JavaQualifiedTypeInfoTranslator javaQualifiedTypeInfo,
- JavaImportData importData) {
+ JavaImportData importData) {
for (JavaQualifiedTypeInfoTranslator curImportInfo : importData.getImportSet()) {
if (curImportInfo.getClassInfo()
.contentEquals(javaQualifiedTypeInfo.getClassInfo())) {
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
index 82cff15..0ab080e 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/MethodsGenerator.java
@@ -1539,6 +1539,7 @@
" * @param " + getSmallCase(name) + SPACE + getSmallCase(name) + SPACE + "being passed to check" +
" for" +
" content match\n" +
+ " * @param isSelectAllSchemaChild is select all schema child\n" +
" * @return match result\n" +
" */\n";
return method + FOUR_SPACE_INDENTATION + name + SPACE + PROCESS_SUBTREE_FILTERING +
@@ -1590,6 +1591,7 @@
" * Set a leaf to be selected.\n" +
" *\n" +
" * @param leaf leaf needs to be selected\n" +
+ " * @return builder object for select leaf\n" +
" */\n";
return method + FOUR_SPACE_INDENTATION + name + BUILDER + SPACE + SET_SELECT_LEAF + OPEN_PARENTHESIS
+ LEAF_IDENTIFIER + SPACE + "leaf" + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE;
@@ -1661,13 +1663,13 @@
*/
static String getGetterForOperationType() {
return " /**\n" +
- " * Returns the operationType.\n" +
+ " * Returns the onosYangNodeOperationType.\n" +
" *\n" +
- " * @return value of operationType\n" +
+ " * @return value of onosYangNodeOperationType\n" +
" */\n" +
- " public OperationType getOperationType() {\n" +
- " return operationType;\n" +
- " }\n";
+ " public OnosYangNodeOperationType onosYangNodeOperationType() {\n" +
+ " return onosYangNodeOperationType;\n" +
+ " }\n\n";
}
/**
@@ -1696,14 +1698,16 @@
*/
static String getSetterForOperationType(String name) {
return " /**\n" +
- " * Set operation type.\n" +
+ " * Set node operation type.\n" +
" *\n" +
- " * @param operationType operation type\n" +
+ " * @param onosYangNodeOperationType node operation type\n" +
+ " * @return builder object for node operation type\n" +
" */\n" +
- " public " + name + BUILDER + " setOperationType(OperationType operationType) {\n" +
- " this.operationType = operationType;\n" +
+ " public " + name + BUILDER + " onosYangNodeOperationType(OnosYangNodeOperationType " +
+ "onosYangNodeOperationType) {\n" +
+ " this.onosYangNodeOperationType = onosYangNodeOperationType;\n" +
" return this;\n" +
- " }\n";
+ " }\n\n";
}
/**
diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
index f9af450..3bda74c 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/utils/SubtreeFilteringMethodsGenerator.java
@@ -22,19 +22,26 @@
import org.onosproject.yangutils.datamodel.YangCase;
import org.onosproject.yangutils.datamodel.YangChoice;
import org.onosproject.yangutils.datamodel.YangLeafRef;
+import org.onosproject.yangutils.datamodel.YangLeavesHolder;
import org.onosproject.yangutils.datamodel.YangNode;
import org.onosproject.yangutils.datamodel.YangType;
import org.onosproject.yangutils.translator.tojava.JavaAttributeInfo;
import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
import org.onosproject.yangutils.translator.tojava.JavaFileInfoTranslator;
-import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFilesContainer;
+import org.onosproject.yangutils.translator.tojava
+ .TempJavaCodeFragmentFilesContainer;
import org.onosproject.yangutils.utils.io.YangPluginConfig;
-import static org.onosproject.yangutils.datamodel.utils.builtindatatype.YangDataTypes.LEAFREF;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_LEAF_LIST_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_LEAF_MASK;
-import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_NODES_MASK;
-import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGeneratorUtils.getDataFromTempFileHandle;
+import static org.onosproject.yangutils.datamodel.utils.builtindatatype
+ .YangDataTypes.LEAFREF;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_LEAF_LIST_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_LEAF_MASK;
+import static org.onosproject.yangutils.translator.tojava
+ .GeneratedTempFileType.FILTER_CONTENT_MATCH_FOR_NODES_MASK;
+import static org.onosproject.yangutils.translator.tojava.utils
+ .JavaFileGeneratorUtils.getDataFromTempFileHandle;
import static org.onosproject.yangutils.utils.UtilConstants.ADD_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.AND_OPERATION;
import static org.onosproject.yangutils.utils.UtilConstants.APP_INSTANCE;
@@ -48,35 +55,45 @@
import static org.onosproject.yangutils.utils.UtilConstants.COLAN;
import static org.onosproject.yangutils.utils.UtilConstants.COMMA;
import static org.onosproject.yangutils.utils.UtilConstants.CONTINUE;
-import static org.onosproject.yangutils.utils.UtilConstants.EIGHT_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .EIGHT_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.ELSE;
-import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_PARAMETER_FUNCTION_CALL;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .EMPTY_PARAMETER_FUNCTION_CALL;
import static org.onosproject.yangutils.utils.UtilConstants.EQUAL;
import static org.onosproject.yangutils.utils.UtilConstants.EQUALS_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.EXCEPTION_VAR;
import static org.onosproject.yangutils.utils.UtilConstants.FALSE;
import static org.onosproject.yangutils.utils.UtilConstants.FOR;
-import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .FOUR_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.GET_CLASS;
import static org.onosproject.yangutils.utils.UtilConstants.GET_LEAF_INDEX;
import static org.onosproject.yangutils.utils.UtilConstants.GET_METHOD;
import static org.onosproject.yangutils.utils.UtilConstants.GET_METHOD_PREFIX;
-import static org.onosproject.yangutils.utils.UtilConstants.GET_SELECT_LEAF_FLAGS;
-import static org.onosproject.yangutils.utils.UtilConstants.GET_VALUE_LEAF_FLAGS;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .GET_SELECT_LEAF_FLAGS;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .GET_VALUE_LEAF_FLAGS;
import static org.onosproject.yangutils.utils.UtilConstants.IF;
-import static org.onosproject.yangutils.utils.UtilConstants.ILLEGAL_ACCESS_EXCEPTION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .ILLEGAL_ACCESS_EXCEPTION;
import static org.onosproject.yangutils.utils.UtilConstants.INSTANCE;
-import static org.onosproject.yangutils.utils.UtilConstants.INVOCATION_TARGET_EXCEPTION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .INVOCATION_TARGET_EXCEPTION;
import static org.onosproject.yangutils.utils.UtilConstants.INVOKE;
-import static org.onosproject.yangutils.utils.UtilConstants.IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG;
import static org.onosproject.yangutils.utils.UtilConstants.IS_EMPTY;
-import static org.onosproject.yangutils.utils.UtilConstants.IS_SELECT_ALL_SCHEMA_CHILD_FLAG;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .IS_SELECT_ALL_SCHEMA_CHILD_FLAG;
import static org.onosproject.yangutils.utils.UtilConstants.LEAF_IDENTIFIER;
import static org.onosproject.yangutils.utils.UtilConstants.MAP;
import static org.onosproject.yangutils.utils.UtilConstants.NEW;
import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
import static org.onosproject.yangutils.utils.UtilConstants.NOT;
-import static org.onosproject.yangutils.utils.UtilConstants.NO_SUCH_METHOD_EXCEPTION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .NO_SUCH_METHOD_EXCEPTION;
import static org.onosproject.yangutils.utils.UtilConstants.NULL;
import static org.onosproject.yangutils.utils.UtilConstants.OBJECT;
import static org.onosproject.yangutils.utils.UtilConstants.OBJECT_STRING;
@@ -85,32 +102,43 @@
import static org.onosproject.yangutils.utils.UtilConstants.OR_OPERATION;
import static org.onosproject.yangutils.utils.UtilConstants.PERIOD;
import static org.onosproject.yangutils.utils.UtilConstants.PRIVATE;
-import static org.onosproject.yangutils.utils.UtilConstants.PROCESS_SUBTREE_FILTERING;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .PROCESS_SUBTREE_FILTERING;
import static org.onosproject.yangutils.utils.UtilConstants.PUBLIC;
import static org.onosproject.yangutils.utils.UtilConstants.QUOTES;
import static org.onosproject.yangutils.utils.UtilConstants.RETURN;
import static org.onosproject.yangutils.utils.UtilConstants.SEMI_COLAN;
-import static org.onosproject.yangutils.utils.UtilConstants.SIXTEEN_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .SIXTEEN_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.SPACE;
-import static org.onosproject.yangutils.utils.UtilConstants.SUBTREE_FILTERING_RESULT_BUILDER;
-import static org.onosproject.yangutils.utils.UtilConstants.THIRTY_TWO_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .SUBTREE_FILTERING_RESULT_BUILDER;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .THIRTY_TWO_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.THIS;
import static org.onosproject.yangutils.utils.UtilConstants.TO;
import static org.onosproject.yangutils.utils.UtilConstants.TRUE;
import static org.onosproject.yangutils.utils.UtilConstants.TRY;
-import static org.onosproject.yangutils.utils.UtilConstants.TWELVE_SPACE_INDENTATION;
-import static org.onosproject.yangutils.utils.UtilConstants.TWENTY_EIGHT_SPACE_INDENTATION;
-import static org.onosproject.yangutils.utils.UtilConstants.TWENTY_FOUR_SPACE_INDENTATION;
-import static org.onosproject.yangutils.utils.UtilConstants.TWENTY_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .TWELVE_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .TWENTY_EIGHT_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .TWENTY_FOUR_SPACE_INDENTATION;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .TWENTY_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.VALUE;
import static org.onosproject.yangutils.utils.UtilConstants.YANG_AUGMENTED_INFO;
-import static org.onosproject.yangutils.utils.UtilConstants.YANG_AUGMENTED_OP_PARAM_INFO;
+import static org.onosproject.yangutils.utils.UtilConstants
+ .YANG_AUGMENTED_OP_PARAM_INFO;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCamelCase;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCapitalCase;
+import static org.onosproject.yangutils.utils.io.impl.YangIoUtils
+ .getCapitalCase;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getSmallCase;
/**
- * Represents generator for subtree filtering methods of generated files based on the file type.
+ * Represents generator for subtree filtering methods of generated files
+ * based on the file type.
*/
public final class SubtreeFilteringMethodsGenerator {
@@ -127,67 +155,100 @@
* @param type data type
* @return is filter content match for leaf
*/
- public static String getSubtreeFilteringForLeaf(JavaAttributeInfo javaAttributeInfo, YangType<?> type) {
+ public static String getSubtreeFilteringForLeaf(
+ JavaAttributeInfo javaAttributeInfo, YangType<?> type) {
String attrQualifiedType;
String attributeName = javaAttributeInfo.getAttributeName();
attrQualifiedType = getIfFilterContentMatchMethodImpl(attributeName,
- type);
+ type);
return EIGHT_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS
- + GET_VALUE_LEAF_FLAGS + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + GET_METHOD_PREFIX
- + OPEN_PARENTHESIS + LEAF_IDENTIFIER + PERIOD + attributeName.toUpperCase() + PERIOD
- + GET_LEAF_INDEX + CLOSE_PARENTHESIS + CLOSE_PARENTHESIS
- + SPACE + OPEN_CURLY_BRACKET + NEW_LINE + TWELVE_SPACE_INDENTATION + IF + SPACE
- + OPEN_PARENTHESIS + attrQualifiedType + CLOSE_PARENTHESIS + SPACE
- + OPEN_CURLY_BRACKET + NEW_LINE + SIXTEEN_SPACE_INDENTATION + RETURN + SPACE + FALSE
- + SEMI_COLAN + NEW_LINE + TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + SPACE + ELSE + SPACE
- + OPEN_CURLY_BRACKET + NEW_LINE + SIXTEEN_SPACE_INDENTATION
- + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + attributeName + OPEN_PARENTHESIS + APP_INSTANCE
- + PERIOD + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + CLOSE_PARENTHESIS
- + SEMI_COLAN + NEW_LINE + TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE
- + EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + SPACE + ELSE + SPACE + IF + SPACE + OPEN_PARENTHESIS
- + GET_SELECT_LEAF_FLAGS + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + GET_METHOD_PREFIX + OPEN_PARENTHESIS
- + LEAF_IDENTIFIER + PERIOD + attributeName.toUpperCase() + PERIOD + GET_LEAF_INDEX + CLOSE_PARENTHESIS
- + SPACE + OR_OPERATION + SPACE + IS_SELECT_ALL_SCHEMA_CHILD_FLAG + CLOSE_PARENTHESIS + SPACE
- + OPEN_CURLY_BRACKET + NEW_LINE + TWELVE_SPACE_INDENTATION + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG
- + SPACE + EQUAL + SPACE + TRUE + SEMI_COLAN + NEW_LINE + TWELVE_SPACE_INDENTATION
- + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + attributeName + OPEN_PARENTHESIS + APP_INSTANCE
- + PERIOD + attributeName + EMPTY_PARAMETER_FUNCTION_CALL + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE
- + EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
+ + GET_VALUE_LEAF_FLAGS + EMPTY_PARAMETER_FUNCTION_CALL +
+ PERIOD + GET_METHOD_PREFIX + OPEN_PARENTHESIS +
+ LEAF_IDENTIFIER + PERIOD + attributeName.toUpperCase() +
+ PERIOD + GET_LEAF_INDEX + CLOSE_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS +
+ attrQualifiedType + CLOSE_PARENTHESIS + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE + SIXTEEN_SPACE_INDENTATION +
+ RETURN + SPACE + FALSE + SEMI_COLAN + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + SPACE +
+ ELSE + SPACE + OPEN_CURLY_BRACKET + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + attributeName +
+ OPEN_PARENTHESIS + APP_INSTANCE + PERIOD + attributeName +
+ OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE +
+ EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + SPACE + ELSE +
+ SPACE + IF + SPACE + OPEN_PARENTHESIS +
+ GET_SELECT_LEAF_FLAGS + EMPTY_PARAMETER_FUNCTION_CALL +
+ PERIOD + GET_METHOD_PREFIX + OPEN_PARENTHESIS +
+ LEAF_IDENTIFIER + PERIOD + attributeName.toUpperCase() +
+ PERIOD + GET_LEAF_INDEX + CLOSE_PARENTHESIS + SPACE +
+ OR_OPERATION + SPACE + IS_SELECT_ALL_SCHEMA_CHILD_FLAG +
+ CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE +
+ TWELVE_SPACE_INDENTATION +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL +
+ SPACE + TRUE + SEMI_COLAN + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER +
+ PERIOD + attributeName + OPEN_PARENTHESIS + APP_INSTANCE +
+ PERIOD + attributeName + EMPTY_PARAMETER_FUNCTION_CALL +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
}
- private static String getAttrTypeForFilterContentMatchWhenPrimitiveDataType(String attributeName) {
- return /* TODO: Need to check if we can expose the value leaf flag in interface.
- NOT + APP_INSTANCE + PERIOD + GET_VALUE_LEAF_FLAGS + OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
- GET_METHOD_PREFIX + OPEN_PARENTHESIS + LEAF_IDENTIFIER + PERIOD + attributeName.toUpperCase() + PERIOD
+ private static String getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
+ String attributeName) {
+ return/* TODO: Need to check if we can expose the value leaf flag in
+ interface.
+ NOT + APP_INSTANCE + PERIOD + GET_VALUE_LEAF_FLAGS +
+ OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
+ GET_METHOD_PREFIX + OPEN_PARENTHESIS + LEAF_IDENTIFIER +
+ PERIOD + attributeName.toUpperCase() + PERIOD
+ GET_LEAF_INDEX + OR_OPERATION +*/
- APP_INSTANCE + PERIOD + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SPACE + NOT + EQUAL
- + SPACE + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS;
+ APP_INSTANCE + PERIOD + attributeName + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE + NOT + EQUAL + SPACE +
+ attributeName + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS;
}
- private static String getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(String attributeName) {
- return APP_INSTANCE + PERIOD + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS
- + SPACE + EQUAL + EQUAL + SPACE + NULL + SPACE + OR_OPERATION + SPACE
- + NOT + OPEN_PARENTHESIS + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS
- + PERIOD + EQUALS_STRING + OPEN_PARENTHESIS + APP_INSTANCE + PERIOD
- + attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS
- + CLOSE_PARENTHESIS + CLOSE_PARENTHESIS;
+ private static String
+ getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(
+ String attributeName) {
+ return APP_INSTANCE + PERIOD + attributeName + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE + EQUAL + EQUAL + SPACE + NULL +
+ SPACE + OR_OPERATION + SPACE + NOT + OPEN_PARENTHESIS +
+ attributeName + OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
+ PERIOD + EQUALS_STRING + OPEN_PARENTHESIS + APP_INSTANCE +
+ PERIOD + attributeName + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + CLOSE_PARENTHESIS + CLOSE_PARENTHESIS;
}
- private static String getIfFilterContentMatchMethodImpl(String attributeName,
+ private static String getIfFilterContentMatchMethodImpl(
+ String attributeName,
YangType dataType) {
String attrQualifiedType;
if (MethodsGenerator.isPrimitiveDataType(dataType.getDataType())) {
- attrQualifiedType = getAttrTypeForFilterContentMatchWhenPrimitiveDataType(attributeName);
+ attrQualifiedType =
+ getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
+ attributeName);
} else if (dataType.getDataType() == LEAFREF) {
- YangType type = ((YangLeafRef) dataType.getDataTypeExtendedInfo()).getEffectiveDataType();
+ YangType type = ((YangLeafRef) dataType.getDataTypeExtendedInfo())
+ .getEffectiveDataType();
if (MethodsGenerator.isPrimitiveDataType(type.getDataType())) {
- attrQualifiedType = getAttrTypeForFilterContentMatchWhenPrimitiveDataType(attributeName);
+ attrQualifiedType =
+ getAttrTypeForFilterContentMatchWhenPrimitiveDataType(
+ attributeName);
} else {
- attrQualifiedType = getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(attributeName);
+ attrQualifiedType =
+ getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(
+ attributeName);
}
} else {
- attrQualifiedType = getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(attributeName);
+ attrQualifiedType =
+ getAttrTypeForFilterContentMatchWhenNonPrimitiveDataTypes(
+ attributeName);
}
return attrQualifiedType;
@@ -199,7 +260,8 @@
* @param javaAttributeInfo java attribute
* @return is filter content match for leaf
*/
- public static String getSubtreeFilteringForLeafList(JavaAttributeInfo javaAttributeInfo) {
+ public static String getSubtreeFilteringForLeafList(
+ JavaAttributeInfo javaAttributeInfo) {
return getSubtreeFilteringForList(javaAttributeInfo, true);
}
@@ -211,9 +273,13 @@
* @param path path of temp file
* @return is filter content match for child node
*/
- static String getProcessChildNodeSubtreeFiltering(YangNode curNode, YangPluginConfig pluginConfig, String path)
+ static String getProcessChildNodeSubtreeFiltering(YangNode curNode,
+ YangPluginConfig
+ pluginConfig,
+ String path)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
JavaFileInfoTranslator parentInfo;
String instance = APP_INSTANCE;
@@ -226,37 +292,49 @@
parentInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo();
name = getCapitalCase(parentInfo.getJavaName());
} else if (parent instanceof YangAugment) {
- parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent).getAugmentedNode()).getJavaFileInfo();
+ parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent)
+ .getAugmentedNode()).getJavaFileInfo();
if (parentInfo != null) {
name = getCapitalCase(parentInfo.getJavaName());
} else {
- name = getCapitalCase(getCamelCase(((YangAugment) parent).getAugmentedNode().getName(),
+ name = getCapitalCase(getCamelCase(
+ ((YangAugment) parent).getAugmentedNode().getName(),
pluginConfig.getConflictResolver()));
}
}
}
String processSubtreeFilteringMethod =
- FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE + SPACE
- + "processChildNodesSubTreeFiltering" + OPEN_PARENTHESIS + name + SPACE + instance + COMMA
- + SPACE + builderNamePrefix + BUILDER + SPACE + "subTreeFilteringResultBuilder"
- + COMMA + NEW_LINE + TWELVE_SPACE_INDENTATION + "Boolean isAnySelectOrContainmentNode, "
- + "boolean isSelectAllSchemaChild" + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
+ FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE +
+ SPACE + "processChildNodesSubTreeFiltering" +
+ OPEN_PARENTHESIS + name + SPACE + instance + COMMA +
+ SPACE + builderNamePrefix + BUILDER + SPACE +
+ "subTreeFilteringResultBuilder" + COMMA + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + "Boolean " +
+ "isAnySelectOrContainmentNode, " + "boolean " +
+ "isSelectAllSchemaChild" + CLOSE_PARENTHESIS +
+ SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
if (curNode instanceof YangCase) {
String caseName = getCapitalCase(javaFileInfo.getJavaName());
processSubtreeFilteringMethod =
- processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION + caseName + SPACE + APP_INSTANCE + SPACE +
- EQUAL + SPACE + OPEN_PARENTHESIS + caseName + CLOSE_PARENTHESIS + SPACE + instance
- + SEMI_COLAN + NEW_LINE;
+ processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION +
+ caseName + SPACE + APP_INSTANCE + SPACE +
+ EQUAL + SPACE + OPEN_PARENTHESIS + caseName +
+ CLOSE_PARENTHESIS + SPACE + instance +
+ SEMI_COLAN + NEW_LINE;
}
- processSubtreeFilteringMethod += getDataFromTempFileHandle(FILTER_CONTENT_MATCH_FOR_NODES_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path);
+ processSubtreeFilteringMethod +=
+ getDataFromTempFileHandle(FILTER_CONTENT_MATCH_FOR_NODES_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(), path);
- processSubtreeFilteringMethod += EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN + NEW_LINE
- + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
+ processSubtreeFilteringMethod +=
+ EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN +
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
return processSubtreeFilteringMethod;
}
@@ -269,9 +347,13 @@
* @param path path of temp file
* @return is filter content match for leaf list
*/
- static String getProcessLeafListSubtreeFiltering(YangNode curNode, YangPluginConfig pluginConfig, String path)
+ static String getProcessLeafListSubtreeFiltering(YangNode curNode,
+ YangPluginConfig
+ pluginConfig,
+ String path)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
JavaFileInfoTranslator parentInfo;
String instance = APP_INSTANCE;
@@ -284,37 +366,49 @@
parentInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo();
name = getCapitalCase(parentInfo.getJavaName());
} else if (parent instanceof YangAugment) {
- parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent).getAugmentedNode()).getJavaFileInfo();
+ parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent)
+ .getAugmentedNode()).getJavaFileInfo();
if (parentInfo != null) {
name = getCapitalCase(parentInfo.getJavaName());
} else {
- name = getCapitalCase(getCamelCase(((YangAugment) parent).getAugmentedNode().getName(),
+ name = getCapitalCase(getCamelCase(
+ ((YangAugment) parent).getAugmentedNode().getName(),
pluginConfig.getConflictResolver()));
}
}
}
String processSubtreeFilteringMethod =
- FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE + SPACE +
- "processLeafListSubTreeFiltering" + OPEN_PARENTHESIS + name + SPACE + instance + COMMA
- + SPACE + builderNamePrefix + BUILDER + SPACE + "subTreeFilteringResultBuilder" + COMMA
- + NEW_LINE + TWELVE_SPACE_INDENTATION + "Boolean isAnySelectOrContainmentNode, "
- + "boolean isSelectAllSchemaChild" + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
+ FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE +
+ SPACE + "processLeafListSubTreeFiltering" +
+ OPEN_PARENTHESIS + name + SPACE + instance + COMMA +
+ SPACE + builderNamePrefix + BUILDER + SPACE +
+ "subTreeFilteringResultBuilder" + COMMA + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + "Boolean " +
+ "isAnySelectOrContainmentNode, " + "boolean " +
+ "isSelectAllSchemaChild" + CLOSE_PARENTHESIS +
+ SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
if (curNode instanceof YangCase) {
String caseName = getCapitalCase(javaFileInfo.getJavaName());
processSubtreeFilteringMethod =
- processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION + caseName + SPACE + APP_INSTANCE + SPACE +
- EQUAL + SPACE + OPEN_PARENTHESIS + caseName + CLOSE_PARENTHESIS + SPACE + instance
- + SEMI_COLAN + NEW_LINE;
+ processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION +
+ caseName + SPACE + APP_INSTANCE + SPACE +
+ EQUAL + SPACE + OPEN_PARENTHESIS + caseName +
+ CLOSE_PARENTHESIS + SPACE + instance +
+ SEMI_COLAN + NEW_LINE;
}
- processSubtreeFilteringMethod += getDataFromTempFileHandle(FILTER_CONTENT_MATCH_FOR_LEAF_LIST_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
+ processSubtreeFilteringMethod += getDataFromTempFileHandle(
+ FILTER_CONTENT_MATCH_FOR_LEAF_LIST_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
.getBeanTempFiles(), path);
- processSubtreeFilteringMethod += EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN + NEW_LINE
- + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
+ processSubtreeFilteringMethod +=
+ EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN +
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
return processSubtreeFilteringMethod;
}
@@ -327,9 +421,12 @@
* @param path path of temp file
* @return is filter content match for leaf
*/
- static String getProcessLeafSubtreeFiltering(YangNode curNode, YangPluginConfig pluginConfig, String path)
+ static String getProcessLeafSubtreeFiltering(YangNode curNode,
+ YangPluginConfig pluginConfig,
+ String path)
throws IOException {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
JavaFileInfoTranslator parentInfo;
String instance = APP_INSTANCE;
@@ -342,37 +439,49 @@
parentInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo();
name = getCapitalCase(parentInfo.getJavaName());
} else if (parent instanceof YangAugment) {
- parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent).getAugmentedNode()).getJavaFileInfo();
+ parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent)
+ .getAugmentedNode()).getJavaFileInfo();
if (parentInfo != null) {
name = getCapitalCase(parentInfo.getJavaName());
} else {
- name = getCapitalCase(getCamelCase(((YangAugment) parent).getAugmentedNode().getName(),
+ name = getCapitalCase(getCamelCase(
+ ((YangAugment) parent).getAugmentedNode().getName(),
pluginConfig.getConflictResolver()));
}
}
}
String processSubtreeFilteringMethod =
- FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE + SPACE + "processLeafSubtreeFiltering" +
- OPEN_PARENTHESIS + name + SPACE + instance + COMMA + SPACE + builderNamePrefix
- + BUILDER + SPACE + "subTreeFilteringResultBuilder" + COMMA + NEW_LINE
- + TWELVE_SPACE_INDENTATION + "Boolean isAnySelectOrContainmentNode, "
- + "boolean isSelectAllSchemaChild" + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
+ FOUR_SPACE_INDENTATION + PRIVATE + SPACE + BOOLEAN_DATA_TYPE +
+ SPACE + "processLeafSubtreeFiltering" +
+ OPEN_PARENTHESIS + name + SPACE + instance + COMMA +
+ SPACE + builderNamePrefix + BUILDER + SPACE +
+ "subTreeFilteringResultBuilder" + COMMA + NEW_LINE
+ + TWELVE_SPACE_INDENTATION + "Boolean " +
+ "isAnySelectOrContainmentNode, " + "boolean " +
+ "isSelectAllSchemaChild" + CLOSE_PARENTHESIS +
+ SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
if (curNode instanceof YangCase) {
String caseName = getCapitalCase(javaFileInfo.getJavaName());
processSubtreeFilteringMethod =
- processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION + caseName + SPACE + APP_INSTANCE + SPACE +
- EQUAL + SPACE + OPEN_PARENTHESIS + caseName + CLOSE_PARENTHESIS + SPACE + instance
- + SEMI_COLAN + NEW_LINE;
+ processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION +
+ caseName + SPACE + APP_INSTANCE + SPACE +
+ EQUAL + SPACE + OPEN_PARENTHESIS + caseName +
+ CLOSE_PARENTHESIS + SPACE + instance +
+ SEMI_COLAN + NEW_LINE;
}
- processSubtreeFilteringMethod += getDataFromTempFileHandle(FILTER_CONTENT_MATCH_FOR_LEAF_MASK,
- ((TempJavaCodeFragmentFilesContainer) curNode).getTempJavaCodeFragmentFiles()
- .getBeanTempFiles(), path);
+ processSubtreeFilteringMethod +=
+ getDataFromTempFileHandle(FILTER_CONTENT_MATCH_FOR_LEAF_MASK,
+ ((TempJavaCodeFragmentFilesContainer) curNode)
+ .getTempJavaCodeFragmentFiles()
+ .getBeanTempFiles(), path);
- processSubtreeFilteringMethod += EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN + NEW_LINE
- + FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
+ processSubtreeFilteringMethod +=
+ EIGHT_SPACE_INDENTATION + RETURN + SPACE + TRUE + SEMI_COLAN +
+ NEW_LINE + FOUR_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE + NEW_LINE;
return processSubtreeFilteringMethod;
}
@@ -384,8 +493,11 @@
* @param pluginConfig plugin configurations
* @return is filter content match for leaf
*/
- static String getProcessSubtreeFilteringStart(YangNode curNode, YangPluginConfig pluginConfig) {
- JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) curNode).getJavaFileInfo();
+ static String getProcessSubtreeFilteringStart(YangNode curNode,
+ YangPluginConfig
+ pluginConfig) {
+ JavaFileInfoTranslator javaFileInfo =
+ ((JavaFileInfoContainer) curNode).getJavaFileInfo();
JavaFileInfoTranslator parentInfo;
String instance = APP_INSTANCE;
@@ -398,32 +510,41 @@
parentInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo();
name = getCapitalCase(parentInfo.getJavaName());
} else if (parent instanceof YangAugment) {
- parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent).getAugmentedNode()).getJavaFileInfo();
+ parentInfo = ((JavaFileInfoContainer) ((YangAugment) parent)
+ .getAugmentedNode()).getJavaFileInfo();
if (parentInfo != null) {
name = getCapitalCase(parentInfo.getJavaName());
} else {
- name = getCapitalCase(getCamelCase(((YangAugment) parent).getAugmentedNode().getName(),
+ name = getCapitalCase(getCamelCase(
+ ((YangAugment) parent).getAugmentedNode().getName(),
pluginConfig.getConflictResolver()));
}
}
}
String processSubtreeFilteringMethod =
- MethodsGenerator.getOverRideString() + FOUR_SPACE_INDENTATION + PUBLIC + SPACE +
- name + SPACE + PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + name
- + SPACE + instance + COMMA + SPACE + BOOLEAN_DATA_TYPE + SPACE + "isSelectAllSchemaChild" +
- CLOSE_PARENTHESIS + SPACE
- + OPEN_CURLY_BRACKET + NEW_LINE + EIGHT_SPACE_INDENTATION + builderNamePrefix
- + BUILDER + SPACE + SUBTREE_FILTERING_RESULT_BUILDER + SPACE + EQUAL + SPACE + NEW + SPACE
- + builderNamePrefix + BUILDER + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE
- + EIGHT_SPACE_INDENTATION + "Boolean" + SPACE + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG
- + SPACE + EQUAL + SPACE + FALSE + SEMI_COLAN + NEW_LINE;
+ MethodsGenerator.getOverRideString() + FOUR_SPACE_INDENTATION +
+ PUBLIC + SPACE + name + SPACE +
+ PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + name +
+ SPACE + instance + COMMA + SPACE + BOOLEAN_DATA_TYPE +
+ SPACE + "isSelectAllSchemaChild" +
+ CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET +
+ NEW_LINE + EIGHT_SPACE_INDENTATION +
+ builderNamePrefix + BUILDER + SPACE +
+ SUBTREE_FILTERING_RESULT_BUILDER + SPACE + EQUAL +
+ SPACE + NEW + SPACE + builderNamePrefix + BUILDER +
+ OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SEMI_COLAN +
+ NEW_LINE + EIGHT_SPACE_INDENTATION + "Boolean" + SPACE +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE +
+ EQUAL + SPACE + FALSE + SEMI_COLAN + NEW_LINE;
if (curNode instanceof YangCase) {
String caseName = getCapitalCase(javaFileInfo.getJavaName());
processSubtreeFilteringMethod =
- processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION + caseName + SPACE + APP_INSTANCE + SPACE +
- EQUAL + SPACE + OPEN_PARENTHESIS + caseName + CLOSE_PARENTHESIS + SPACE + instance
- + SEMI_COLAN + NEW_LINE;
+ processSubtreeFilteringMethod + EIGHT_SPACE_INDENTATION +
+ caseName + SPACE + APP_INSTANCE + SPACE +
+ EQUAL + SPACE + OPEN_PARENTHESIS + caseName +
+ CLOSE_PARENTHESIS + SPACE + instance +
+ SEMI_COLAN + NEW_LINE;
}
return processSubtreeFilteringMethod;
@@ -432,32 +553,67 @@
/**
* Get the body for process subtree filtering.
*
+ * @param curNode node for which the code is being generated
* @return body of subtree filtering
*/
- static String getProcessSubtreeFunctionBody() {
- String method = MethodsGenerator.getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT
- + "processLeafSubtreeFiltering(appInstance, subTreeFilteringResultBuilder,"
- + NEW_LINE + TWELVE_SPACE_INDENTATION + "isAnySelectOrContainmentNode, isSelectAllSchemaChild)");
+ static String getProcessSubtreeFunctionBody(YangNode curNode) {
- method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL + SEMI_COLAN + NEW_LINE;
+ String method = "";
- method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ if (curNode instanceof YangLeavesHolder) {
+ if (((YangLeavesHolder) curNode).getListOfLeaf() != null
+ &&
+ !((YangLeavesHolder) curNode).getListOfLeaf().isEmpty()) {
+ method += MethodsGenerator
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT +
+ "processLeafSubtreeFiltering(appInstance, " +
+ "subTreeFilteringResultBuilder," + NEW_LINE +
+ TWELVE_SPACE_INDENTATION +
+ "isAnySelectOrContainmentNode, " +
+ "isSelectAllSchemaChild)");
- method += MethodsGenerator.getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT
- + "processLeafListSubTreeFiltering(appInstance, subTreeFilteringResultBuilder,"
- + NEW_LINE + TWELVE_SPACE_INDENTATION + "isAnySelectOrContainmentNode, isSelectAllSchemaChild)");
+ method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL +
+ SEMI_COLAN + NEW_LINE;
- method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL + SEMI_COLAN + NEW_LINE;
+ method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ }
+ }
- method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ if (curNode instanceof YangLeavesHolder) {
+ if (((YangLeavesHolder) curNode).getListOfLeafList() != null
+ &&
+ !((YangLeavesHolder) curNode).getListOfLeafList()
+ .isEmpty()) {
+ method += MethodsGenerator
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT +
+ "processLeafListSubTreeFiltering(appInstance," +
+ " subTreeFilteringResultBuilder," + NEW_LINE
+ + TWELVE_SPACE_INDENTATION +
+ "isAnySelectOrContainmentNode, " +
+ "isSelectAllSchemaChild)");
- method += MethodsGenerator.getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT
- + "processChildNodesSubTreeFiltering(appInstance, subTreeFilteringResultBuilder,"
- + NEW_LINE + TWELVE_SPACE_INDENTATION + "isAnySelectOrContainmentNode, isSelectAllSchemaChild)");
+ method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL +
+ SEMI_COLAN + NEW_LINE;
- method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL + SEMI_COLAN + NEW_LINE;
+ method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ }
+ }
- method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ if (curNode.getChild() != null) {
+
+ method += MethodsGenerator
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT +
+ "processChildNodesSubTreeFiltering(appInstance, " +
+ "subTreeFilteringResultBuilder," + NEW_LINE +
+ TWELVE_SPACE_INDENTATION +
+ "isAnySelectOrContainmentNode, " +
+ "isSelectAllSchemaChild)");
+
+ method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + NULL +
+ SEMI_COLAN + NEW_LINE;
+
+ method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
+ }
return method;
}
@@ -484,17 +640,23 @@
*/
static String getProcessSubTreeFilteringEnd() {
String method = MethodsGenerator
- .getIfConditionBegin(EIGHT_SPACE_INDENTATION, NOT + IS_SELECT_ALL_SCHEMA_CHILD_FLAG
- + SPACE + AND_OPERATION + SPACE + NOT + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG);
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION,
+ NOT + IS_SELECT_ALL_SCHEMA_CHILD_FLAG +
+ SPACE + AND_OPERATION + SPACE +
+ NOT +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG);
- method += TWELVE_SPACE_INDENTATION + RETURN + SPACE + PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS
- + APP_INSTANCE + COMMA + SPACE + TRUE + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE;
+ method += TWELVE_SPACE_INDENTATION + RETURN + SPACE +
+ PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + APP_INSTANCE +
+ COMMA + SPACE + TRUE + CLOSE_PARENTHESIS + SEMI_COLAN +
+ NEW_LINE;
method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION);
- method += EIGHT_SPACE_INDENTATION + RETURN + SPACE + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + BUILD
- + EMPTY_PARAMETER_FUNCTION_CALL + SEMI_COLAN + NEW_LINE + FOUR_SPACE_INDENTATION
- + CLOSE_CURLY_BRACKET + NEW_LINE;
+ method += EIGHT_SPACE_INDENTATION + RETURN + SPACE +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + BUILD +
+ EMPTY_PARAMETER_FUNCTION_CALL + SEMI_COLAN + NEW_LINE +
+ FOUR_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
return method;
}
@@ -505,33 +667,43 @@
* @param javaAttributeInfo attribute to be added
* @return filter content match for child nodes
*/
- private static String getSubtreeFilteringForChildNode(JavaAttributeInfo javaAttributeInfo) {
+ private static String getSubtreeFilteringForChildNode(
+ JavaAttributeInfo javaAttributeInfo) {
String name = javaAttributeInfo.getAttributeName();
name = getSmallCase(name);
String type = javaAttributeInfo.getImportInfo().getClassInfo();
if (javaAttributeInfo.isQualifiedName()) {
- type = javaAttributeInfo.getImportInfo().getPkgInfo() + PERIOD + type;
+ type = javaAttributeInfo.getImportInfo().getPkgInfo() + PERIOD +
+ type;
}
- String method = MethodsGenerator.getIfConditionBegin(EIGHT_SPACE_INDENTATION, name + "() != null");
+ String method = MethodsGenerator
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION, name + "() != " +
+ "null");
- method += TWELVE_SPACE_INDENTATION + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL + SPACE + TRUE
- + SEMI_COLAN + NEW_LINE;
+ method += TWELVE_SPACE_INDENTATION +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL + SPACE +
+ TRUE + SEMI_COLAN + NEW_LINE;
- method += TWELVE_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS + APP_INSTANCE
- + PERIOD + name + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SPACE + NOT
- + EQUAL + SPACE + NULL + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
+ method += TWELVE_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS +
+ APP_INSTANCE + PERIOD + name + OPEN_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE + NOT
+ + EQUAL + SPACE + NULL + CLOSE_PARENTHESIS + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE;
+ method += SIXTEEN_SPACE_INDENTATION + type + SPACE + "result = " +
+ name + PERIOD + PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS +
+ APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL
+ + COMMA + SPACE + FALSE + CLOSE_PARENTHESIS + SEMI_COLAN +
+ NEW_LINE;
- method += SIXTEEN_SPACE_INDENTATION + type + SPACE + "result = " + name + PERIOD +
- PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + APP_INSTANCE + PERIOD + name
- + EMPTY_PARAMETER_FUNCTION_CALL + COMMA + SPACE + FALSE + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE;
+ method += SIXTEEN_SPACE_INDENTATION + "if (result != null) {" +
+ NEW_LINE;
- method += SIXTEEN_SPACE_INDENTATION + "if (result != null) {" + NEW_LINE;
-
- method += TWENTY_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + name + OPEN_PARENTHESIS
- + "result" + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE + SIXTEEN_SPACE_INDENTATION +
- CLOSE_CURLY_BRACKET + NEW_LINE;
+ method += TWENTY_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER +
+ PERIOD + name + OPEN_PARENTHESIS + "result" +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
//if app instance is not null
method += MethodsGenerator.getBlockEnd(TWELVE_SPACE_INDENTATION);
@@ -549,122 +721,181 @@
* @param isLeafList if for leaf list
* @return filter content match for list types
*/
- private static String getSubtreeFilteringForList(JavaAttributeInfo javaAttributeInfo, boolean isLeafList) {
- String capitalCaseName = getCapitalCase(javaAttributeInfo.getAttributeName());
+ private static String getSubtreeFilteringForList(
+ JavaAttributeInfo javaAttributeInfo, boolean isLeafList) {
+ String capitalCaseName =
+ getCapitalCase(javaAttributeInfo.getAttributeName());
String name = javaAttributeInfo.getAttributeName();
String type = javaAttributeInfo.getImportInfo().getClassInfo();
if (javaAttributeInfo.isQualifiedName()) {
- type = javaAttributeInfo.getImportInfo().getPkgInfo() + PERIOD + type;
+ type = javaAttributeInfo.getImportInfo().getPkgInfo() + PERIOD +
+ type;
}
/*
* If select all schema child
*/
- String method = MethodsGenerator.getIfConditionBegin(EIGHT_SPACE_INDENTATION, IS_SELECT_ALL_SCHEMA_CHILD_FLAG);
+ String method = MethodsGenerator
+ .getIfConditionBegin(EIGHT_SPACE_INDENTATION,
+ IS_SELECT_ALL_SCHEMA_CHILD_FLAG);
- method = method + MethodsGenerator.getCollectionIteratorForLoopBegin(TWELVE_SPACE_INDENTATION,
- type + SPACE + name, APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL);
+ method = method + MethodsGenerator
+ .getCollectionIteratorForLoopBegin(TWELVE_SPACE_INDENTATION,
+ type + SPACE + name,
+ APP_INSTANCE + PERIOD +
+ name +
+ EMPTY_PARAMETER_FUNCTION_CALL);
- method = method + SIXTEEN_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING
- + getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS + name + CLOSE_PARENTHESIS + SEMI_COLAN
- + NEW_LINE;
+ method = method + SIXTEEN_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING +
+ getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS +
+ name + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE;
- method += MethodsGenerator.getBlockEnd(TWELVE_SPACE_INDENTATION); // Close collection Iteration loop
+ method += MethodsGenerator.getBlockEnd(
+ TWELVE_SPACE_INDENTATION); // Close collection Iteration loop
//If need to explicitly participate in query
method += MethodsGenerator
- .getElseIfConditionBegin(EIGHT_SPACE_INDENTATION, name + EMPTY_PARAMETER_FUNCTION_CALL + SPACE + NOT
- + EQUAL + SPACE + NULL);
+ .getElseIfConditionBegin(EIGHT_SPACE_INDENTATION,
+ name + EMPTY_PARAMETER_FUNCTION_CALL +
+ SPACE + NOT + EQUAL +
+ SPACE + NULL);
if (!isLeafList) {
- method += TWELVE_SPACE_INDENTATION + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL + SPACE
- + TRUE + SEMI_COLAN + NEW_LINE;
+ method += TWELVE_SPACE_INDENTATION +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL +
+ SPACE + TRUE + SEMI_COLAN + NEW_LINE;
}
//If there is any parameter in the query condition
method += MethodsGenerator
- .getIfConditionBegin(TWELVE_SPACE_INDENTATION, NOT + name + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD
- + IS_EMPTY);
+ .getIfConditionBegin(TWELVE_SPACE_INDENTATION, NOT + name +
+ EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + IS_EMPTY);
if (isLeafList) {
/*
* If there is no app instance to perform content match
*/
- method += MethodsGenerator.getIfConditionBegin(SIXTEEN_SPACE_INDENTATION, APP_INSTANCE + PERIOD + name
- + EMPTY_PARAMETER_FUNCTION_CALL + SPACE + EQUAL + EQUAL + SPACE + NULL + SPACE + OR_OPERATION
- + SPACE + APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + IS_EMPTY);
+ method += MethodsGenerator
+ .getIfConditionBegin(SIXTEEN_SPACE_INDENTATION,
+ APP_INSTANCE + PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL +
+ SPACE + EQUAL + EQUAL + SPACE +
+ NULL + SPACE + OR_OPERATION
+ + SPACE + APP_INSTANCE +
+ PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL +
+ PERIOD + IS_EMPTY);
- method += TWENTY_SPACE_INDENTATION + RETURN + SPACE + FALSE + SEMI_COLAN + NEW_LINE;
+ method += TWENTY_SPACE_INDENTATION + RETURN + SPACE + FALSE +
+ SEMI_COLAN + NEW_LINE;
method += MethodsGenerator.getBlockEnd(SIXTEEN_SPACE_INDENTATION);
// for instance iterator
- method += MethodsGenerator.getCollectionIteratorForLoopBegin(SIXTEEN_SPACE_INDENTATION, type + SPACE + name,
+ method += MethodsGenerator.getCollectionIteratorForLoopBegin(
+ SIXTEEN_SPACE_INDENTATION, type + SPACE + name,
name + EMPTY_PARAMETER_FUNCTION_CALL);
- method += TWENTY_SPACE_INDENTATION + BOOLEAN_DATA_TYPE + SPACE + "flag" + SPACE + EQUAL
- + SPACE + FALSE + SEMI_COLAN + NEW_LINE;
+ method += TWENTY_SPACE_INDENTATION + BOOLEAN_DATA_TYPE + SPACE +
+ "flag" + SPACE + EQUAL + SPACE + FALSE + SEMI_COLAN +
+ NEW_LINE;
// for app instance iterator
- method += MethodsGenerator.getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION,
- type + SPACE + name + "2", APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL);
+ method += MethodsGenerator
+ .getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION,
+ type + SPACE + name +
+ "2",
+ APP_INSTANCE + PERIOD +
+ name +
+ EMPTY_PARAMETER_FUNCTION_CALL);
//the content match leaf list attribute value matches
- method += MethodsGenerator.getIfConditionBegin(TWENTY_FOUR_SPACE_INDENTATION, name + PERIOD + EQUALS_STRING
- + OPEN_PARENTHESIS + name + "2" + CLOSE_PARENTHESIS);
+ method += MethodsGenerator
+ .getIfConditionBegin(TWENTY_FOUR_SPACE_INDENTATION,
+ name + PERIOD + EQUALS_STRING
+ + OPEN_PARENTHESIS + name +
+ "2" + CLOSE_PARENTHESIS);
- method += TWENTY_EIGHT_SPACE_INDENTATION + "flag" + SPACE + EQUAL + SPACE + TRUE + SEMI_COLAN + NEW_LINE;
+ method += TWENTY_EIGHT_SPACE_INDENTATION + "flag" + SPACE + EQUAL +
+ SPACE + TRUE + SEMI_COLAN + NEW_LINE;
- method += TWENTY_EIGHT_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING +
- getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS + name + "2" + CLOSE_PARENTHESIS +
- SEMI_COLAN + NEW_LINE + TWENTY_EIGHT_SPACE_INDENTATION + BREAK + SEMI_COLAN + NEW_LINE;
+ method += TWENTY_EIGHT_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING +
+ getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS +
+ name + "2" + CLOSE_PARENTHESIS +
+ SEMI_COLAN + NEW_LINE + TWENTY_EIGHT_SPACE_INDENTATION +
+ BREAK + SEMI_COLAN + NEW_LINE;
//the content match leaf list attribute value matches
- method += MethodsGenerator.getBlockEnd(TWENTY_FOUR_SPACE_INDENTATION);
+ method +=
+ MethodsGenerator.getBlockEnd(TWENTY_FOUR_SPACE_INDENTATION);
// for app instance iterator
method += MethodsGenerator.getBlockEnd(TWENTY_SPACE_INDENTATION);
//if the content match failed
- method += MethodsGenerator.getIfConditionBegin(TWENTY_SPACE_INDENTATION, "!flag");
+ method += MethodsGenerator
+ .getIfConditionBegin(TWENTY_SPACE_INDENTATION, "!flag");
- method += TWENTY_FOUR_SPACE_INDENTATION + RETURN + SPACE + FALSE + SEMI_COLAN + NEW_LINE;
+ method += TWENTY_FOUR_SPACE_INDENTATION + RETURN + SPACE + FALSE +
+ SEMI_COLAN + NEW_LINE;
- method += MethodsGenerator.getBlockEnd(TWENTY_SPACE_INDENTATION); // if flag == false
+ method += MethodsGenerator
+ .getBlockEnd(TWENTY_SPACE_INDENTATION); // if flag == false
- method += MethodsGenerator.getBlockEnd(SIXTEEN_SPACE_INDENTATION); // for instance iterator
+ method += MethodsGenerator.getBlockEnd(
+ SIXTEEN_SPACE_INDENTATION); // for instance iterator
} else {
/*if there is any app instance entry*/
- method += MethodsGenerator.getIfConditionBegin(SIXTEEN_SPACE_INDENTATION, APP_INSTANCE + PERIOD + name
- + EMPTY_PARAMETER_FUNCTION_CALL + SPACE + NOT + EQUAL + SPACE + NULL + SPACE + AND_OPERATION + SPACE
- + NOT + APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + IS_EMPTY);
+ method += MethodsGenerator
+ .getIfConditionBegin(SIXTEEN_SPACE_INDENTATION,
+ APP_INSTANCE + PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL +
+ SPACE + NOT + EQUAL + SPACE +
+ NULL + SPACE + AND_OPERATION +
+ SPACE + NOT + APP_INSTANCE +
+ PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL +
+ PERIOD + IS_EMPTY);
/*
* loop all the query condition instance(s)
*/
- method += MethodsGenerator.getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION, type + SPACE + name,
- name + EMPTY_PARAMETER_FUNCTION_CALL);
+ method += MethodsGenerator
+ .getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION,
+ type + SPACE + name,
+ name +
+ EMPTY_PARAMETER_FUNCTION_CALL);
//loop all the app instance(s)
- method += MethodsGenerator.getCollectionIteratorForLoopBegin(TWENTY_FOUR_SPACE_INDENTATION,
- type + SPACE + name + "2", APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL);
+ method += MethodsGenerator.getCollectionIteratorForLoopBegin(
+ TWENTY_FOUR_SPACE_INDENTATION, type + SPACE + name + "2",
+ APP_INSTANCE + PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL);
- method += TWENTY_EIGHT_SPACE_INDENTATION + type + SPACE + "result = " + name + PERIOD +
- PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + name + "2" + COMMA
- + SPACE + FALSE + CLOSE_PARENTHESIS + SEMI_COLAN
- + NEW_LINE;
+ method += TWENTY_EIGHT_SPACE_INDENTATION + type + SPACE +
+ "result = " + name + PERIOD +
+ PROCESS_SUBTREE_FILTERING + OPEN_PARENTHESIS + name + "2" +
+ COMMA + SPACE + FALSE + CLOSE_PARENTHESIS + SEMI_COLAN +
+ NEW_LINE;
- method += TWENTY_EIGHT_SPACE_INDENTATION + "if (result != null) {" + NEW_LINE;
+ method += TWENTY_EIGHT_SPACE_INDENTATION + "if (result != null) {" +
+ NEW_LINE;
- method += THIRTY_TWO_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING +
- getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS + "result" + CLOSE_PARENTHESIS +
- SEMI_COLAN + NEW_LINE + TWENTY_EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
+ method += THIRTY_TWO_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING +
+ getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS +
+ "result" + CLOSE_PARENTHESIS +
+ SEMI_COLAN + NEW_LINE + TWENTY_EIGHT_SPACE_INDENTATION +
+ CLOSE_CURLY_BRACKET + NEW_LINE;
//loop all the app instance(s)
- method += MethodsGenerator.getBlockEnd(TWENTY_FOUR_SPACE_INDENTATION);
+ method +=
+ MethodsGenerator.getBlockEnd(TWENTY_FOUR_SPACE_INDENTATION);
//loop all the query condition instance(s)
method += MethodsGenerator.getBlockEnd(TWENTY_SPACE_INDENTATION);
@@ -676,28 +907,45 @@
method += TWELVE_SPACE_INDENTATION + "} else {" + NEW_LINE;
if (isLeafList) {
- method += SIXTEEN_SPACE_INDENTATION + IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE + EQUAL
- + SPACE + TRUE + SEMI_COLAN + NEW_LINE;
+ method += SIXTEEN_SPACE_INDENTATION +
+ IS_ANY_SELECT_OR_CONTAINMENT_NODE_FLAG + SPACE +
+ EQUAL + SPACE + TRUE + SEMI_COLAN + NEW_LINE;
}
- method += MethodsGenerator.getIfConditionBegin(SIXTEEN_SPACE_INDENTATION, APP_INSTANCE + PERIOD + name
- + EMPTY_PARAMETER_FUNCTION_CALL + SPACE + NOT + EQUAL + SPACE + NULL + SPACE + AND_OPERATION + SPACE
- + NOT + APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL + PERIOD + IS_EMPTY);
+ method += MethodsGenerator
+ .getIfConditionBegin(SIXTEEN_SPACE_INDENTATION,
+ APP_INSTANCE + PERIOD + name
+ + EMPTY_PARAMETER_FUNCTION_CALL +
+ SPACE + NOT + EQUAL + SPACE +
+ NULL + SPACE + AND_OPERATION +
+ SPACE + NOT + APP_INSTANCE +
+ PERIOD + name +
+ EMPTY_PARAMETER_FUNCTION_CALL +
+ PERIOD + IS_EMPTY);
- method = method + MethodsGenerator.getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION,
- type + SPACE + name, APP_INSTANCE + PERIOD + name + EMPTY_PARAMETER_FUNCTION_CALL);
+ method = method + MethodsGenerator
+ .getCollectionIteratorForLoopBegin(TWENTY_SPACE_INDENTATION,
+ type + SPACE + name,
+ APP_INSTANCE + PERIOD +
+ name +
+ EMPTY_PARAMETER_FUNCTION_CALL);
- method = method + TWENTY_FOUR_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING
- + getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS + name + CLOSE_PARENTHESIS + SEMI_COLAN
- + NEW_LINE;
+ method = method + TWENTY_FOUR_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + ADD_STRING
+ + getCapitalCase(TO) + capitalCaseName + OPEN_PARENTHESIS +
+ name + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE;
- method += MethodsGenerator.getBlockEnd(TWENTY_SPACE_INDENTATION); // Close collection Iteration loop
+ method += MethodsGenerator.getBlockEnd(
+ TWENTY_SPACE_INDENTATION); // Close collection Iteration loop
- method += MethodsGenerator.getBlockEnd(SIXTEEN_SPACE_INDENTATION); // close if condition
+ method += MethodsGenerator
+ .getBlockEnd(SIXTEEN_SPACE_INDENTATION); // close if condition
- method += MethodsGenerator.getBlockEnd(TWELVE_SPACE_INDENTATION); // close else condition
+ method += MethodsGenerator
+ .getBlockEnd(TWELVE_SPACE_INDENTATION); // close else condition
- method += MethodsGenerator.getBlockEnd(EIGHT_SPACE_INDENTATION); // close else if condition
+ method += MethodsGenerator.getBlockEnd(
+ EIGHT_SPACE_INDENTATION); // close else if condition
return method;
@@ -705,35 +953,55 @@
//Returns method string for op params augmented syntax
static String getAugmentableSubTreeFiltering() {
- return EIGHT_SPACE_INDENTATION + FOR + SPACE + OPEN_PARENTHESIS + OBJECT_STRING + SPACE +
- getSmallCase(YANG_AUGMENTED_INFO) + SPACE + COLAN + SPACE + THIS +
- PERIOD + getSmallCase(YANG_AUGMENTED_INFO) + MAP + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + PERIOD
- + VALUE + "s" + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET +
+ return EIGHT_SPACE_INDENTATION + FOR + SPACE + OPEN_PARENTHESIS +
+ OBJECT_STRING + SPACE + getSmallCase(YANG_AUGMENTED_INFO) +
+ SPACE + COLAN + SPACE + THIS + PERIOD +
+ getSmallCase(YANG_AUGMENTED_INFO) + MAP +
+ OPEN_PARENTHESIS + CLOSE_PARENTHESIS + PERIOD
+ + VALUE + "s" + OPEN_PARENTHESIS + CLOSE_PARENTHESIS +
+ CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET +
NEW_LINE + TWELVE_SPACE_INDENTATION + OBJECT_STRING + SPACE +
- getSmallCase(YANG_AUGMENTED_OP_PARAM_INFO) + SPACE + EQUAL + SPACE + APP_INSTANCE + PERIOD +
- getSmallCase(YANG_AUGMENTED_INFO) + OPEN_PARENTHESIS + getSmallCase(YANG_AUGMENTED_INFO) + PERIOD +
- GET_CLASS + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE + TWELVE_SPACE_INDENTATION
- + OBJECT + SPACE + PROCESS_SUBTREE_FILTERING + SEMI_COLAN
- + NEW_LINE + TWELVE_SPACE_INDENTATION + TRY + SPACE + OPEN_CURLY_BRACKET + NEW_LINE +
+ getSmallCase(YANG_AUGMENTED_OP_PARAM_INFO) + SPACE + EQUAL +
+ SPACE + APP_INSTANCE + PERIOD +
+ getSmallCase(YANG_AUGMENTED_INFO) + OPEN_PARENTHESIS +
+ getSmallCase(YANG_AUGMENTED_INFO) + PERIOD +
+ GET_CLASS + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + OBJECT + SPACE +
+ PROCESS_SUBTREE_FILTERING + SEMI_COLAN
+ + NEW_LINE + TWELVE_SPACE_INDENTATION + TRY + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE +
SIXTEEN_SPACE_INDENTATION +
- "Class<?>[] interfaces = " + getSmallCase(YANG_AUGMENTED_INFO) + ".getClass().getInterfaces();" +
+ "Class<?>[] interfaces = " + getSmallCase(YANG_AUGMENTED_INFO) +
+ ".getClass().getInterfaces();" +
NEW_LINE + SIXTEEN_SPACE_INDENTATION +
- PROCESS_SUBTREE_FILTERING + SPACE + EQUAL + SPACE + getSmallCase(YANG_AUGMENTED_INFO) + PERIOD
- + GET_CLASS + NEW_LINE + TWENTY_SPACE_INDENTATION + PERIOD + GET_METHOD
- + OPEN_PARENTHESIS + QUOTES + PROCESS_SUBTREE_FILTERING + QUOTES + COMMA + SPACE + "interfaces[0]"
- + CLOSE_PARENTHESIS + PERIOD + INVOKE + OPEN_PARENTHESIS + getSmallCase(YANG_AUGMENTED_INFO) + COMMA
- + NEW_LINE + TWENTY_FOUR_SPACE_INDENTATION + getSmallCase(YANG_AUGMENTED_OP_PARAM_INFO)
- + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE
- + SIXTEEN_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS + PROCESS_SUBTREE_FILTERING + SPACE
- + NOT + EQUAL + SPACE + NULL + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE
- + TWENTY_SPACE_INDENTATION + SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + "add" + YANG_AUGMENTED_INFO
- + OPEN_PARENTHESIS + PROCESS_SUBTREE_FILTERING + COMMA + SPACE + PROCESS_SUBTREE_FILTERING + PERIOD
- + GET_CLASS + CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE + SIXTEEN_SPACE_INDENTATION
- + CLOSE_CURLY_BRACKET + NEW_LINE
- + TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + SPACE + CATCH + SPACE + OPEN_PARENTHESIS
- + NO_SUCH_METHOD_EXCEPTION + " | " + INVOCATION_TARGET_EXCEPTION + " | " + ILLEGAL_ACCESS_EXCEPTION +
- SPACE + EXCEPTION_VAR + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET + NEW_LINE
- + SIXTEEN_SPACE_INDENTATION + CONTINUE + SEMI_COLAN + NEW_LINE + TWELVE_SPACE_INDENTATION
- + CLOSE_CURLY_BRACKET + NEW_LINE + EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
+ PROCESS_SUBTREE_FILTERING + SPACE + EQUAL + SPACE +
+ getSmallCase(YANG_AUGMENTED_INFO) + PERIOD + GET_CLASS +
+ NEW_LINE + TWENTY_SPACE_INDENTATION + PERIOD +
+ GET_METHOD + OPEN_PARENTHESIS + QUOTES +
+ PROCESS_SUBTREE_FILTERING + QUOTES + COMMA + SPACE +
+ "interfaces[0]" + CLOSE_PARENTHESIS + PERIOD + INVOKE +
+ OPEN_PARENTHESIS + getSmallCase(YANG_AUGMENTED_INFO) +
+ COMMA + NEW_LINE + TWENTY_FOUR_SPACE_INDENTATION +
+ getSmallCase(YANG_AUGMENTED_OP_PARAM_INFO) +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION + IF + SPACE + OPEN_PARENTHESIS +
+ PROCESS_SUBTREE_FILTERING + SPACE + NOT + EQUAL + SPACE +
+ NULL + CLOSE_PARENTHESIS + SPACE + OPEN_CURLY_BRACKET +
+ NEW_LINE + TWENTY_SPACE_INDENTATION +
+ SUBTREE_FILTERING_RESULT_BUILDER + PERIOD + "add" +
+ YANG_AUGMENTED_INFO + OPEN_PARENTHESIS +
+ PROCESS_SUBTREE_FILTERING + COMMA + SPACE +
+ PROCESS_SUBTREE_FILTERING + PERIOD + GET_CLASS +
+ CLOSE_PARENTHESIS + SEMI_COLAN + NEW_LINE +
+ SIXTEEN_SPACE_INDENTATION + CLOSE_CURLY_BRACKET +
+ NEW_LINE + TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET +
+ SPACE + CATCH + SPACE + OPEN_PARENTHESIS +
+ NO_SUCH_METHOD_EXCEPTION + " | " +
+ INVOCATION_TARGET_EXCEPTION + " | " + ILLEGAL_ACCESS_EXCEPTION +
+ SPACE + EXCEPTION_VAR + CLOSE_PARENTHESIS + SPACE +
+ OPEN_CURLY_BRACKET + NEW_LINE + SIXTEEN_SPACE_INDENTATION +
+ CONTINUE + SEMI_COLAN + NEW_LINE +
+ TWELVE_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE +
+ EIGHT_SPACE_INDENTATION + CLOSE_CURLY_BRACKET + NEW_LINE;
}
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/JavaDocGen.java b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/JavaDocGen.java
index 3fa8b18..341d6d6 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/JavaDocGen.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/JavaDocGen.java
@@ -662,7 +662,9 @@
+ JAVA_DOC_ADD_TO_LIST + attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
+ FOUR_SPACE_INDENTATION + JAVA_DOC_PARAM + VALUE + SPACE;
javadoc = javadoc + VALUE + SPACE + OF + SPACE;
- javadoc = javadoc + attribute + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
+ javadoc = javadoc + attribute + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_RETURN + BUILDER_OBJECT
+ + attribute
+ + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
return javadoc;
}