AT&T 1712 and 1802 release code

[so.git] / mso-api-handlers / mso-api-handler-common / src / main / java / org / openecomp / mso / apihandler / common / CamundaTaskClient.java

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
index 4b179da..3941e1e 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
@@ -20,15 +20,16 @@
 \r
 package org.openecomp.mso.apihandler.common;\r
 \r
-import org.openecomp.mso.logger.MsoLogger;\r
+import java.io.IOException;\r
+\r
+import javax.xml.bind.DatatypeConverter;\r
+\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.client.ClientProtocolException;\r
 import org.apache.http.client.methods.HttpGet;\r
 import org.apache.http.client.methods.HttpPost;\r
 import org.apache.http.entity.StringEntity;\r
-\r
-import javax.xml.bind.DatatypeConverter;\r
-import java.io.IOException;\r
+import org.openecomp.mso.logger.MsoLogger;\r
 \r
 public class CamundaTaskClient extends RequestClient{\r
        private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);\r
@@ -53,7 +54,7 @@ public class CamundaTaskClient extends RequestClient{
                                String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);\r
                                if(userCredentials != null){\r
                                        post.addHeader("Authorization", "Basic " + DatatypeConverter\r
-                        .printBase64Binary(userCredentials.getBytes()));\r
+                                               .printBase64Binary(userCredentials.getBytes()));\r
                                }\r
                        }\r
                }\r
@@ -73,7 +74,7 @@ public class CamundaTaskClient extends RequestClient{
        @Override\r
        public HttpResponse post(String requestId, boolean isBaseVfModule,\r
                        int recipeTimeout, String requestAction, String serviceInstanceId,\r
-                       String vnfId, String vfModuleId, String volumeGroupId, String networkId,\r
+                       String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,\r
                        String serviceType, String vnfType, String vfModuleType, String networkType,\r
                        String requestDetails, String recipeParamXsd)\r
                                        throws ClientProtocolException, IOException{\r
@@ -91,8 +92,8 @@ public class CamundaTaskClient extends RequestClient{
                        if(encryptedCredentials != null){\r
                                String userCredentials = getEncryptedPropValue(encryptedCredentials, CommonConstants.DEFAULT_BPEL_AUTH, CommonConstants.ENCRYPTION_KEY);\r
                                if(userCredentials != null){\r
-                                       get.addHeader("Authorization", "Basic " + DatatypeConverter\r
-                        .printBase64Binary(userCredentials.getBytes()));\r
+                                       get.addHeader("Authorization", "Basic " + new String(DatatypeConverter\r
+                                               .printBase64Binary(userCredentials.getBytes())));\r
                                }\r
                        }\r
                }\r