From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 7 Apr 2017 23:34:09 +0000 (-0700)
Subject: Refactor to remove redundant code
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F3207%2F1;p=sdnc%2Fcore.git

Refactor to remove redundant code

Change-Id: I910c4c168164f8709684729c67c000c190b07618
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java
index 6ee264e..ba929ba 100644
--- a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java
+++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/SvcLogicServiceImpl.java
@@ -257,28 +257,12 @@ public class SvcLogicServiceImpl implements SvcLogicService {
 
 		}
 		
-		if (nodeExecutors == null) {
-			LOG.info("Start: registering node executors");
-			registerExecutors();
-
-			LOG.info("Done: registering node executors");
-		}
-		
-		LOG.info("About to execute graph " + graph.toString());
-
-		LOG.info("Executing root node");
 		SvcLogicContext ctx = new SvcLogicContext(props);
         ctx.setAttribute("currentGraph", graph.toString());
         ctx.setAttribute("X-ECOMP-RequestID", MDC.get("X-ECOMP-RequestID"));
 		ctx.setDomDataBroker(domDataBroker);
-		SvcLogicNode curNode = graph.getRootNode();
-
-		while (curNode != null) {
-			LOG.info("About to execute node # "+curNode.getNodeId()+" ("+curNode.getNodeType()+")");
-			SvcLogicNode nextNode = executeNode(curNode, ctx);
-			curNode = nextNode;
-		}
 		
+		execute(graph, ctx);
 
 		return(ctx.toProperties());
 	}