X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fclient%2FDcaeDispatcherServices.java;h=f285dc27cc284965bdcd9843bade70a10b0ea8e3;hb=da4caf492050e17c1aaa8915064659a16e060d8d;hp=3d8d5d53a5080075ab76b661a305c222378617ce;hpb=f74d1e91d69f202439da6db420dd8efc028e6c4e;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
index 3d8d5d53..f285dc27 100644
--- a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
@@ -25,6 +25,7 @@ package org.onap.clamp.clds.client;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -96,18 +97,16 @@ public class DcaeDispatcherServices {
             if (inStream != null) {
                 BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inStream));
                 String inputLine = null;
-                StringBuffer response = new StringBuffer();
+                StringBuilder response = new StringBuilder();
                 while ((inputLine = bufferedReader.readLine()) != null) {
                     response.append(inputLine);
                 }
                 responseStr = response.toString();
             }
 
-            if (responseStr != null) {
-                if (requestFailed) {
-                    logger.error("requestFailed - responseStr=" + responseStr);
-                    throw new BadRequestException(responseStr);
-                }
+            if (responseStr != null && requestFailed) {
+                logger.error("requestFailed - responseStr=" + responseStr);
+                throw new BadRequestException(responseStr);
             }
 
             logger.debug("response code " + responseCode);
@@ -237,7 +236,10 @@ public class DcaeDispatcherServices {
         Date startTime = new Date();
         LoggingUtils.setTargetContext("DCAE", "createNewDeployment");
         try {
-            String apiBodyString = "{\"serviceTypeId\": \"" + serviceTypeId + "\"}";
+            ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("dcae.deployment.template");
+            ((ObjectNode) rootNode).put("serviceTypeId", serviceTypeId);
+            String apiBodyString = rootNode.toString();
+
             logger.info("Dcae api Body String - " + apiBodyString);
             String url = refProp.getStringValue("DCAE_DISPATCHER_URL") + "/dcae-deployments/" + deploymentId;
             logger.info("Dcae Dispatcher Service url - " + url);
@@ -270,7 +272,7 @@ public class DcaeDispatcherServices {
 
                 String inputLine = null;
 
-                StringBuffer response = new StringBuffer();
+                StringBuilder response = new StringBuilder();
 
                 while ((inputLine = in.readLine()) != null) {
                     response.append(inputLine);
@@ -279,11 +281,9 @@ public class DcaeDispatcherServices {
                 responseStr = response.toString();
             }
 
-            if (responseStr != null) {
-                if (requestFailed) {
-                    logger.error("requestFailed - responseStr=" + responseStr);
-                    throw new BadRequestException(responseStr);
-                }
+            if (responseStr != null && requestFailed) {
+                logger.error("requestFailed - responseStr=" + responseStr);
+                throw new BadRequestException(responseStr);
             }
 
             logger.debug("response code " + responseCode);