Fixed generation of javadocs.

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/BaseTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
index 99a19687142de6054cd602c2c9f7994657801541..6d26e0f6a9a450b3220f4926d104e0ee9fe76c95 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/BaseTemplate.xtend
@@ -146,7 +146,11 @@ abstract class BaseTemplate {
      */
     def protected CharSequence asJavadoc(String comment) {
         if(comment == null) return '';
-        val paragraphs = paragraphSplitter.split(comment)
+        var txt = comment
+        if (txt.contains("*/")) {
+            txt = txt.replace("*/", "*/")
+        }
+        val paragraphs = paragraphSplitter.split(txt)
 
         return '''
             /**

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend
index e90b99c136bba015047d8ca290e2c5d88c530da1..7a710efd92f307a93c453732581d71580439235b 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/InterfaceTemplate.xtend
@@ -59,7 +59,7 @@ class InterfaceTemplate extends BaseTemplate {
      * @return string with code for interface body in JAVA format\r
      */\r
     override body() '''\r
-        «type.comment.generateComment»\r
+        «type.comment.asJavadoc»\r
         public interface «type.name»\r
             «superInterfaces»\r
         {\r
@@ -75,21 +75,7 @@ class InterfaceTemplate extends BaseTemplate {
         }\r
         \r
     '''\r
-    \r
-    /**\r
-     * Template method which generates JAVA comment.\r
-     * \r
-     * @param comment \r
-     * string with the comment for whole JAVA interface\r
-     * @return string with comment in JAVA format\r
-     */\r
-    def private generateComment(String comment) '''\r
-        «IF comment != null && !comment.empty»\r
-            /*\r
-            «comment»\r
-            */\r
-        «ENDIF»\r
-    '''\r
+   \r
 \r
     def private generateAnnotations(List<AnnotationType> annotations) '''\r
         «IF annotations != null && !annotations.empty»\r
@@ -182,7 +168,7 @@ class InterfaceTemplate extends BaseTemplate {
     def private generateMethods() '''\r
         «IF !methods.empty»\r
             «FOR m : methods SEPARATOR "\n"»\r
-                «m.comment.generateComment»\r
+                «m.comment.asJavadoc»\r
                 «m.annotations.generateAnnotations»\r
                 «m.returnType.importedName» «m.name»(«m.parameters.generateParameters»);\r
             «ENDFOR»\r