Various minor fixes
- Use more appropriate constant
- Reflect modelId to RuleKey
- comment typo fix
Change-Id: I04f2a0bb3c4d10f93757aa57a073dd71d2792d2b
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/ClassDefinitionGenerator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/ClassDefinitionGenerator.java
index 558f5a6..5a2ff1c 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/ClassDefinitionGenerator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/ClassDefinitionGenerator.java
@@ -386,7 +386,7 @@
break;
case DEFAULT_CLASS_MASK:
- // class defination
+ // class definition
if (curNode instanceof RpcNotificationContainer) {
def.append(CLASS).append(SPACE).append(yangName)
.append(OP_PARAM).append(SPACE).append(EXTEND)
diff --git a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/JavaFileGenerator.java b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/JavaFileGenerator.java
index 96747c6..624cf7e 100644
--- a/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/JavaFileGenerator.java
+++ b/compiler/base/translator/src/main/java/org/onosproject/yang/compiler/translator/tojava/utils/JavaFileGenerator.java
@@ -138,7 +138,6 @@
import static org.onosproject.yang.compiler.utils.UtilConstants.CLOSE_CURLY_BRACKET;
import static org.onosproject.yang.compiler.utils.UtilConstants.COMMA;
import static org.onosproject.yang.compiler.utils.UtilConstants.COMMAND;
-import static org.onosproject.yang.compiler.utils.UtilConstants.DEFAULT;
import static org.onosproject.yang.compiler.utils.UtilConstants.DEFAULT_CAPS;
import static org.onosproject.yang.compiler.utils.UtilConstants.DEFAULT_RPC_HANDLER;
import static org.onosproject.yang.compiler.utils.UtilConstants.DIAMOND_CLOSE_BRACKET;
@@ -447,7 +446,7 @@
insertDataIntoJavaFile(file, NEW_LINE);
}
- methods.add(addDefaultConstructor(curNode, PUBLIC, DEFAULT));
+ methods.add(addDefaultConstructor(curNode, PUBLIC, DEFAULT_CAPS));
if (leavesPresent) {
methods.add(getIsValueLeafSet());
diff --git a/compiler/plugin/buck/src/main/java/org/onosproject/yang/compiler/plugin/buck/YangLibrary.java b/compiler/plugin/buck/src/main/java/org/onosproject/yang/compiler/plugin/buck/YangLibrary.java
index d577bdd..36e917c 100644
--- a/compiler/plugin/buck/src/main/java/org/onosproject/yang/compiler/plugin/buck/YangLibrary.java
+++ b/compiler/plugin/buck/src/main/java/org/onosproject/yang/compiler/plugin/buck/YangLibrary.java
@@ -80,6 +80,8 @@
private final Path genSrcsDirectory;
private final Path outputDirectory;
private final Path output;
+
+ @AddToRuleKey
private final String modelId;
public YangLibrary(