Rework the CldsService (rest apis)

[clamp.git] / src / main / java / org / onap / clamp / clds / workflow / RestMessageDelegate.java

diff --git a/src/main/java/org/onap/clamp/clds/workflow/RestMessageDelegate.java b/src/main/java/org/onap/clamp/clds/workflow/RestMessageDelegate.java
index 0eda2de..e273b0e 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/workflow/RestMessageDelegate.java
+++ b/src/main/java/org/onap/clamp/clds/workflow/RestMessageDelegate.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
@@ -23,36 +23,45 @@
 
 package org.onap.clamp.clds.workflow;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 
 /**
- * Log message.
- * Invoked by the log-message-wf example Camunda workflow/bpmn.
+ * Log message. Invoked by the log-message-wf example Camunda workflow/bpmn.
  */
 public class RestMessageDelegate implements JavaDelegate {
-    private static final Logger logger = Logger.getLogger(RestMessageDelegate.class.getName());
+    protected static final EELFLogger       logger      = EELFManager.getInstance().getLogger(RestMessageDelegate.class);
+    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
 
     /**
-     * Perform activity.  Log message from running process and set a variable in the running process.
+     * Perform activity. Log message from running process and set a variable in
+     * the running process.
      *
      * @param execution
      */
+    @Override
     public void execute(DelegateExecution execution) throws Exception {
         String logMessageText = (String) execution.getVariable("logMessageText");
         RestTemplate restTemplate = new RestTemplate();
         Map<String, String> restValues = new HashMap<>();
         restValues.put("procInstId", execution.getProcessInstanceId());
-        logger.info("Invoked from processDefinitionId=" + execution.getProcessDefinitionId() + ", processInstanceId=" + execution.getProcessInstanceId() + ", activityInstanceId=" + execution.getActivityInstanceId() + ": logMessageText=" + logMessageText);
-        // TODO: this should be fixed - put in temporary solution with existing sysprop and vars - why are we calling our own service?
+        logger.info("Invoked from processDefinitionId=" + execution.getProcessDefinitionId() + ", processInstanceId="
+                + execution.getProcessInstanceId() + ", activityInstanceId=" + execution.getActivityInstanceId()
+                + ": logMessageText=" + logMessageText);
+        // TODO: this should be fixed - put in temporary solution with existing
+        // sysprop and vars - why are we calling our own service?
         String port = System.getProperty("server.port");
-        ResponseEntity<String> resp = restTemplate.getForEntity("http://localhost:" + port + "/services/CamundaExample/v1/jaxrsExample/log/histLog/{procInstId}", String.class, restValues);
+        ResponseEntity<String> resp = restTemplate.getForEntity(
+                "http://localhost:" + port + "/services/CamundaExample/v1/jaxrsExample/log/histLog/{procInstId}",
+                String.class, restValues);
         logger.info("value of resp:" + resp);
         execution.setVariable("isMessageLogComplete", true);
     }