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 48895d21694879963a0981b5fdc7ae28dcd1e53b..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,7 +9,7 @@ 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;
 
 /**
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.Module;
 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;
     }
 
@@ -34,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();
             }
@@ -55,7 +55,7 @@ public class PackageTranslator {
     }
 
     // TODO add to PackageTranslator
-    private static String sanitizePackage(String namespace) {
+    private static String sanitizePackage(final String namespace) {
         String newNamespace = namespace;
         newNamespace = newNamespace.replace("://", ".");
         newNamespace = newNamespace.replace("/", ".");