Revert "Fix add imports of nested classes"

This reverts commit ae34daa2a74d6b952f3567341c163a77ca3a5720.

Concatenating imports does not work as the inner class has to
take into account for containing class name, as that takes
precedence over imports.

Change-Id: I6921b5e923bf6bb48d3f1a118e9beb289c6f6932
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
index 380848c2e4a4aab82a902fa42c33f3093ac8aed9..2d76f7add77c2e0f6a16aae45d65a4c1e5afb1f8 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/Types.java
@@ -376,4 +376,4 @@ public final class Types {
             return Optional.empty();
         }
     }
-}
\ No newline at end of file
+}

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
index dec2c5761e7ea197d7a930cafce00aa239021e59..9b82cd1374709d3676acf9ebaa9f64a1768394f8 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/ClassTemplate.xtend
@@ -185,7 +185,7 @@ class ClassTemplate extends BaseTemplate {
                 «IF (innerClass instanceof GeneratedTransferObject)»
                     «val classTemplate = new ClassTemplate(innerClass)»
                     «classTemplate.generateAsInnerClass»
-                    «addImports(classTemplate)»
+
                 «ENDIF»
             «ENDFOR»
         «ENDIF»
@@ -407,7 +407,6 @@ class ClassTemplate extends BaseTemplate {
             «FOR e : enums SEPARATOR "\n"»
                 «val enumTemplate = new EnumTemplate(e)»
                 «enumTemplate.generateAsInnerClass»
-                «addImports(enumTemplate)»
             «ENDFOR»
         «ENDIF»
     '''

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
index f2e7533a10763f5b9004bef2eb8193f12c567a79..a322f842ced09ec828af7c274be98f91972e3bdf 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/EnumTemplate.xtend
@@ -9,11 +9,6 @@ package org.opendaylight.mdsal.binding.java.api.generator
 
 import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets
 
-import com.google.common.collect.ImmutableMap
-import com.google.common.collect.ImmutableMap.Builder
-import java.util.Map
-import java.util.Objects
-import java.util.Optional
 import org.opendaylight.mdsal.binding.model.api.Enumeration
 import org.opendaylight.mdsal.binding.model.api.GeneratedType
 
@@ -55,19 +50,20 @@ class EnumTemplate extends BaseTemplate {
      *
      * @return string with the enumeration body
      */
+    // FIXME: for some reason importedName does not work here :(
     override body() '''
         «wrapToDocumentation(formatDataForJavaDoc(enums))»
-        public enum «enums.name» implements «org.opendaylight.yangtools.yang.binding.Enumeration.importedName» {
+        public enum «enums.name» implements org.opendaylight.yangtools.yang.binding.Enumeration {
             «writeEnumeration(enums)»
 
-            private static final «Map.importedName»<«String.importedName», «enums.name»> NAME_MAP;
-            private static final «Map.importedName»<«Integer.importedName», «enums.name»> VALUE_MAP;
+            private static final java.util.Map<java.lang.String, «enums.name»> NAME_MAP;
+            private static final java.util.Map<java.lang.Integer, «enums.name»> VALUE_MAP;
 
             static {
-                final «Builder.importedName»<«String.importedName», «enums.name»> nb =
-                    «ImmutableMap.importedName».builder();
-                final «Builder.importedName»<«Integer.importedName», «enums.name»> vb =
-                    «ImmutableMap.importedName».builder();
+                final com.google.common.collect.ImmutableMap.Builder<java.lang.String, «enums.name»> nb =
+                    com.google.common.collect.ImmutableMap.builder();
+                final com.google.common.collect.ImmutableMap.Builder<java.lang.Integer, «enums.name»> vb =
+                    com.google.common.collect.ImmutableMap.builder();
                 for («enums.name» enumItem : «enums.name».values()) {
                     vb.put(enumItem.value, enumItem);
                     nb.put(enumItem.name, enumItem);
@@ -77,7 +73,7 @@ class EnumTemplate extends BaseTemplate {
                 VALUE_MAP = vb.build();
             }
 
-            private final «String.importedName» name;
+            private final java.lang.String name;
             private final int value;
 
             private «enums.name»(int value, «String.importedName» name) {
@@ -86,7 +82,7 @@ class EnumTemplate extends BaseTemplate {
             }
 
             @Override
-            public «String.importedName» getName() {
+            public java.lang.String getName() {
                 return name;
             }
 
@@ -102,8 +98,8 @@ class EnumTemplate extends BaseTemplate {
              * @return corresponding «enums.name» item, if present
              * @throws NullPointerException if name is null
              */
-            public static «Optional.importedName»<«enums.name»> forName(«String.importedName» name) {
-                return «Optional.importedName».ofNullable(NAME_MAP.get(«Objects.importedName».requireNonNull(name)));
+            public static java.util.Optional<«enums.name»> forName(«String.importedName» name) {
+                return java.util.Optional.ofNullable(NAME_MAP.get(java.util.Objects.requireNonNull(name)));
             }
 
             /**

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
index 0d10d69345698d27618ce6d2886f11262c6ee5cc..2d70587e06ac8d095be90b2c33c128a3bac1c188 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/InterfaceTemplate.xtend
@@ -148,7 +148,6 @@ class InterfaceTemplate extends BaseTemplate {
             «FOR e : enums SEPARATOR "\n"»
                 «val enumTemplate = new EnumTemplate(e)»
                 «enumTemplate.generateAsInnerClass»
-                «addImports(enumTemplate)»
             «ENDFOR»
         «ENDIF»
     '''