Regex from common to validate subscription in EI back-end (#277)

* Change regex validation to use regex class from eiffel-commons.

Author: saif-ericsson

pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.github.eiffel-community</groupId>
             <artifactId>eiffel-commons</artifactId>
-            <version>0.0.4</version>
+            <version>0.0.10</version>
         </dependency>
 
         <dependency>

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

@@ -28,6 +28,7 @@
 import com.ericsson.ei.controller.model.NotificationMessageKeyValue;
 import com.ericsson.ei.controller.model.Subscription;
 import com.ericsson.ei.exception.SubscriptionValidationException;
+import com.ericsson.eiffelcommons.utils.RegExProvider;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.fge.jackson.JsonLoader;
@@ -44,14 +45,16 @@ public class SubscriptionValidator {
     private static final String SCHEMA_FILE_PATH = "/schemas/subscription_schema.json";
 
     /**
-     * The private constructor forces all implementations to use the functions as static methods.
+     * The private constructor forces all implementations to use the functions as
+     * static methods.
      */
     private SubscriptionValidator() {
     }
 
     /**
-     * Validation of parameters values in subscriptions objects. Throws SubscriptionValidationException
-     * if validation of a parameter fails due to wrong format of parameter.
+     * Validation of parameters values in subscriptions objects. Throws
+     * SubscriptionValidationException if validation of a parameter fails due to
+     * wrong format of parameter.
      *
      * @param subscription
      */
@@ -70,29 +73,30 @@ public static void validateSubscription(Subscription subscription) throws Subscr
     }
 
     /**
-     * Validation of subscriptionName parameter Throws SubscriptionValidationException if validation of
-     * the parameter fails due to wrong format of parameter.
+     * Validation of subscriptionName parameter Throws
+     * SubscriptionValidationException if validation of the parameter fails due to
+     * wrong format of parameter.
      *
      * @param subscriptionName
      */
     private static void validateSubscriptionName(String subscriptionName) throws SubscriptionValidationException {
-        // When this regExp need to be changed then remember to change the one in the
-        // back-end (invalidSubscriptionNameRegex in subscription.js), which do the same
-        // invalid subscription name check. The two
-        // regEx always need to be the same for ensuring the same check.
-        // /(\W)/ Is a regEx that matches anything that is not [A-Z,a-z,0-8] and _.
-        String invalidSubscriptionNameRegex = "(\\W)";
+        String invalidSubscriptionNameRegex = null;
+        invalidSubscriptionNameRegex = RegExProvider.SUBSCRIPTION_NAME;
+
         if (subscriptionName == null) {
             throw new SubscriptionValidationException("Required field SubscriptionName has not been set");
+        } else if (invalidSubscriptionNameRegex == null || invalidSubscriptionNameRegex.isEmpty()) {
+            throw new SubscriptionValidationException(
+                    "A valid regular expression for validating subscription name is not provided.");
         } else if (Pattern.matches(invalidSubscriptionNameRegex, subscriptionName)) {
             throw new SubscriptionValidationException("Wrong format of SubscriptionName: " + subscriptionName);
         }
     }
 
     /**
      * Validation of NotificationMessageKeyValues parameters (key/values) Throws
-     * SubscriptionValidationException if validation of the parameter fails due to wrong format of
-     * parameter.
+     * SubscriptionValidationException if validation of the parameter fails due to
+     * wrong format of parameter.
      *
      * @param notificationMessage
      * @param restPostBodyMediaType
@@ -129,8 +133,9 @@ private static void validateNotificationMessageKeyValues(List<NotificationMessag
     }
 
     /**
-     * Validation of notificationMeta parameter Throws SubscriptionValidationException if validation of
-     * the parameter fails due to wrong format of parameter.
+     * Validation of notificationMeta parameter Throws
+     * SubscriptionValidationException if validation of the parameter fails due to
+     * wrong format of parameter.
      *
      * @param notificationMeta
      * @param notificationType
@@ -151,8 +156,9 @@ private static void validateNotificationMeta(String notificationMeta, String not
     }
 
     /**
-     * Validation of notificationType parameter Throws SubscriptionValidationException if validation of
-     * the parameter fails due to wrong format of parameter.
+     * Validation of notificationType parameter Throws
+     * SubscriptionValidationException if validation of the parameter fails due to
+     * wrong format of parameter.
      *
      * @param notificationType
      */
@@ -179,20 +185,21 @@ private static void RestPostMediaType(String restPostMediaType) throws Subscript
     }
 
     /**
-     * Validation of email address Throws SubscriptionValidationException if validation of the parameter
-     * fails due to wrong format of parameter.
+     * Validation of email address Throws SubscriptionValidationException if
+     * validation of the parameter fails due to wrong format of parameter.
      *
      * @param email
      */
     public static void validateEmail(String email) throws SubscriptionValidationException {
-        // When this regExp need to be changed then remember to change the one in the
-        // back-end (validEmailRegExpression in subscription.js), which do the same
-        // email validation check. The two
-        // regEx always need to be the same for ensuring the same check.
-        String validEmailRegExpression = "^(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$";
-        final Pattern VALID_EMAIL_ADDRESS_REGEX = Pattern.compile(validEmailRegExpression,
-                Pattern.CASE_INSENSITIVE);
-        Matcher matcher = VALID_EMAIL_ADDRESS_REGEX.matcher(email);
+        String validEmailRegEx = null;
+        validEmailRegEx = RegExProvider.NOTIFICATION_META;
+
+        if (validEmailRegEx == null || validEmailRegEx.isEmpty()) {
+            throw new SubscriptionValidationException(
+                    "A valid regular expression for subscription email validation is not provided");
+        }
+        final Pattern validEmailAddressRegex = Pattern.compile(validEmailRegEx, Pattern.CASE_INSENSITIVE);
+        Matcher matcher = validEmailAddressRegex.matcher(email);
         if (!(matcher.matches())) {
             throw new SubscriptionValidationException(
                     "Notification type is set to [MAIL] but the given notificatioMeta contains an invalid e-mail ["