Merge "Add ietf-inet-types@2013-07-15 and ietf-yang-types@2013-07-15. Rename older...

[yangtools.git] / yang / yang-binding / src / main / java / org / opendaylight / yangtools / yang / binding / BindingMapping.java

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
index 2f1dfb275efedaa5cbc42020f4b505fb896b491e..f7c6f728ddf304a28e6b29e7e8b18a3fe35ac215 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingMapping.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.binding;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.util.Set;
 
 import org.opendaylight.yangtools.yang.common.QName;
@@ -14,8 +16,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;
 
-import static com.google.common.base.Preconditions.*;
-
 public final class BindingMapping {
 
     public static final String VERSION = "0.6";
@@ -38,27 +38,30 @@ public final class BindingMapping {
     public static final String MODULE_INFO_CLASS_NAME = "$YangModuleInfoImpl";
     public static final String MODEL_BINDING_PROVIDER_CLASS_NAME = "$YangModelBindingProvider";
 
-    public static final String getMethodName(QName name) {
+    public static final String RPC_INPUT_SUFFIX = "Input";
+    public static final String RPC_OUTPUT_SUFFIX = "Output";
+
+    public static final String getMethodName(final QName name) {
         checkArgument(name != null, "Name should not be null.");
         return getMethodName(name.getLocalName());
     }
 
-    public static final String getClassName(String localName) {
+    public static final String getClassName(final String localName) {
         checkArgument(localName != null, "Name should not be null.");
         return toFirstUpper(toCamelCase(localName));
     }
 
-    public static final String getMethodName(String yangIdentifier) {
+    public static final String getMethodName(final String yangIdentifier) {
         checkArgument(yangIdentifier != null,"Identifier should not be null");
         return toFirstLower(toCamelCase(yangIdentifier));
     }
 
-    public static final String getClassName(QName name) {
+    public static final String getClassName(final QName name) {
         checkArgument(name != null, "Name should not be null.");
         return toFirstUpper(toCamelCase(name.getLocalName()));
     }
 
-    public static String getPropertyName(String yangIdentifier) {
+    public static String getPropertyName(final String yangIdentifier) {
         final String potential = toFirstLower(toCamelCase(yangIdentifier));
         if("class".equals(potential)) {
             return "xmlClass";
@@ -66,21 +69,34 @@ public final class BindingMapping {
         return potential;
     }
 
-    private static final String toCamelCase(String rawString) {
+    private static final String toCamelCase(final String rawString) {
         checkArgument(rawString != null, "String should not be null");
-        Iterable<String> components = SPACE_SPLITTER.split(rawString.replace('-', ' ').replace('_', ' '));
+        Iterable<String> components = SPACE_SPLITTER.split(rawString.replace('-', ' ').replace('_', ' ')
+                .replace('.', ' '));
         StringBuilder builder = new StringBuilder();
         for (String comp : components) {
             builder.append(toFirstUpper(comp));
         }
-        return builder.toString();
+        return checkNumericPrefix(builder.toString());
+    }
+
+    private static final String checkNumericPrefix(final String rawString) {
+        if (rawString == null || rawString.isEmpty()) {
+            return rawString;
+        }
+        char firstChar = rawString.charAt(0);
+        if (firstChar >= '0' && firstChar <= '9') {
+            return "_" + rawString;
+        } else {
+            return rawString;
+        }
     }
 
     /**
      * Returns the {@link String} {@code s} with an
      * {@link Character#isUpperCase(char) upper case} first character. This
      * function is null-safe.
-     * 
+     *
      * @param s
      *            the string that should get an upper case first character. May
      *            be <code>null</code>.
@@ -88,7 +104,7 @@ public final class BindingMapping {
      *         or <code>null</code> if the input {@link String} {@code s} was
      *         <code>null</code>.
      */
-    private static String toFirstUpper(String s) {
+    private static String toFirstUpper(final String s) {
         if (s == null || s.length() == 0)
             return s;
         if (Character.isUpperCase(s.charAt(0)))
@@ -102,7 +118,7 @@ public final class BindingMapping {
      * Returns the {@link String} {@code s} with an
      * {@link Character#isLowerCase(char) lower case} first character. This
      * function is null-safe.
-     * 
+     *
      * @param s
      *            the string that should get an lower case first character. May
      *            be <code>null</code>.
@@ -110,7 +126,7 @@ public final class BindingMapping {
      *         or <code>null</code> if the input {@link String} {@code s} was
      *         <code>null</code>.
      */
-    private static String toFirstLower(String s) {
+    private static String toFirstLower(final String s) {
         if (s == null || s.length() == 0)
             return s;
         if (Character.isLowerCase(s.charAt(0)))