[ONOS-5630][ONOS-5615][ONOS-5634][ONOS-5635][ONOS-5568] defect fix for generated code.

Change-Id: I1d07e8c836005cdc9107186df18b468bc3b13cd1
diff --git a/generator/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java b/generator/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
index c289e77..ecc70b6 100644
--- a/generator/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
+++ b/generator/src/main/java/org/onosproject/yangutils/utils/UtilConstants.java
@@ -1224,7 +1224,8 @@
                           "short", "static", "strictfp", "super", "switch",
                           "synchronized", "this", "throw", "throws", "transient",
                           "true", "try", "void", "volatile", "while", "list",
-                          "map", "arrayList", "hashMap", "linkedList",
+                          "map", "arrayList", "hashMap", "linkedList", "notify",
+                          "notifyAll", "Method",
                           "collections");
 
     /**
@@ -1727,17 +1728,10 @@
      */
     public static final String INVOCATION_TARGET_EXCEPTION =
             "InvocationTargetException";
-
-    /**
-     * Static attribute for InvocationTargetException.
-     */
-    public static final String INVOCATION_TARGET_EXCEPTION_IMPORT = "import" +
-            " java.lang.reflect.InvocationTargetException;\n";
-
     /**
      * Static attribute for arrayList.
      */
-    public static final String ARRAY_LIST = "ArrayList<>()";
+    public static final String ARRAY_LIST_INIT = "ArrayList<>()";
 
     /**
      * Static attribute for arrayList import.
@@ -1746,23 +1740,6 @@
             IMPORT + COLLECTION_IMPORTS + ".ArrayList;\n";
 
     /**
-     * Static attribute for set collection import.
-     */
-    public static final String SET_IMPORT = IMPORT + COLLECTION_IMPORTS +
-            PERIOD + SET + SEMI_COLON + NEW_LINE;
-
-    /**
-     * Static attribute for reflect method import.
-     */
-    public static final String METHOD_IMPORT = IMPORT + REFLECT_IMPORTS +
-            PERIOD + METHOD + SEMI_COLON + NEW_LINE;
-
-    /**
-     * Static attribute for collection iterator import.
-     */
-    public static final String ITR_IMPORT = IMPORT + COLLECTION_IMPORTS +
-            PERIOD + "Iterator;\n";
-    /**
      * Static attribute for unused keyword.
      */
     public static final String UNUSED = "UNUSED";
@@ -1918,6 +1895,16 @@
     //File type extension for java classes.
     public static final String JAVA_FILE_EXTENSION = ".java";
 
+    /**
+     * Static param for typedef.
+     */
+    public static final String HOLDER_TYPE_DEF = "typedef";
+
+    /**
+     * Static param for last.
+     */
+    public static final String LAST = "last";
+
     // No instantiation.
     private UtilConstants() {
     }