Eliminate TextTemplateUtil.getFormattedRevision

This value is readily available from QNameModule, use that directly
instead of open-coding the functionality in a completely inefficient
manner.

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

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
index 9e8de3c06ba10c9082be9125daa4d5d40c1db3b9..d1b6569dcd101a3a9698d17b8d21a88a05c9421d 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
@@ -12,8 +12,6 @@ import com.google.common.base.CharMatcher;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -56,8 +54,8 @@ public final class TextTemplateUtil {
      * @return getter name starting in LowerCase
      */
     public static String toFirstLower(final String s) {
-        return s != null && s.length() != 0 ? (Character.isLowerCase(s.charAt(0)) ? s : (s.length() == 1 ?
-                s.toLowerCase() : s.substring(0, 1).toLowerCase() + s.substring(1))) : s;
+        return s != null && s.length() != 0 ? Character.isLowerCase(s.charAt(0)) ? s : s.length() == 1 ?
+                s.toLowerCase() : s.substring(0, 1).toLowerCase() + s.substring(1) : s;
     }
 
     /**
@@ -296,7 +294,7 @@ public final class TextTemplateUtil {
         final List<String> strings = new LinkedList<>();
         if (!parameters.isEmpty()) {
             for (final GeneratedProperty parameter : parameters) {
-                strings.add((fieldName(parameter)));
+                strings.add(fieldName(parameter));
             }
         }
         return String.join(", ", strings);
@@ -351,8 +349,8 @@ public final class TextTemplateUtil {
      * @return getter name starting in uppercase
      */
     public static String toFirstUpper(final String s) {
-        return s != null && s.length() != 0 ? (Character.isUpperCase(s.charAt(0)) ? s : (s.length() == 1 ?
-                s.toUpperCase() : s.substring(0, 1).toUpperCase() + s.substring(1))) : s;
+        return s != null && s.length() != 0 ? Character.isUpperCase(s.charAt(0)) ? s : s.length() == 1 ?
+                s.toUpperCase() : s.substring(0, 1).toUpperCase() + s.substring(1) : s;
     }
 
     /**
@@ -409,16 +407,6 @@ public final class TextTemplateUtil {
         return clarification.toString();
     }
 
-    /**
-     * Returns revision Date as String
-     * @param revision
-     * @return formatted Revision as String
-     */
-    public static String getFormattedRevision(final Date revision) {
-        final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        return simpleDateFormat.format(revision);
-    }
-
     /**
      * Returns source path as String
      * @param module

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt
index e322f7c5151917d5e13d52e381d027624f811f11..4e752537bae3aafbccaec601a807416a106d1d5c 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/twirl/org/opendaylight/mdsal/binding/javav2/java/api/generator/yangModuleInfoTemplate.scala.txt
@@ -9,7 +9,6 @@
 @import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifier.CLASS
 @import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer.normalizeSpecificIdentifier
 @import org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer.normalizeFullPackageName
-@import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getFormattedRevision
 @import org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.getSourcePath
 @import org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers.YangModuleInfoTemplateRenderer.getSortedQName
 @import org.opendaylight.mdsal.binding.javav2.util.BindingMapping.getRootPackageName
@@ -26,7 +25,7 @@ public final class @{MODULE_INFO_CLASS_NAME} implements @{importedNames.get("yan
     private final @{importedNames.get("string")} name = "@{module.getName}";
     private final @{importedNames.get("string")} namespace = "@{module.getNamespace.toString}";
     private final @{importedNames.get("string")} semanticVersion = "@{module.getSemanticVersion}";
-    private final @{importedNames.get("string")} revision = "@{getFormattedRevision(module.getRevision)}";
+    private final @{importedNames.get("string")} revision = "@{module.getQNameModule.getFormattedRevision}";
     private final @{importedNames.get("string")} resourcePath = "@{getSourcePath(module)}";
     private final @{importedNames.get("set")}<YangModuleInfo> importedModules;
 
@@ -47,7 +46,7 @@ public final class @{MODULE_INFO_CLASS_NAME} implements @{importedNames.get("yan
         private final @{importedNames.get("string")} name = "@{submodule.getName}";
         private final @{importedNames.get("string")} semanticVersion = "@{submodule.getSemanticVersion}";
         private final @{importedNames.get("string")} namespace = "@{submodule.getNamespace.toString}";
-        private final @{importedNames.get("string")} revision = "@{getFormattedRevision(submodule.getRevision)}";
+        private final @{importedNames.get("string")} revision = "@{submodule.getQNameModule.getFormattedRevision}";
         private final @{importedNames.get("string")} resourcePath = "@{getSourcePath(submodule)}";
         private final @{importedNames.get("set")}<YangModuleInfo> importedModules;
 
@@ -153,4 +152,4 @@ public final class @{MODULE_INFO_CLASS_NAME} implements @{importedNames.get("yan
     }
 
     @{generateSubInfo(module)}
-}
\ No newline at end of file
+}