Whitebox issue fix
Change-Id: I856266e26d2686affb9271c460927ba3e0e07db2
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaFileInfo.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaFileInfo.java
index c73258e..efd4be8 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaFileInfo.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaFileInfo.java
@@ -26,12 +26,12 @@
*
* @return generated java file information
*/
- public JavaFileInfo getJavaFileInfo();
+ JavaFileInfo getJavaFileInfo();
/**
* Sets the java file info object.
*
* @param javaInfo java file info object
*/
- public void setJavaFileInfo(JavaFileInfo javaInfo);
+ void setJavaFileInfo(JavaFileInfo javaInfo);
}
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaImportData.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaImportData.java
index 4ae28dd..7251b7f 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaImportData.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/HasJavaImportData.java
@@ -25,7 +25,7 @@
*
* @return data of java imports to be included in generated file
*/
- public JavaImportData getJavaImportData();
+ JavaImportData getJavaImportData();
/**
* Sets the data of java imports to be included in generated file.
@@ -33,5 +33,5 @@
* @param javaImportData data of java imports to be included in generated
* file
*/
- public void setJavaImportData(JavaImportData javaImportData);
+ void setJavaImportData(JavaImportData javaImportData);
}
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
index 577a3ba..7e010db 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
@@ -29,7 +29,7 @@
import static org.onosproject.yangutils.translator.tojava.TraversalType.SIBILING;
/**
- * Representation of Java code generator based on application schema.
+ * Representation of java code generator based on application schema.
*/
public final class JavaCodeGeneratorUtil {
@@ -75,7 +75,7 @@
YangNode curNode = rootNode;
TraversalType curTraversal = ROOT;
- while (!(curNode == null)) {
+ while (curNode != null) {
if (curTraversal != PARENT) {
setCurNode(curNode);
generateCodeEntry(curNode, yangPlugin);
@@ -166,9 +166,8 @@
* Free the current node.
*
* @param node YANG node
- * @throws DataModelException when fails to do datamodel operations
*/
- private static void free(YangNode node) throws DataModelException {
+ private static void free(YangNode node) {
YangNode parent = node.getParent();
parent.setChild(null);
@@ -202,7 +201,7 @@
setCurNode(curNode.getChild());
TraversalType curTraversal = ROOT;
- while (!(curNode == null)) {
+ while (curNode != null) {
if (curTraversal != PARENT) {
close(curNode);
@@ -220,7 +219,6 @@
}
freeRestResources();
- curNode = null;
}
/**
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
index 469e416..2c2ce05 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
@@ -19,6 +19,7 @@
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
+import static java.util.Collections.sort;
import org.onosproject.yangutils.datamodel.YangNode;
import org.onosproject.yangutils.translator.exception.TranslatorException;
@@ -62,7 +63,7 @@
/**
* Returns if the list needs to be imported.
*
- * @return true if any of the attribute needs to be maintained as a list.
+ * @return true if any of the attribute needs to be maintained as a list
*/
public boolean getIfListImported() {
return isListToImport;
@@ -71,7 +72,7 @@
/**
* Sets the status of importing list.
*
- * @param isList status to mention list is bing imported.
+ * @param isList status to mention list is bing imported
*/
public void setIfListImported(boolean isList) {
isListToImport = isList;
@@ -138,10 +139,9 @@
List<String> imports = new ArrayList<>();
for (JavaQualifiedTypeInfo importInfo : getImportSet()) {
- importString = IMPORT;
- if (importInfo.getPkgInfo() != EMPTY_STRING && importInfo.getClassInfo() != null
- && importInfo.getPkgInfo() != JAVA_LANG) {
- importString = importString + importInfo.getPkgInfo() + PERIOD + importInfo.getClassInfo() + SEMI_COLAN
+ if (!importInfo.getPkgInfo().equals(EMPTY_STRING) && importInfo.getClassInfo() != null
+ && !importInfo.getPkgInfo().equals(JAVA_LANG)) {
+ importString = IMPORT + importInfo.getPkgInfo() + PERIOD + importInfo.getClassInfo() + SEMI_COLAN
+ NEW_LINE;
imports.add(importString);
@@ -152,7 +152,7 @@
imports.add(getImportForList());
}
- java.util.Collections.sort(imports);
+ sort(imports);
return imports;
}
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaCodeFragmentFiles.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaCodeFragmentFiles.java
index c815c95..205990f 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaCodeFragmentFiles.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaCodeFragmentFiles.java
@@ -1108,7 +1108,6 @@
addToStringMethod(newAttrInfo);
}
}
- return;
}
/**
diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaModule.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaModule.java
index d6ba066..8895da2 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaModule.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaModule.java
@@ -136,9 +136,11 @@
YangJavaModelUtils.generateCodeOfRootNode(this, yangPlugin, modulePkg);
}
+ /**
+ * Creates a java file using the YANG module info.
+ */
@Override
public void generateCodeExit() throws IOException {
getTempJavaCodeFragmentFiles().generateJavaFile(GENERATE_INTERFACE_WITH_BUILDER, this);
- return;
}
}