Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Matcher from pre-compiled Pattern rather than String for replaceAll

Browse Source 
Closes gh-14483
This commit is contained in:
durigon
2018-09-16 11:42:49 +09:00
committed by Andy Wilkinson
parent 11016bc7f4
commit 7aaeefbc0e
8 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LaunchScriptConfiguration.java
View File

@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import org.gradle.api.Project;
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
@@ -36,6 +37,10 @@ import org.springframework.boot.loader.tools.FileUtils;
@SuppressWarnings("serial")
public class LaunchScriptConfiguration implements Serializable {
private static final Pattern WHITE_SPACE_PATTERN = Pattern.compile("\\s+");
private static final Pattern LINE_FEED_PATTERN = Pattern.compile("\n");
private final Map<String, String> properties = new HashMap<>();
private File script;
@@ -134,11 +139,13 @@ public class LaunchScriptConfiguration implements Serializable {
}
private String removeLineBreaks(String string) {
return (string != null) ? string.replaceAll("\\s+", " ") : null;
return (string != null) ? WHITE_SPACE_PATTERN.matcher(string).replaceAll(" ")
: null;
}
private String augmentLineBreaks(String string) {
return (string != null) ? string.replaceAll("\n", "\n# ") : null;
return (string != null) ? LINE_FEED_PATTERN.matcher(string).replaceAll("\n# ")
: null;
}
private void putIfMissing(Map<String, String> properties, String key,

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View File

@@ -24,6 +24,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
@@ -50,6 +51,9 @@ import org.springframework.util.FileCopyUtils;
*/
public class GradleBuild implements TestRule {
private static final Pattern GRADLE_VERSION_PATTERN = Pattern
.compile("\\[Gradle .+\\]");
private final TemporaryFolder temp = new TemporaryFolder();
private File projectDir;
@@ -95,7 +99,7 @@ public class GradleBuild implements TestRule {
}
private String removeGradleVersion(String methodName) {
return methodName.replaceAll("\\[Gradle .+\\]", "").trim();
return GRADLE_VERSION_PATTERN.matcher(methodName).replaceAll("").trim();
}
private URL getScriptForTestClass(Class<?> testClass) {