[ONOS-5003][ONOS-5004][ONOS-5005]Generated Code modification for YangUtils+added interface for augmentation method and other api changes.
Change-Id: I954b9c99e182f21d01fcc5cd76fbac7d61a6c3aa
diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/FileSystemUtil.java b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/FileSystemUtil.java
index fae08ed..1b58c0f 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/FileSystemUtil.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/FileSystemUtil.java
@@ -44,16 +44,13 @@
}
/**
- * Reads the contents from source file and append its contents to append
- * file.
+ * Reads the contents from source file and append its contents to append file.
*
- * @param toAppend destination file in which the contents of source file is
- * appended
- * @param srcFile source file from which data is read and added to to append
- * file
+ * @param toAppend destination file in which the contents of source file is appended
+ * @param srcFile source file from which data is read and added to to append file
* @throws IOException any IO errors
*/
- public static void appendFileContents(File toAppend, File srcFile)
+ static void appendFileContents(File toAppend, File srcFile)
throws IOException {
updateFileHandle(srcFile, NEW_LINE + readAppendFile(toAppend.toString(), FOUR_SPACE_INDENTATION), false);
}
@@ -76,14 +73,21 @@
String line = bufferReader.readLine();
while (line != null) {
- if (line.equals(SPACE) || line.equals(EMPTY_STRING) || line.equals(EIGHT_SPACE_INDENTATION)
- || line.equals(MULTIPLE_NEW_LINE)) {
- stringBuilder.append(NEW_LINE);
- } else if (line.equals(FOUR_SPACE_INDENTATION)) {
- stringBuilder.append(EMPTY_STRING);
- } else {
- stringBuilder.append(spaces + line);
- stringBuilder.append(NEW_LINE);
+ switch (line) {
+ case SPACE:
+ case EMPTY_STRING:
+ case EIGHT_SPACE_INDENTATION:
+ case MULTIPLE_NEW_LINE:
+ stringBuilder.append(NEW_LINE);
+ break;
+ case FOUR_SPACE_INDENTATION:
+ stringBuilder.append(EMPTY_STRING);
+ break;
+ default:
+ String append = spaces + line;
+ stringBuilder.append(append);
+ stringBuilder.append(NEW_LINE);
+ break;
}
line = bufferReader.readLine();
}
@@ -100,10 +104,10 @@
* @param inputFile input file
* @param contentTobeAdded content to be appended to the file
* @param isClose when close of file is called.
- * @throws IOException if the named file exists but is a directory rather than a regular file,
- * does not exist but cannot be created, or cannot be opened for any other reason
+ * @throws IOException if the named file exists but is a directory rather than a regular file, does not exist but
+ * cannot be created, or cannot be opened for any other reason
*/
- public static void updateFileHandle(File inputFile, String contentTobeAdded, boolean isClose)
+ static void updateFileHandle(File inputFile, String contentTobeAdded, boolean isClose)
throws IOException {
List<FileWriter> fileWriterStore = new ArrayList<>();
@@ -119,7 +123,6 @@
for (FileWriter curWriter : fileWriterStore) {
curWriter.flush();
curWriter.close();
- curWriter = null;
}
}
}
@@ -137,7 +140,10 @@
if (file != null) {
updateFileHandle(file, null, true);
if (toBeDeleted) {
- file.delete();
+ boolean deleted = file.delete();
+ if (!deleted) {
+ throw new IOException("Failed to delete temporary file " + file.getName());
+ }
}
}
}
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 a674f17..3b47386 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
@@ -19,17 +19,12 @@
import org.onosproject.yangutils.datamodel.javadatamodel.YangPluginConfig;
import static org.onosproject.yangutils.utils.UtilConstants.AUGMENTED;
-import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FOR_VALIDATOR;
-import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FOR_VALIDATOR_RETURN;
-import static org.onosproject.yangutils.utils.UtilConstants.MAX_RANGE;
-import static org.onosproject.yangutils.utils.UtilConstants.MIN_RANGE;
-import static org.onosproject.yangutils.utils.UtilConstants.YANG_AUGMENTED_INFO;
import static org.onosproject.yangutils.utils.UtilConstants.BUILDER;
import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_CLASS_JAVA_DOC;
-import static org.onosproject.yangutils.utils.UtilConstants.OP_PARAM_JAVA_DOC;
import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_INTERFACE_JAVA_DOC;
import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_OBJECT;
import static org.onosproject.yangutils.utils.UtilConstants.CLASS;
+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.ENUM_ATTRIBUTE_JAVADOC;
import static org.onosproject.yangutils.utils.UtilConstants.ENUM_CLASS_JAVADOC;
@@ -38,15 +33,17 @@
import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_METHOD_NAME;
import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_PARAM_NAME;
-import static org.onosproject.yangutils.utils.UtilConstants.IMPL;
import static org.onosproject.yangutils.utils.UtilConstants.IMPL_CLASS_JAVA_DOC;
import static org.onosproject.yangutils.utils.UtilConstants.INPUT;
import static org.onosproject.yangutils.utils.UtilConstants.INTERFACE_JAVA_DOC;
+import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_ADD_TO_LIST;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_BUILD;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_BUILD_RETURN;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_CONSTRUCTOR;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_END_LINE;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FIRST_LINE;
+import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FOR_VALIDATOR;
+import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FOR_VALIDATOR_RETURN;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_GETTERS;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_MANAGER_SETTERS;
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_OF;
@@ -57,11 +54,14 @@
import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_SETTERS_COMMON;
import static org.onosproject.yangutils.utils.UtilConstants.LIST;
import static org.onosproject.yangutils.utils.UtilConstants.MAP;
+import static org.onosproject.yangutils.utils.UtilConstants.MAX_RANGE;
+import static org.onosproject.yangutils.utils.UtilConstants.MIN_RANGE;
import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE_ASTERISK;
import static org.onosproject.yangutils.utils.UtilConstants.OBJECT;
import static org.onosproject.yangutils.utils.UtilConstants.OBJECT_STRING;
import static org.onosproject.yangutils.utils.UtilConstants.OF;
+import static org.onosproject.yangutils.utils.UtilConstants.OP_PARAM_JAVA_DOC;
import static org.onosproject.yangutils.utils.UtilConstants.PACKAGE_INFO_JAVADOC;
import static org.onosproject.yangutils.utils.UtilConstants.PACKAGE_INFO_JAVADOC_OF_CHILD;
import static org.onosproject.yangutils.utils.UtilConstants.PERIOD;
@@ -71,6 +71,7 @@
import static org.onosproject.yangutils.utils.UtilConstants.STRING_DATA_TYPE;
import static org.onosproject.yangutils.utils.UtilConstants.VALUE;
import static org.onosproject.yangutils.utils.UtilConstants.VOID;
+import static org.onosproject.yangutils.utils.UtilConstants.YANG_AUGMENTED_INFO;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCamelCase;
import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getSmallCase;
@@ -92,7 +93,7 @@
* @param name name of the YangNode
* @param isList is list attribute
* @param pluginConfig plugin configurations
- * @return javadocs.
+ * @return javaDocs.
*/
public static String getJavaDoc(JavaDocType type, String name, boolean isList, YangPluginConfig pluginConfig) {
@@ -167,6 +168,9 @@
case EVENT_SUBJECT_CLASS: {
return generateForClass(name);
}
+ case ADD_TO_LIST: {
+ return generateForAddToList(name);
+ }
default: {
return generateForConstructors(name);
}
@@ -180,8 +184,8 @@
* @return javaDocs
*/
private static String generateForEnumAttr(String name) {
- return NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION + ENUM_ATTRIBUTE_JAVADOC
- + name + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
+ return EIGHT_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + EIGHT_SPACE_INDENTATION + ENUM_ATTRIBUTE_JAVADOC
+ + name + PERIOD + NEW_LINE + EIGHT_SPACE_INDENTATION + JAVA_DOC_END_LINE;
}
/**
@@ -438,11 +442,11 @@
/**
* Generates javaDoc for the builder interface.
*
- * @param builderforName builder for name
+ * @param builderForName builder for name
* @return javaDocs
*/
- private static String generateForBuilderInterface(String builderforName) {
- return JAVA_DOC_FIRST_LINE + BUILDER_INTERFACE_JAVA_DOC + builderforName + PERIOD + NEW_LINE
+ private static String generateForBuilderInterface(String builderForName) {
+ return JAVA_DOC_FIRST_LINE + BUILDER_INTERFACE_JAVA_DOC + builderForName + PERIOD + NEW_LINE
+ JAVA_DOC_END_LINE;
}
@@ -480,7 +484,7 @@
*/
private static String generateForConstructors(String className) {
return NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_CONSTRUCTOR
- + className + IMPL + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
+ + className + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
+ FOUR_SPACE_INDENTATION + JAVA_DOC_PARAM + BUILDER.toLowerCase() + OBJECT + SPACE + BUILDER_OBJECT
+ className + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
}
@@ -504,7 +508,7 @@
* @param attribute attribute string
* @return javaDocs for type constructor
*/
- public static String generateForTypeConstructor(String attribute) {
+ private static String generateForTypeConstructor(String attribute) {
return NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_CONSTRUCTOR
+ attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK + FOUR_SPACE_INDENTATION
+ JAVA_DOC_PARAM + VALUE + SPACE + VALUE + SPACE + OF + SPACE + attribute + NEW_LINE
@@ -557,6 +561,52 @@
}
/**
+ * Generates javaDocs for type constructor.
+ *
+ * @param attribute attribute string
+ * @return javaDocs for type constructor
+ */
+ 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
+ + FOUR_SPACE_INDENTATION + JAVA_DOC_RETURN + VALUE + SPACE + OF + SPACE + attribute + NEW_LINE
+ + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
+ }
+
+ /**
+ * Returns javaDocs for add to list method.
+ *
+ * @param attribute attribute
+ * @return javaDocs
+ */
+ private static String generateForAddToList(String attribute) {
+ String javadoc = NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
+ + 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;
+ return javadoc;
+ }
+
+ /**
+ * Generates for builder method.
+ *
+ * @param attribute attribute
+ * @return javaDocs
+ */
+ public static String generateForBuilderMethod(String attribute) {
+
+ String javadoc = FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
+ + JAVA_DOC_GETTERS + attribute + BUILDER + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION
+ + NEW_LINE_ASTERISK + FOUR_SPACE_INDENTATION + JAVA_DOC_RETURN;
+ javadoc = javadoc + VALUE + SPACE + OF + SPACE;
+ javadoc = javadoc + attribute + BUILDER + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
+ return javadoc;
+ }
+
+
+ /**
* JavaDocs types.
*/
public enum JavaDocType {
@@ -679,6 +729,12 @@
/**
* For operation builder.
*/
- OPERATION_BUILDER_CLASS
+ OPERATION_BUILDER_CLASS,
+
+ /**
+ * For add to list.
+ */
+ ADD_TO_LIST,
}
+
}
diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangFileScanner.java b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangFileScanner.java
index ff2e3e7..b5f5fca 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangFileScanner.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangFileScanner.java
@@ -27,8 +27,8 @@
*/
public final class YangFileScanner {
- private static final String JAVA_FILE_EXTENTION = ".java";
- private static final String YANG_FILE_EXTENTION = ".yang";
+ private static final String JAVA_FILE_EXTENSION = ".java";
+ private static final String YANG_FILE_EXTENSION = ".yang";
/**
* Creates an instance of YANG file scanner.
@@ -45,9 +45,8 @@
* @throws IOException when files get deleted while performing the
* operations
*/
- public static List<String> getJavaFiles(String root) throws IOException {
-
- return getFiles(root, JAVA_FILE_EXTENTION);
+ static List<String> getJavaFiles(String root) throws IOException {
+ return getFiles(root, JAVA_FILE_EXTENSION);
}
/**
@@ -60,8 +59,7 @@
* operations
*/
public static List<String> getYangFiles(String root) throws IOException {
-
- return getFiles(root, YANG_FILE_EXTENTION);
+ return getFiles(root, YANG_FILE_EXTENSION);
}
/**
@@ -73,22 +71,22 @@
* @throws NullPointerException when no file is there
* @throws IOException when files get deleted while performing the operations
*/
- public static List<String> getFiles(String root, String extension) throws IOException {
+ private static List<String> getFiles(String root, String extension) throws IOException {
List<String> store = new LinkedList<>();
Stack<String> stack = new Stack<>();
stack.push(root);
File file;
- File[] filelist;
+ File[] fileList;
try {
while (!stack.empty()) {
root = stack.pop();
file = new File(root);
- filelist = file.listFiles();
- if ((filelist == null) || (filelist.length == 0)) {
+ fileList = file.listFiles();
+ if ((fileList == null) || (fileList.length == 0)) {
continue;
}
- for (File current : filelist) {
+ for (File current : fileList) {
if (current.isDirectory()) {
stack.push(current.toString());
} else {
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 0c6b51e..7b91ae9 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
@@ -62,6 +62,7 @@
import static org.onosproject.yangutils.utils.UtilConstants.TWELVE_SPACE_INDENTATION;
import static org.onosproject.yangutils.utils.UtilConstants.UNDER_SCORE;
import static org.onosproject.yangutils.utils.UtilConstants.YANG_AUTO_PREFIX;
+import static org.onosproject.yangutils.utils.io.impl.CopyrightHeader.getCopyrightHeader;
import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.appendFileContents;
import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.updateFileHandle;
import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.PACKAGE_INFO;
@@ -87,10 +88,16 @@
*
* @param path directory path
* @return directory structure
+ * @throws IOException when fails to do IO operations
*/
- public static File createDirectories(String path) {
+ public static File createDirectories(String path) throws IOException {
File generatedDir = new File(path);
- generatedDir.mkdirs();
+ if (!generatedDir.exists()) {
+ boolean isGenerated = generatedDir.mkdirs();
+ if (!isGenerated) {
+ throw new IOException("failed to generated directory " + path);
+ }
+ }
return generatedDir;
}
@@ -113,22 +120,26 @@
try {
File packageInfo = new File(path + SLASH + "package-info.java");
- packageInfo.createNewFile();
-
+ if (!packageInfo.exists()) {
+ boolean isGenerated = packageInfo.createNewFile();
+ if (!isGenerated) {
+ throw new IOException("failed to generated package-info " + path);
+ }
+ }
FileWriter fileWriter = new FileWriter(packageInfo);
BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
- bufferedWriter.write(CopyrightHeader.getCopyrightHeader());
+ bufferedWriter.write(getCopyrightHeader());
bufferedWriter.write(getJavaDoc(PACKAGE_INFO, classInfo, isChildNode, pluginConfig));
String pkg = PACKAGE + SPACE + pack + SEMI_COLAN;
if (pkg.length() > LINE_SIZE) {
- pkg = whenDelimiterIsPersent(pkg, LINE_SIZE);
+ pkg = whenDelimiterIsPresent(pkg, LINE_SIZE);
}
bufferedWriter.write(pkg);
bufferedWriter.close();
fileWriter.close();
} catch (IOException e) {
- throw new IOException("Exception occured while creating package info file.");
+ throw new IOException("Exception occurred while creating package info file.");
}
}
@@ -192,11 +203,11 @@
while (!stack.empty()) {
root = stack.pop();
File file = new File(root);
- File[] filelist = file.listFiles();
- if (filelist == null || filelist.length == 0) {
+ File[] fileList = file.listFiles();
+ if (fileList == null || fileList.length == 0) {
continue;
}
- for (File current : filelist) {
+ for (File current : fileList) {
if (current.isDirectory()) {
stack.push(current.toString());
if (current.getName().endsWith("-Temp")) {
@@ -215,12 +226,12 @@
* Removes extra char from the string.
*
* @param valueString string to be trimmed
- * @param removalStirng extra chars
+ * @param removalString extra chars
* @return new string
*/
- public static String trimAtLast(String valueString, String removalStirng) {
+ public static String trimAtLast(String valueString, String removalString) {
StringBuilder stringBuilder = new StringBuilder(valueString);
- int index = valueString.lastIndexOf(removalStirng);
+ int index = valueString.lastIndexOf(removalString);
if (index != -1) {
stringBuilder.deleteCharAt(index);
}
@@ -302,9 +313,9 @@
*/
public static File validateLineLength(File dataFile)
throws IOException {
- File tempFile = dataFile;
FileReader fileReader = new FileReader(dataFile);
BufferedReader bufferReader = new BufferedReader(fileReader);
+ String append;
try {
StringBuilder stringBuilder = new StringBuilder();
String line = bufferReader.readLine();
@@ -312,20 +323,21 @@
while (line != null) {
if (line.length() > LINE_SIZE) {
if (line.contains(PERIOD)) {
- line = whenDelimiterIsPersent(line, LINE_SIZE);
+ line = whenDelimiterIsPresent(line, LINE_SIZE);
} else if (line.contains(SPACE)) {
line = whenSpaceIsPresent(line, LINE_SIZE);
}
stringBuilder.append(line);
} else {
- stringBuilder.append(line + NEW_LINE);
+ append = line + NEW_LINE;
+ stringBuilder.append(append);
}
line = bufferReader.readLine();
}
- FileWriter writer = new FileWriter(tempFile);
+ FileWriter writer = new FileWriter(dataFile);
writer.write(stringBuilder.toString());
writer.close();
- return tempFile;
+ return dataFile;
} finally {
fileReader.close();
bufferReader.close();
@@ -333,14 +345,15 @@
}
/* When delimiters are present in the given line. */
- private static String whenDelimiterIsPersent(String line, int lineSize) {
+ private static String whenDelimiterIsPresent(String line, int lineSize) {
StringBuilder stringBuilder = new StringBuilder();
-
+ String append;
if (line.length() > lineSize) {
String[] strArray = line.split(Pattern.quote(PERIOD));
stringBuilder = updateString(strArray, stringBuilder, PERIOD, lineSize);
} else {
- stringBuilder.append(line + NEW_LINE);
+ append = line + NEW_LINE;
+ stringBuilder.append(append);
}
String[] strArray = stringBuilder.toString().split(NEW_LINE);
StringBuilder tempBuilder = new StringBuilder();
@@ -353,7 +366,8 @@
tempBuilder.append(whenSpaceIsPresent(str, SUB_LINE_SIZE));
}
} else {
- tempBuilder.append(str + NEW_LINE);
+ append = str + NEW_LINE;
+ tempBuilder.append(append);
}
}
return tempBuilder.toString();
@@ -363,11 +377,13 @@
/* When spaces are present in the given line. */
private static String whenSpaceIsPresent(String line, int lineSize) {
StringBuilder stringBuilder = new StringBuilder();
+ String append;
if (line.length() > lineSize) {
String[] strArray = line.split(SPACE);
stringBuilder = updateString(strArray, stringBuilder, SPACE, lineSize);
} else {
- stringBuilder.append(line + NEW_LINE);
+ append = line + NEW_LINE;
+ stringBuilder.append(append);
}
String[] strArray = stringBuilder.toString().split(NEW_LINE);
@@ -379,7 +395,8 @@
tempBuilder = updateString(strArr, tempBuilder, SPACE, SUB_LINE_SIZE);
}
} else {
- tempBuilder.append(str + NEW_LINE);
+ append = str + NEW_LINE;
+ tempBuilder.append(append);
}
}
return tempBuilder.toString();
@@ -390,28 +407,34 @@
int lineSize) {
StringBuilder tempBuilder = new StringBuilder();
+ String append;
for (String str : strArray) {
- tempBuilder.append(str + string);
+ append = str + string;
+ tempBuilder.append(append);
if (tempBuilder.length() > lineSize) {
String tempString = stringBuilder.toString();
stringBuilder.delete(ZERO, stringBuilder.length());
tempString = trimAtLast(tempString, string);
stringBuilder.append(tempString);
if (string.equals(PERIOD)) {
- stringBuilder.append(NEW_LINE + TWELVE_SPACE_INDENTATION + PERIOD + str + string);
+ append = NEW_LINE + TWELVE_SPACE_INDENTATION + PERIOD + str + string;
+ stringBuilder.append(append);
} else {
- stringBuilder.append(NEW_LINE + TWELVE_SPACE_INDENTATION + str + string);
+ append = NEW_LINE + TWELVE_SPACE_INDENTATION + str + string;
+ stringBuilder.append(append);
}
tempBuilder.delete(ZERO, tempBuilder.length());
tempBuilder.append(TWELVE_SPACE_INDENTATION);
} else {
- stringBuilder.append(str + string);
+ append = str + string;
+ stringBuilder.append(append);
}
}
String tempString = stringBuilder.toString();
tempString = trimAtLast(tempString, string);
stringBuilder.delete(ZERO, stringBuilder.length());
- stringBuilder.append(tempString + NEW_LINE);
+ append = tempString + NEW_LINE;
+ stringBuilder.append(append);
return stringBuilder;
}
@@ -464,7 +487,7 @@
* @param consecCapitalCaseRemover which requires the restriction of consecutive capital case
* @return string without consecutive capital case
*/
- public static String restrictConsecutiveCapitalCase(String consecCapitalCaseRemover) {
+ private static String restrictConsecutiveCapitalCase(String consecCapitalCaseRemover) {
for (int k = 0; k < consecCapitalCaseRemover.length(); k++) {
if (k + 1 < consecCapitalCaseRemover.length()) {
@@ -487,7 +510,7 @@
* @param conflictResolver object of YANG to java naming conflict util
* @return prefixed camel case string
*/
- public static String addPrefix(String camelCasePrefix, YangToJavaNamingConflictUtil conflictResolver) {
+ private static String addPrefix(String camelCasePrefix, YangToJavaNamingConflictUtil conflictResolver) {
String prefix = getPrefixForIdentifier(conflictResolver);
if (camelCasePrefix.matches(REGEX_FOR_FIRST_DIGIT)) {
@@ -508,7 +531,7 @@
* @param conflictResolver object of YANG to java naming conflict util
* @return camel case rule checked string
*/
- public static String applyCamelCaseRule(String[] stringArray, YangToJavaNamingConflictUtil conflictResolver) {
+ private static String applyCamelCaseRule(String[] stringArray, YangToJavaNamingConflictUtil conflictResolver) {
String ruleChecker = stringArray[0].toLowerCase();
int i;
@@ -551,8 +574,8 @@
* @param conflictResolver object of YANG to java naming conflict util
* @return camel cased string
*/
- public static String upperCaseConflictResolver(String[] stringArray,
- YangToJavaNamingConflictUtil conflictResolver) {
+ private static String upperCaseConflictResolver(String[] stringArray,
+ YangToJavaNamingConflictUtil conflictResolver) {
for (int l = 0; l < stringArray.length; l++) {
String[] upperCaseSplitArray = stringArray[l].split(REGEX_WITH_UPPERCASE);
@@ -579,7 +602,7 @@
}
stringArray[l] = strBuilder.toString();
}
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
for (String element : stringArray) {
String[] capitalCaseSplitArray = element.split(REGEX_WITH_UPPERCASE);
for (String letter : capitalCaseSplitArray) {
@@ -625,10 +648,8 @@
yangIdentifier = yangIdentifier.replaceAll(REGEX_FOR_IDENTIFIER_SPECIAL_CHAR, COLAN);
String[] strArray = yangIdentifier.split(COLAN);
if (strArray[0].isEmpty()) {
- List<String> stringArrangement = new ArrayList<String>();
- for (int i = 1; i < strArray.length; i++) {
- stringArrangement.add(strArray[i]);
- }
+ List<String> stringArrangement = new ArrayList<>();
+ stringArrangement.addAll(Arrays.asList(strArray).subList(1, strArray.length));
strArray = stringArrangement.toArray(new String[stringArrangement.size()]);
}
return upperCaseConflictResolver(strArray, conflictResolver);
@@ -651,10 +672,8 @@
String[] strArray = prefixForIdentifier.split(COLAN);
try {
if (strArray[0].isEmpty()) {
- List<String> stringArrangement = new ArrayList<String>();
- for (int i = 1; i < strArray.length; i++) {
- stringArrangement.add(strArray[i]);
- }
+ List<String> stringArrangement = new ArrayList<>();
+ stringArrangement.addAll(Arrays.asList(strArray).subList(1, strArray.length));
strArray = stringArrangement.toArray(new String[stringArrangement.size()]);
}
prefixForIdentifier = strArray[0];