From 93bf9cbff571114a6cc2422cd4a6a006a50b2b0e Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 1 Aug 2016 17:15:46 +0200
Subject: [PATCH 1/1] Bug 6165: Do not omit java.lang prefix in various places
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Yang expression "typedef String" leads to java class String,
creating potential naming conflict with java.lang.String.
Few places places in EnumTemplate are fixed by using «String.importedName».

Also, YangModuleInfoTemplate#getExplicitType
no longer removes java.lang unconditionally.

+ Ifs against void are re-ordered to occur sooner in getExplicitType.

Change-Id: If014aca30875589e361733317dfb47eaa07df031
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 .../sal/java/api/generator/EnumTemplate.xtend  |  6 +++---
 .../api/generator/YangModuleInfoTemplate.xtend | 18 +++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend
index bfeeae5b97..4f0acce4f6 100644
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/EnumTemplate.xtend
@@ -59,7 +59,7 @@ class EnumTemplate extends BaseTemplate {
             «writeEnumeration(enums)»
 
 
-            String name;
+            «String.importedName» name;
             int value;
             private static final java.util.Map<java.lang.Integer, «enums.name»> VALUE_MAP;
 
@@ -73,7 +73,7 @@ class EnumTemplate extends BaseTemplate {
                 VALUE_MAP = b.build();
             }
 
-            private «enums.name»(int value, String name) {
+            private «enums.name»(int value, «String.importedName» name) {
                 this.value = value;
                 this.name = name;
             }
@@ -83,7 +83,7 @@ class EnumTemplate extends BaseTemplate {
              *
              * @return the name of the enumeration item as it is specified in the input yang
              */
-            public String getName() {
+            public «String.importedName» getName() {
                 return name;
             }
 
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 64693702ff..850e35e68f 100644
--- 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();
-- 
2.36.6