1 files changed, 18 insertions, 6 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/services/ExtWorkflowsServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/ExtWorkflowsServiceImpl.java
index d5170b6e5..a06e0b587 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/ExtWorkflowsServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/ExtWorkflowsServiceImpl.java
@@ -2,6 +2,7 @@ package org.onap.vid.services;
 
 import java.util.List;
 import org.onap.vid.model.SOWorkflow;
+import org.onap.vid.model.SOWorkflowParameterDefinitions;
 import org.onap.vid.model.SOWorkflows;
 import org.onap.vid.mso.MsoResponseWrapper2;
 import org.onap.vid.mso.rest.MockedWorkflowsRestClient;
@@ -21,25 +22,36 @@ public class ExtWorkflowsServiceImpl implements ExtWorkflowsService {
     @Override
     public List<SOWorkflow> getWorkflows(String vnfName) {
         MsoResponseWrapper2<SOWorkflows> msoResponse = mockedWorkflowsRestClient.getWorkflows(vnfName);
-        if (msoResponse.getStatus() >= 400 || msoResponse.getEntity() == null) {
-            throw new BadResponseFromMso(msoResponse);
-        }
+        validateSOResponse(msoResponse, SOWorkflows.class);
         return convertMsoResponseToWorkflowList(msoResponse);
     }
 
+    @Override
+    public SOWorkflowParameterDefinitions getWorkflowParameterDefinitions(Long workflowId) {
+        MsoResponseWrapper2<SOWorkflowParameterDefinitions> msoResponse = mockedWorkflowsRestClient.getWorkflowParameterDefinitions(workflowId);
+        validateSOResponse(msoResponse, SOWorkflowParameterDefinitions.class);
+        return (SOWorkflowParameterDefinitions) msoResponse.getEntity();
+    }
+
     private List<SOWorkflow> convertMsoResponseToWorkflowList(MsoResponseWrapper2<SOWorkflows> msoResponse) {
         SOWorkflows soWorkflows = (SOWorkflows) msoResponse.getEntity();
         return soWorkflows.getWorkflows();
     }
 
+    private void validateSOResponse(MsoResponseWrapper2 response, Class<?> expectedResponseClass){
+        if (response.getStatus() >= 400 || !expectedResponseClass.isInstance(response.getEntity())) {
+            throw new BadResponseFromMso(response);
+        }
+    }
+
     public static class BadResponseFromMso extends RuntimeException {
-        private final MsoResponseWrapper2<SOWorkflows> msoResponse;
+        private final MsoResponseWrapper2<?> msoResponse;
 
-        public BadResponseFromMso(MsoResponseWrapper2<SOWorkflows> msoResponse) {
+        BadResponseFromMso(MsoResponseWrapper2<?> msoResponse) {
             this.msoResponse = msoResponse;
         }
 
-        public MsoResponseWrapper2<SOWorkflows> getMsoResponse() {
+        public MsoResponseWrapper2<?> getMsoResponse() {
             return msoResponse;
         }
     }