Sonar Blocker fix 57/12657/2
authorsanchitap <sanchita@techmahindra.com>
Fri, 15 Sep 2017 06:24:44 +0000 (11:54 +0530)
committerSkip Wonnell <skip@att.com>
Fri, 15 Sep 2017 13:48:28 +0000 (13:48 +0000)
Redundent if condition removed from DGXMLLoadNActive.java L70 & L102
Change-Id: Ia7c4d115e2fcbd29eb132791958286b077118441
Issue-ID: APPC-202
Signed-off-by: sanchitap <sanchita@techmahindra.com>
appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java

index d076216..54f1091 100644 (file)
@@ -67,7 +67,7 @@ public class DGXMLLoadNActivate {
             List<String> errors = new ArrayList<String>();
             if(this.store != null){
                 File xmlDir = new File(xmlPath);
-                if(xmlDir != null && xmlDir.isDirectory()){
+                if(xmlDir.isDirectory()){
                     String[] extensions = new String[] { "xml", "XML" };
                     List<File> files = (List<File>) FileUtils.listFiles(xmlDir, extensions, true);
                     for (File file : files) {
@@ -99,7 +99,7 @@ public class DGXMLLoadNActivate {
             List<String> errors = new ArrayList<String>();
             if(this.store != null){
                 File activateFile = new File(activateFilePath);
-                if(activateFile != null && activateFile.isFile()){
+                if(activateFile.isFile()){
                     List<String> fileLines = FileUtils.readLines(activateFile,STRING_ENCODING);
                     if(fileLines != null ){
                         for (String line : fileLines) {