#352: Switching to named-regexp mini library (10kb) that adds named regex group support for Android

Author: bbottema

modules/cli-module/pom.xml

@@ -101,6 +101,12 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency><!-- support for named regex groups in Android -->
+            <groupId>com.github.tony19</groupId>
+            <artifactId>named-regexp</artifactId>
+            <version>0.2.6</version>
+        </dependency>
+
         <!-- Logging -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java

@@ -1,5 +1,7 @@
 package org.simplejavamail.internal.clisupport;
 
+import com.google.code.regexp.Pattern;
+import com.google.code.regexp.Matcher;
 import org.bbottema.javareflection.BeanUtils;
 import org.bbottema.javareflection.BeanUtils.Visibility;
 import org.bbottema.javareflection.ClassUtils;
@@ -45,14 +47,12 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+import static com.google.code.regexp.Pattern.compile;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.EnumSet.allOf;
 import static java.util.EnumSet.of;
-import static java.util.regex.Pattern.compile;
 import static org.bbottema.javareflection.TypeUtils.containsAnnotation;
 import static org.simplejavamail.internal.util.Preconditions.assumeTrue;
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;

modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java

@@ -8,6 +8,8 @@
 import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
 import com.github.therapi.runtimejavadoc.SeeAlsoJavadoc;
 import com.github.therapi.runtimejavadoc.Value;
+import com.google.code.regexp.Matcher;
+import com.google.code.regexp.Pattern;
 import org.bbottema.javareflection.ClassUtils;
 import org.bbottema.javareflection.MethodUtils;
 import org.jetbrains.annotations.NotNull;
@@ -25,12 +27,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+import static com.google.code.regexp.Pattern.compile;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
-import static java.util.regex.Pattern.compile;
 import static java.util.stream.Collectors.toList;
 import static org.simplejavamail.internal.clisupport.BuilderApiToPicocliCommandsMapper.colorizeDescriptions;
 import static org.simplejavamail.internal.util.ListUtil.getFirst;

modules/core-module/pom.xml

@@ -46,7 +46,7 @@
             <version>1.3.5</version>
         </dependency>
 
-        <dependency>
+        <dependency><!-- email validation framework -->
             <groupId>com.sanctionco.jmail</groupId>
             <artifactId>jmail</artifactId>
             <version>1.2.1</version>
@@ -58,5 +58,11 @@
             <version>0.9.0</version>
             <scope>provided</scope><!-- makes library mandatory if we should support CLI (even optionally) -->
         </dependency>
+
+        <dependency><!-- support for named regex groups in Android -->
+            <groupId>com.github.tony19</groupId>
+            <artifactId>named-regexp</artifactId>
+            <version>0.2.6</version>
+        </dependency>
     </dependencies>
 </project>

modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java

@@ -1,5 +1,6 @@
 package org.simplejavamail.api.email;
 
+import com.google.code.regexp.Pattern;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.internal.clisupport.model.Cli;
@@ -20,9 +21,9 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
-import static java.util.regex.Pattern.compile;
+import static com.google.code.regexp.Pattern.compile;
+
 
 /**
  * Fluent interface Builder for populating {@link Email} instances. An instance of this builder can only be obtained through one of the builder

modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java

@@ -1,29 +1,27 @@
 package org.simplejavamail.config;
 
+import com.google.code.regexp.Matcher;
+import com.google.code.regexp.Pattern;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.mailer.config.LoadBalancingStrategy;
 import org.simplejavamail.api.mailer.config.TransportStrategy;
 import org.simplejavamail.internal.util.SimpleConversions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+import static com.google.code.regexp.Pattern.compile;
 import static java.util.Collections.unmodifiableMap;
-import static java.util.regex.Pattern.compile;
 import static org.simplejavamail.internal.util.MiscUtil.checkArgumentNotEmpty;
 import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 import static org.simplejavamail.internal.util.Preconditions.assumeTrue;

modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java

@@ -1,11 +1,11 @@
 package org.simplejavamail.internal.util;
 
+import com.google.code.regexp.Matcher;
+import com.google.code.regexp.Pattern;
 import org.jetbrains.annotations.NotNull;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
+import static com.google.code.regexp.Pattern.compile;
 import static java.lang.String.format;
-import static java.util.regex.Pattern.compile;
 import static java.util.regex.Pattern.quote;
 import static org.simplejavamail.internal.util.Preconditions.assumeTrue;
 

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -1,5 +1,6 @@
 package org.simplejavamail.email.internal;
 
+import com.google.code.regexp.Matcher;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -39,7 +40,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
 
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;

modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java

@@ -1,5 +1,7 @@
 package org.simplejavamail.email.internal;
 
+import com.google.code.regexp.Matcher;
+import com.google.code.regexp.Pattern;
 import org.assertj.core.api.ThrowableAssert;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.operator.OperatorCreationException;
@@ -33,8 +35,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static demo.ResourceFolderHelper.determineResourceFolder;
 import static javax.mail.Message.RecipientType.BCC;