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

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

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,