Changes to config bundle for vnf level enhancement

[appc.git] / appc-config / appc-flow-controller / provider / src / main / java / org / onap / appc / flow / controller / ResponseHandlerImpl / DefaultResponseHandler.java

diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
index 36cb899..95740e9 100644 (file)
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/ResponseHandlerImpl/DefaultResponseHandler.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 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.
@@ -16,38 +16,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-package org.onap.appc.flow.controller.ResponseHandlerImpl;
 
+package org.onap.appc.flow.controller.ResponseHandlerImpl;
 
+import org.apache.commons.lang3.StringUtils;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.onap.appc.flow.controller.data.Response;
 import org.onap.appc.flow.controller.data.ResponseAction;
 import org.onap.appc.flow.controller.data.Transaction;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class DefaultResponseHandler {
 
     private static final EELFLogger log = EELFManager.getInstance().getLogger(DefaultResponseHandler.class);
 
-    public ResponseAction handlerResponse(Transaction transaction){
-
+    public ResponseAction handlerResponse(Transaction transaction, SvcLogicContext ctx) {
         log.info("Transaction Input params " + transaction.toString());
         ResponseAction responseAction = new ResponseAction();
-        if(transaction.getResponses() != null && !transaction.getResponses().isEmpty()) {
-            for(Response response : transaction.getResponses()) {
-                if(response.getResponseCode() != null && response.getResponseCode().equals(transaction.getStatusCode())) {
+        if (transaction.getResponses() != null && !transaction.getResponses().isEmpty()) {
+            for (Response response : transaction.getResponses()) {
+                if ((StringUtils.isNotBlank(ctx.getAttribute("error-code"))
+                        && !StringUtils.equals(ctx.getAttribute("error-code"), "400"))
+                        || ((StringUtils.isNotBlank(transaction.getStatusCode()))
+                                && !StringUtils.equals(transaction.getStatusCode(), "400"))) {
+
                     responseAction = response.getResponseAction();
                     break;
                 }
-
             }
-
         }
-        return responseAction ;
+        return responseAction;
     }
 }