Bug 6165: Do not omit java.lang prefix in various places

[mdsal.git] / binding / mdsal-binding-java-api-generator / src / main / java / org / opendaylight / yangtools / sal / java / api / generator / YangModuleInfoTemplate.xtend

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
index 64693702ff05b90f4fcd6f92e0e822385ed09d96..850e35e68f0a11a6cdf17c9a5f3b5c5a78fdaca7 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
@@ -232,24 +232,20 @@ class YangModuleInfoTemplate {
         var StringBuilder builder;
         if (typePackageName.equals(importedPackageName)) {
             builder = new StringBuilder(type.getName());
-            addActualTypeParameters(builder, type);
             if (builder.toString().equals("Void")) {
                 return "void";
             }
+            addActualTypeParameters(builder, type);
         } else {
-            builder = new StringBuilder();
-            if (typePackageName.startsWith("java.lang")) {
-                builder.append(type.getName());
-            } else {
-                if (!typePackageName.isEmpty()) {
-                    builder.append(typePackageName + Constants.DOT + type.getName());
-                } else {
-                    builder.append(type.getName());
-                }
-            }
             if (type.equals(Types.voidType())) {
                 return "void";
             }
+            builder = new StringBuilder();
+            if (!typePackageName.isEmpty()) {
+                builder.append(typePackageName + Constants.DOT + type.getName());
+            } else {
+                builder.append(type.getName());
+            }
             addActualTypeParameters(builder, type);
         }
         return builder.toString();