[ONOS-5096][ONOS-5104] Checkstyle issues fixed for generated code.
Change-Id: I6a0984c2b397dbeda912e75138d5ad9e7adf33d5
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 31e454f..251523b 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
@@ -91,15 +91,15 @@
/**
* Returns java docs.
*
- * @param type java doc type
- * @param name name of the YangNode
- * @param isList is list attribute
- * @param pluginConfig plugin configurations
+ * @param type java doc type
+ * @param name name of the YangNode
+ * @param isList is list attribute
+ * @param pluginConfig plugin configurations
* @param compilerAnnotation compiler annotations for user defined data type
* @return javadocs.
*/
public static String getJavaDoc(JavaDocType type, String name, boolean isList, YangPluginConfig pluginConfig,
- String compilerAnnotation) {
+ String compilerAnnotation) {
name = YangIoUtils.getSmallCase(getCamelCase(name, pluginConfig.getConflictResolver()));
switch (type) {
@@ -279,13 +279,13 @@
/**
* Generates javaDocs for getter method.
*
- * @param attribute attribute
- * @param isList is list attribute
+ * @param attribute attribute
+ * @param isList is list attribute
* @param compilerAnnotation compiler annotation
* @return javaDocs
*/
private static String generateForGetters(String attribute, boolean isList,
- String compilerAnnotation) {
+ String compilerAnnotation) {
String getter = NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
+ JAVA_DOC_GETTERS + attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
@@ -325,13 +325,13 @@
/**
* Generates javaDocs for setter method.
*
- * @param attribute attribute
- * @param isList is list attribute
+ * @param attribute attribute
+ * @param isList is list attribute
* @param compilerAnnotation compiler annotation
* @return javaDocs
*/
private static String generateForSetters(String attribute, boolean isList,
- String compilerAnnotation) {
+ String compilerAnnotation) {
String setter = NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
+ JAVA_DOC_SETTERS + attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
@@ -374,13 +374,13 @@
/**
* Generates javaDocs for setter method.
*
- * @param attribute attribute
- * @param isList is list attribute
+ * @param attribute attribute
+ * @param isList is list attribute
* @param compilerAnnotation compiler annotation
* @return javaDocs
*/
private static String generateForManagerSetters(String attribute, boolean isList,
- String compilerAnnotation) {
+ String compilerAnnotation) {
String setter = NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
+ JAVA_DOC_MANAGER_SETTERS + attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
@@ -646,7 +646,7 @@
public static String generateForGetMethodWithAttribute(String attribute) {
return NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_GETTERS
+ attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK + FOUR_SPACE_INDENTATION
- + JAVA_DOC_PARAM + attribute + SPACE + VALUE + SPACE + OF + SPACE + attribute + NEW_LINE
+ + JAVA_DOC_PARAM + getSmallCase(attribute) + SPACE + VALUE + SPACE + OF + SPACE + attribute + NEW_LINE
+ FOUR_SPACE_INDENTATION + JAVA_DOC_RETURN + VALUE + SPACE + OF + SPACE + attribute + NEW_LINE
+ FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
index be6db1f..fe2d382 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Stack;
import java.util.regex.Pattern;
+
import org.apache.commons.io.FileUtils;
import org.onosproject.yangutils.translator.exception.TranslatorException;
import org.onosproject.yangutils.utils.io.YangPluginConfig;
@@ -76,8 +77,8 @@
*/
public final class YangIoUtils {
- private static final int LINE_SIZE = 118;
- private static final int SUB_LINE_SIZE = 112;
+ private static final int LINE_SIZE = 116;
+ private static final int SUB_LINE_SIZE = 114;
private static final int ZERO = 0;
/**
@@ -402,7 +403,7 @@
}
/* When spaces are present in the given line. */
- private static String whenSpaceIsPresent(String line, int lineSize) {
+ public static String whenSpaceIsPresent(String line, int lineSize) {
StringBuilder stringBuilder = new StringBuilder();
String append;
if (line.length() > lineSize) {
@@ -416,7 +417,7 @@
String[] strArray = stringBuilder.toString().split(NEW_LINE);
StringBuilder tempBuilder = new StringBuilder();
for (String str : strArray) {
- if (str.length() > SUB_LINE_SIZE) {
+ if (str.length() > LINE_SIZE) {
if (str.contains(SPACE)) {
String[] strArr = str.split(SPACE);
tempBuilder = updateString(strArr, tempBuilder, SPACE, SUB_LINE_SIZE);
@@ -445,15 +446,13 @@
stringBuilder.append(tempString);
if (string.equals(PERIOD)) {
append = NEW_LINE + TWELVE_SPACE_INDENTATION + PERIOD + str + string;
- stringBuilder.append(append);
} else {
append = NEW_LINE + TWELVE_SPACE_INDENTATION + str + string;
- stringBuilder.append(append);
}
+ stringBuilder.append(append);
tempBuilder.delete(ZERO, tempBuilder.length());
tempBuilder.append(TWELVE_SPACE_INDENTATION);
} else {
- append = str + string;
stringBuilder.append(append);
}
}