Merge "Fixed Sonar issues in the onap.clamp.clds.client packages"

diff --combined src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
index 1ea4c4b,024785e..f7aff0e
--- 1/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
--- 2/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
+++ b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java
@@@ -5,6 -5,8 +5,8 @@@
   * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights\r
   *                             reserved.\r
   * ================================================================================\r
+  * Modifications Copyright (c) 2019 Samsung\r
+  * ================================================================================\r
   * Licensed under the Apache License, Version 2.0 (the "License");\r
   * you may not use this file except in compliance with the License.\r
   * You may obtain a copy of the License at\r
@@@ -54,7 -56,6 +56,6 @@@ public class DcaeDispatcherServices 
      private static final String STATUS_URL_LOG = "Status URL extracted: ";\r
      private static final String DCAE_URL_PREFIX = "/dcae-deployments/";\r
      private static final String DCAE_URL_PROPERTY_NAME = "dcae.dispatcher.url";\r
-     public static final String DCAE_REQUESTID_PROPERTY_NAME = "dcae.header.requestId";\r
      private static final String DCAE_LINK_FIELD = "links";\r
      private static final String DCAE_STATUS_FIELD = "status";\r
  \r
@@@ -99,9 -100,7 +100,9 @@@
          Date startTime = new Date();\r
          LoggingUtils.setTargetContext("DCAE", "getOperationStatus");\r
          try {\r
 -            String responseStr = dcaeHttpConnectionManager.doHttpRequest(statusUrl, "GET", null, null, "DCAE", null, null);\r
 +            String responseStr = dcaeHttpConnectionManager.doHttpRequest(statusUrl, "GET", null,\r
 +                                                                         null, "DCAE", null,\r
 +                                                                         null);\r
              JSONObject jsonObj = parseResponse(responseStr);\r
              String operationType = (String) jsonObj.get("operationType");\r
              String status = (String) jsonObj.get(DCAE_STATUS_FIELD);\r
@@@ -158,7 -157,6 +159,7 @@@
  \r
      /***\r
       * Returns status URL for deleteExistingDeployment operation.\r
 +     *\r
       * @param deploymentId\r
       *        The deployment ID\r
       * @param serviceTypeId\r