Update to 1.0.2

Author: Alexandre van Beurden

README.md

@@ -18,14 +18,14 @@ they were sets.
 <dependency>
     <groupId>com.regexsolver.api</groupId>
     <artifactId>RegexSolver</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```groovy
-implementation "com.regexsolver.api:RegexSolver:1.0.1"
+implementation "com.regexsolver.api:RegexSolver:1.0.2"
 ```
 
 ## Usage
@@ -43,11 +43,11 @@ public class Main {
     public static void main(String[] args) throws IOException, ApiError {
         RegexSolver.initialize(/* Your API token here -> */"");
 
-        Term term1 = Term.Regex.of("(abc|de|fg){2,}");
-        Term term2 = Term.Regex.of("de.*");
-        Term term3 = Term.Regex.of(".*abc");
+        Term term1 = Term.regex("(abc|de|fg){2,}");
+        Term term2 = Term.regex("de.*");
+        Term term3 = Term.regex(".*abc");
 
-        Term term4 = Term.Regex.of(".+(abc|de).+");
+        Term term4 = Term.regex(".+(abc|de).+");
 
         Term result = term1.intersection(term2, term3)
                 .subtraction(term4);

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.regexsolver.api</groupId>
     <artifactId>RegexSolver</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <url>https://regexsolver.com</url>
     <organization>

src/main/java/com/regexsolver/api/Term.java

@@ -40,6 +40,26 @@ protected Term(String value) {
         this.value = value;
     }
 
+    /**
+     * Create a new instance of {@link Term.Regex}.
+     *
+     * @param regex The regular expression pattern.
+     * @return The created instance.
+     */
+    public static Term.Regex regex(String regex) {
+        return new Term.Regex(regex);
+    }
+
+    /**
+     * Create a new instance of {@link Term.Fair}.
+     *
+     * @param fair The FAIR.
+     * @return The created instance.
+     */
+    public static Term.Fair fair(String fair) {
+        return new Term.Fair(fair);
+    }
+
     String getValue() {
         return value;
     }
@@ -186,9 +206,9 @@ public static Optional<Term> deserialize(String string) {
         }
 
         if (string.startsWith(REGEX_PREFIX)) {
-            return Optional.of(Regex.of(string.substring(REGEX_PREFIX.length() + 1)));
+            return Optional.of(regex(string.substring(REGEX_PREFIX.length() + 1)));
         } else if (string.startsWith(FAIR_PREFIX)) {
-            return Optional.of(Fair.of(string.substring(FAIR_PREFIX.length() + 1)));
+            return Optional.of(fair(string.substring(FAIR_PREFIX.length() + 1)));
         } else {
             return Optional.empty();
         }
@@ -228,17 +248,6 @@ public Fair(@JsonProperty("value") String fair) {
             super(fair);
         }
 
-        /**
-         * Create a new instance.
-         *
-         * @param fair The FAIR.
-         * @return The created instance.
-         */
-        @JsonIgnore
-        public static Fair of(String fair) {
-            return new Fair(fair);
-        }
-
         /**
          * Return the Fast Automaton Internal Representation (FAIR).
          *
@@ -267,17 +276,6 @@ public Regex(@JsonProperty("value") String regex) {
             super(regex);
         }
 
-        /**
-         * Create a new instance.
-         *
-         * @param regex The regular expression pattern.
-         * @return The created instance.
-         */
-        @JsonIgnore
-        public static Regex of(String regex) {
-            return new Regex(regex);
-        }
-
         /**
          * Return the regular expression pattern.
          *

src/test/java/com/regexsolver/api/TermOperationTest.java

@@ -39,7 +39,7 @@ public void test_getDetails() throws IOException, ApiError, InterruptedException
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_getDetails.json"));
         server.enqueue(response);
 
-        Term.Regex regex = Term.Regex.of("(abc|de)");
+        Term.Regex regex = Term.regex("(abc|de)");
 
         Details details = regex.getDetails();
 
@@ -69,7 +69,7 @@ public void test_generateStrings() throws IOException, ApiError, InterruptedExce
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_generateStrings.json"));
         server.enqueue(response);
 
-        Term.Regex regex = Term.Regex.of("(abc|de){2}");
+        Term.Regex regex = Term.regex("(abc|de){2}");
 
         List<String> strings = regex.generateStrings(10);
         assertEquals(4, strings.size());
@@ -87,9 +87,9 @@ public void test_intersection() throws IOException, ApiError, InterruptedExcepti
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_intersection.json"));
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("(abc|de){2}");
-        Term.Regex term2 = Term.Regex.of("de.*");
-        Term.Regex term3 = Term.Regex.of(".*abc");
+        Term.Regex term1 = Term.regex("(abc|de){2}");
+        Term.Regex term2 = Term.regex("de.*");
+        Term.Regex term3 = Term.regex(".*abc");
 
         Term result = term1.intersection(term2, term3);
         assertTrue(result instanceof Term.Regex);
@@ -110,9 +110,9 @@ public void test_union() throws IOException, ApiError, InterruptedException {
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_union.json"));
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("abc");
-        Term.Regex term2 = Term.Regex.of("de");
-        Term.Regex term3 = Term.Regex.of("fghi");
+        Term.Regex term1 = Term.regex("abc");
+        Term.Regex term2 = Term.regex("de");
+        Term.Regex term3 = Term.regex("fghi");
 
         Term result = term1.union(term2, term3);
         assertTrue(result instanceof Term.Regex);
@@ -133,8 +133,8 @@ public void test_subtraction() throws IOException, ApiError, InterruptedExceptio
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_subtraction.json"));
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("(abc|de)");
-        Term.Regex term2 = Term.Regex.of("de");
+        Term.Regex term1 = Term.regex("(abc|de)");
+        Term.Regex term2 = Term.regex("de");
 
         Term result = term1.subtraction(term2);
         assertTrue(result instanceof Term.Regex);
@@ -154,8 +154,8 @@ public void test_isEquivalentTo() throws IOException, ApiError, InterruptedExcep
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_isEquivalentTo.json"));
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("(abc|de)");
-        Term.Fair term2 = Term.Fair.of("rgmsW[1g2LvP=Gr&V>sLc#w-!No&(oq@Sf>X).?lI3{uh{80qWEH[#0.pHq@B-9o[LpP-a#fYI+");
+        Term.Regex term1 = Term.regex("(abc|de)");
+        Term.Fair term2 = Term.fair("rgmsW[1g2LvP=Gr&V>sLc#w-!No&(oq@Sf>X).?lI3{uh{80qWEH[#0.pHq@B-9o[LpP-a#fYI+");
 
         boolean result = term1.isEquivalentTo(term2);
         assertFalse(result);
@@ -174,8 +174,8 @@ public void test_isSubsetOf() throws IOException, ApiError, InterruptedException
         MockResponse response = TestUtils.generateMockResponse(TestUtils.getResourceFileContent("response_isSubsetOf.json"));
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("de");
-        Term.Regex term2 = Term.Regex.of("(abc|de)");
+        Term.Regex term1 = Term.regex("de");
+        Term.Regex term2 = Term.regex("(abc|de)");
 
         boolean result = term1.isSubsetOf(term2);
         assertTrue(result);
@@ -194,8 +194,8 @@ public void test_errorResponse() throws IOException {
         MockResponse response = TestUtils.generateErrorMockResponse(TestUtils.getResourceFileContent("response_error.json"), 400);
         server.enqueue(response);
 
-        Term.Regex term1 = Term.Regex.of("abc");
-        Term.Regex term2 = Term.Regex.of("de");
+        Term.Regex term1 = Term.regex("abc");
+        Term.Regex term2 = Term.regex("de");
 
         try {
             term1.intersection(term2);

src/test/java/com/regexsolver/api/TermSerializeTest.java

@@ -11,13 +11,13 @@
 public class TermSerializeTest {
     @Test
     public void test_serialization_deserialization() {
-        assertSerialization(Term.Regex.of(".*"));
-        assertSerialization(Term.Regex.of("="));
-        assertSerialization(Term.Regex.of(""));
+        assertSerialization(Term.regex(".*"));
+        assertSerialization(Term.regex("="));
+        assertSerialization(Term.regex(""));
 
-        assertSerialization(Term.Fair.of("rgmsW[1g2LvP=Gr&V>sLc#w-!No&(oq@Sf>X).?lI3{uh{80qWEH[#0.pHq@B-9o[LpP-a#fYI+"));
-        assertSerialization(Term.Fair.of("=rgmsW[1g2LvP=Gr&+"));
-        assertSerialization(Term.Fair.of(""));
+        assertSerialization(Term.fair("rgmsW[1g2LvP=Gr&V>sLc#w-!No&(oq@Sf>X).?lI3{uh{80qWEH[#0.pHq@B-9o[LpP-a#fYI+"));
+        assertSerialization(Term.fair("=rgmsW[1g2LvP=Gr&+"));
+        assertSerialization(Term.fair(""));
 
         assertTrue(Term.deserialize(null).isEmpty());
         assertTrue(Term.deserialize("not a term").isEmpty());