Added support for resolving augmentations.

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java
index 1e16a05def2789ae9fde0b24f236ed94e2aaecba..1fb862291f19700b673a153112bf6f4352d02553 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/src/main/java/org/opendaylight/controller/binding/generator/util/BindingGeneratorUtil.java
@@ -1,22 +1,15 @@
 package org.opendaylight.controller.binding.generator.util;
 
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.opendaylight.controller.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;
 import org.opendaylight.controller.sal.binding.model.api.type.builder.GeneratedTOBuilder;
 import org.opendaylight.controller.yang.common.QName;
-import org.opendaylight.controller.yang.model.api.SchemaNode;
-import org.opendaylight.controller.yang.model.api.SchemaPath;
+import org.opendaylight.controller.yang.model.api.*;
+
+import java.util.*;
 
 public class BindingGeneratorUtil {
 
-    private static final String[] SET_VALUES = new String[] { "abstract",
+    private static final String[] SET_VALUES = new String[]{"abstract",
             "assert", "boolean", "break", "byte", "case", "catch", "char",
             "class", "const", "continue", "default", "double", "do", "else",
             "enum", "extends", "false", "final", "finally", "float", "for",
@@ -24,12 +17,9 @@ public class BindingGeneratorUtil {
             "interface", "long", "native", "new", "null", "package", "private",
             "protected", "public", "return", "short", "static", "strictfp",
             "super", "switch", "synchronized", "this", "throw", "throws",
-            "transient", "true", "try", "void", "volatile", "while" };
-
-    private static Calendar calendar = new GregorianCalendar();
+            "transient", "true", "try", "void", "volatile", "while"};
 
-    private BindingGeneratorUtil() {
-    }
+    private BindingGeneratorUtil() {}
 
     public static final Set<String> JAVA_RESERVED_WORDS = new HashSet<String>(
             Arrays.asList(SET_VALUES));
@@ -53,7 +43,7 @@ public class BindingGeneratorUtil {
         }
         return packageName;
     }
-    
+
     public static String validateParameterName(final String parameterName) {
         if (parameterName != null) {
             if (JAVA_RESERVED_WORDS.contains(parameterName)) {
@@ -62,38 +52,38 @@ public class BindingGeneratorUtil {
         }
         return parameterName;
     }
-    
+
     public static GeneratedTOBuilder schemaNodeToTransferObjectBuilder(
-            final String basePackageName, final SchemaNode schemaNode, final String transObjectName) {
-        if (basePackageName != null && schemaNode != null && transObjectName != null) {
-            final String packageName = packageNameForGeneratedType(basePackageName,
-                    schemaNode.getPath());
-
-            if (packageName != null) {
-                final String genTOName = BindingGeneratorUtil
-                        .parseToClassName(transObjectName);
-                final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(
-                        packageName, genTOName);
-
-                return newType;
-            }
+            final String packageName, final SchemaNode schemaNode,
+            final String transObjectName) {
+        if (packageName != null && schemaNode != null
+                && transObjectName != null) {
+
+            final String genTOName = BindingGeneratorUtil
+                    .parseToClassName(transObjectName);
+            final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(
+                    packageName, genTOName);
+
+            return newType;
+
         }
         return null;
     }
 
     public static String moduleNamespaceToPackageName(
-            final URI moduleNamespace, final String yangVersion) {
+            final Module module) {
         final StringBuilder packageNameBuilder = new StringBuilder();
 
+        final Calendar calendar = Calendar.getInstance();
+        if (module.getRevision() == null) {
+            throw new IllegalArgumentException("Module " + module.getName()
+                    + " does not specify revision date!");
+        }
         packageNameBuilder.append("org.opendaylight.yang.gen.v");
-        packageNameBuilder.append(yangVersion);
-        packageNameBuilder.append(".rev");
-        packageNameBuilder.append(calendar.get(Calendar.YEAR));
-        packageNameBuilder.append((calendar.get(Calendar.MONTH) + 1));
-        packageNameBuilder.append(calendar.get(Calendar.DAY_OF_MONTH));
+        packageNameBuilder.append(module.getYangVersion());
         packageNameBuilder.append(".");
 
-        String namespace = moduleNamespace.toString();
+        String namespace = module.getNamespace().toString();
         namespace = namespace.replace("://", ".");
         namespace = namespace.replace("/", ".");
         namespace = namespace.replace(":", ".");
@@ -109,8 +99,13 @@ public class BindingGeneratorUtil {
         namespace = namespace.replace("=", ".");
 
         packageNameBuilder.append(namespace);
+        calendar.setTime(module.getRevision());
+        packageNameBuilder.append(".rev");
+        packageNameBuilder.append(calendar.get(Calendar.YEAR));
+        packageNameBuilder.append((calendar.get(Calendar.MONTH) + 1));
+        packageNameBuilder.append(calendar.get(Calendar.DAY_OF_MONTH));
 
-        return packageNameBuilder.toString();
+        return validateJavaPackage(packageNameBuilder.toString());
     }
 
     public static String packageNameForGeneratedType(
@@ -132,7 +127,7 @@ public class BindingGeneratorUtil {
         }
         return null;
     }
-    
+
     public static String parseToClassName(String token) {
         token = token.replace(".", "");
         String correctStr = parseToCamelCase(token);
@@ -142,7 +137,7 @@ public class BindingGeneratorUtil {
         correctStr = first + correctStr.substring(1);
         return correctStr;
     }
-    
+
     public static String parseToValidParamName(final String token) {
         final String validToken = token.replace(".", "");
         String correctStr = parseToCamelCase(validToken);
@@ -152,7 +147,7 @@ public class BindingGeneratorUtil {
         correctStr = first + correctStr.substring(1);
         return validateParameterName(correctStr);
     }
-    
+
     private static String parseToCamelCase(String token) {
         if (token == null) {
             throw new NullPointerException("Name can not be null");
@@ -168,7 +163,7 @@ public class BindingGeneratorUtil {
         correctStr = replaceWithCamelCase(correctStr, '_');
         return correctStr;
     }
-    
+
     private static String replaceWithCamelCase(String text, char removalChar) {
         StringBuilder sb = new StringBuilder(text);
         String toBeRemoved = String.valueOf(removalChar);