X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fconfig%2Fyang-jmx-generator-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fplugin%2FJMXGenerator.java;h=34480b9d1086e77a0bc99295f199781f4767c9ff;hb=db89afdefb3cfa4454dfdc6008e1d54d3ede66fb;hp=ae0962b9e74c1ddd49f90b4c4e115354d76417e5;hpb=0ac8d08952b78b20738683e806085609aced5932;p=controller.git diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java index ae0962b9e7..34480b9d10 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/JMXGenerator.java @@ -30,7 +30,7 @@ import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.config.yangjmxgenerator.PackageTranslator; import org.opendaylight.controller.config.yangjmxgenerator.ServiceInterfaceEntry; import org.opendaylight.controller.config.yangjmxgenerator.TypeProviderWrapper; -import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl; +import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -88,27 +88,27 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { "Null outputBaseDir received"); Preconditions - .checkArgument(namespaceToPackageMapping != null && !namespaceToPackageMapping.isEmpty(), + .checkArgument((this.namespaceToPackageMapping != null) && !this.namespaceToPackageMapping.isEmpty(), "No namespace to package mapping provided in additionalConfiguration"); - PackageTranslator packageTranslator = new PackageTranslator(namespaceToPackageMapping); + final PackageTranslator packageTranslator = new PackageTranslator(this.namespaceToPackageMapping); if (!outputBaseDir.exists()) { outputBaseDir.mkdirs(); } - GeneratedFilesTracker generatedFiles = new GeneratedFilesTracker(); + final GeneratedFilesTracker generatedFiles = new GeneratedFilesTracker(); // create SIE structure qNamesToSIEs - Map qNamesToSIEs = new HashMap<>(); + final Map qNamesToSIEs = new HashMap<>(); - Map knownSEITracker = new HashMap<>(); - for (Module module : context.getModules()) { - String packageName = packageTranslator.getPackageName(module); - Map namesToSIEntries = ServiceInterfaceEntry + final Map knownSEITracker = new HashMap<>(); + for (final Module module : context.getModules()) { + final String packageName = packageTranslator.getPackageName(module); + final Map namesToSIEntries = ServiceInterfaceEntry .create(module, packageName, knownSEITracker); - for (Entry sieEntry : namesToSIEntries + for (final Entry sieEntry : namesToSIEntries .entrySet()) { // merge value into qNamesToSIEs if (qNamesToSIEs.put(sieEntry.getKey(), sieEntry.getValue()) != null) { @@ -119,11 +119,11 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { } if (yangModulesInCurrentMavenModule.contains(module)) { // write this sie to disk - for (ServiceInterfaceEntry sie : namesToSIEntries.values()) { + for (final ServiceInterfaceEntry sie : namesToSIEntries.values()) { try { - generatedFiles.addFile(codeWriter.writeSie(sie, + generatedFiles.addFile(this.codeWriter.writeSie(sie, outputBaseDir)); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException( "Error occurred during SIE source generate phase", e); @@ -132,26 +132,26 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { } } - File mainBaseDir = concatFolders(projectBaseDir, "src", "main", "java"); - Preconditions.checkNotNull(resourceBaseDir, + final File mainBaseDir = concatFolders(this.projectBaseDir, "src", "main", "java"); + Preconditions.checkNotNull(this.resourceBaseDir, "resource base dir attribute was null"); - StringBuilder fullyQualifiedNamesOfFactories = new StringBuilder(); + final StringBuilder fullyQualifiedNamesOfFactories = new StringBuilder(); // create MBEs - for (Module module : yangModulesInCurrentMavenModule) { - String packageName = packageTranslator.getPackageName(module); - Map namesToMBEs = ModuleMXBeanEntry + for (final Module module : yangModulesInCurrentMavenModule) { + final String packageName = packageTranslator.getPackageName(module); + final Map namesToMBEs = ModuleMXBeanEntry .create(module, qNamesToSIEs, context, new TypeProviderWrapper(new TypeProviderImpl(context)), packageName); - for (Entry mbeEntry : namesToMBEs + for (final Entry mbeEntry : namesToMBEs .entrySet()) { - ModuleMXBeanEntry mbe = mbeEntry.getValue(); + final ModuleMXBeanEntry mbe = mbeEntry.getValue(); try { - List files1 = codeWriter.writeMbe(mbe, outputBaseDir, + final List files1 = this.codeWriter.writeMbe(mbe, outputBaseDir, mainBaseDir); generatedFiles.addFile(files1); - } catch (Exception e) { + } catch (final Exception e) { throw new RuntimeException( "Error occurred during MBE source generate phase", e); @@ -162,18 +162,18 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { } } // create ModuleFactory file if needed - if (fullyQualifiedNamesOfFactories.length() > 0 - && generateModuleFactoryFile) { - File serviceLoaderFile = JMXGenerator.concatFolders( - resourceBaseDir, "META-INF", "services", + if ((fullyQualifiedNamesOfFactories.length() > 0) + && this.generateModuleFactoryFile) { + final File serviceLoaderFile = JMXGenerator.concatFolders( + this.resourceBaseDir, "META-INF", "services", ModuleFactory.class.getName()); // if this file does not exist, create empty file serviceLoaderFile.getParentFile().mkdirs(); try { serviceLoaderFile.createNewFile(); Files.write(fullyQualifiedNamesOfFactories.toString(), serviceLoaderFile, StandardCharsets.UTF_8); - } catch (IOException e) { - String message = "Cannot write to " + serviceLoaderFile; + } catch (final IOException e) { + final String message = "Cannot write to " + serviceLoaderFile; LOG.error(message, e); throw new RuntimeException(message, e); } @@ -184,7 +184,7 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { @VisibleForTesting static File concatFolders(final File projectBaseDir, final String... folderNames) { File result = projectBaseDir; - for (String folder: folderNames) { + for (final String folder: folderNames) { result = new File(result, folder); } return result; @@ -198,17 +198,17 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { } private static boolean extractModuleFactoryBoolean(final Map additionalCfg) { - String bool = additionalCfg.get(MODULE_FACTORY_FILE_BOOLEAN); + final String bool = additionalCfg.get(MODULE_FACTORY_FILE_BOOLEAN); return !"false".equals(bool); } private static Map extractNamespaceMapping( final Map additionalCfg) { - Map namespaceToPackage = Maps.newHashMap(); - for (String key : additionalCfg.keySet()) { + final Map namespaceToPackage = Maps.newHashMap(); + for (final String key : additionalCfg.keySet()) { if (key.startsWith(NAMESPACE_TO_PACKAGE_PREFIX)) { - String mapping = additionalCfg.get(key); - NamespaceMapping mappingResolved = extractNamespaceMapping(mapping); + final String mapping = additionalCfg.get(key); + final NamespaceMapping mappingResolved = extractNamespaceMapping(mapping); namespaceToPackage.put(mappingResolved.namespace, mappingResolved.packageName); } @@ -217,7 +217,7 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { } private static NamespaceMapping extractNamespaceMapping(final String mapping) { - Matcher matcher = NAMESPACE_MAPPING_PATTERN.matcher(mapping); + final Matcher matcher = NAMESPACE_MAPPING_PATTERN.matcher(mapping); Preconditions.checkArgument(matcher.matches(), "Namespace to package mapping:%s is in invalid format, requested format is: %s", mapping, NAMESPACE_MAPPING_PATTERN); @@ -232,7 +232,7 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { @Override public void setMavenProject(final MavenProject project) { this.projectBaseDir = project.getBasedir(); - LOG.debug("{}: project base dir: {}", getClass().getCanonicalName(), projectBaseDir); + LOG.debug("{}: project base dir: {}", getClass().getCanonicalName(), this.projectBaseDir); } @VisibleForTesting @@ -240,9 +240,9 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { private final Set files = Sets.newHashSet(); void addFile(final File file) { - if (files.contains(file)) { - List undeletedFiles = Lists.newArrayList(); - for (File presentFile : files) { + if (this.files.contains(file)) { + final List undeletedFiles = Lists.newArrayList(); + for (final File presentFile : this.files) { if (!presentFile.delete()) { undeletedFiles.add(presentFile); } @@ -256,17 +256,17 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware { "Name conflict in generated files, file" + file + " present twice"); } - files.add(file); + this.files.add(file); } void addFile(final Collection files) { - for (File file : files) { + for (final File file : files) { addFile(file); } } public Set getFiles() { - return files; + return this.files; } } }