Merge branch 'pmd7-merge-master' into text-utils-simple

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java

@@ -6,9 +6,10 @@ package net.sourceforge.pmd.lang.scala.ast;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Stack;
 
 import scala.meta.Case;
 import scala.meta.Ctor;
@@ -171,7 +172,7 @@ class ScalaTreeBuilder {
     }
 
     // The nodes having children built.
-    private final Stack<AbstractScalaNode<?>> nodes = new Stack<>();
+    private final Deque<AbstractScalaNode<?>> nodes = new ArrayDeque<>();
 
     private static <T extends Tree> void register(Class<T> nodeType,
             Class<? extends ScalaNode<T>> nodeAdapterType) {

pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java

@@ -9,7 +9,7 @@ import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
 
 public final class ScalaParsingHelper extends BaseParsingHelper<ScalaParsingHelper, ASTSource> {
 
-    public static final ScalaParsingHelper DEFAULT = new ScalaParsingHelper(Params.getDefaultProcess());
+    public static final ScalaParsingHelper DEFAULT = new ScalaParsingHelper(Params.getDefault());
 
     private ScalaParsingHelper(Params params) {
         super(ScalaLanguageModule.NAME, ASTSource.class, params);

pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java

@@ -42,7 +42,7 @@ public class ScalaRuleTest extends BaseScalaTest {
         ScalaRule rule = new ScalaRule() {
             @Override
             public String getMessage() {
-                return "message";
+                return "a message";
             }
 
             @Override