X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2Fplugin%2FJMXGenerator.java;h=2216f19f884584ab0a4fd5762034817735ce4638;hp=1f1776f0a5f86ffa1f229de339a8463ebcb2a9b0;hb=dd65a7ecf4237d0e11e01f71d2184c2bc9de2895;hpb=c31509c7a6630e54a9f9749a643fed5e1a1ad380

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 1f1776f0a5..2216f19f88 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
@@ -12,8 +12,10 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -22,7 +24,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.io.FileUtils;
 import org.apache.maven.project.MavenProject;
 import org.opendaylight.controller.config.spi.ModuleFactory;
 import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry;
@@ -64,7 +65,6 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
     private static final Logger LOG = LoggerFactory.getLogger(JMXGenerator.class);
     private static final Pattern NAMESPACE_MAPPING_PATTERN = Pattern.compile("(.+)" + NAMESPACE_TO_PACKAGE_DIVIDER + "(.+)");
 
-    private PackageTranslator packageTranslator;
     private final CodeWriter codeWriter;
     private Map<String, String> namespaceToPackageMapping;
     private File resourceBaseDir;
@@ -91,7 +91,7 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
                 .checkArgument(namespaceToPackageMapping != null && !namespaceToPackageMapping.isEmpty(),
                         "No namespace to package mapping provided in additionalConfiguration");
 
-        packageTranslator = new PackageTranslator(namespaceToPackageMapping);
+        PackageTranslator packageTranslator = new PackageTranslator(namespaceToPackageMapping);
 
         if (!outputBaseDir.exists()) {
             outputBaseDir.mkdirs();
@@ -111,11 +111,9 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
             for (Entry<QName, ServiceInterfaceEntry> sieEntry : namesToSIEntries
                     .entrySet()) {
                 // merge value into qNamesToSIEs
-                if (qNamesToSIEs.containsKey(sieEntry.getKey()) == false) {
-                    qNamesToSIEs.put(sieEntry.getKey(), sieEntry.getValue());
-                } else {
+                if (qNamesToSIEs.put(sieEntry.getKey(), sieEntry.getValue()) != null) {
                     throw new IllegalStateException(
-                        "Cannot add two SIE  with same qname "
+                        "Cannot add two SIE with same qname "
                                 + sieEntry.getValue());
                 }
             }
@@ -173,11 +171,10 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
             serviceLoaderFile.getParentFile().mkdirs();
             try {
                 serviceLoaderFile.createNewFile();
-                FileUtils.write(serviceLoaderFile,
-                        fullyQualifiedNamesOfFactories.toString());
+                Files.write(fullyQualifiedNamesOfFactories.toString(), serviceLoaderFile, StandardCharsets.UTF_8);
             } catch (IOException e) {
                 String message = "Cannot write to " + serviceLoaderFile;
-                LOG.error(message);
+                LOG.error(message, e);
                 throw new RuntimeException(message, e);
             }
         }
@@ -186,12 +183,11 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
 
     @VisibleForTesting
     static File concatFolders(final File projectBaseDir, final String... folderNames) {
-        StringBuilder b = new StringBuilder();
-        for (String folder : folderNames) {
-            b.append(folder);
-            b.append(File.separator);
+        File result = projectBaseDir;
+        for (String folder: folderNames) {
+            result = new File(result, folder);
         }
-        return new File(projectBaseDir, b.toString());
+        return result;
     }
 
     @Override
@@ -204,13 +200,7 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
     private boolean extractModuleFactoryBoolean(
             final Map<String, String> additionalCfg) {
         String bool = additionalCfg.get(MODULE_FACTORY_FILE_BOOLEAN);
-        if (bool == null) {
-            return true;
-        }
-        if ("false".equals(bool)) {
-            return false;
-        }
-        return true;
+        return !"false".equals(bool);
     }
 
     private static Map<String, String> extractNamespaceMapping(
@@ -254,11 +244,11 @@ public class JMXGenerator implements BasicCodeGenerator, MavenProjectAware {
             if (files.contains(file)) {
                 List<File> undeletedFiles = Lists.newArrayList();
                 for (File presentFile : files) {
-                    if (presentFile.delete() == false) {
+                    if (!presentFile.delete()) {
                         undeletedFiles.add(presentFile);
                     }
                 }
-                if (undeletedFiles.isEmpty() == false) {
+                if (!undeletedFiles.isEmpty()) {
                     LOG.error(
                             "Illegal state occurred: Unable to delete already generated files, undeleted files: {}",
                             undeletedFiles);