X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FPackageTranslator.java;h=07b4f2d7db006560122d160d53577ddbeed86270;hp=2b130e318804bdb8c5dbf0b25dccf84847e5a3db;hb=db89afdefb3cfa4454dfdc6008e1d54d3ede66fb;hpb=9dbad6e87ea28714c4268605927ae64f04443bd3 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 2b130e3188..07b4f2d7db 100644 --- 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,18 +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, where key is namespace prefix and value is package that replaces - * matched prefix. + * 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. */ public class PackageTranslator { private final Map namespacePrefixToPackageMap; - public PackageTranslator(Map namespacePrefixToPackageMap) { + public PackageTranslator(final Map namespacePrefixToPackageMap) { this.namespacePrefixToPackageMap = namespacePrefixToPackageMap; } @@ -35,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 longestMatch = null; int longestMatchLength = 0; - String namespace = module.getNamespace().toString(); - for (Entry entry : namespacePrefixToPackageMap + final String namespace = module.getNamespace().toString(); + for (final Entry entry : this.namespacePrefixToPackageMap .entrySet()) { if (namespace.startsWith(entry.getKey()) - && entry.getKey().length() > longestMatchLength) { + && (entry.getKey().length() > longestMatchLength)) { longestMatch = entry; longestMatchLength = entry.getKey().length(); } @@ -56,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("/", ".");