Fixed concurrency issue

Author: andrecsilva

plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/CommandChain.java

@@ -16,18 +16,7 @@ class CommandChain {
   private static final Logger LOGGER = LoggerFactory.getLogger(CommandChain.class);
 
   /** Internal ArrayList of the Commands */
-  private List<Command> commandList;
-
-  private static List<Command> COMMON_COMMANDS =
-      List.of(
-          // Validation commands
-          CheckDependencyPresent.getInstance(),
-          CheckParentPackaging.getInstance(),
-          // Format commands
-          new FormatCommand(),
-          new DiscardFormatCommand(),
-          // Multipom command
-          new CompositeDependencyManagement());
+  private final List<Command> commandList;
 
   private CommandChain(List<Command> commands) {
     this.commandList = commands;
@@ -93,7 +82,17 @@ public boolean execute(ProjectModel c)
    * @return A pre-configured Chain for modifying a POM.
    */
   public static CommandChain modifyDependency() {
-    final List<Command> modifyCommands = new ArrayList<>(COMMON_COMMANDS);
+    final List<Command> modifyCommands =
+        new ArrayList<>(
+            List.of(
+                // Validation commands
+                CheckDependencyPresent.getInstance(),
+                CheckParentPackaging.getInstance(),
+                // Format commands
+                new FormatCommand(),
+                new DiscardFormatCommand(),
+                // Multipom command
+                new CompositeDependencyManagement()));
     modifyCommands.addAll(
         List.of(
             SimpleUpgrade.getInstance(),
@@ -109,7 +108,17 @@ public static CommandChain modifyDependency() {
    * @return A pre-configured Chain.
    */
   public static CommandChain insertDependency() {
-    final List<Command> insertCommands = new ArrayList<>(COMMON_COMMANDS);
+    final List<Command> insertCommands =
+        new ArrayList<>(
+            List.of(
+                // Validation commands
+                CheckDependencyPresent.getInstance(),
+                CheckParentPackaging.getInstance(),
+                // Format commands
+                new FormatCommand(),
+                new DiscardFormatCommand(),
+                // Multipom command
+                new CompositeDependencyManagement()));
     insertCommands.add(new SimpleInsert(true));
     return new CommandChain(insertCommands);
   }
@@ -120,7 +129,17 @@ public static CommandChain insertDependency() {
    * @return A pre-configured Chain.
    */
   public static CommandChain updateDependency() {
-    final List<Command> insertCommands = new ArrayList<>(COMMON_COMMANDS);
+    final List<Command> insertCommands =
+        new ArrayList<>(
+            List.of(
+                // Validation commands
+                CheckDependencyPresent.getInstance(),
+                CheckParentPackaging.getInstance(),
+                // Format commands
+                new FormatCommand(),
+                new DiscardFormatCommand(),
+                // Multipom command
+                new CompositeDependencyManagement()));
     insertCommands.addAll(
         List.of(SimpleUpgrade.getInstance(), SimpleDependencyManagement.getInstance()));
 
@@ -169,7 +188,8 @@ public static CommandChain createForDependencyQuery(QueryType queryType) {
     return filterByQueryType(
         AVAILABLE_DEPENDENCY_QUERY_COMMANDS,
         queryType,
-        Arrays.asList(CheckLocalRepositoryDirCommand.CheckParentDirCommand.getInstance()),
+        Collections.singletonList(
+            CheckLocalRepositoryDirCommand.CheckParentDirCommand.getInstance()),
         it -> it == queryType);
   }
 
@@ -196,7 +216,7 @@ public static CommandChain createForVersionQuery(QueryType queryType) {
    * and report issues creating
    */
   static final List<Pair<QueryType, String>> AVAILABLE_DEPENDENCY_QUERY_COMMANDS =
-      new ArrayList<>(Arrays.asList(new Pair<>(QueryType.SAFE, "QueryByParsing")));
+      new ArrayList<>(List.of(new Pair<>(QueryType.SAFE, "QueryByParsing")));
 
   /** List of Commands for Version Query */
   private static final List<Pair<QueryType, String>> AVAILABLE_QUERY_VERSION_COMMANDS =

plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java

@@ -18,15 +18,12 @@
 import org.dom4j.DocumentException;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlunit.diff.ComparisonType;
 import org.xmlunit.diff.Diff;
 import org.xmlunit.diff.Difference;
 
-@Execution(ExecutionMode.SAME_THREAD)
 final class POMOperatorTest extends AbstractTestBase {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(POMOperatorTest.class);