Fix merging lines in JavaCodePrettyPrint

Change-Id: Ice139808fdad35ee329ee87c10c05edef7984195
Signed-off-by: Jakub Toth <jatoth@cisco.com>

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/JavaCodePrettyPrint.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/JavaCodePrettyPrint.java
index 8163dbde27c4f5f86ccbc11a782413817a711709..f67e8bfafee30cee734cfe14ad64ea6b6f10ad6b 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/JavaCodePrettyPrint.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/JavaCodePrettyPrint.java
@@ -157,7 +157,6 @@ public final class JavaCodePrettyPrint {
             }
         }
 
-        sbLineClass = new StringBuilder();
         for(int i = classStartEnd; i < splittedByNewLine.length; i++){
             i = appendJDoc(splittedByNewLine, fixedLines, i);
             if (!splittedByNewLine[i].startsWith(COMMENTS)
@@ -165,8 +164,10 @@ public final class JavaCodePrettyPrint {
                     && !splittedByNewLine[i].endsWith(String.valueOf(START_BODY))
                     && !splittedByNewLine[i].endsWith(String.valueOf(END_BODY))
                     && !splittedByNewLine[i].startsWith(String.valueOf(AT))) {
+                sbLineClass = new StringBuilder();
                 for (int j = i; j < splittedByNewLine.length; j++) {
-                    if (!splittedByNewLine[j].contains(String.valueOf(START_BODY))) {
+                    if (!splittedByNewLine[j].contains(String.valueOf(START_BODY))
+                            && !splittedByNewLine[j].contains(String.valueOf(END_LINE))) {
                         final String str = splittedByNewLine[j];
                         sbLineClass.append(str).append(SPACE);
                     } else {

diff --git a/binding2/mdsal-binding2-java-api-generator/src/test/resources/base/with_import/test-import.yang b/binding2/mdsal-binding2-java-api-generator/src/test/resources/base/with_import/test-import.yang
index ac7c31b2fab7c5e76b91253db385826d6c13e11d..a6954c02e6d6b528058a0bb03ee8f2ec41f2c661 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/test/resources/base/with_import/test-import.yang
+++ b/binding2/mdsal-binding2-java-api-generator/src/test/resources/base/with_import/test-import.yang
@@ -7,5 +7,8 @@ module test-import {
     revision 2017-04-21;
 
     container *my-import-%cont {
+        leaf test-leaf {
+            type string;
+        }
     }
 }
\ No newline at end of file