PMD improvements

Author: AB-xdev

src/main/java/software/xdev/saveactions/core/component/Engine.java

@@ -3,11 +3,13 @@
 import static java.util.stream.Collectors.toSet;
 
 import java.util.AbstractMap.SimpleEntry;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
@@ -45,6 +47,7 @@ public class Engine
 {
 	private static final Logger LOGGER = Logger.getInstance(SaveActionsService.class);
 	private static final String REGEX_STARTS_WITH_ANY_STRING = ".*?";
+	private static final Map<String, Pattern> PATTERN_CACHE = Collections.synchronizedMap(new WeakHashMap<>());
 
 	private final Storage storage;
 	private final List<Processor> processors;
@@ -327,14 +330,17 @@ private boolean isIncluded(final String path)
 		return psiFileIncluded;
 	}
 
+	@SuppressWarnings("PMD.AvoidRecompilingPatterns")
 	private boolean atLeastOneMatch(final String psiFileUrl, final Set<String> patterns)
 	{
 		for(final String pattern : patterns)
 		{
 			try
 			{
-				final Matcher matcher = Pattern.compile(REGEX_STARTS_WITH_ANY_STRING + pattern).matcher(psiFileUrl);
-				if(matcher.matches())
+				final Pattern compiledPattern = PATTERN_CACHE.computeIfAbsent(
+					pattern,
+					p -> Pattern.compile(REGEX_STARTS_WITH_ANY_STRING + p));
+				if(compiledPattern.matcher(psiFileUrl).matches())
 				{
 					return true;
 				}

src/main/java/software/xdev/saveactions/model/java/EpfAction.java

@@ -4,7 +4,10 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import software.xdev.saveactions.model.Action;
@@ -64,6 +67,9 @@ public enum EpfAction
 		Action.explicitTypeCanBeDiamond,
 		EpfKey.remove_redundant_type_arguments);
 
+	private static final Map<Action, EpfAction> ACTION_VALUES = stream()
+		.collect(Collectors.toMap(EpfAction::getAction, Function.identity()));
+	
 	private final Action action;
 	private final List<EpfKey> epfKeys;
 
@@ -85,7 +91,7 @@ public List<EpfKey> getEpfKeys()
 
 	public static Optional<EpfAction> getEpfActionForAction(final Action action)
 	{
-		return stream().filter(epfAction -> epfAction.action.equals(action)).findFirst();
+		return Optional.ofNullable(ACTION_VALUES.get(action));
 	}
 
 	public static Stream<EpfAction> stream()

src/main/java/software/xdev/saveactions/processors/GlobalProcessor.java

@@ -2,9 +2,12 @@
 
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
@@ -38,6 +41,9 @@ public enum GlobalProcessor implements Processor
 
 	rearrange(Action.rearrange, GlobalProcessor::rearrangeCode);
 
+	private static final Map<Action, Processor> ACTION_VALUES = stream()
+		.collect(Collectors.toMap(Processor::getAction, Function.identity()));
+	
 	@NotNull
 	private static Runnable rearrangeCode(final Project project, final PsiFile[] psiFiles)
 	{
@@ -103,7 +109,7 @@ public BiFunction<Project, PsiFile[], Runnable> getCommand()
 
 	public static Optional<Processor> getProcessorForAction(final Action action)
 	{
-		return stream().filter(processor -> processor.getAction().equals(action)).findFirst();
+		return Optional.ofNullable(ACTION_VALUES.get(action));
 	}
 
 	public static Stream<Processor> stream()

src/main/java/software/xdev/saveactions/processors/java/JavaProcessor.java

@@ -2,10 +2,13 @@
 
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.intellij.codeInspection.ExplicitTypeCanBeDiamondInspection;
@@ -129,6 +132,9 @@ public enum JavaProcessor implements Processor
 		Action.accessCanBeTightened,
 		() -> new CustomAccessCanBeTightenedInspection(new VisibilityInspection()));
 
+	private static final Map<Action, JavaProcessor> ACTION_VALUES = stream()
+		.collect(Collectors.toMap(JavaProcessor::getAction, Function.identity()));
+	
 	private final Action action;
 	private final LocalInspectionTool inspection;
 
@@ -169,12 +175,12 @@ public LocalInspectionTool getInspection()
 		return this.inspection;
 	}
 
-	public static Optional<Processor> getProcessorForAction(final Action action)
+	public static Optional<JavaProcessor> getProcessorForAction(final Action action)
 	{
-		return stream().filter(processor -> processor.getAction().equals(action)).findFirst();
+		return Optional.ofNullable(ACTION_VALUES.get(action));
 	}
 
-	public static Stream<Processor> stream()
+	public static Stream<JavaProcessor> stream()
 	{
 		return Arrays.stream(values());
 	}

src/test/java/software/xdev/saveactions/processors/java/JavaProcessorTest.java

@@ -27,7 +27,7 @@ void should_java_processor_have_valid_type_and_inspection()
 		JavaProcessor.stream()
 			.forEach(processor -> assertThat(processor.getAction().getType()).isEqualTo(java));
 		JavaProcessor.stream()
-			.forEach(processor -> assertThat(((JavaProcessor)processor).getInspection()).isNotNull());
+			.forEach(processor -> assertThat(processor.getInspection()).isNotNull());
 	}
 
 	@Test