Sonar Blocker fix

[appc.git] / appc-directed-graph / dg-loader / provider / src / main / java / org / openecomp / sdnc / dg / loader / DGXMLLoadNActivate.java

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 f5eb244..54f1091 100644 (file)
--- 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
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -29,11 +33,11 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.openecomp.sdnc.sli.SvcLogicException;
-import org.openecomp.sdnc.sli.SvcLogicGraph;
-import org.openecomp.sdnc.sli.SvcLogicParser;
-import org.openecomp.sdnc.sli.SvcLogicStore;
-import org.openecomp.sdnc.sli.SvcLogicStoreFactory;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicGraph;
+import org.onap.ccsdk.sli.core.sli.SvcLogicParser;
+import org.onap.ccsdk.sli.core.sli.SvcLogicStore;
+import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;
 
 public class DGXMLLoadNActivate {
     private final static Logger logger = LoggerFactory.getLogger(DGXMLLoadNActivate.class);
@@ -47,6 +51,10 @@ public class DGXMLLoadNActivate {
         this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
     }
 
+    protected DGXMLLoadNActivate(SvcLogicStore store) {
+        this.store=store;
+    }
+
     public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException{
         if(dgXMLpath != null ){
             SvcLogicParser.load(dgXMLpath, this.store);
@@ -59,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) {
@@ -91,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) {
@@ -164,5 +172,4 @@ public class DGXMLLoadNActivate {
             System.exit(1);
         }
     }
-
 }