Subscription validation updated for MAIL (#69)

Author: emichaf

src/main/java/com/ericsson/ei/subscriptionhandler/SubscriptionValidator.java

@@ -46,7 +46,9 @@ public void validateSubscription(Subscription subscription) throws SubscriptionV
 		this.validateNotificationMessageKeyValues(subscription.getNotificationMessageKeyValues(), subscription.getRestPostBodyMediaType() );
 		this.validateNotificationMeta(subscription.getNotificationMeta());
 		this.validateNotificationType(subscription.getNotificationType());
-		this.RestPostMediaType(subscription.getRestPostBodyMediaType());
+		if(subscription.getNotificationType().equals("REST_POST")) {
+			this.RestPostMediaType(subscription.getRestPostBodyMediaType());
+		}
 //		List<Requirement> reqList = subscription.getRequirements();
 //		for (int i=0; i < reqList.size(); i++) {
 //			this.validateJmespath(reqList.get(i).getConditions().get(0).getJmespath());
@@ -87,7 +89,7 @@ public void validateNotificationMessageKeyValues(List<NotificationMessageKeyValu
 				String test_key = item.getFormkey();
 				String test_value = item.getFormvalue();
 
-			if (restPostBodyMediaType.equals(MediaType.APPLICATION_FORM_URLENCODED.toString())) { // FORM/POST PARAMETERS
+			if (restPostBodyMediaType != null && restPostBodyMediaType.equals(MediaType.APPLICATION_FORM_URLENCODED.toString())) { // FORM/POST PARAMETERS
                if((test_key == null || test_key.isEmpty() || StringUtils.isBlank(test_key)) || (test_value == null || test_value.isEmpty() || StringUtils.isBlank(test_value))){
 				   throw new SubscriptionValidationException("Value & Key  in notificationMessage must have a values: " + notificationMessage);
 			   }

src/test/java/com/ericsson/ei/subscriptionhandler/test/SubscriptionValidatorTest.java

@@ -75,7 +75,7 @@ public SubscriptionValidatorTest() {
 		subscritptionInvalid.setSubscriptionName("Kalle1");
 
 		// new stuff
-		subscritptionInvalid.setRestPostBodyMediaType(MediaType.APPLICATION_FORM_URLENCODED.toString());
+		subscritptionInvalid.setRestPostBodyMediaType(null);
 
 		NotificationMessageKeyValue notificationMessageKeyValueinvalid = new NotificationMessageKeyValue();
 		notificationMessageKeyValueinvalid.setFormkey("");