Bug 6859 - Binding generator v1 refactoring

[controller.git] / opendaylight / config / yang-jmx-generator / src / main / java / org / opendaylight / controller / config / yangjmxgenerator / PackageTranslator.java

diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/PackageTranslator.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/PackageTranslator.java
index a6a1ac7dc391b05267e71e1575d5f4d7d6cd5396..07b4f2d7db006560122d160d53577ddbeed86270 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/PackageTranslator.java
+++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/PackageTranslator.java
@@ -9,19 +9,17 @@ package org.opendaylight.controller.config.yangjmxgenerator;
 
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil;
+import org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil;
 import org.opendaylight.yangtools.yang.model.api.Module;
 
 /**
- * Maps from module namespaces to java package names using a Map<String,
- * String>, where key is namespace prefix and value is package that replaces
- * matched prefix.
+ * Maps from module namespaces to java package names using a Map&lt;String, String&gt;,
+ * where key is namespace prefix and value is package that replaces matched prefix.
  */
 public class PackageTranslator {
     private final Map<String, String> namespacePrefixToPackageMap;
 
-    public PackageTranslator(Map<String, String> namespacePrefixToPackageMap) {
+    public PackageTranslator(final Map<String, String> namespacePrefixToPackageMap) {
         this.namespacePrefixToPackageMap = namespacePrefixToPackageMap;
     }
 
@@ -36,14 +34,14 @@ public class PackageTranslator {
      * @throws IllegalStateException
      *             if there is no mapping found.
      */
-    public String getPackageName(Module module) {
+    public String getPackageName(final Module module) {
         Entry<String, String> longestMatch = null;
         int longestMatchLength = 0;
-        String namespace = module.getNamespace().toString();
-        for (Entry<String, String> entry : namespacePrefixToPackageMap
+        final String namespace = module.getNamespace().toString();
+        for (final Entry<String, String> entry : this.namespacePrefixToPackageMap
                 .entrySet()) {
             if (namespace.startsWith(entry.getKey())
-                    && entry.getKey().length() > longestMatchLength) {
+                    && (entry.getKey().length() > longestMatchLength)) {
                 longestMatch = entry;
                 longestMatchLength = entry.getKey().length();
             }
@@ -57,20 +55,21 @@ public class PackageTranslator {
     }
 
     // TODO add to PackageTranslator
-    private static String sanitizePackage(String namespace) {
-        namespace = namespace.replace("://", ".");
-        namespace = namespace.replace("/", ".");
-        namespace = namespace.replace(":", ".");
-        namespace = namespace.replace("-", "_");
-        namespace = namespace.replace("@", ".");
-        namespace = namespace.replace("$", ".");
-        namespace = namespace.replace("#", ".");
-        namespace = namespace.replace("'", ".");
-        namespace = namespace.replace("*", ".");
-        namespace = namespace.replace("+", ".");
-        namespace = namespace.replace(",", ".");
-        namespace = namespace.replace(";", ".");
-        namespace = namespace.replace("=", ".");
-        return namespace;
+    private static String sanitizePackage(final String namespace) {
+        String newNamespace = namespace;
+        newNamespace = newNamespace.replace("://", ".");
+        newNamespace = newNamespace.replace("/", ".");
+        newNamespace = newNamespace.replace(":", ".");
+        newNamespace = newNamespace.replace("-", "_");
+        newNamespace = newNamespace.replace("@", ".");
+        newNamespace = newNamespace.replace("$", ".");
+        newNamespace = newNamespace.replace("#", ".");
+        newNamespace = newNamespace.replace("'", ".");
+        newNamespace = newNamespace.replace("*", ".");
+        newNamespace = newNamespace.replace("+", ".");
+        newNamespace = newNamespace.replace(",", ".");
+        newNamespace = newNamespace.replace(";", ".");
+        newNamespace = newNamespace.replace("=", ".");
+        return newNamespace;
     }
 }