Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Collection;
import java.util.Collections;
import java.util.regex.Pattern;

import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
Expand All @@ -30,6 +31,8 @@
*/
public final class WebOperationRequestPredicate {

private static final Pattern PATH_VAR_PATTERN = Pattern.compile("\\{.*?}");

private final String path;

private final String canonicalPath;
Expand All @@ -50,7 +53,7 @@ public final class WebOperationRequestPredicate {
public WebOperationRequestPredicate(String path, WebEndpointHttpMethod httpMethod,
Collection<String> consumes, Collection<String> produces) {
this.path = path;
this.canonicalPath = path.replaceAll("\\{.*?}", "{*}");
this.canonicalPath = PATH_VAR_PATTERN.matcher(path).replaceAll("{*}");
this.httpMethod = httpMethod;
this.consumes = consumes;
this.produces = produces;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.net.URI;
import java.util.regex.Pattern;

import io.micrometer.core.instrument.Tag;

Expand All @@ -36,6 +37,8 @@
*/
public final class RestTemplateExchangeTags {

private static final Pattern STRIP_URI_PATTERN = Pattern.compile("^https?://[^/]+/");

private RestTemplateExchangeTags() {
}

Expand Down Expand Up @@ -69,7 +72,7 @@ public static Tag uri(String uriTemplate) {
}

private static String stripUri(String uri) {
return uri.replaceAll("^https?://[^/]+/", "");
return STRIP_URI_PATTERN.matcher(uri).replaceAll("");
}

private static String ensureLeadingSlash(String url) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.boot.actuate.metrics.web.servlet;

import java.util.regex.Pattern;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

Expand Down Expand Up @@ -50,6 +52,10 @@ public final class WebMvcTags {

private static final Tag METHOD_UNKNOWN = Tag.of("method", "UNKNOWN");

private static final Pattern TRAILING_SLASH_PATTERN = Pattern.compile("/$");

private static final Pattern MULTIPLE_SLASH_PATTERN = Pattern.compile("//+");

private WebMvcTags() {
}

Expand Down Expand Up @@ -124,7 +130,8 @@ private static String getMatchingPattern(HttpServletRequest request) {
private static String getPathInfo(HttpServletRequest request) {
String pathInfo = request.getPathInfo();
String uri = StringUtils.hasText(pathInfo) ? pathInfo : "/";
return uri.replaceAll("//+", "/").replaceAll("/$", "");
uri = MULTIPLE_SLASH_PATTERN.matcher(uri).replaceAll("/");
return TRAILING_SLASH_PATTERN.matcher(uri).replaceAll("");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import javax.annotation.processing.ProcessingEnvironment;
Expand Down Expand Up @@ -61,6 +62,8 @@ class TypeUtils {

private static final Map<String, TypeKind> WRAPPER_TO_PRIMITIVE;

private static final Pattern NEW_LINE_PATTERN = Pattern.compile("[\r\n]+");

static {
Map<String, TypeKind> primitives = new HashMap<>();
PRIMITIVE_WRAPPERS.forEach(
Expand Down Expand Up @@ -131,7 +134,7 @@ public String getJavaDoc(Element element) {
String javadoc = (element != null)
? this.env.getElementUtils().getDocComment(element) : null;
if (javadoc != null) {
javadoc = javadoc.replaceAll("[\r\n]+", "").trim();
javadoc = NEW_LINE_PATTERN.matcher(javadoc).replaceAll("").trim();
}
return "".equals(javadoc) ? null : javadoc;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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;
Expand All @@ -36,6 +37,10 @@
@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;
Expand Down Expand Up @@ -134,11 +139,13 @@ public int hashCode() {
}

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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand All @@ -50,6 +51,9 @@
*/
public class GradleBuild implements TestRule {

private static final Pattern GRADLE_VERSION_PATTERN = Pattern
.compile("\\[Gradle .+\\]");

private final TemporaryFolder temp = new TemporaryFolder();

private File projectDir;
Expand Down Expand Up @@ -95,7 +99,7 @@ private URL getScriptForTestMethod(Description description) {
}

private String removeGradleVersion(String methodName) {
return methodName.replaceAll("\\[Gradle .+\\]", "").trim();
return GRADLE_VERSION_PATTERN.matcher(methodName).replaceAll("").trim();
}

private URL getScriptForTestClass(Class<?> testClass) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Pattern;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
Expand Down Expand Up @@ -62,6 +63,8 @@
@Mojo(name = "repackage", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
public class RepackageMojo extends AbstractDependencyFilterMojo {

private static final Pattern WHITE_SPACE_PATTERN = Pattern.compile("\\s+");

/**
* The Maven project.
* @since 1.0
Expand Down Expand Up @@ -312,7 +315,8 @@ private Properties buildLaunchScriptProperties() {
}

private String removeLineBreaks(String description) {
return (description != null) ? description.replaceAll("\\s+", " ") : null;
return (description != null)
? WHITE_SPACE_PATTERN.matcher(description).replaceAll(" ") : null;
}

private void putIfMissing(Properties properties, String key,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;

import org.junit.rules.TestRule;
import org.junit.runner.Description;
Expand All @@ -36,12 +37,14 @@
*/
class JvmLauncher implements TestRule {

private static final Pattern NON_ALPHABET_PATTERN = Pattern.compile("[^A-Za-z]+");

private File outputDirectory;

@Override
public Statement apply(Statement base, Description description) {
this.outputDirectory = new File("target/output/"
+ description.getMethodName().replaceAll("[^A-Za-z]+", ""));
this.outputDirectory = new File("target/output/" + NON_ALPHABET_PATTERN
.matcher(description.getMethodName()).replaceAll(""));
this.outputDirectory.mkdirs();
return base;
}
Expand Down