Fixed bug in equals method generation.

Refactored CopyUtils class, expanded UsesAugmentTest.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend
index fb5bff3cc0255331667e397b369d219825ad7a92..5bd4756164c6f9c16d2fc88bbf0592113865b776 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/ClassTemplate.xtend
@@ -29,7 +29,7 @@ class ClassTemplate {
         this.consts = genTO.constantDefinitions
     }
     
-    def generate() {
+    def String generate() {
         val body = generateBody(false)
         val pkgAndImports = generatePkgAndImports
         return pkgAndImports.toString + body.toString
@@ -227,7 +227,7 @@ class ClassTemplate {
     def private generateEquals() '''
         «IF !genTO.equalsIdentifiers.empty»
             @Override
-            public boolean equals(Object obj) {
+            public boolean equals(java.lang.Object obj) {
                 if (this == obj) {
                     return true;
                 }