Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7686] Speed up by replacing non-pattern #replaceAll() with #replace() or precompiled patterns 

This closes #984
This commit is contained in:
Andrey Bruykhov 2023-02-07 17:28:03 +03:00 committed by Michael Osipov
parent ef3cf56b51
commit 6e25a2674b
16 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
View File

@ -68,7 +68,7 @@ private boolean matchJdkVersionRange(String jdk) throws InvalidVersionSpecificat
}
private String convertJdkToMavenVersion(String jdk) {
return jdk.replaceAll("_", "-");
return jdk.replace("_", "-");
}
protected String getJdkVersion() {

6
maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -22,7 +22,6 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
@ -81,7 +80,8 @@ protected File getLocalRepositoryPath() throws FileNotFoundException, URISyntaxE
return markerFile.getAbsoluteFile().getParentFile();
}
protected static File getFileForClasspathResource(String resource) throws FileNotFoundException {
protected static File getFileForClasspathResource(String resource)
throws FileNotFoundException, URISyntaxException {
ClassLoader cloader = Thread.currentThread().getContextClassLoader();
URL resourceUrl = cloader.getResource(resource);
@ -90,7 +90,7 @@ protected static File getFileForClasspathResource(String resource) throws FileNo
throw new FileNotFoundException("Unable to find: " + resource);
}
return new File(URI.create(resourceUrl.toString().replaceAll(" ", "%20")));
return new File(resourceUrl.toURI());
}
protected ArtifactRepository getLocalRepository() throws Exception {

5
maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java
View File

@ -22,6 +22,7 @@
import javax.inject.Singleton;
import java.io.FileNotFoundException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -59,8 +60,8 @@ public List<ArtifactResult> resolveArtifacts(
artifact = artifact.setFile(ProjectClasspathTest.getFileForClasspathResource(
ProjectClasspathTest.dir + "transitive-" + scope + "-dep.xml"));
result.setArtifact(artifact);
} catch (FileNotFoundException e) {
throw new IllegalStateException("Missing test POM for " + artifact);
} catch (FileNotFoundException | URISyntaxException e) {
throw new IllegalStateException("Missing test POM for " + artifact, e);
}
} else {
result.addException(new ArtifactNotFoundException(artifact, null));

5
maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java
View File

@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
/**
* Helper class to format multiline messages to the console
@ -29,6 +30,8 @@ public class MultilineMessageHelper {
private static final int DEFAULT_MAX_SIZE = 65;
private static final char BOX_CHAR = '*';
private static final Pattern S_FILTER = Pattern.compile("\\s+");
public static String separatorLine() {
StringBuilder sb = new StringBuilder(DEFAULT_MAX_SIZE);
repeat(sb, '*', DEFAULT_MAX_SIZE);
@ -47,7 +50,7 @@ public static List<String> format(String... lines) {
// lines
for (String line : lines) {
sb.setLength(0);
String[] words = line.split("\\s+");
String[] words = S_FILTER.split(line);
for (String word : words) {
if (sb.length() >= remainder - word.length() - (sb.length() > 0 ? 1 : 0)) {
repeat(sb, ' ', remainder - sb.length());

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -160,11 +160,7 @@ public Object evaluate(String expr, Class<?> type) throws ExpressionEvaluationEx
}
// Was not an expression
if (expression.contains("$$")) {
return expression.replaceAll("\\$\\$", "\\$");
} else {
return expression;
}
return expression.replace("$$", "$");
}
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();

6
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
View File

@ -163,11 +163,7 @@ public Object evaluate(String expr, Class<?> type) throws ExpressionEvaluationEx
}
// Was not an expression
if (expression.contains("$$")) {
return expression.replaceAll("\\$\\$", "\\$");
} else {
return expression;
}
return expression.replace("$$", "$");
}
if ("localRepository".equals(expression)) {

9
maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View File

@ -119,11 +119,12 @@ private File getFile(String pathPattern, String basedirSysProp, String altLocati
basedir = System.getProperty("user.dir");
}
basedir = basedir.replaceAll("\\\\", "/");
basedir = basedir.replaceAll("\\$", "\\\\\\$");
basedir = basedir.replace("\\", "/");
basedir = basedir.replace("$", "\\$");
path = pathPattern.replaceAll("\\$\\{" + basedirSysProp + "\\}", basedir);
path = path.replaceAll("\\\\", "/");
// basedirSysProp is non regexp and basedir too
path = pathPattern.replace("${" + basedirSysProp + "}", basedir);
path = path.replace("\\", "/");
// ---------------------------------------------------------------------------------
// I'm not sure if this last regexp was really intended to disallow the usage of
// network paths as user.home directory. Unfortunately it did. I removed it and

6
maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -22,7 +22,6 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
@ -79,7 +78,8 @@ protected File getLocalRepositoryPath() throws FileNotFoundException, URISyntaxE
return markerFile.getAbsoluteFile().getParentFile();
}
protected static File getFileForClasspathResource(String resource) throws FileNotFoundException {
protected static File getFileForClasspathResource(String resource)
throws FileNotFoundException, URISyntaxException {
ClassLoader cloader = Thread.currentThread().getContextClassLoader();
URL resourceUrl = cloader.getResource(resource);
@ -88,7 +88,7 @@ protected static File getFileForClasspathResource(String resource) throws FileNo
throw new FileNotFoundException("Unable to find: " + resource);
}
return new File(URI.create(resourceUrl.toString().replaceAll(" ", "%20")));
return new File(resourceUrl.toURI());
}
protected ArtifactRepository getLocalRepository() throws Exception {

4
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -175,6 +175,8 @@ public class MavenCli {
private CLIManager cliManager;
private static final Pattern NEXT_LINE = Pattern.compile("\r?\n");
public MavenCli() {
this(null);
}
@ -985,7 +987,7 @@ private void logSummary(
}
}
String[] lines = msg.split("(\r\n)|(\r)|(\n)");
String[] lines = NEXT_LINE.split(msg);
String currentColor = "";
for (int i = 0; i < lines.length; i++) {

11
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java
View File

@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
@ -43,6 +44,10 @@
@Singleton
public class JdkVersionProfileActivator implements ProfileActivator {
private static final Pattern FILTER_1 = Pattern.compile("[^0-9._-]");
private static final Pattern FILTER_2 = Pattern.compile("[._-]");
private static final Pattern FILTER_3 = Pattern.compile("\\."); // used for split now
@Override
public boolean isActive(Profile profile, ProfileActivationContext context, ModelProblemCollector problems) {
Activation activation = profile.getActivation();
@ -110,10 +115,10 @@ private static int getRelationOrder(String value, RangeValue rangeValue, boolean
return isLeft ? 1 : -1;
}
value = value.replaceAll("[^0-9\\.\\-\\_]", "");
value = FILTER_1.matcher(value).replaceAll("");
List<String> valueTokens = new ArrayList<>(Arrays.asList(value.split("[\\.\\-\\_]")));
List<String> rangeValueTokens = new ArrayList<>(Arrays.asList(rangeValue.value.split("\\.")));
List<String> valueTokens = new ArrayList<>(Arrays.asList(FILTER_2.split(value)));
List<String> rangeValueTokens = new ArrayList<>(Arrays.asList(FILTER_3.split(rangeValue.value)));
addZeroTokens(valueTokens, 3);
addZeroTokens(rangeValueTokens, 3);

5
maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java
View File

@ -25,6 +25,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import java.util.regex.Pattern;
import org.apache.maven.model.transform.pull.NodeBufferingParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@ -47,6 +48,8 @@ class ParentXMLFilter extends NodeBufferingParser {
private final Path projectPath;
private static final Pattern S_FILTER = Pattern.compile("\\s+");
/**
* @param relativePathMapper
*/
@ -73,7 +76,7 @@ protected void process(List<Event> buffer) {
hasVersion |= "version".equals(tagName);
hasRelativePath |= "relativePath".equals(tagName);
} else if (event.event == TEXT) {
if (event.text.matches("\\s+")) {
if (S_FILTER.matcher(event.text).matches()) {
if (whitespaceAfterParentStart.isEmpty()) {
whitespaceAfterParentStart = event.text;
}

5
maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java
View File

@ -20,6 +20,7 @@
import java.util.List;
import java.util.function.BiFunction;
import java.util.regex.Pattern;
import org.apache.maven.model.transform.pull.NodeBufferingParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@ -34,6 +35,8 @@
public class ReactorDependencyXMLFilter extends NodeBufferingParser {
private final BiFunction<String, String, String> reactorVersionMapper;
private static final Pattern S_FILTER = Pattern.compile("\\s+");
public ReactorDependencyXMLFilter(
XmlPullParser xmlPullParser, BiFunction<String, String, String> reactorVersionMapper) {
super(xmlPullParser, "dependency");
@ -53,7 +56,7 @@ protected void process(List<Event> buffer) {
tagName = event.name;
hasVersion |= "version".equals(tagName);
} else if (event.event == TEXT) {
if (event.text.matches("\\s+")) {
if (S_FILTER.matcher(event.text).matches()) {
if (dependencyWhitespace.isEmpty()) {
dependencyWhitespace = event.text;
}

7
maven-model-transform/src/main/java/org/apache/maven/model/transform/RelativePathXMLFilter.java
View File

@ -19,6 +19,7 @@
package org.apache.maven.model.transform;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.maven.model.transform.pull.NodeBufferingParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@ -32,6 +33,8 @@
*/
public class RelativePathXMLFilter extends NodeBufferingParser {
private static final Pattern S_FILTER = Pattern.compile("\\s+");
public RelativePathXMLFilter(XmlPullParser xmlPullParser) {
super(xmlPullParser, "parent");
}
@ -42,7 +45,9 @@ protected void process(List<Event> buffer) {
for (Event event : buffer) {
if (event.event == START_TAG && "relativePath".equals(event.name)) {
skip = true;
if (prev != null && prev.event == TEXT && prev.text.matches("\\s+")) {
if (prev != null
&& prev.event == TEXT
&& S_FILTER.matcher(prev.text).matches()) {
prev = null;
}
event = null;

5
maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
View File

@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@ -49,6 +50,8 @@ public class PluginDescriptor extends ComponentSetDescriptor implements Cloneabl
private static final String LIFECYCLE_DESCRIPTOR = "META-INF/maven/lifecycle.xml";
private static final Pattern PATTERN_FILTER_1 = Pattern.compile("-?(maven|plugin)-?");
private String groupId;
private String artifactId;
@ -166,7 +169,7 @@ public static String getGoalPrefixFromArtifactId(String artifactId) {
if ("maven-plugin-plugin".equals(artifactId)) {
return "plugin";
} else {
return artifactId.replaceAll("-?maven-?", "").replaceAll("-?plugin-?", "");
return PATTERN_FILTER_1.matcher(artifactId).replaceAll("");
}
}

5
maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
View File

@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.eclipse.aether.artifact.DefaultArtifact;
@ -37,6 +38,8 @@
public class RemoteSnapshotMetadataTest {
private Locale defaultLocale;
private static final Pattern DATE_FILTER = Pattern.compile("\\..*");
@BeforeEach
public void setLocaleToUseBuddhistCalendar() {
defaultLocale = Locale.getDefault();
@ -66,7 +69,7 @@ public void gregorianCalendarIsUsed() {
String dateAfter = gregorianDate();
String ts = metadata.metadata.getVersioning().getSnapshot().getTimestamp();
String datePart = ts.replaceAll("\\..*", "");
String datePart = DATE_FILTER.matcher(ts).replaceAll("");
/* Allow for this test running across midnight */
Set<String> expected = new HashSet<>(Arrays.asList(dateBefore, dateAfter));

12
maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
View File

@ -24,6 +24,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Profile;
@ -42,11 +43,10 @@
@Singleton
public class DefaultSettingsValidator implements SettingsValidator {
private static final String ID_REGEX = "[A-Za-z0-9_\\-.]+";
private static final String ID = "[\\w.-]+";
private static final Pattern ID_REGEX = Pattern.compile(ID);
private static final String ILLEGAL_FS_CHARS = "\\/:\"<>|?*";
private static final String ILLEGAL_REPO_ID_CHARS = ILLEGAL_FS_CHARS;
private static final String ILLEGAL_REPO_ID_CHARS = "\\/:\"<>|?*"; // ILLEGAL_FS_CHARS
@Override
public void validate(Settings settings, SettingsProblemCollector problems) {
@ -63,13 +63,13 @@ public void validate(Settings settings, SettingsProblemCollector problems) {
if (StringUtils.isBlank(pluginGroup)) {
addViolation(
problems, Severity.ERROR, "pluginGroups.pluginGroup[" + i + "]", null, "must not be empty");
} else if (!pluginGroup.matches(ID_REGEX)) {
} else if (!ID_REGEX.matcher(pluginGroup).matches()) {
addViolation(
problems,
Severity.ERROR,
"pluginGroups.pluginGroup[" + i + "]",
null,
"must denote a valid group id and match the pattern " + ID_REGEX);
"must denote a valid group id and match the pattern " + ID);
}
}
}