From: sanchitap <sanchita@techmahindra.com>
Date: Fri, 15 Sep 2017 06:24:44 +0000 (+0530)
Subject: Sonar Blocker fix
X-Git-Tag: v1.2.0~79
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3aa02022732ca26c7c586026926674e88ab0bb2e;hp=ac62a4a52bad0f0c5d3b3a0de39893f6993a9f1b;p=appc.git

Sonar Blocker fix

Redundent if condition removed from DGXMLLoadNActive.java L70 & L102
Change-Id: Ia7c4d115e2fcbd29eb132791958286b077118441
Issue-ID: APPC-202
Signed-off-by: sanchitap <sanchita@techmahindra.com>
---

diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java
index d07621681..54f109177 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java
+++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/openecomp/sdnc/dg/loader/DGXMLLoadNActivate.java
@@ -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) {