Fixing sonar issues 2

[yangtools.git] / code-generator / binding-generator-util / src / main / java / org / opendaylight / yangtools / binding / generator / util / BindingGeneratorUtil.java

diff --git a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
index 77259cabce5ad3d206e8599ba042cce0b34886d5..e4e532fba91a22b0f8b8a4207e3f0ab3baf96feb 100644 (file)
--- a/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
+++ b/code-generator/binding-generator-util/src/main/java/org/opendaylight/yangtools/binding/generator/util/BindingGeneratorUtil.java
@@ -8,8 +8,6 @@ import java.util.HashSet;
 import java.util.List;\r
 import java.util.Set;\r
 \r
-import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTOBuilderImpl;\r
-import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTOBuilder;\r
 import org.opendaylight.yangtools.yang.common.QName;\r
 import org.opendaylight.yangtools.yang.model.api.Module;\r
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;\r
@@ -91,40 +89,12 @@ public final class BindingGeneratorUtil {
      * @return string with the admissible parameter name\r
      */\r
     public static String validateParameterName(final String parameterName) {\r
-        if (parameterName != null) {\r
-            if (JAVA_RESERVED_WORDS.contains(parameterName)) {\r
-                return "_" + parameterName;\r
-            }\r
+        if (parameterName != null && JAVA_RESERVED_WORDS.contains(parameterName)) {\r
+            return "_" + parameterName;\r
         }\r
         return parameterName;\r
     }\r
 \r
-    /**\r
-     * Creates generated TO builder from <code>packageName</code> and\r
-     * <code>transObjectName</code>.\r
-     * \r
-     * @param packageName\r
-     *            string with name of package to which the returned object\r
-     *            belongs\r
-     * @param transObjectName\r
-     *            string with name which the returned object has\r
-     * @return generated TO builder or <code>null</code> value if\r
-     *         <code>packageName</code> or <code>transObjectName</code> equal\r
-     *         <code>null</code>\r
-     */\r
-    public static GeneratedTOBuilder schemaNodeToTransferObjectBuilder(final String packageName,\r
-            final String transObjectName) {\r
-        if (packageName != null && transObjectName != null) {\r
-\r
-            final String genTOName = BindingGeneratorUtil.parseToClassName(transObjectName);\r
-            final GeneratedTOBuilder newType = new GeneratedTOBuilderImpl(packageName, genTOName);\r
-\r
-            return newType;\r
-\r
-        }\r
-        return null;\r
-    }\r
-\r
     /**\r
      * Converts module name to valid JAVA package name.\r
      * \r
@@ -254,13 +224,13 @@ public final class BindingGeneratorUtil {
      *         name.\r
      */\r
     public static String parseToClassName(String token) {\r
-        token = token.replace(".", "");\r
-        String correctStr = parseToCamelCase(token);\r
+        String correctStr = token.replace(".", "");\r
+        correctStr = parseToCamelCase(correctStr);\r
 \r
         // make first char upper-case\r
         char first = Character.toUpperCase(correctStr.charAt(0));\r
-        if(first >= '0' && first <= '9') {\r
-            \r
+        if (first >= '0' && first <= '9') {\r
+\r
             correctStr = "_" + correctStr;\r
         } else {\r
             correctStr = first + correctStr.substring(1);\r
@@ -310,14 +280,15 @@ public final class BindingGeneratorUtil {
      * @param token\r
      *            string which should be converted to the cammel case format\r
      * @return string in the cammel case format\r
-     * @throws NullPointerException\r
-     *             - if <code>token</code> equals null\r
      * @throws IllegalArgumentException\r
-     *             - if <code>token</code> without white spaces is empty\r
+     *             <ul>\r
+     *             <li>if <code>token</code> without white spaces is empty</li>\r
+     *             <li>if <code>token</code> equals null</li>\r
+     *             </ul>\r
      */\r
     private static String parseToCamelCase(String token) {\r
         if (token == null) {\r
-            throw new NullPointerException("Name can not be null");\r
+            throw new IllegalArgumentException("Name can not be null");\r
         }\r
 \r
         String correctStr = token.trim();\r