Fix single notification meta issue (#268)

- Fix single notification issue so that multiple notification metas are
  now accepted on the backend.
- Updated tests to test this.
- Updated lombok version. The current version didnt seem to work with openJDK.

Author: erik-edling

pom.xml

@@ -269,7 +269,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.20</version>
+            <version>1.18.6</version>
             <scope>provided</scope>
         </dependency>
 

src/integrationtests/java/com/ericsson/ei/integrationtests/FlowStepsIT.java

@@ -235,8 +235,8 @@ public void the_jenkins_job_should_be_deleted() throws Throwable {
         jenkinsManager.deleteJob(this.jenkinsJobName);
     }
 
-    @Then("^mongodb should contain mail\\.$")
-    public void mongodb_should_contain_mails() throws Throwable {
+    @Then("^mongodb should contain \"([^\"]*)\" mails\\.$")
+    public void mongodb_should_contain_mails(int amountOfMails) throws Exception {
         long stopTime = System.currentTimeMillis() + 30000;
         Boolean mailHasBeenDelivered = false;
         long createdDateInMillis = 0;
@@ -245,6 +245,9 @@ public void mongodb_should_contain_mails() throws Throwable {
             JsonNode newestMailJson = getNewestMailFromDatabase();
 
             if (newestMailJson != null) {
+                JsonNode to = newestMailJson.get("to");
+                assertEquals("Sent mails " + to.size() + ". Expected " + amountOfMails, amountOfMails, to.size());
+
                 String createdDate = newestMailJson.get("created")
                                                    .get("$date")
                                                    .asText();

src/integrationtests/resources/features/ArtifactFlowIT.feature

@@ -30,12 +30,12 @@ Feature: Artifact flow Integrationtest
     Then the expected aggregated object ID is "aacc3c87-75e0-4b6d-88f5-b1a5d4e62b43"
     # Setup subscription
     Given subscription object for "MAIL" with name "MailTestSubscription" is created
-    When notification meta "some.cool.email@ericsson.com" is set in subscription
+    When notification meta "some.cool.email@ericsson.com,some.other.cool.email@ericsson.com" is set in subscription
     And paremeter form key "" and form value "to_string(@)" is added in subscription
     And condition "id=='aacc3c87-75e0-4b6d-88f5-b1a5d4e62b43'" at requirement index '0' is added in subscription
     Then subscription is uploaded
     # Send Events and Check job triggered
     Given all previous steps passed
     When the upstream input events are sent
     And the eiffel events are sent
-    Then mongodb should contain mail.
+    Then mongodb should contain "2" mails.

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

@@ -139,14 +139,6 @@ private static void validateNotificationMeta(String notificationMeta, String not
             for (String address : addresses) {
                     validateEmail(address.trim());
             }
-
-            String regexEmailCheck = "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$";
-            boolean isInvalidEmailAddress = !Pattern.matches(regexEmailCheck, notificationMeta);
-            if (isInvalidEmailAddress) {
-                throw new SubscriptionValidationException(
-                        "Notification type is set to [MAIL] but the given notificatioMeta is not a valid e-mail ["
-                                + notificationMeta + "]");
-            }
         }
     }