YANG translator error handler framework and UT fixes.
Change-Id: Icb4d65540ed7ea8d6ecbd8458d44d7d86df969fa
diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
index 5ea5f1e..1f42d68 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/JavaIdentifierSyntax.java
@@ -47,6 +47,8 @@
private static final int INDEX_ZERO = 0;
private static final int INDEX_ONE = 1;
private static final int INDEX_TWO = 2;
+ private static final int VALUE_CHECK = 10;
+ private static final String ZERO = "0";
/**
* Default constructor.
@@ -103,12 +105,12 @@
String pkg;
if (!(curNode instanceof HasJavaFileInfo)
|| curNode.getParent() == null) {
- throw new RuntimeException("missing parent node to get current node's package");
+ throw new TranslatorException("missing parent node to get current node's package");
}
YangNode parentNode = getParentNodeInGenCode(curNode);
if (!(parentNode instanceof HasJavaFileInfo)) {
- throw new RuntimeException("missing parent java node to get current node's package");
+ throw new TranslatorException("missing parent java node to get current node's package");
}
JavaFileInfo parentJavaFileHandle = ((HasJavaFileInfo) parentNode).getJavaFileInfo();
pkg = parentJavaFileHandle.getPackage() + PERIOD + parentJavaFileHandle.getJavaName();
@@ -122,7 +124,6 @@
* @return version
*/
private static String getYangVersion(byte ver) {
-
return VERSION_PREFIX + ver;
}
@@ -164,8 +165,8 @@
for (int i = INDEX_ONE; i < revisionArr.length; i++) {
Integer val = Integer.parseInt(revisionArr[i]);
- if (val < 10) {
- rev = rev + "0";
+ if (val < VALUE_CHECK) {
+ rev = rev + ZERO;
}
rev = rev + val;
}
@@ -242,7 +243,6 @@
* @return corresponding java identifier
*/
public static String getCaptialCase(String yangIdentifier) {
-
return yangIdentifier.substring(0, 1).toUpperCase() + yangIdentifier.substring(1);
}
@@ -254,7 +254,6 @@
* @return corresponding java identifier
*/
public static String getSmallCase(String yangIdentifier) {
-
return yangIdentifier.substring(0, 1).toLowerCase() + yangIdentifier.substring(1);
}
@@ -265,7 +264,6 @@
* @return java package
*/
public static String getJavaPackageFromPackagePath(String packagePath) {
-
return packagePath.replace(SLASH, PERIOD);
}
@@ -276,7 +274,6 @@
* @return java package
*/
public static String getPackageDirPathFromJavaJPackage(String packagePath) {
-
return packagePath.replace(PERIOD, SLASH);
}
}