regex as a json to regex as a constant class (#18)

* version 0.0.9

* changing regex as a JSON to constant static class

Author: saif-ericsson

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-commons-java</artifactId>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
     <name>eiffel commons java</name>
     <description>A shared library for eiffel components</description>
 

src/main/java/com/ericsson/eiffelcommons/utils/RegExProvider.java

@@ -1,20 +1,11 @@
 package com.ericsson.eiffelcommons.utils;
 
-import java.io.IOException;
-
-import org.json.JSONObject;
-
 public class RegExProvider {
 
-    private static final String REGULAR_EXPRESSIONS_PATH = "/regExs.json";
-
-    /**
-     * This method returns Json Object for regular expressions
-     *
-     * @return JSONObject
-     */
-    public static JSONObject getRegExs() throws IOException {
+  public static final String SUBSCRIPTION_NAME = "(\\W)";
+    public static final String NOTIFICATION_META = "^(([^<>()\\[\\]\\\\.,;:\\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,}))$";;
 
-        return Utils.getResourceFileAsJsonObject(REGULAR_EXPRESSIONS_PATH);
+    private RegExProvider() {
+        throw new AssertionError();
     }
 }

src/main/resources/regExs.json

@@ -2,9 +2,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.IOException;
-
-import org.json.JSONException;
 import org.junit.Test;
 
 import com.ericsson.eiffelcommons.utils.RegExProvider;
@@ -13,29 +10,11 @@ public class RegExProviderTest {
 
     @Test
     public void test() {
-        String regExForInvalidName = getValue("invalidName");
-        String regExForValidEmail = getValue("validEmail");
 
-        assertEquals(regExForInvalidName, "(\\W)");
-        assertEquals(regExForValidEmail,
-                "^(([^<>()\\[\\]\\\\.,;:\\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,}))$");
-    }
+        String expectedRegexForSubscriptionName = "(\\W)";
+        String expectedRegexForEmail = "^(([^<>()\\[\\]\\\\.,;:\\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,}))$";
 
-    /**
-     * This function takes a key and returns the corresponding value from the
-     * JSONObject
-     *
-     * @param String
-     *            key
-     * @return String value
-     */
-    public String getValue(String key) {
-        String value = null;
-        try {
-            value = (String) RegExProvider.getRegExs().get(key);
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
-        }
-        return value;
+        assertEquals(RegExProvider.SUBSCRIPTION_NAME, expectedRegexForSubscriptionName);
+        assertEquals(RegExProvider.NOTIFICATION_META, expectedRegexForEmail);
     }
 }