Merge "Allow additional parameters to deployment"

[clamp.git] / src / main / java / org / onap / clamp / clds / service / CldsService.java

diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java
index 9d6cb08..c23d2ec 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/service/CldsService.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java
@@ -412,10 +412,8 @@ public class CldsService extends SecureServiceBase {
             isAuthorizedForVf(model);
             String userId = getUserId();
             String actionStateCd = CldsEvent.ACTION_STATE_INITIATED;
-            String processDefinitionKey = "clds-process-action-wf";
             logger.info("PUT actionCd={}", actionCd);
             logger.info("PUT actionStateCd={}", actionStateCd);
-            logger.info("PUT processDefinitionKey={}", processDefinitionKey);
             logger.info("PUT modelName={}", modelName);
             logger.info("PUT test={}", test);
             logger.info("PUT bpmnText={}", model.getBpmnText());
@@ -806,8 +804,8 @@ public class CldsService extends SecureServiceBase {
     @Path("/deploy/{modelName}")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public Response deployModel(@PathParam("action") String action, @PathParam("modelName") String modelName,
-            @QueryParam("test") String test, CldsModel model) {
+    public Response deployModel(@PathParam("modelName") String modelName,
+            CldsModel model) {
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsService: Deploy model", getPrincipalName());
         Boolean errorCase = false;
@@ -874,8 +872,8 @@ public class CldsService extends SecureServiceBase {
     @Path("/undeploy/{modelName}")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public Response unDeployModel(@PathParam("action") String action, @PathParam("modelName") String modelName,
-            @QueryParam("test") String test, CldsModel model) {
+    public Response unDeployModel(@PathParam("modelName") String modelName,
+            CldsModel model) {
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsService: Undeploy model", getPrincipalName());