Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use standard JDK regex library instead of named-regexp library #380

Merged
merged 1 commit into from
Feb 1, 2022
Merged

Use standard JDK regex library instead of named-regexp library #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions modules/cli-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@
<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>
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.simplejavamail.internal.clisupport;

import com.google.code.regexp.Matcher;
import com.google.code.regexp.Pattern;
import jakarta.activation.DataSource;
import jakarta.mail.internet.MimeMessage;
import org.bbottema.javareflection.BeanUtils;
Expand Down Expand Up @@ -47,12 +45,14 @@
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;
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/org/simplejavamail/internal/clisupport/therapijavadoc/TherapiJavadocHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
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 org.bbottema.javareflection.ClassUtils;
import org.bbottema.javareflection.MethodUtils;
import org.jetbrains.annotations.NotNull;
Expand All @@ -24,11 +23,12 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;

import static com.google.code.regexp.Pattern.compile;
import static java.lang.String.format;
import static java.util.Arrays.asList;
import static java.util.Optional.ofNullable;
import static java.util.regex.Pattern.compile;
import static org.simplejavamail.internal.clisupport.BuilderApiToPicocliCommandsMapper.colorizeDescriptions;
import static org.simplejavamail.internal.util.ListUtil.getFirst;
import static org.simplejavamail.internal.util.StringUtil.padRight;
Expand Down Expand Up @@ -185,4 +185,4 @@ public static class DocumentedMethodParam {
@NotNull public String getName() { return name; }
@NotNull public String getJavadoc() { return javadoc; }
}
}
}
6 changes: 0 additions & 6 deletions modules/core-module/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,5 @@
<version>0.13.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>
6 changes: 3 additions & 3 deletions modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.simplejavamail.api.email;

import com.google.code.regexp.Pattern;
import jakarta.activation.DataSource;
import jakarta.mail.Message;
import jakarta.mail.internet.InternetAddress;
Expand All @@ -21,8 +20,9 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;

import static com.google.code.regexp.Pattern.compile;
import static java.util.regex.Pattern.compile;


/**
Expand Down Expand Up @@ -1658,4 +1658,4 @@ public interface EmailPopulatingBuilder {
*/
@Nullable
Date getSentDate();
}
}
8 changes: 4 additions & 4 deletions modules/core-module/src/main/java/org/simplejavamail/config/ConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
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;
Expand All @@ -19,9 +17,11 @@
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;
Expand Down Expand Up @@ -455,4 +455,4 @@ static Object parsePropertyValue(final @Nullable String propertyValue) {
// return value as is (which should be string)
return propertyValue;
}
}
}
7 changes: 4 additions & 3 deletions modules/core-module/src/main/java/org/simplejavamail/internal/util/StringUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package org.simplejavamail.internal.util;

import com.google.code.regexp.Matcher;
import com.google.code.regexp.Pattern;
import org.jetbrains.annotations.NotNull;

import static com.google.code.regexp.Pattern.compile;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

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;

Expand Down
4 changes: 2 additions & 2 deletions ...java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.simplejavamail.email.internal;

import com.google.code.regexp.Matcher;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import jakarta.activation.DataSource;
import jakarta.mail.Message.RecipientType;
Expand Down Expand Up @@ -41,6 +40,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;

import static jakarta.mail.Message.RecipientType.BCC;
import static jakarta.mail.Message.RecipientType.CC;
Expand Down Expand Up @@ -2475,4 +2475,4 @@ public X509Certificate getX509CertificateForSmimeEncryption() {
public Date getSentDate() {
return sentDate != null ? new Date(sentDate.getTime()) : null;
}
}
}
6 changes: 3 additions & 3 deletions ...mail/src/test/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.simplejavamail.email.internal;

import com.google.code.regexp.Matcher;
import com.google.code.regexp.Pattern;
import jakarta.activation.DataSource;
import jakarta.mail.Message;
import jakarta.mail.internet.InternetAddress;
Expand Down Expand Up @@ -34,6 +32,8 @@
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 jakarta.mail.Message.RecipientType.BCC;
Expand Down Expand Up @@ -1405,4 +1405,4 @@ public String getName() {
return "dummy";
}
}
}
}