From e58d8dd892f1839514bd4b29756ee552c3f169ca Mon Sep 17 00:00:00 2001 From: "Plummer, Brittany" Date: Mon, 22 Jul 2019 08:44:15 -0500 Subject: enhance get orchestration request Enhance get orchestration request to include workflow step Began working on adding call for activity name Added call to return activity information Updated to return last task executed Added last task executed info to returned string Updated mocks to fix failing unit tests Added responses for mocks to Camunda for process and activity history Added tests to cover taskName changes Began adding tests to cover changes to RequestHandlerUtils Added more unit tests for activity lookup Updated error messages for taskName Moved properties to application.yaml file Added unit tests to add more coverage to task retrieval Moved Camunda calls to CamundaRequestHandler class Removed unused imports from RequestHandlerUtils Fixed formatting of tests and removed handler where not used Removed CamundaRequestHandler from JerseyConfiguration Added retryTemplate for camunda calls Issue-ID: SO-2142 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I09a82e3458e8f611e4bbaf3ce9ab5de36b1b060a --- .../so/apihandlerinfra/exceptions/ContactCamundaException.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mso-api-handlers/mso-api-handler-common/src') diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ContactCamundaException.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ContactCamundaException.java index 6b38eec4ae..d5fc01781e 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ContactCamundaException.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ContactCamundaException.java @@ -23,7 +23,7 @@ package org.onap.so.apihandlerinfra.exceptions; public class ContactCamundaException extends ApiException { private static final String contactCamundaErrorMessage = - "Unable to get process-instance history from Camunda for requestId: %s due to error: %s"; + "Unable to get %s history from Camunda for requestId: %s due to error: %s"; private ContactCamundaException(Builder builder) { super(builder); @@ -32,9 +32,9 @@ public class ContactCamundaException extends ApiException { public static class Builder extends ApiException.Builder { - public Builder(String requestId, String error, int httpResponseCode, String messageID) { - super(contactCamundaErrorMessage.format(contactCamundaErrorMessage, requestId, error), httpResponseCode, - messageID); + public Builder(String query, String requestId, String error, int httpResponseCode, String messageID) { + super(contactCamundaErrorMessage.format(contactCamundaErrorMessage, query, requestId, error), + httpResponseCode, messageID); } public ContactCamundaException build() { -- cgit 1.2.3-korg