1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java
index 9dc43c7e7a..c7f94c0452 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClientFactory.java
@@ -29,7 +29,7 @@ import org.openecomp.mso.properties.MsoJavaProperties;
 
 public class RequestClientFactory {
 	
-	//based on URI, returns BPEL or Camunda client
+	//based on URI, returns BPEL, CamundaTask or Camunda client
 	public static RequestClient getRequestClient(String orchestrationURI, MsoJavaProperties props) throws IllegalStateException{
 		RequestClient retClient;
 		if(props ==null){
@@ -40,7 +40,11 @@ public class RequestClientFactory {
 			url = props.getProperty(CommonConstants.BPEL_URL,null) + orchestrationURI;
 			retClient= new BPELRestClient();
 			
-		}else{
+		}else if(orchestrationURI.contains(CommonConstants.TASK_SEARCH_STR)){
+			url = props.getProperty(CommonConstants.CAMUNDA_URL,null) + orchestrationURI;
+			retClient = new CamundaTaskClient();
+		}
+		else{
 			url = props.getProperty(CommonConstants.CAMUNDA_URL,null) + orchestrationURI;
 			retClient = new CamundaClient();
 		}