Changes for design service

[appc.git] / appc-inbound / appc-design-services / provider / src / main / java / org / onap / appc / design / dbervices / RequestValidator.java

diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/dbervices/RequestValidator.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/dbervices/RequestValidator.java
index 5278cc7..f98aae4 100644 (file)
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/dbervices/RequestValidator.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/dbervices/RequestValidator.java
@@ -48,6 +48,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 
+import org.onap.appc.design.services.util.DesignServiceConstants;
+
 public class RequestValidator {
 
     private static final EELFLogger log = EELFManager.getInstance().getLogger(RequestValidator.class);
@@ -82,16 +84,28 @@ public class RequestValidator {
             case UPLOADARTIFACT:
                 errorString = resolveUploadArtifactErrorString(payloadObject);
                 break;
+            case DesignServiceConstants.UPLOADADMINARTIFACT:
+                errorString = resolveUploadArtifactErrorString(payloadObject);
+                break;
             case SETPROTOCOLREFERENCE:
             case SETINCART:
                 errorString = resolveErrorString(payloadObject);
                 break;
+            case DesignServiceConstants.CHECKVNF:
+                errorString = resolveCheckVNFErrorString(payloadObject);
+                break;
             default:
                 throw new RequestValidationException(" Action " + action + " not found while processing request ");
         }
         checkForErrorString(errorString);
     }
 
+    private static String resolveCheckVNFErrorString(JsonNode payloadObject) {
+        if (nullOrEmpty(payloadObject, VNF_TYPE)) 
+            return VNF_TYPE;
+        return null;
+    }
+
     private static void checkForErrorString(String errorString) throws RequestValidationException {
         if (errorString != null) {
             throw new RequestValidationException(" Missing input parameter :-" + errorString + " -:");
@@ -174,8 +188,8 @@ public class RequestValidator {
     }
 
     private static boolean nullOrEmpty(JsonNode payloadObject, String param) {
-        return payloadObject.get(param) == null || payloadObject
-            .get(param).textValue().isEmpty();
+        JsonNode payload = payloadObject.get(param);
+        return payload == null || payload.textValue().trim().isEmpty();
     }
 
 }