Added Support for conversion yang binary type to java type;

[controller.git] / opendaylight / sal / yang-prototype / code-generator / binding-java-api-generator / src / main / java / org / opendaylight / controller / sal / java / api / generator / GeneratorUtil.java

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java
index a059c13b069712b76447d60c4708d3b2f7eb96ad..bb4bbbaf789191e29ff6e87a446595f84ee5bd5c 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/controller/sal/java/api/generator/GeneratorUtil.java
@@ -528,7 +528,12 @@ public final class GeneratorUtil {
                        if (packageName.startsWith("java.lang")) {
                                builder.append(type.getName());
                        } else {
                        if (packageName.startsWith("java.lang")) {
                                builder.append(type.getName());
                        } else {

-                               builder.append(packageName + "." + type.getName());
+                if (!packageName.isEmpty()) {
+                    builder.append(packageName + "." + type.getName());
+                } else {
+                    builder.append(type.getName());
+                }
+

                        }
                        if (type instanceof ParameterizedType) {
                                ParameterizedType pType = (ParameterizedType) type;
                        }
                        if (type instanceof ParameterizedType) {
                                ParameterizedType pType = (ParameterizedType) type;


@@ -645,7 +650,8 @@ public final class GeneratorUtil {
                        String genTypePkg) {
                String typeName = type.getName();
                String typePkg = type.getPackageName();
                        String genTypePkg) {
                String typeName = type.getName();
                String typePkg = type.getPackageName();

-               if (typePkg.startsWith("java.lang") || typePkg.equals(genTypePkg)) {
+               if (typePkg.startsWith("java.lang") || typePkg.equals(genTypePkg) ||
+                typePkg.isEmpty()) {

                        return;
                }
                LinkedHashMap<String, Integer> packages = importedTypes.get(typeName);
                        return;
                }
                LinkedHashMap<String, Integer> packages = importedTypes.get(typeName);