Cleanup YangModuleInfoTemplate

generateModelProvider() returns a string, use the appropriate
template syntax. Also use Map.putIfAbsent() instead of
containsKey()/put() checks.

Change-Id: I48faccd7c87f2ffff51b30d9df04c5cb613df184
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d8bc8182155d7ee25ab056c487a4e09b5b2e8df6)

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
index 7c1b4eafbfd6db5fd76cc789efbebc7f99be431a..2ee0c875c17eb4f8898657337dd1bbeda1df83f2 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/YangModuleInfoTemplate.xtend
@@ -97,19 +97,16 @@ class YangModuleInfoTemplate {
         '''.toString
     }
 
-    def String generateModelProvider() {
-        '''
-            package «packageName»;
+    def String generateModelProvider() '''
+        package «packageName»;
 
-            public final class «MODEL_BINDING_PROVIDER_CLASS_NAME» implements «YangModelBindingProvider.name» {
-                @«Override.importedName»
-                public «YangModuleInfo.name» getModuleInfo() {
-                    return «MODULE_INFO_CLASS_NAME».getInstance();
-                }
+        public final class «MODEL_BINDING_PROVIDER_CLASS_NAME» implements «YangModelBindingProvider.name» {
+            @«Override.importedName»
+            public «YangModuleInfo.name» getModuleInfo() {
+                return «MODULE_INFO_CLASS_NAME».getInstance();
             }
-        '''
-
-    }
+        }
+    '''
 
     private static def void collectSubmodules(Set<Module> dest, Module module) {
         for (Module submodule : module.submodules) {
@@ -197,9 +194,7 @@ class YangModuleInfoTemplate {
         if (typePackageName.startsWith("java.lang") || typePackageName.empty) {
             return
         }
-        if (!importMap.containsKey(typeName)) {
-            importMap.put(typeName, typePackageName)
-        }
+        importMap.putIfAbsent(typeName, typePackageName)
         if (type instanceof ParameterizedType) {
             val Type[] params = type.actualTypeArguments
             if (params !== null) {