From 8998d0e3a4a0a8e7010d2d758a69e420f47f29af Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 18 Mar 2022 18:14:35 +0100
Subject: [PATCH 001/180] [core] Make Report mutable

Refs #3792

This changes the getters to return mutable list. This allows
any downstream consumers of the Report to make modifications
to it before passing it manually to a renderer.
---
 .../main/java/net/sourceforge/pmd/Report.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index cd4c3c5b96..799c763533 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -548,38 +548,38 @@ public class Report implements Iterable<RuleViolation> {
 
 
     /**
-     * Returns an unmodifiable list of violations that were suppressed.
+     * Returns a list of violations that were suppressed.
      */
     public final List<SuppressedViolation> getSuppressedViolations() {
-        return Collections.unmodifiableList(suppressedRuleViolations);
+        return suppressedRuleViolations;
     }
 
     /**
-     * Returns an unmodifiable list of violations that have been
+     * Returns a list of violations that have been
      * recorded until now. None of those violations were suppressed.
      *
      * <p>The violations list is sorted with {@link RuleViolation#DEFAULT_COMPARATOR}.
      */
     public final List<RuleViolation> getViolations() {
-        return Collections.unmodifiableList(violations);
+        return violations;
     }
 
 
     /**
-     * Returns an unmodifiable list of processing errors that have been
+     * Returns a list of processing errors that have been
      * recorded until now.
      */
     public final List<ProcessingError> getProcessingErrors() {
-        return Collections.unmodifiableList(errors);
+        return errors;
     }
 
 
     /**
-     * Returns an unmodifiable list of configuration errors that have
+     * Returns a list of configuration errors that have
      * been recorded until now.
      */
     public final List<ConfigurationError> getConfigurationErrors() {
-        return Collections.unmodifiableList(configErrors);
+        return configErrors;
     }
 
 

From cd7e3a3e0d28b209b858a3a6ca3c444de784e811 Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Mon, 21 Mar 2022 11:32:12 +0100
Subject: [PATCH 002/180] Implement CLI progress bar using
 me.tongfei.progressbar

---
 pmd-core/pom.xml                              |  5 +
 .../net/sourceforge/pmd/PMDConfiguration.java | 22 +++++
 .../java/net/sourceforge/pmd/PmdAnalysis.java | 10 +-
 .../sourceforge/pmd/cli/PMDParameters.java    |  9 ++
 .../pmd/reporting/ProgressBarListener.java    | 91 +++++++++++++++++++
 5 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java

diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index c4d35c5be9..b96f988a88 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -162,5 +162,10 @@
             <artifactId>system-rules</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>me.tongfei</groupId>
+            <artifactId>progressbar</artifactId>
+            <version>0.9.3</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
index bc6e618aa2..aac28d62c7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
@@ -122,6 +122,7 @@ public class PMDConfiguration extends AbstractConfiguration {
     private boolean benchmark;
     private AnalysisCache analysisCache = new NoopAnalysisCache();
     private boolean ignoreIncrementalAnalysis;
+    private boolean progressBar;
 
     /**
      * Get the suppress marker. This is the source level marker used to indicate
@@ -780,4 +781,25 @@ public class PMDConfiguration extends AbstractConfiguration {
     public boolean isIgnoreIncrementalAnalysis() {
         return ignoreIncrementalAnalysis;
     }
+
+    /**
+     * Sets whether to indicate analysis progress in command line output.
+     *
+     * @param progressBar Whether to enable progress bar indicator in CLI
+     */
+    public void setProgressBar(boolean progressBar) {
+        this.progressBar = progressBar;
+    }
+
+
+    /**
+     * Returns whether progress bar indicator should be used.
+     *
+     * @return {@code true} if progress bar indicator is enabled
+     */
+    public boolean isProgressBar() {
+        return progressBar;
+    }
+
+
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index 1b74fa5ab8..d3acbc6ca6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -32,6 +32,7 @@ import net.sourceforge.pmd.lang.document.FileCollector;
 import net.sourceforge.pmd.processor.AbstractPMDProcessor;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
+import net.sourceforge.pmd.reporting.ProgressBarListener;
 import net.sourceforge.pmd.util.ClasspathClassLoader;
 import net.sourceforge.pmd.util.IOUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
@@ -287,7 +288,14 @@ public final class PmdAnalysis implements AutoCloseable {
         GlobalAnalysisListener listener;
         try {
             @SuppressWarnings("PMD.CloseResource") AnalysisCacheListener cacheListener = new AnalysisCacheListener(configuration.getAnalysisCache(), rulesets, configuration.getClassLoader());
-            listener = GlobalAnalysisListener.tee(listOf(createComposedRendererListener(renderers), GlobalAnalysisListener.tee(listeners), GlobalAnalysisListener.tee(extraListeners), cacheListener));
+            if (configuration.isProgressBar()) {
+                @SuppressWarnings("PMD.CloseResource") ProgressBarListener progressBarListener = new ProgressBarListener(dataSources.size());
+                addListener(progressBarListener);
+            }
+            listener = GlobalAnalysisListener.tee(listOf(createComposedRendererListener(renderers),
+                                                         GlobalAnalysisListener.tee(listeners),
+                                                         GlobalAnalysisListener.tee(extraListeners),
+                                                         cacheListener));
         } catch (Exception e) {
             reporter.errorEx("Exception while initializing analysis listeners", e);
             throw new RuntimeException("Exception while initializing analysis listeners", e);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
index 7cea583a26..299d936a03 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
@@ -136,6 +136,9 @@ public class PMDParameters {
     @Parameter(names = { "--no-cache", "-no-cache" }, description = "Explicitly disable incremental analysis. The '-cache' option is ignored if this switch is present in the command line.")
     private boolean noCache = false;
 
+    @Parameter(names = { "--progress-bar", "-progress" }, description = "Enables progress bar indicator of live analysis progress.")
+    private boolean progressBar = false;
+
     // this has to be a public static class, so that JCommander can use it!
     public static class PropertyConverter implements IStringConverter<Properties> {
 
@@ -222,6 +225,7 @@ public class PMDParameters {
         configuration.setFailOnViolation(this.isFailOnViolation());
         configuration.setAnalysisCacheLocation(this.cacheLocation);
         configuration.setIgnoreIncrementalAnalysis(this.isIgnoreIncrementalAnalysis());
+        configuration.setProgressBar(this.isProgressBar());
 
         LanguageVersion forceLangVersion = getForceLangVersion();
         if (forceLangVersion != null) {
@@ -368,6 +372,11 @@ public class PMDParameters {
         return failOnViolation;
     }
 
+    public boolean isProgressBar() {
+        return progressBar;
+    }
+
+
     /**
      * @return the uri alternative to source directory.
      */
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
new file mode 100644
index 0000000000..a42d8a2518
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
@@ -0,0 +1,91 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.reporting;
+
+import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.RuleViolation;
+import net.sourceforge.pmd.util.datasource.DataSource;
+
+import me.tongfei.progressbar.ProgressBar;
+import me.tongfei.progressbar.ProgressBarBuilder;
+import me.tongfei.progressbar.ProgressBarStyle;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Collects runtime analysis statistics and displays them live on command line output.
+ * Toggled through -progress command line argument.
+ */
+public final class ProgressBarListener implements GlobalAnalysisListener {
+    private final ProgressBar progressBar;
+    private final AtomicInteger numErrors = new AtomicInteger(0);
+    private final AtomicInteger numViolations = new AtomicInteger(0);
+
+    public ProgressBarListener(int totalFiles) {
+        progressBar = new ProgressBarBuilder()
+                .setInitialMax(totalFiles)
+                .setStyle(ProgressBarStyle.ASCII)
+                .continuousUpdate()
+                .build();
+        progressBar.setExtraMessage(extraMessage() + "\r");
+    }
+
+    private void incrementProgress(){
+        progressBar.step();
+        refreshProgressBar();
+    }
+
+    /**
+     * Updates progress bar string and forces it to be output regardless of its update interval.
+     */
+    private void refreshProgressBar(){
+        // Use trailing carriage return to interleave with other output
+        if(progressBar.getCurrent() != progressBar.getMax()){
+            progressBar.setExtraMessage(extraMessage() + "\r");
+        } else {
+            // Don't include trailing carriage return on last draw
+            progressBar.setExtraMessage(extraMessage() + System.lineSeparator());
+        }
+        progressBar.refresh();
+    }
+
+    private String extraMessage(){
+        return String.format("Violations:%d, Errors:%d", numViolations.get(), numErrors.get());
+    }
+
+    @Override
+    public FileAnalysisListener startFileAnalysis(DataSource file) {
+        // Refresh progress on file analysis start
+        ProgressBarListener.this.refreshProgressBar();
+
+        return new FileAnalysisListener() {
+            @Override
+            public void onRuleViolation(RuleViolation violation) {
+                ProgressBarListener.this.numViolations.addAndGet(1);
+            }
+
+            @Override
+            public void onSuppressedRuleViolation(Report.SuppressedViolation violation) {
+                /*Not handled*/
+            }
+
+            @Override
+            public void onError(Report.ProcessingError error) {
+                ProgressBarListener.this.numErrors.addAndGet(1);
+            }
+
+            @Override
+            public void close() {
+                // Refresh progress bar on file analysis end (or file was in cache)
+                ProgressBarListener.this.incrementProgress();
+            }
+        };
+    }
+
+    @Override
+    public void close() throws Exception {
+        /*ProgressBar auto-closed*/
+    }
+}

From 3338b5e6ba34af50cc3e1bfc62de9f5d088539d5 Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Mon, 21 Mar 2022 12:49:46 +0100
Subject: [PATCH 003/180] Small style fixes

---
 .../pmd/reporting/ProgressBarListener.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
index a42d8a2518..a490ea81ac 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
@@ -4,16 +4,17 @@
 
 package net.sourceforge.pmd.reporting;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.util.datasource.DataSource;
 
+import me.tongfei.progressbar.DelegatingProgressBarConsumer;
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarBuilder;
 import me.tongfei.progressbar.ProgressBarStyle;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * Collects runtime analysis statistics and displays them live on command line output.
  * Toggled through -progress command line argument.
@@ -28,11 +29,12 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
                 .setInitialMax(totalFiles)
                 .setStyle(ProgressBarStyle.ASCII)
                 .continuousUpdate()
+                .setConsumer(new DelegatingProgressBarConsumer(System.out::print))
                 .build();
         progressBar.setExtraMessage(extraMessage() + "\r");
     }
 
-    private void incrementProgress(){
+    private void incrementProgress() {
         progressBar.step();
         refreshProgressBar();
     }
@@ -40,9 +42,9 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
     /**
      * Updates progress bar string and forces it to be output regardless of its update interval.
      */
-    private void refreshProgressBar(){
+    private void refreshProgressBar() {
         // Use trailing carriage return to interleave with other output
-        if(progressBar.getCurrent() != progressBar.getMax()){
+        if (progressBar.getCurrent() != progressBar.getMax()) {
             progressBar.setExtraMessage(extraMessage() + "\r");
         } else {
             // Don't include trailing carriage return on last draw
@@ -51,14 +53,14 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
         progressBar.refresh();
     }
 
-    private String extraMessage(){
+    private String extraMessage() {
         return String.format("Violations:%d, Errors:%d", numViolations.get(), numErrors.get());
     }
 
     @Override
     public FileAnalysisListener startFileAnalysis(DataSource file) {
         // Refresh progress on file analysis start
-        ProgressBarListener.this.refreshProgressBar();
+        refreshProgressBar();
 
         return new FileAnalysisListener() {
             @Override

From 997fef92d0c637cdfad4bbd0640ba1ab1441e485 Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Mon, 21 Mar 2022 13:13:21 +0100
Subject: [PATCH 004/180] Progress bar output choice

---
 .../src/main/java/net/sourceforge/pmd/PmdAnalysis.java     | 2 +-
 .../net/sourceforge/pmd/reporting/ProgressBarListener.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index d3acbc6ca6..bcc4c0ab30 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -289,7 +289,7 @@ public final class PmdAnalysis implements AutoCloseable {
         try {
             @SuppressWarnings("PMD.CloseResource") AnalysisCacheListener cacheListener = new AnalysisCacheListener(configuration.getAnalysisCache(), rulesets, configuration.getClassLoader());
             if (configuration.isProgressBar()) {
-                @SuppressWarnings("PMD.CloseResource") ProgressBarListener progressBarListener = new ProgressBarListener(dataSources.size());
+                @SuppressWarnings("PMD.CloseResource") ProgressBarListener progressBarListener = new ProgressBarListener(dataSources.size(), System.out::print);
                 addListener(progressBarListener);
             }
             listener = GlobalAnalysisListener.tee(listOf(createComposedRendererListener(renderers),
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
index a490ea81ac..09659c1740 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.reporting;
 
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
@@ -23,13 +24,13 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
     private final ProgressBar progressBar;
     private final AtomicInteger numErrors = new AtomicInteger(0);
     private final AtomicInteger numViolations = new AtomicInteger(0);
-
-    public ProgressBarListener(int totalFiles) {
+    
+    public ProgressBarListener(int totalFiles, Consumer<String> loggingFunction) {
         progressBar = new ProgressBarBuilder()
                 .setInitialMax(totalFiles)
                 .setStyle(ProgressBarStyle.ASCII)
                 .continuousUpdate()
-                .setConsumer(new DelegatingProgressBarConsumer(System.out::print))
+                .setConsumer(new DelegatingProgressBarConsumer(loggingFunction))
                 .build();
         progressBar.setExtraMessage(extraMessage() + "\r");
     }

From f5c21828c81d62dd700bc8fbd3993b15cfccfc2e Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Fri, 25 Mar 2022 14:43:53 +0100
Subject: [PATCH 005/180] Move ProgressBarListener to cli.internal package

---
 pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java   | 2 +-
 .../pmd/{reporting => cli/internal}/ProgressBarListener.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename pmd-core/src/main/java/net/sourceforge/pmd/{reporting => cli/internal}/ProgressBarListener.java (95%)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index bcc4c0ab30..bbd5438adf 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -32,7 +32,7 @@ import net.sourceforge.pmd.lang.document.FileCollector;
 import net.sourceforge.pmd.processor.AbstractPMDProcessor;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
-import net.sourceforge.pmd.reporting.ProgressBarListener;
+import net.sourceforge.pmd.cli.internal.ProgressBarListener;
 import net.sourceforge.pmd.util.ClasspathClassLoader;
 import net.sourceforge.pmd.util.IOUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
similarity index 95%
rename from pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
rename to pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
index 09659c1740..c0fe808a4b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
@@ -2,13 +2,15 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.reporting;
+package net.sourceforge.pmd.cli.internal;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
+import net.sourceforge.pmd.reporting.FileAnalysisListener;
+import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
 import net.sourceforge.pmd.util.datasource.DataSource;
 
 import me.tongfei.progressbar.DelegatingProgressBarConsumer;

From 15674891c234fd299961e8d36baec5c1672c94a4 Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Fri, 25 Mar 2022 14:46:34 +0100
Subject: [PATCH 006/180] Switch progress bar default to activated

---
 .../src/main/java/net/sourceforge/pmd/cli/PMDParameters.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
index 299d936a03..10236022f7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
@@ -136,8 +136,8 @@ public class PMDParameters {
     @Parameter(names = { "--no-cache", "-no-cache" }, description = "Explicitly disable incremental analysis. The '-cache' option is ignored if this switch is present in the command line.")
     private boolean noCache = false;
 
-    @Parameter(names = { "--progress-bar", "-progress" }, description = "Enables progress bar indicator of live analysis progress.")
-    private boolean progressBar = false;
+    @Parameter(names = { "--no-progress" }, description = "Disables progress bar indicator of live analysis progress.")
+    private boolean progressBar = true;
 
     // this has to be a public static class, so that JCommander can use it!
     public static class PropertyConverter implements IStringConverter<Properties> {

From 9241da3bf8d0f3c580bf4be5d89e7b0006f4231f Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Fri, 25 Mar 2022 14:54:21 +0100
Subject: [PATCH 007/180] Add progress bar task name

---
 .../net/sourceforge/pmd/cli/internal/ProgressBarListener.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
index c0fe808a4b..8c27669e79 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
@@ -20,7 +20,7 @@ import me.tongfei.progressbar.ProgressBarStyle;
 
 /**
  * Collects runtime analysis statistics and displays them live on command line output.
- * Toggled through -progress command line argument.
+ * Toggled off through --no-progress command line argument.
  */
 public final class ProgressBarListener implements GlobalAnalysisListener {
     private final ProgressBar progressBar;
@@ -29,6 +29,7 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
     
     public ProgressBarListener(int totalFiles, Consumer<String> loggingFunction) {
         progressBar = new ProgressBarBuilder()
+                .setTaskName("Processing")
                 .setInitialMax(totalFiles)
                 .setStyle(ProgressBarStyle.ASCII)
                 .continuousUpdate()

From 9ca8176d3e197ffbe28a6eced1820c3616cd2954 Mon Sep 17 00:00:00 2001
From: jeickhoff <jerrit.eickhoff@gmail.com>
Date: Fri, 25 Mar 2022 16:35:49 +0100
Subject: [PATCH 008/180] Fix pmd-test with progress bar flag

---
 pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java | 2 +-
 .../main/java/net/sourceforge/pmd/cli/PMDParameters.java    | 6 +++---
 .../src/test/java/net/sourceforge/pmd/it/PMDExecutor.java   | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index bbd5438adf..4d6d74ebc8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -23,6 +23,7 @@ import net.sourceforge.pmd.benchmark.TimeTracker;
 import net.sourceforge.pmd.benchmark.TimedOperation;
 import net.sourceforge.pmd.benchmark.TimedOperationCategory;
 import net.sourceforge.pmd.cache.AnalysisCacheListener;
+import net.sourceforge.pmd.cli.internal.ProgressBarListener;
 import net.sourceforge.pmd.internal.util.AssertionUtil;
 import net.sourceforge.pmd.internal.util.FileCollectionUtil;
 import net.sourceforge.pmd.lang.Language;
@@ -32,7 +33,6 @@ import net.sourceforge.pmd.lang.document.FileCollector;
 import net.sourceforge.pmd.processor.AbstractPMDProcessor;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
-import net.sourceforge.pmd.cli.internal.ProgressBarListener;
 import net.sourceforge.pmd.util.ClasspathClassLoader;
 import net.sourceforge.pmd.util.IOUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
index 10236022f7..df10f008f7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/PMDParameters.java
@@ -136,8 +136,8 @@ public class PMDParameters {
     @Parameter(names = { "--no-cache", "-no-cache" }, description = "Explicitly disable incremental analysis. The '-cache' option is ignored if this switch is present in the command line.")
     private boolean noCache = false;
 
-    @Parameter(names = { "--no-progress" }, description = "Disables progress bar indicator of live analysis progress.")
-    private boolean progressBar = true;
+    @Parameter(names = { "--no-progress", "-no-progress" }, description = "Disables progress bar indicator of live analysis progress.")
+    private boolean noProgressBar = false;
 
     // this has to be a public static class, so that JCommander can use it!
     public static class PropertyConverter implements IStringConverter<Properties> {
@@ -373,7 +373,7 @@ public class PMDParameters {
     }
 
     public boolean isProgressBar() {
-        return progressBar;
+        return !noProgressBar;
     }
 
 
diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/PMDExecutor.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/PMDExecutor.java
index 673ff76138..1ab6ddbba2 100644
--- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/PMDExecutor.java
+++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/PMDExecutor.java
@@ -28,6 +28,7 @@ public class PMDExecutor {
     private static final String FORMAT_FLAG = "-f";
     private static final String FORMATTER = "text";
     private static final String REPORTFILE_FLAG = "-r";
+    private static final String NO_PROGRESSBAR_FLAG = "--no-progress";
 
     private PMDExecutor() {
         // this is a helper class only
@@ -108,10 +109,10 @@ public class PMDExecutor {
     public static ExecutionResult runPMDRules(Path reportFile, Path tempDir, String sourceDirectory, String ruleset, String formatter) throws Exception {
         if (SystemUtils.IS_OS_WINDOWS) {
             return runPMDWindows(tempDir, reportFile, SOURCE_DIRECTORY_FLAG, sourceDirectory, RULESET_FLAG, ruleset,
-                    FORMAT_FLAG, formatter, REPORTFILE_FLAG, reportFile.toAbsolutePath().toString());
+                    FORMAT_FLAG, formatter, REPORTFILE_FLAG, reportFile.toAbsolutePath().toString(), NO_PROGRESSBAR_FLAG);
         } else {
             return runPMDUnix(tempDir, reportFile, SOURCE_DIRECTORY_FLAG, sourceDirectory, RULESET_FLAG, ruleset,
-                    FORMAT_FLAG, formatter, REPORTFILE_FLAG, reportFile.toAbsolutePath().toString());
+                    FORMAT_FLAG, formatter, REPORTFILE_FLAG, reportFile.toAbsolutePath().toString(), NO_PROGRESSBAR_FLAG);
         }
     }
 

From 4a12aebbf9f4c15d3c1be41c06ae4372cf4749ad Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sun, 27 Mar 2022 17:48:08 +0200
Subject: [PATCH 009/180] Bump pmd from 6.43.0 to 6.44.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 42669441d9..94ed6846fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,12 +406,12 @@
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>6.43.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-java</artifactId>
-                            <version>6.43.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <!-- This contains the dogfood ruleset -->
                         <dependency>

From 2a57871fdbdf4382592612c1a5adac5bb26ac40f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 03:01:58 +0000
Subject: [PATCH 010/180] Bump actions/cache from 2 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml           | 2 +-
 .github/workflows/troubleshooting.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 566fc4f2fd..6dadb3e2d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 2
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.m2/repository
diff --git a/.github/workflows/troubleshooting.yml b/.github/workflows/troubleshooting.yml
index dc8f796c12..31a90eef7f 100644
--- a/.github/workflows/troubleshooting.yml
+++ b/.github/workflows/troubleshooting.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
               ~/.m2/repository

From d662e9f8efe219a868a079687f3b01d594cda77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Wed, 30 Mar 2022 21:59:39 +0200
Subject: [PATCH 011/180] Fix AssertionError (exhaustive switch)

Ref #3881
---
 .../net/sourceforge/pmd/util/log/MessageReporter.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/log/MessageReporter.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/MessageReporter.java
index b6843d68de..ecf9fb5739 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/log/MessageReporter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/log/MessageReporter.java
@@ -75,12 +75,14 @@ public interface MessageReporter {
             switch (this) {
             case ERROR:
                 return java.util.logging.Level.SEVERE;
-            case INFO:
-                return java.util.logging.Level.INFO;
-            case TRACE:
-                return java.util.logging.Level.FINER;
             case WARN:
                 return java.util.logging.Level.WARNING;
+            case INFO:
+                return java.util.logging.Level.INFO;
+            case DEBUG:
+                return java.util.logging.Level.FINE;
+            case TRACE:
+                return java.util.logging.Level.FINER;
             default:
                 throw AssertionUtil.shouldNotReachHere("exhaustive");
             }

From 6f3dd6c11dbfc6a761aec7e8b5655828421814b4 Mon Sep 17 00:00:00 2001
From: jasonqiu98 <jingxuan.qiu@outlook.com>
Date: Thu, 31 Mar 2022 02:25:53 +0200
Subject: [PATCH 012/180] add release date on sidebar

---
 docs/_includes/sidebar.html   | 1 +
 docs/css/pmd-customstyles.css | 6 ++++++
 docs/css/theme-blue.css       | 4 ++--
 docs/css/theme-green.css      | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/_includes/sidebar.html b/docs/_includes/sidebar.html
index 0a3474f9ba..4220419313 100644
--- a/docs/_includes/sidebar.html
+++ b/docs/_includes/sidebar.html
@@ -2,6 +2,7 @@
 
 <ul id="mysidebar" class="nav">
     <li class="sidebarTitle">{{sidebar[0].product}} {{sidebar[0].version | replace: '!PMD_VERSION!', site.pmd.version}}</li>
+    <div class="sidebarTitleDate">Release date: {{site.pmd.date}}</div>
     {% for entry in sidebar %}
     {% for folder in entry.folders %}
     {% if folder.output contains "web" %}
diff --git a/docs/css/pmd-customstyles.css b/docs/css/pmd-customstyles.css
index 46afb1aa32..2005a56939 100644
--- a/docs/css/pmd-customstyles.css
+++ b/docs/css/pmd-customstyles.css
@@ -88,3 +88,9 @@ details[open] summary {
 .xpath-fun-doc .code-examples dt {
     font-weight: normal;
 }
+
+div.sidebarTitleDate {
+    margin-top:2.5px;
+    margin-bottom:5px;
+    margin-left:5px; 
+}
diff --git a/docs/css/theme-blue.css b/docs/css/theme-blue.css
index 64cc6c387e..91caad7277 100644
--- a/docs/css/theme-blue.css
+++ b/docs/css/theme-blue.css
@@ -97,7 +97,7 @@ li.sidebarTitle {
     font-weight:normal;
     font-size:130%;
     color: #ED1951;
-    margin-bottom:10px;
-    margin-left: 5px;
+    margin-bottom:2.5px;
+    margin-left:5px;
 
 }
\ No newline at end of file
diff --git a/docs/css/theme-green.css b/docs/css/theme-green.css
index f6b0d8b1e7..b5c10446b7 100644
--- a/docs/css/theme-green.css
+++ b/docs/css/theme-green.css
@@ -93,7 +93,7 @@ li.sidebarTitle {
     font-weight:normal;
     font-size:130%;
     color: #ED1951;
-    margin-bottom:10px;
-    margin-left: 5px;
+    margin-bottom:2.5px;
+    margin-left:5px;
 
 }
\ No newline at end of file

From b413d86d088556743095652619494704e4de1ba5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 31 Mar 2022 17:04:14 +0200
Subject: [PATCH 013/180] [html] Add support for HTML using jsoup parser

---
 docs/_data/sidebars/pmd_sidebar.yml           |  12 ++
 pmd-dist/pom.xml                              |   5 +
 .../net/sourceforge/pmd/it/AllRulesIT.java    |   4 +-
 .../pmd/it/BinaryDistributionIT.java          |   4 +-
 .../src/test/resources/rulesets/all-html.xml  |  18 +++
 .../sample-source/html/SimpleHtmlFile.html    |   7 +
 pmd-html/pom.xml                              |  53 +++++++
 .../pmd/lang/html/HtmlCpdLanguage.java        |  15 ++
 .../pmd/lang/html/HtmlHandler.java            |  46 +++++++
 .../pmd/lang/html/HtmlLanguageModule.java     |  20 +++
 .../sourceforge/pmd/lang/html/HtmlParser.java |  56 ++++++++
 .../pmd/lang/html/HtmlTokenizer.java          |  52 +++++++
 .../pmd/lang/html/ast/AbstractHtmlNode.java   |  46 +++++++
 .../pmd/lang/html/ast/HtmlCDataNode.java      |  19 +++
 .../pmd/lang/html/ast/HtmlComment.java        |  19 +++
 .../pmd/lang/html/ast/HtmlDocument.java       |  17 +++
 .../pmd/lang/html/ast/HtmlDocumentType.java   |  27 ++++
 .../pmd/lang/html/ast/HtmlElement.java        |  49 +++++++
 .../pmd/lang/html/ast/HtmlNode.java           |  15 ++
 .../pmd/lang/html/ast/HtmlTextNode.java       |  28 ++++
 .../pmd/lang/html/ast/HtmlTreeBuilder.java    |  57 ++++++++
 .../pmd/lang/html/ast/HtmlXmlDeclaration.java |  19 +++
 .../pmd/lang/html/ast/LineNumbers.java        |  98 +++++++++++++
 .../services/net.sourceforge.pmd.cpd.Language |   1 +
 .../net.sourceforge.pmd.lang.Language         |   1 +
 .../resources/category/html/bestpractices.xml |  40 ++++++
 .../category/html/categories.properties       |  18 +++
 .../resources/category/html/codestyle.xml     |  11 ++
 .../main/resources/category/html/design.xml   |  11 ++
 .../resources/category/html/documentation.xml |  11 ++
 .../resources/category/html/errorprone.xml    |  12 ++
 .../category/html/multithreading.xml          |  11 ++
 .../resources/category/html/performance.xml   |  11 ++
 .../main/resources/category/html/security.xml |  11 ++
 .../pmd/lang/html/HtmlTokenizerTest.java      |  36 +++++
 .../pmd/lang/html/RuleSetFactoryTest.java     |  11 ++
 .../pmd/lang/html/ast/HtmlParsingHelper.java  |  22 +++
 .../pmd/lang/html/ast/HtmlTreeDumpTest.java   |  38 +++++
 .../pmd/lang/html/ast/PositionTest.java       |  42 ++++++
 .../bestpractices/AvoidInlineStylesTest.java  |  11 ++
 .../html/ast/testdata/SimpleHtmlFile.html     |   7 +
 .../lang/html/ast/testdata/SimpleHtmlFile.txt |  22 +++
 .../html/ast/testdata/SimpleHtmlFile2.html    |   7 +
 .../html/ast/testdata/SimpleHtmlFile2.txt     |  15 ++
 .../lang/html/ast/testdata/SimpleXmlFile.html |   4 +
 .../lang/html/ast/testdata/SimpleXmlFile.txt  |  13 ++
 .../html/ast/testdata/TemplateFragment.html   |  57 ++++++++
 .../html/ast/testdata/TemplateFragment.txt    | 130 ++++++++++++++++++
 .../pmd/lang/html/cpd/SimpleHtmlFile.html     |   7 +
 .../pmd/lang/html/cpd/SimpleHtmlFile.txt      |  24 ++++
 .../bestpractices/xml/AvoidInlineStyles.xml   |  21 +++
 pom.xml                                       |   1 +
 52 files changed, 1288 insertions(+), 4 deletions(-)
 create mode 100644 pmd-dist/src/test/resources/rulesets/all-html.xml
 create mode 100644 pmd-dist/src/test/resources/sample-source/html/SimpleHtmlFile.html
 create mode 100644 pmd-html/pom.xml
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlLanguageModule.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
 create mode 100644 pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
 create mode 100644 pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
 create mode 100644 pmd-html/src/main/resources/category/html/bestpractices.xml
 create mode 100644 pmd-html/src/main/resources/category/html/categories.properties
 create mode 100644 pmd-html/src/main/resources/category/html/codestyle.xml
 create mode 100644 pmd-html/src/main/resources/category/html/design.xml
 create mode 100644 pmd-html/src/main/resources/category/html/documentation.xml
 create mode 100644 pmd-html/src/main/resources/category/html/errorprone.xml
 create mode 100644 pmd-html/src/main/resources/category/html/multithreading.xml
 create mode 100644 pmd-html/src/main/resources/category/html/performance.xml
 create mode 100644 pmd-html/src/main/resources/category/html/security.xml
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.html
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.html
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.html
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.html
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.html
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.txt
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/AvoidInlineStyles.xml

diff --git a/docs/_data/sidebars/pmd_sidebar.yml b/docs/_data/sidebars/pmd_sidebar.yml
index f3f2250b66..a8a420916f 100644
--- a/docs/_data/sidebars/pmd_sidebar.yml
+++ b/docs/_data/sidebars/pmd_sidebar.yml
@@ -178,6 +178,18 @@ entries:
         - title: Error Prone
           output: web, pdf
           url: /pmd_rules_ecmascript_errorprone.html
+    - title: null
+      output: web, pdf
+      subfolders:
+      - title: HTML Rules
+        output: web, pdf
+        subfolderitems:
+        - title: Index
+          output: web, pdf
+          url: /pmd_rules_html.html
+        - title: Best Practices
+          output: web, pdf
+          url: /pmd_rules_html_bestpractices.html
     - title: null
       output: web, pdf
       subfolders:
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 1575d40f66..ca44f39d0b 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -275,6 +275,11 @@
                     <artifactId>pmd-apex</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>net.sourceforge.pmd</groupId>
+                    <artifactId>pmd-html</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>net.sourceforge.pmd</groupId>
                     <artifactId>pmd-javascript</artifactId>
diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java
index 4f9a38ff0f..26953ec10a 100644
--- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java
+++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java
@@ -22,12 +22,12 @@ public class AllRulesIT extends AbstractBinaryDistributionTest {
     @Parameters
     public static Iterable<String> languagesToTest() {
         if (PMDExecutor.isJava7Test()) {
-            // note: apex, javascript, scala, and visualforce require java8
+            // note: apex, html, javascript, scala, and visualforce require java8
             return Arrays.asList("java", "jsp", "modelica",
                     "plsql", "pom", "velocitytemplate", "xml", "xsl");
         }
         // note: scala and wsdl have no rules
-        return Arrays.asList("java", "apex", "javascript", "jsp", "modelica",
+        return Arrays.asList("java", "apex", "html", "javascript", "jsp", "modelica",
                 "plsql", "pom", "visualforce", "velocitytemplate", "xml", "xsl");
     }
 
diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java
index 4b4b114474..48c9bc3ee3 100644
--- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java
+++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java
@@ -31,8 +31,8 @@ public class BinaryDistributionIT extends AbstractBinaryDistributionTest {
             SUPPORTED_LANGUAGES_CPD = "Supported languages: [cpp, cs, dart, fortran, go, groovy, java, jsp, kotlin, lua, matlab, modelica, objectivec, perl, php, plsql, python, ruby, swift, xml]";
             SUPPORTED_LANGUAGES_PMD = "java, jsp, modelica, plsql, pom, vm, wsdl, xml, xsl";
         } else {
-            SUPPORTED_LANGUAGES_CPD = "Supported languages: [apex, cpp, cs, dart, ecmascript, fortran, go, groovy, java, jsp, kotlin, lua, matlab, modelica, objectivec, perl, php, plsql, python, ruby, scala, swift, vf, xml]";
-            SUPPORTED_LANGUAGES_PMD = "apex, ecmascript, java, jsp, modelica, plsql, pom, scala, vf, vm, wsdl, xml, xsl";
+            SUPPORTED_LANGUAGES_CPD = "Supported languages: [apex, cpp, cs, dart, ecmascript, fortran, go, groovy, html, java, jsp, kotlin, lua, matlab, modelica, objectivec, perl, php, plsql, python, ruby, scala, swift, vf, xml]";
+            SUPPORTED_LANGUAGES_PMD = "apex, ecmascript, html, java, jsp, modelica, plsql, pom, scala, vf, vm, wsdl, xml, xsl";
         }
     }
 
diff --git a/pmd-dist/src/test/resources/rulesets/all-html.xml b/pmd-dist/src/test/resources/rulesets/all-html.xml
new file mode 100644
index 0000000000..b179a0584b
--- /dev/null
+++ b/pmd-dist/src/test/resources/rulesets/all-html.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<ruleset name="All HTML Rules" 
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+    <description>Every HTML Rule in PMD</description>
+
+    <rule ref="category/html/bestpractices.xml" />
+    <rule ref="category/html/codestyle.xml" />
+    <rule ref="category/html/design.xml" />
+    <rule ref="category/html/documentation.xml" />
+    <rule ref="category/html/errorprone.xml" />
+    <rule ref="category/html/multithreading.xml" />
+    <rule ref="category/html/performance.xml" />
+    <rule ref="category/html/security.xml" />
+
+</ruleset>
diff --git a/pmd-dist/src/test/resources/sample-source/html/SimpleHtmlFile.html b/pmd-dist/src/test/resources/sample-source/html/SimpleHtmlFile.html
new file mode 100644
index 0000000000..f9fb6994d9
--- /dev/null
+++ b/pmd-dist/src/test/resources/sample-source/html/SimpleHtmlFile.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>hello</head>
+    <body>
+        <h1 style="font-size: 40pt;">world</h1>
+    </body>
+</html>
diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
new file mode 100644
index 0000000000..8e35a9cf2b
--- /dev/null
+++ b/pmd-html/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>pmd-html</artifactId>
+    <name>PMD HTML</name>
+
+    <parent>
+        <groupId>net.sourceforge.pmd</groupId>
+        <artifactId>pmd</artifactId>
+        <version>6.45.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <java.version>8</java.version>
+    </properties>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.14.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-lang-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
new file mode 100644
index 0000000000..3aa54289c8
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
@@ -0,0 +1,15 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import net.sourceforge.pmd.cpd.AbstractLanguage;
+
+public final class HtmlCpdLanguage extends AbstractLanguage {
+
+    public HtmlCpdLanguage() {
+        super("HTML", "html", new HtmlTokenizer(), ".html");
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
new file mode 100644
index 0000000000..6988089323
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
@@ -0,0 +1,46 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleViolation;
+import net.sourceforge.pmd.lang.AbstractLanguageVersionHandler;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.ParserOptions;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.rule.AbstractRuleViolationFactory;
+import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
+import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
+
+class HtmlHandler extends AbstractLanguageVersionHandler {
+
+    @Override
+    public RuleViolationFactory getRuleViolationFactory() {
+        return new AbstractRuleViolationFactory() {
+
+            @Override
+            protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message) {
+                return new ParametricRuleViolation<Node>(rule, ruleContext, node, message);
+            }
+
+            @Override
+            protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
+                    int beginLine, int endLine) {
+                ParametricRuleViolation<Node> ruleViolation = new ParametricRuleViolation<>(rule, ruleContext, node, message);
+                ruleViolation.setLines(beginLine, endLine);
+                return ruleViolation;
+            }
+            
+        };
+    }
+
+    @Override
+    public Parser getParser(ParserOptions parserOptions) {
+        return new HtmlParser();
+    }
+
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlLanguageModule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlLanguageModule.java
new file mode 100644
index 0000000000..d3389fe55c
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlLanguageModule.java
@@ -0,0 +1,20 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import net.sourceforge.pmd.lang.BaseLanguageModule;
+
+public final class HtmlLanguageModule extends BaseLanguageModule {
+
+    public static final String NAME = "HTML";
+    public static final String TERSE_NAME = "html";
+
+    public HtmlLanguageModule() {
+        super(NAME, null, TERSE_NAME, "html");
+        addDefaultVersion("", new HtmlHandler());
+    }
+
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java
new file mode 100644
index 0000000000..4b89e099aa
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java
@@ -0,0 +1,56 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.jsoup.nodes.Document;
+import org.jsoup.parser.Parser;
+
+import net.sourceforge.pmd.lang.ParserOptions;
+import net.sourceforge.pmd.lang.TokenManager;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.ParseException;
+import net.sourceforge.pmd.lang.html.ast.HtmlTreeBuilder;
+
+class HtmlParser implements net.sourceforge.pmd.lang.Parser {
+
+    @Override
+    public boolean canParse() {
+        return true;
+    }
+
+    @Override
+    public Node parse(String fileName, Reader source) throws ParseException {
+        try {
+            String data = IOUtils.toString(source);
+            Document doc = Parser.xmlParser().parseInput(data, "");
+            HtmlTreeBuilder builder = new HtmlTreeBuilder();
+            return builder.build(doc, data);
+        } catch (IOException e) {
+            throw new ParseException(e);
+        }
+    }
+
+    @Override
+    public Map<Integer, String> getSuppressMap() {
+        return new HashMap<>(); // FIXME
+    }
+
+    @Override
+    public ParserOptions getParserOptions() {
+        return new ParserOptions();
+    }
+
+    @Override
+    public TokenManager getTokenManager(String fileName, Reader source) {
+        return null;
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
new file mode 100644
index 0000000000..ad803faade
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
@@ -0,0 +1,52 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import java.io.IOException;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.parser.Parser;
+
+import net.sourceforge.pmd.cpd.SourceCode;
+import net.sourceforge.pmd.cpd.TokenEntry;
+import net.sourceforge.pmd.cpd.Tokenizer;
+import net.sourceforge.pmd.cpd.Tokens;
+import net.sourceforge.pmd.lang.html.ast.HtmlDocument;
+import net.sourceforge.pmd.lang.html.ast.HtmlNode;
+import net.sourceforge.pmd.lang.html.ast.HtmlTextNode;
+import net.sourceforge.pmd.lang.html.ast.HtmlTreeBuilder;
+
+class HtmlTokenizer implements Tokenizer {
+
+    @Override
+    public void tokenize(SourceCode sourceCode, Tokens tokenEntries) throws IOException {
+        String data = sourceCode.getCodeBuffer().toString();
+
+        Document doc = Parser.xmlParser().parseInput(data, "");
+        HtmlTreeBuilder builder = new HtmlTreeBuilder();
+        HtmlDocument root = builder.build(doc, data);
+        
+        traverse(root, tokenEntries);
+        tokenEntries.add(TokenEntry.EOF);
+    }
+
+    private void traverse(HtmlNode node, Tokens tokenEntries) {
+        String image = node.getXPathNodeName();
+
+        if (node instanceof HtmlTextNode) {
+            image = ((HtmlTextNode) node).getText();
+        }
+
+        TokenEntry token = new TokenEntry(image, node.getXPathNodeName(), node.getBeginLine(),
+                node.getBeginColumn(), node.getEndColumn());
+        tokenEntries.add(token);
+
+        for (HtmlNode child : node.children()) {
+            traverse(child, tokenEntries);
+        }
+    }
+
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
new file mode 100644
index 0000000000..43741a63ea
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
@@ -0,0 +1,46 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.Node;
+
+import net.sourceforge.pmd.lang.ast.AbstractNode;
+
+class AbstractHtmlNode<T extends Node> extends AbstractNode implements HtmlNode {
+
+    protected final T node;
+
+    AbstractHtmlNode(T node) {
+        super(0);
+        this.node = node;
+    }
+
+    @Override
+    public String getXPathNodeName() {
+        return node.nodeName();
+    }
+
+    @Override
+    public Iterable<? extends HtmlNode> children() {
+        return (Iterable<? extends HtmlNode>) super.children();
+    }
+
+    void setBeginLine(int beginLine) {
+        this.beginLine = beginLine;
+    }
+
+    void setBeginColumn(int beginColumn) {
+        this.beginColumn = beginColumn;
+    }
+
+    void setEndLine(int endLine) {
+        this.endLine = endLine;
+    }
+
+    void setEndColumn(int endColumn) {
+        this.endColumn = endColumn;
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
new file mode 100644
index 0000000000..f86402f475
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
@@ -0,0 +1,19 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.CDataNode;
+
+public final class HtmlCDataNode extends AbstractHtmlNode<CDataNode> {
+
+    HtmlCDataNode(CDataNode node) {
+        super(node);
+    }
+
+    public String getText() {
+        return node.text();
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
new file mode 100644
index 0000000000..48ffe347e9
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
@@ -0,0 +1,19 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.Comment;
+
+public final class HtmlComment extends AbstractHtmlNode<Comment> {
+
+    HtmlComment(Comment node) {
+        super(node);
+    }
+
+    public String getData() {
+        return node.getData();
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
new file mode 100644
index 0000000000..840166b3d9
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
@@ -0,0 +1,17 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.Document;
+
+import net.sourceforge.pmd.lang.ast.RootNode;
+
+public class HtmlDocument extends HtmlElement implements RootNode {
+
+    HtmlDocument(Document document) {
+        super(document);
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
new file mode 100644
index 0000000000..3511db323d
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
@@ -0,0 +1,27 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.DocumentType;
+
+public final class HtmlDocumentType extends AbstractHtmlNode<DocumentType> {
+
+    HtmlDocumentType(DocumentType node) {
+        super(node);
+    }
+
+    public String getName() {
+        return node.name();
+    }
+
+    public String getPublicId() {
+        return node.publicId();
+    }
+
+    public String getSystemId() {
+        return node.systemId();
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
new file mode 100644
index 0000000000..6a6c018fa5
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
@@ -0,0 +1,49 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jsoup.nodes.Element;
+
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+
+public class HtmlElement extends AbstractHtmlNode<Element> {
+
+    private final List<Attribute> attributes;
+
+    HtmlElement(Element element) {
+        super(element);
+
+        attributes = new ArrayList<>();
+        for (org.jsoup.nodes.Attribute att : node.attributes()) {
+            attributes.add(new Attribute(this, att.getKey(), att.getValue()));
+        }
+    }
+
+    @Override
+    public Iterator<Attribute> getXPathAttributesIterator() {
+        Iterator<Attribute> defaultAttributes = super.getXPathAttributesIterator();
+        Iterator<Attribute> elementAttributes = attributes.iterator();
+
+        return new Iterator<Attribute>() {
+            @Override
+            public boolean hasNext() {
+                return defaultAttributes.hasNext() || elementAttributes.hasNext();
+            }
+
+            @Override
+            public Attribute next() {
+                if (defaultAttributes.hasNext()) {
+                    return defaultAttributes.next();
+                }
+                return elementAttributes.next();
+            }
+        };
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
new file mode 100644
index 0000000000..2cda1e5b38
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
@@ -0,0 +1,15 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import net.sourceforge.pmd.lang.ast.Node;
+
+public interface HtmlNode extends Node {
+
+    @Override
+    Iterable<? extends HtmlNode> children();
+
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
new file mode 100644
index 0000000000..16ecb530f1
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
@@ -0,0 +1,28 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.TextNode;
+
+public class HtmlTextNode extends AbstractHtmlNode<TextNode> {
+
+    HtmlTextNode(TextNode node) {
+        super(node);
+    }
+
+    public String getNormalizedText() {
+        return node.text();
+    }
+
+    public String getText() {
+        return node.getWholeText();
+    }
+
+    @Override
+    public String getImage() {
+        return getNormalizedText();
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
new file mode 100644
index 0000000000..f9f72eb8cf
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
@@ -0,0 +1,57 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.CDataNode;
+import org.jsoup.nodes.Comment;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.DocumentType;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.nodes.XmlDeclaration;
+
+import net.sourceforge.pmd.annotation.InternalApi;
+
+@InternalApi
+public final class HtmlTreeBuilder {
+
+    public HtmlDocument build(Document doc, String htmlString) {
+        HtmlDocument root = new HtmlDocument(doc);
+        addChilds(root, doc);
+
+        LineNumbers lineNumbers = new LineNumbers(root, htmlString);
+        lineNumbers.determine();
+
+        return root;
+    }
+    
+    private void addChilds(HtmlNode parent, Node node) {
+        for (Node child : node.childNodes()) {
+            HtmlNode converted = convertJsoupNode(child);
+            parent.jjtAddChild(converted, parent.getNumChildren());
+            addChilds(converted, child);
+        }
+    }
+
+    private HtmlNode convertJsoupNode(Node node) {
+        if (node instanceof Element) {
+            return new HtmlElement((Element) node);
+        } else if (node instanceof CDataNode) {
+            return new HtmlCDataNode((CDataNode) node);
+        } else if (node instanceof TextNode) {
+            return new HtmlTextNode((TextNode) node);
+        } else if (node instanceof Comment) {
+            return new HtmlComment((Comment) node);
+        } else if (node instanceof XmlDeclaration) {
+            return new HtmlXmlDeclaration((XmlDeclaration) node);
+        } else if (node instanceof DocumentType) {
+            return new HtmlDocumentType((DocumentType) node);
+        } else {
+            throw new RuntimeException("Unsupported node type: " + node.getClass());
+        }
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
new file mode 100644
index 0000000000..3c80f5cbf2
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
@@ -0,0 +1,19 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.jsoup.nodes.XmlDeclaration;
+
+public final class HtmlXmlDeclaration extends AbstractHtmlNode<XmlDeclaration> {
+
+    HtmlXmlDeclaration(XmlDeclaration node) {
+        super(node);
+    }
+
+    public String getName() {
+        return node.name();
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
new file mode 100644
index 0000000000..52b9a2904d
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
@@ -0,0 +1,98 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
+
+class LineNumbers {
+    private final HtmlDocument document;
+    private String htmlString;
+    private SourceCodePositioner sourceCodePositioner;
+
+    LineNumbers(HtmlDocument document, String htmlString) {
+        this.document = document;
+        this.htmlString = htmlString;
+        this.sourceCodePositioner = new SourceCodePositioner(htmlString);
+    }
+
+    public void determine() {
+        determineLocation(document, 0);
+    }
+
+    private int determineLocation(AbstractHtmlNode<?> n, int index) {
+        int nextIndex = index;
+        int nodeLength = 0;
+        int textLength = 0;
+
+        if (n instanceof HtmlDocument) {
+            nextIndex = index;
+        } else if (n instanceof HtmlComment) {
+            nextIndex = htmlString.indexOf("<!--", nextIndex);
+        } else if (n instanceof HtmlElement) {
+            nextIndex = htmlString.indexOf("<" + n.getXPathNodeName(), nextIndex);
+            nodeLength = htmlString.indexOf(">", nextIndex) - nextIndex + 1;
+        } else if (n instanceof HtmlCDataNode) {
+            nextIndex = htmlString.indexOf("<![CDATA[", nextIndex);
+        } else if (n instanceof HtmlXmlDeclaration) {
+            nextIndex = htmlString.indexOf("<?", nextIndex);
+        } else if (n instanceof HtmlTextNode) {
+            textLength = ((HtmlTextNode) n).getText().length();
+        } else if (n instanceof HtmlDocumentType) {
+            nextIndex = index;
+        }
+
+        setBeginLocation(n, nextIndex);
+
+        nextIndex += nodeLength;
+
+        for (net.sourceforge.pmd.lang.ast.Node child : n.children()) {
+            nextIndex = determineLocation((AbstractHtmlNode<?>) child, nextIndex);
+        }
+
+        // autoclosing element, eg <a />
+        boolean isAutoClose = n.getNumChildren() == 0
+                && n instanceof HtmlElement
+                // nextIndex is up to the closing > at this point
+                && htmlString.startsWith("/>", nextIndex - 2);
+
+        if (n instanceof HtmlDocument) {
+            nextIndex = htmlString.length();
+        } else if (n instanceof HtmlElement && !isAutoClose) {
+            nextIndex += 2 + n.getXPathNodeName().length() + 1; // </nodename>
+        } else if (n instanceof HtmlComment) {
+            nextIndex += 4 + 3; // <!-- and -->
+            nextIndex += ((HtmlComment) n).getData().length();
+        } else if (n instanceof HtmlTextNode) {
+            nextIndex += textLength;
+        } else if (n instanceof HtmlCDataNode) {
+            nextIndex += "<![CDATA[".length() + ((HtmlCDataNode) n).getText().length() + "]]>".length();
+        } else if (n instanceof HtmlXmlDeclaration) {
+            nextIndex = htmlString.indexOf("?>", nextIndex) + 2;
+        } else if (n instanceof HtmlDocumentType) {
+            nextIndex = htmlString.indexOf(">", nextIndex) + 1;
+        }
+
+        setEndLocation(n, nextIndex - 1);
+        return nextIndex;
+    }
+
+    private void setBeginLocation(AbstractHtmlNode<?> n, int index) {
+        if (n != null) {
+            int line = sourceCodePositioner.lineNumberFromOffset(index);
+            int column = sourceCodePositioner.columnFromOffset(line, index);
+            n.setBeginLine(line);
+            n.setBeginColumn(column);
+        }
+    }
+
+    private void setEndLocation(AbstractHtmlNode<?> n, int index) {
+        if (n != null) {
+            int line = sourceCodePositioner.lineNumberFromOffset(index);
+            int column = sourceCodePositioner.columnFromOffset(line, index);
+            n.setEndLine(line);
+            n.setEndColumn(column);
+        }
+    }
+}
diff --git a/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language b/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
new file mode 100644
index 0000000000..ce5a2a4033
--- /dev/null
+++ b/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
@@ -0,0 +1 @@
+net.sourceforge.pmd.lang.html.HtmlCpdLanguage
diff --git a/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
new file mode 100644
index 0000000000..be2515c78a
--- /dev/null
+++ b/pmd-html/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
@@ -0,0 +1 @@
+net.sourceforge.pmd.lang.html.HtmlLanguageModule
diff --git a/pmd-html/src/main/resources/category/html/bestpractices.xml b/pmd-html/src/main/resources/category/html/bestpractices.xml
new file mode 100644
index 0000000000..d64ee57961
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/bestpractices.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<ruleset name="Best Practices"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules which enforce generally accepted best practices.
+    </description>
+
+    <rule name="AvoidInlineStyles"
+          language="html"
+          since="6.45.0"
+          message="Avoid inline styles"
+          class="net.sourceforge.pmd.lang.rule.XPathRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_html_bestpractices.html#avoidinlinestyles">
+        <description>
+Don't mix content and style. Use separate CSS-files for the style and introduce classes.
+This helps to reuse common styles.
+        </description>
+        <priority>3</priority>
+        <properties>
+            <property name="version" value="2.0"/>
+            <property name="xpath">
+                <value>
+<![CDATA[
+//*[@style]
+]]>
+                </value>
+            </property>
+        </properties>
+        <example>
+<![CDATA[
+<div style="font-size: 12pt;"></div>
+]]>
+        </example>
+    </rule>
+
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/categories.properties b/pmd-html/src/main/resources/category/html/categories.properties
new file mode 100644
index 0000000000..aa6af3ee88
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/categories.properties
@@ -0,0 +1,18 @@
+#
+# BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+#
+
+rulesets.filenames=\
+    category/html/bestpractices.xml
+
+#
+# categories without rules
+#
+# category/html/codestyle.xml
+# category/html/design.xml
+# category/html/documentation.xml
+# category/html/errorprone.xml
+# category/html/multithreading.xml
+# category/html/performance.xml
+# category/html/security.xml
+
diff --git a/pmd-html/src/main/resources/category/html/codestyle.xml b/pmd-html/src/main/resources/category/html/codestyle.xml
new file mode 100644
index 0000000000..c9a6b51d10
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/codestyle.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Code Style"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules which enforce a specific coding style.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/design.xml b/pmd-html/src/main/resources/category/html/design.xml
new file mode 100644
index 0000000000..6833b8b773
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/design.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Design"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules that help you discover design issues.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/documentation.xml b/pmd-html/src/main/resources/category/html/documentation.xml
new file mode 100644
index 0000000000..c049f5b6f0
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/documentation.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Documentation"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules that are related to code documentation.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/errorprone.xml b/pmd-html/src/main/resources/category/html/errorprone.xml
new file mode 100644
index 0000000000..ff1f6fc771
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/errorprone.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<ruleset name="Error Prone"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules to detect constructs that are either broken, extremely confusing or prone to runtime errors.
+    </description>
+
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/multithreading.xml b/pmd-html/src/main/resources/category/html/multithreading.xml
new file mode 100644
index 0000000000..88c22dfc8b
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/multithreading.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Multithreading"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules that flag issues when dealing with multiple threads of execution.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/performance.xml b/pmd-html/src/main/resources/category/html/performance.xml
new file mode 100644
index 0000000000..251663aafc
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/performance.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Performance"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules that flag suboptimal code.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/main/resources/category/html/security.xml b/pmd-html/src/main/resources/category/html/security.xml
new file mode 100644
index 0000000000..d6fa5415a5
--- /dev/null
+++ b/pmd-html/src/main/resources/category/html/security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<ruleset name="Security"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+Rules that flag potential security flaws.
+    </description>
+</ruleset>
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
new file mode 100644
index 0000000000..b5cf3ab200
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
@@ -0,0 +1,36 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html;
+
+import java.util.Properties;
+
+import org.junit.Test;
+
+import net.sourceforge.pmd.cpd.Tokenizer;
+import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+
+public class HtmlTokenizerTest extends CpdTextComparisonTest {
+
+    public HtmlTokenizerTest() {
+        super(".html");
+    }
+
+    @Override
+    public Tokenizer newTokenizer(Properties properties) {
+        return new HtmlTokenizer();
+    }
+
+    @Override
+    protected String getResourcePrefix() {
+        return "cpd";
+    }
+
+    @Test
+    public void testSimpleHtmlFile() {
+        doTest("SimpleHtmlFile");
+    }
+
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java
new file mode 100644
index 0000000000..e9b7776435
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java
@@ -0,0 +1,11 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html;
+
+import net.sourceforge.pmd.AbstractRuleSetFactoryTest;
+
+public class RuleSetFactoryTest extends AbstractRuleSetFactoryTest {
+    // no additional tests yet
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
new file mode 100644
index 0000000000..7cdcc057f9
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
@@ -0,0 +1,22 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
+
+public final class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, HtmlDocument> {
+
+    public static final HtmlParsingHelper DEFAULT = new HtmlParsingHelper(Params.getDefaultProcess());
+
+    private HtmlParsingHelper(Params params) {
+        super(HtmlLanguageModule.NAME, HtmlDocument.class, params);
+    }
+
+    @Override
+    protected HtmlParsingHelper clone(Params params) {
+        return new HtmlParsingHelper(params);
+    }
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
new file mode 100644
index 0000000000..8ffe75d03a
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
@@ -0,0 +1,38 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+
+public class HtmlTreeDumpTest extends BaseTreeDumpTest {
+    public HtmlTreeDumpTest() {
+        super(new RelevantAttributePrinter(), ".html");
+    }
+
+    @Override
+    public BaseParsingHelper<HtmlParsingHelper, HtmlDocument> getParser() {
+        return HtmlParsingHelper.DEFAULT.withResourceContext(HtmlTreeDumpTest.class, "testdata");
+    }
+
+    @Test
+    public void simpleHtmlFile() {
+        doTest("SimpleHtmlFile");
+    }
+
+    @Test
+    public void templateFragment() {
+        doTest("TemplateFragment");
+    }
+
+    @Test
+    public void simpleXmlFile() {
+        doTest("SimpleXmlFile");
+    }
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
new file mode 100644
index 0000000000..aa7db3ddb0
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
@@ -0,0 +1,42 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+
+package net.sourceforge.pmd.lang.html.ast;
+
+import java.util.Set;
+
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.test.BaseNodeAttributePrinter;
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.util.CollectionUtil;
+
+public class PositionTest extends BaseTreeDumpTest {
+    public PositionTest() {
+        super(new PositionRenderer(), ".html");
+    }
+
+    @Override
+    public BaseParsingHelper<HtmlParsingHelper, HtmlDocument> getParser() {
+        return HtmlParsingHelper.DEFAULT.withResourceContext(HtmlTreeDumpTest.class, "testdata");
+    }
+
+    @Test
+    public void testPositions() {
+        doTest("SimpleHtmlFile2");
+    }
+
+    private static class PositionRenderer extends BaseNodeAttributePrinter {
+        private final Set<String> pos = CollectionUtil.asSet(new String[] {"BeginLine", "BeginColumn", "EndLine", "EndColumn"});
+
+        @Override
+        protected boolean ignoreAttribute(Node node, Attribute attribute) {
+            return !pos.contains(attribute.getName());
+        }
+    }
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java
new file mode 100644
index 0000000000..204c2c9909
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java
@@ -0,0 +1,11 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule.bestpractices;
+
+import net.sourceforge.pmd.testframework.PmdRuleTst;
+
+public class AvoidInlineStylesTest extends PmdRuleTst {
+    // no additional unit tests
+}
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.html b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.html
new file mode 100644
index 0000000000..326afa05e0
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>hello</head>
+    <body>
+        <h1>world</h1>
+    </body>
+</html>
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
new file mode 100644
index 0000000000..3dbe45de94
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
@@ -0,0 +1,22 @@
++- #document[]
+   +- #doctype[@Name = "html", @PublicId = "", @SystemId = ""]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- html[]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+    "]
+   |  +- head[]
+   |  |  +- #text[@Image = "hello", @NormalizedText = "hello", @Text = "hello"]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+    "]
+   |  +- body[]
+   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+        "]
+   |  |  +- h1[]
+   |  |  |  +- #text[@Image = "world", @NormalizedText = "world", @Text = "world"]
+   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+    "]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.html b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.html
new file mode 100644
index 0000000000..326afa05e0
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>hello</head>
+    <body>
+        <h1>world</h1>
+    </body>
+</html>
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
new file mode 100644
index 0000000000..6e90423dff
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
@@ -0,0 +1,15 @@
++- #document[@BeginColumn = 1, @BeginLine = 1, @EndColumn = 8, @EndLine = 7]
+   +- #doctype[@BeginColumn = 1, @BeginLine = 1, @EndColumn = 15, @EndLine = 1]
+   +- #text[@BeginColumn = 16, @BeginLine = 1, @EndColumn = 16, @EndLine = 1]
+   +- html[@BeginColumn = 1, @BeginLine = 2, @EndColumn = 7, @EndLine = 7]
+   |  +- #text[@BeginColumn = 7, @BeginLine = 2, @EndColumn = 4, @EndLine = 3]
+   |  +- head[@BeginColumn = 5, @BeginLine = 3, @EndColumn = 22, @EndLine = 3]
+   |  |  +- #text[@BeginColumn = 11, @BeginLine = 3, @EndColumn = 15, @EndLine = 3]
+   |  +- #text[@BeginColumn = 23, @BeginLine = 3, @EndColumn = 4, @EndLine = 4]
+   |  +- body[@BeginColumn = 5, @BeginLine = 4, @EndColumn = 11, @EndLine = 6]
+   |  |  +- #text[@BeginColumn = 11, @BeginLine = 4, @EndColumn = 8, @EndLine = 5]
+   |  |  +- h1[@BeginColumn = 9, @BeginLine = 5, @EndColumn = 22, @EndLine = 5]
+   |  |  |  +- #text[@BeginColumn = 13, @BeginLine = 5, @EndColumn = 17, @EndLine = 5]
+   |  |  +- #text[@BeginColumn = 23, @BeginLine = 5, @EndColumn = 4, @EndLine = 6]
+   |  +- #text[@BeginColumn = 12, @BeginLine = 6, @EndColumn = 12, @EndLine = 6]
+   +- #text[@BeginColumn = 8, @BeginLine = 7, @EndColumn = 8, @EndLine = 7]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.html b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.html
new file mode 100644
index 0000000000..ee7f3edab2
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.html
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <child attr1="value1">text &amp; entities</child>
+</root>
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
new file mode 100644
index 0000000000..29a2088979
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
@@ -0,0 +1,13 @@
++- #document[]
+   +- #declaration[@Name = "xml"]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- root[]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+  "]
+   |  +- child[@attr1 = "value1"]
+   |  |  +- #text[@Image = "text & entities", @NormalizedText = "text & entities", @Text = "text & entities"]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.html b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.html
new file mode 100644
index 0000000000..5bbee33028
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.html
@@ -0,0 +1,57 @@
+<!-- from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html -->
+<template>
+    <section class="content container page-background">
+        <ui-navbar
+            nav-items={navigationItems}
+            selected-item={currentNavigationItem}
+            oncategorychange={handleCategoryChange}
+        >
+        </ui-navbar>
+
+        <article class="container">
+            <div>
+                <template if:true={navigationItems.hello.visible}>
+                    <recipe-hello></recipe-hello>
+                    <recipe-hello-binding></recipe-hello-binding>
+                    <recipe-hello-expressions></recipe-hello-expressions>
+                    <recipe-hello-expressions-track></recipe-hello-expressions-track>
+                    <recipe-hello-conditional-rendering></recipe-hello-conditional-rendering>
+                    <recipe-hello-for-each></recipe-hello-for-each
+                    ><recipe-hello-iterator></recipe-hello-iterator>
+                </template>
+                <template if:true={navigationItems.composition.visible}>
+                    <recipe-composition-basics></recipe-composition-basics>
+                    <recipe-composition-iteration></recipe-composition-iteration>
+                    <recipe-composition-contact-search></recipe-composition-contact-search>
+                    <recipe-composition-dynamic></recipe-composition-dynamic>
+                </template>
+                <template if:true={navigationItems.child.visible}>
+                    <recipe-event-simple></recipe-event-simple>
+                    <recipe-event-with-data></recipe-event-with-data>
+                    <recipe-event-bubbling></recipe-event-bubbling>
+                </template>
+                <template if:true={navigationItems.parent.visible}>
+                    <recipe-api-property></recipe-api-property>
+                    <recipe-api-function></recipe-api-function>
+                    <recipe-api-setter-getter></recipe-api-setter-getter>
+                </template>
+                <template if:true={navigationItems.misc.visible}>
+                    <recipe-misc-shared-java-script></recipe-misc-shared-java-script>
+                    <recipe-misc-rest-api-call></recipe-misc-rest-api-call>
+                    <recipe-misc-dom-query></recipe-misc-dom-query>
+                    <recipe-misc-multiple-templates></recipe-misc-multiple-templates>
+                </template>
+                <template if:true={navigationItems.party.visible}>
+                    <recipe-libs-d3></recipe-libs-d3>
+                    <recipe-libs-chartjs></recipe-libs-chartjs>
+                </template>
+                <ui-navfooter
+                    label-next={nextNavigationItem}
+                    label-previous={previousNavigationItem}
+                    onnextclicked={handleNavigateNext}
+                    onpreviousclicked={handleNavigatePrevious}
+                ></ui-navfooter>
+            </div>
+        </article>
+    </section>
+</template>
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
new file mode 100644
index 0000000000..db08ecb82d
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
@@ -0,0 +1,130 @@
++- #document[]
+   +- #comment[@Data = " from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html "]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- template[]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+    "]
+   |  +- section[@class = "content container page-background"]
+   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+        "]
+   |  |  +- ui-navbar[@nav-items = "{navigationItems}", @oncategorychange = "{handleCategoryChange}", @selected-item = "{currentNavigationItem}"]
+   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+        "]
+   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+
+        "]
+   |  |  +- article[@class = "container"]
+   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+            "]
+   |  |  |  +- div[]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.hello.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello-binding[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello-expressions[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello-expressions-track[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello-conditional-rendering[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-hello-for-each[]
+   |  |  |  |  |  +- recipe-hello-iterator[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.composition.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-composition-basics[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-composition-iteration[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-composition-contact-search[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-composition-dynamic[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.child.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-event-simple[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-event-with-data[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-event-bubbling[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.parent.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-api-property[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-api-function[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-api-setter-getter[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.misc.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-misc-shared-java-script[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-misc-rest-api-call[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-misc-dom-query[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-misc-multiple-templates[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- template[@if:true = "{navigationItems.party.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-libs-d3[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                    "]
+   |  |  |  |  |  +- recipe-libs-chartjs[]
+   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+                "]
+   |  |  |  |  +- ui-navfooter[@label-next = "{nextNavigationItem}", @label-previous = "{previousNavigationItem}", @onnextclicked = "{handleNavigateNext}", @onpreviousclicked = "{handleNavigatePrevious}"]
+   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+            "]
+   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+        "]
+   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+    "]
+   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
+   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.html b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.html
new file mode 100644
index 0000000000..326afa05e0
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+    <head>hello</head>
+    <body>
+        <h1>world</h1>
+    </body>
+</html>
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.txt
new file mode 100644
index 0000000000..3876c78744
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/cpd/SimpleHtmlFile.txt
@@ -0,0 +1,24 @@
+    [Image] or [Truncated image[            Bcol      Ecol
+L1
+    [#document]                             1         8
+    [#doctype]                              1         15
+    [\n]                                    16        16
+L2
+    [html]                                  1         7
+    [\n    ]                                7         4
+L3
+    [head]                                  5         22
+    [hello]                                 11        15
+    [\n    ]                                23        4
+L4
+    [body]                                  5         11
+    [\n        ]                            11        8
+L5
+    [h1]                                    9         22
+    [world]                                 13        17
+    [\n    ]                                23        4
+L6
+    [\n]                                    12        12
+L7
+    [\n]                                    8         8
+EOF
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/AvoidInlineStyles.xml b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/AvoidInlineStyles.xml
new file mode 100644
index 0000000000..53e08395ef
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/AvoidInlineStyles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+
+    <test-code>
+        <description>Example</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
+        <code><![CDATA[
+<html>
+  <body>
+    <div style="font-size: 10pt;"></div>
+    <div class="small"></div>
+  </body>
+</html>
+        ]]></code>
+    </test-code>
+
+</test-data>
diff --git a/pom.xml b/pom.xml
index 94ed6846fd..568a6cfb4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1084,6 +1084,7 @@
         <!-- java8 modules -->
         <module>pmd-apex-jorje</module>
         <module>pmd-apex</module>
+        <module>pmd-html</module>
         <module>pmd-java8</module>
         <module>pmd-javascript</module>
         <module>pmd-doc</module>

From 7080ca04876e03b08485d29ced28cccb4f8fd016 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 31 Mar 2022 18:07:51 +0200
Subject: [PATCH 014/180] [core] Renderers are started now by PmdAnalyzer

PMDTask doesn't need to start it itself.

- Fixes #3884
---
 docs/pages/release_notes.md                    |  3 +++
 .../net/sourceforge/pmd/ant/Formatter.java     |  1 -
 .../sourceforge/pmd/renderers/XMLRenderer.java |  3 +--
 .../net/sourceforge/pmd/ant/PMDTaskTest.java   | 18 ++++++++++++++++++
 .../pmd/ant/xml/expected-pmd-ant-xml.xml       |  8 ++++++++
 .../sourceforge/pmd/ant/xml/pmdtasktest.xml    | 10 ++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..fb72e6ab4f 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -16,6 +16,9 @@ This is a {{ site.pmd.release_type }} release.
 
 ### Fixed Issues
 
+*   core
+    *   [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
+
 ### API Changes
 
 ### External Contributions
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java
index 7995508c26..da031a0152 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/ant/Formatter.java
@@ -106,7 +106,6 @@ public class Formatter {
             }
             renderer = createRenderer();
             renderer.setWriter(writer);
-            renderer.start();
         } catch (IOException ioe) {
             throw new BuildException(ioe.getMessage(), ioe);
         }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java
index 204fc4f31a..f9dfd96a72 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/XMLRenderer.java
@@ -24,7 +24,6 @@ import javax.xml.stream.XMLStreamWriter;
 import org.apache.commons.io.output.WriterOutputStream;
 import org.apache.commons.lang3.StringUtils;
 
-import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMDVersion;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
@@ -69,7 +68,7 @@ public class XMLRenderer extends AbstractIncrementingRenderer {
     public void start() throws IOException {
         String encoding = getProperty(ENCODING);
         String unmarkedEncoding = toUnmarkedEncoding(encoding);
-        lineSeparator = PMD.EOL.getBytes(unmarkedEncoding);
+        lineSeparator = System.lineSeparator().getBytes(unmarkedEncoding);
 
         try {
             xmlWriter.writeStartDocument(encoding, "1.0");
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index cad90eac45..e3664ed464 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -80,4 +80,22 @@ public class PMDTaskTest {
             Assert.assertEquals("sample.dummy:0:\tSampleXPathRule:\tTest Rule 2", actual);
         }
     }
+
+    @Test
+    public void testXmlFormatter() throws IOException {
+        buildRule.executeTarget("testXmlFormatter");
+
+        try (InputStream in = new FileInputStream("target/pmd-ant-xml.xml");
+             InputStream expectedStream = PMDTaskTest.class.getResourceAsStream("xml/expected-pmd-ant-xml.xml")) {
+            String actual = IOUtils.toString(in, StandardCharsets.UTF_8);
+            actual = actual.replaceFirst("timestamp=\"[^\"]+\"", "timestamp=\"\"");
+            actual = actual.replaceFirst("\\.xsd\" version=\"[^\"]+\"", ".xsd\" version=\"\"");
+
+            String expected = IOUtils.toString(expectedStream, StandardCharsets.UTF_8);
+            expected = expected.replaceFirst("timestamp=\"[^\"]+\"", "timestamp=\"\"");
+            expected = expected.replaceFirst("\\.xsd\" version=\"[^\"]+\"", ".xsd\" version=\"\"");
+
+            Assert.assertEquals(expected, actual);
+        }
+    }
 }
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
new file mode 100644
index 0000000000..baf8db963b
--- /dev/null
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd xmlns="http://pmd.sourceforge.net/report/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/report/2.0.0 http://pmd.sourceforge.net/report_2_0_0.xsd" version="6.45.0-SNAPSHOT" timestamp="2022-03-31T17:55:43.046">
+<file name="sample.dummy">
+<violation beginline="0" endline="0" begincolumn="1" endcolumn="0" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
+Test Rule 2
+</violation>
+</file>
+</pmd>
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
index 43034d2c0e..71c482915a 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
@@ -34,4 +34,14 @@
             </fileset>
         </pmd>
     </target>
+
+    <target name="testXmlFormatter">
+        <pmd noCache="true" shortFilenames="true">
+            <ruleset>${pmd.home}/src/test/resources/rulesets/dummy/basic.xml</ruleset>
+            <formatter type="xml" toFile="${pmd.home}/target/pmd-ant-xml.xml" />
+            <fileset dir="${pmd.home}/src/test/resources/net/sourceforge/pmd/ant/src">
+                <include name="**/*dummy"/>
+            </fileset>
+        </pmd>
+    </target>
 </project>

From bbcfc00daebb41a751f63d471407eda08186aad1 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 1 Apr 2022 10:51:39 +0200
Subject: [PATCH 015/180] [doc] Update release notes (#3882)

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..262bf7df56 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -15,6 +15,8 @@ This is a {{ site.pmd.release_type }} release.
 ### New and noteworthy
 
 ### Fixed Issues
+* core
+  * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
 
 ### API Changes
 

From cd18ba0144cfdc62babedd05ea5950077578a22c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 1 Apr 2022 12:32:00 +0200
Subject: [PATCH 016/180] [core] Use always UTF-8 encoding for SARIF

Fixes #3881
---
 docs/pages/release_notes.md                   |  1 +
 .../pmd/renderers/SarifRenderer.java          |  7 ++++
 .../java/net/sourceforge/pmd/util/IOUtil.java | 20 ++++++++-
 .../java/net/sourceforge/pmd/FooRule.java     |  6 +--
 .../pmd/renderers/AbstractRendererTest.java   | 41 +++++++++++++++----
 .../renderers/CodeClimateRendererTest.java    | 11 +++--
 .../pmd/renderers/HTMLRendererTest.java       |  7 ++--
 .../pmd/renderers/JsonRendererTest.java       |  3 +-
 .../pmd/renderers/SarifRendererTest.java      | 15 ++++++-
 .../renderers/SummaryHTMLRendererTest.java    |  5 +--
 .../pmd/renderers/YAHTMLRendererTest.java     |  3 +-
 .../expected-multiple-locations.sarif.json    |  4 +-
 .../sarif/expected-multiple.sarif.json        |  4 +-
 .../pmd/renderers/sarif/expected.sarif.json   |  4 +-
 14 files changed, 91 insertions(+), 40 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 262bf7df56..f3d09032f2 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -16,6 +16,7 @@ This is a {{ site.pmd.release_type }} release.
 
 ### Fixed Issues
 * core
+  * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
 
 ### API Changes
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/renderers/SarifRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/SarifRenderer.java
index c7bcd5cf6b..135858d80b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/renderers/SarifRenderer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/renderers/SarifRenderer.java
@@ -5,12 +5,14 @@
 package net.sourceforge.pmd.renderers;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.renderers.internal.sarif.SarifLog;
 import net.sourceforge.pmd.renderers.internal.sarif.SarifLogBuilder;
+import net.sourceforge.pmd.util.IOUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -70,4 +72,9 @@ public class SarifRenderer extends AbstractIncrementingRenderer {
         final String json = gson.toJson(sarifLog);
         writer.write(json);
     }
+
+    @Override
+    public void setReportFile(String reportFilename) {
+        this.setWriter(IOUtil.createWriter(StandardCharsets.UTF_8, reportFilename));
+    }
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java
index ef082384d8..d4833987d1 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/IOUtil.java
@@ -74,14 +74,30 @@ public final class IOUtil {
      * @return the writer, never null
      */
     public static Writer createWriter(String reportFile) {
+        return createWriter(getDefaultCharset(), reportFile);
+    }
+
+    /**
+     * Creates a writer that writes to the given file or to stdout.
+     * The file is created if it does not exist.
+     *
+     * <p>Unlike {@link #createWriter(String)}, this method always uses
+     * the given charset. Even for writing to stdout. It never
+     * falls back to the default charset.</p>
+     *
+     * @param charset the charset to be used (required)
+     * @param reportFile the file name (optional)
+     * @return
+     */
+    public static Writer createWriter(Charset charset, String reportFile) {
         try {
             if (StringUtils.isBlank(reportFile)) {
-                return createWriter();
+                return new OutputStreamWriter(System.out, charset);
             }
             Path path = new File(reportFile).toPath().toAbsolutePath();
             Files.createDirectories(path.getParent()); // ensure parent dir exists
             // this will create the file if it doesn't exist
-            return Files.newBufferedWriter(path, getDefaultCharset());
+            return Files.newBufferedWriter(path, charset);
         } catch (IOException e) {
             throw new IllegalArgumentException(e);
         }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
index 6d37897942..a1e018718c 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
@@ -18,6 +18,7 @@ public class FooRule extends AbstractRule {
     public FooRule() {
         setLanguage(LanguageRegistry.getLanguage(DummyLanguageModule.NAME));
         setName("Foo");
+        setDescription("Description with Unicode Character U+2013: – .");
     }
 
     @Override
@@ -30,11 +31,6 @@ public class FooRule extends AbstractRule {
         return "RuleSet";
     }
 
-    @Override
-    public String getDescription() {
-        return "desc";
-    }
-
     @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         for (Node node : nodes) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
index 097c1c80b3..faa66b88e4 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
@@ -7,14 +7,17 @@ package net.sourceforge.pmd.renderers;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import net.sourceforge.pmd.FooRule;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
-import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RulePriority;
@@ -26,6 +29,9 @@ import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 
 public abstract class AbstractRendererTest {
 
+    @org.junit.Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     public abstract Renderer getRenderer();
 
     public abstract String getExpected();
@@ -100,6 +106,7 @@ public abstract class AbstractRendererTest {
     protected Rule createBooRule() {
         Rule booRule = new FooRule();
         booRule.setName("Boo");
+        booRule.setDescription("desc");
         booRule.setPriority(RulePriority.HIGH);
         return booRule;
     }
@@ -130,28 +137,32 @@ public abstract class AbstractRendererTest {
         theRule.setProperty(RuleWithProperties.STRING_PROPERTY_DESCRIPTOR,
                 "the string value\nsecond line with \"quotes\"");
         report.addRuleViolation(newRuleViolation(1, 1, 1, 1, theRule));
-        String rendered = ReportTest.render(getRenderer(), report);
+        String rendered = renderReport(getRenderer(), report);
         assertEquals(filter(getExpectedWithProperties()), filter(rendered));
     }
 
     @Test
     public void testRenderer() throws Exception {
+        testRenderer(Charset.defaultCharset());
+    }
+
+    protected void testRenderer(Charset expectedCharset) throws Exception {
         Report rep = reportOneViolation();
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep, expectedCharset);
         assertEquals(filter(getExpected()), filter(actual));
     }
 
     @Test
     public void testRendererEmpty() throws Exception {
         Report rep = new Report();
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         assertEquals(filter(getExpectedEmpty()), filter(actual));
     }
 
     @Test
     public void testRendererMultiple() throws Exception {
         Report rep = reportTwoViolations();
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         assertEquals(filter(getExpectedMultiple()), filter(actual));
     }
 
@@ -160,7 +171,7 @@ public abstract class AbstractRendererTest {
         Report rep = new Report();
         Report.ProcessingError err = new Report.ProcessingError(new RuntimeException("Error"), "file");
         rep.addError(err);
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         assertEquals(filter(getExpectedError(err)), filter(actual));
     }
 
@@ -169,7 +180,7 @@ public abstract class AbstractRendererTest {
         Report rep = new Report();
         Report.ProcessingError err = new Report.ProcessingError(new NullPointerException(), "file");
         rep.addError(err);
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         assertEquals(filter(getExpectedErrorWithoutMessage(err)), filter(actual));
     }
 
@@ -178,7 +189,21 @@ public abstract class AbstractRendererTest {
         Report rep = new Report();
         Report.ConfigurationError err = new Report.ConfigurationError(new FooRule(), "a configuration error");
         rep.addConfigError(err);
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         assertEquals(filter(getExpectedError(err)), filter(actual));
     }
+
+    protected String renderReport(Renderer renderer, Report report) throws IOException {
+        return renderReport(renderer, report, Charset.defaultCharset());
+    }
+
+    protected String renderReport(Renderer renderer, Report report, Charset expectedEncoding) throws IOException {
+        File file = temporaryFolder.newFile();
+        renderer.setReportFile(file.getAbsolutePath());
+        renderer.start();
+        renderer.renderFileReport(report);
+        renderer.end();
+        renderer.flush();
+        return FileUtils.readFileToString(file, expectedEncoding);
+    }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/CodeClimateRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/CodeClimateRendererTest.java
index 2d6ec8be4e..536561015f 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/CodeClimateRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/CodeClimateRendererTest.java
@@ -10,7 +10,6 @@ import org.junit.Test;
 
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report;
-import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class CodeClimateRendererTest extends AbstractRendererTest {
@@ -26,7 +25,7 @@ public class CodeClimateRendererTest extends AbstractRendererTest {
                 + "\"content\":{\"body\":\"## Foo\\n\\nSince: PMD null\\n\\nPriority: Low\\n\\n"
                 + "[Categories](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#categories): Style\\n\\n"
                 + "[Remediation Points](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#remediation-points): 50000\\n\\n"
-                + "desc\\n\\n"
+                + "Description with Unicode Character U+2013: – .\\n\\n"
                 + "### [PMD properties](https://pmd.github.io/latest/pmd_userdocs_configuring_rules.html#rule-properties)\\n\\n"
                 + "Name | Value | Description\\n" + "--- | --- | ---\\n"
                 + "violationSuppressRegex | | Suppress violations with messages matching a regular expression\\n"
@@ -41,7 +40,7 @@ public class CodeClimateRendererTest extends AbstractRendererTest {
                 + "\"content\":{\"body\":\"## Foo\\n\\nSince: PMD null\\n\\nPriority: Low\\n\\n"
                 + "[Categories](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#categories): Style\\n\\n"
                 + "[Remediation Points](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#remediation-points): 50000\\n\\n"
-                + "desc\\n\\n"
+                + "Description with Unicode Character U+2013: – .\\n\\n"
                 + "### [PMD properties](https://pmd.github.io/latest/pmd_userdocs_configuring_rules.html#rule-properties)\\n\\n"
                 + "Name | Value | Description\\n" + "--- | --- | ---\\n"
                 + "violationSuppressRegex | | Suppress violations with messages matching a regular expression\\n"
@@ -63,7 +62,7 @@ public class CodeClimateRendererTest extends AbstractRendererTest {
                 + "\"content\":{\"body\":\"## Foo\\n\\nSince: PMD null\\n\\nPriority: Low\\n\\n"
                 + "[Categories](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#categories): Style\\n\\n"
                 + "[Remediation Points](https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#remediation-points): 50000\\n\\n"
-                + "desc\\n\\n"
+                + "Description with Unicode Character U+2013: – .\\n\\n"
                 + "### [PMD properties](https://pmd.github.io/latest/pmd_userdocs_configuring_rules.html#rule-properties)\\n\\n"
                 + "Name | Value | Description\\n" + "--- | --- | ---\\n"
                 + "violationSuppressRegex | | Suppress violations with messages matching a regular expression\\n"
@@ -89,11 +88,11 @@ public class CodeClimateRendererTest extends AbstractRendererTest {
         XPathRule theRule = new XPathRule();
         theRule.setProperty(XPathRule.XPATH_DESCRIPTOR, "//dummyNode");
         // Setup as FooRule
-        theRule.setDescription("desc");
+        theRule.setDescription("Description with Unicode Character U+2013: – .");
         theRule.setName("Foo");
 
         report.addRuleViolation(newRuleViolation(1, 1, 1, 2, theRule));
-        String rendered = ReportTest.render(getRenderer(), report);
+        String rendered = renderReport(getRenderer(), report);
 
         // Output should be the exact same as for non xpath rules
         assertEquals(filter(getExpected()), filter(rendered));
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java
index 9daba62e06..c9cee30100 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java
@@ -14,7 +14,6 @@ import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
-import net.sourceforge.pmd.ReportTest;
 
 public class HTMLRendererTest extends AbstractRendererTest {
 
@@ -100,7 +99,7 @@ public class HTMLRendererTest extends AbstractRendererTest {
         renderer.setProperty(HTMLRenderer.HTML_EXTENSION, false);
 
         Report rep = reportOneViolation();
-        String actual = ReportTest.render(renderer, rep);
+        String actual = renderReport(renderer, rep);
         assertEquals(filter(getExpected(linkPrefix, "L1")), filter(actual));
     }
 
@@ -113,7 +112,7 @@ public class HTMLRendererTest extends AbstractRendererTest {
         renderer.setProperty(HTMLRenderer.HTML_EXTENSION, false);
 
         Report rep = reportOneViolation();
-        String actual = ReportTest.render(renderer, rep);
+        String actual = renderReport(renderer, rep);
         assertEquals(filter(getExpected(linkPrefix, "")), filter(actual));
     }
 
@@ -126,7 +125,7 @@ public class HTMLRendererTest extends AbstractRendererTest {
         renderer.setProperty(HTMLRenderer.HTML_EXTENSION, false);
 
         Report rep = reportOneViolation();
-        String actual = ReportTest.render(renderer, rep);
+        String actual = renderReport(renderer, rep);
         assertEquals(filter(getExpected(linkPrefix, "1")), filter(actual));
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/JsonRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/JsonRendererTest.java
index a913af96a8..38f3a1ad9a 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/JsonRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/JsonRendererTest.java
@@ -19,7 +19,6 @@ import net.sourceforge.pmd.FooRule;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
-import net.sourceforge.pmd.ReportTest;
 
 public class JsonRendererTest extends AbstractRendererTest {
 
@@ -92,7 +91,7 @@ public class JsonRendererTest extends AbstractRendererTest {
         suppressedLines.put(1, "test");
         rep.suppress(suppressedLines);
         rep.addRuleViolation(newRuleViolation(1, 1, 1, 1, new FooRule()));
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
         String expected = readFile("expected-suppressed.json");
         Assert.assertEquals(filter(expected), filter(actual));
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SarifRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SarifRendererTest.java
index 26899a7384..ae6f605dd4 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SarifRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SarifRendererTest.java
@@ -14,17 +14,28 @@ import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 
 import net.sourceforge.pmd.Report;
-import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.Rule;
 
+
 public class SarifRendererTest extends AbstractRendererTest {
+
+    @org.junit.Rule
+    public RestoreSystemProperties systemProperties = new RestoreSystemProperties();
+
     @Override
     public Renderer getRenderer() {
         return new SarifRenderer();
     }
 
+    @Test
+    public void testRendererWithASCII() throws Exception {
+        System.setProperty("file.encoding", StandardCharsets.US_ASCII.name());
+        testRenderer(StandardCharsets.UTF_8);
+    }
+
     @Override
     public String getExpected() {
         return readFile("expected.sarif.json");
@@ -80,7 +91,7 @@ public class SarifRendererTest extends AbstractRendererTest {
     @Test
     public void testRendererMultipleLocations() throws Exception {
         Report rep = reportThreeViolationsTwoRules();
-        String actual = ReportTest.render(getRenderer(), rep);
+        String actual = renderReport(getRenderer(), rep);
 
         JSONObject json = new JSONObject(actual);
         JSONArray results = json.getJSONArray("runs").getJSONObject(0).getJSONArray("results");
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
index b4201019c0..6a3366ee5b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
@@ -16,7 +16,6 @@ import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
-import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
@@ -121,7 +120,7 @@ public class SummaryHTMLRendererTest extends AbstractRendererTest {
         Report rep = createEmptyReportWithSuppression();
         Renderer renderer = getRenderer();
         renderer.setShowSuppressedViolations(true);
-        String actual = ReportTest.render(renderer, rep);
+        String actual = renderReport(renderer, rep);
         assertEquals("<html><head><title>PMD</title></head><body>" + PMD.EOL + "<center><h2>Summary</h2></center>"
                 + PMD.EOL + "<table align=\"center\" cellspacing=\"0\" cellpadding=\"3\">" + PMD.EOL
                 + "<tr><th>Rule name</th><th>Number of violations</th></tr>" + PMD.EOL + "</table>" + PMD.EOL
@@ -142,7 +141,7 @@ public class SummaryHTMLRendererTest extends AbstractRendererTest {
         Report rep = createEmptyReportWithSuppression();
         Renderer renderer = getRenderer();
         renderer.setShowSuppressedViolations(false);
-        String actual = ReportTest.render(renderer, rep);
+        String actual = renderReport(renderer, rep);
         assertEquals(getExpectedEmpty(), actual);
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java
index 0b0355f5d1..f52cc72a23 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java
@@ -24,7 +24,6 @@ import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
-import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleViolation;
@@ -67,7 +66,7 @@ public class YAHTMLRendererTest extends AbstractRendererTest {
         report.addRuleViolation(newRuleViolation(1, 1, 1, 1, "net.sf.pmd.test", "YAHTMLSampleClass1"));
         report.addRuleViolation(newRuleViolation(1, 1, 1, 2, "net.sf.pmd.test", "YAHTMLSampleClass1"));
         report.addRuleViolation(newRuleViolation(1, 1, 1, 1, "net.sf.pmd.other", "YAHTMLSampleClass2"));
-        String actual = ReportTest.render(getRenderer(), report);
+        String actual = renderReport(getRenderer(), report);
         assertEquals(filter(getExpected()), filter(actual));
 
         String[] htmlFiles = outputDir.list();
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple-locations.sarif.json b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple-locations.sarif.json
index 7a545006b0..7b54693e8d 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple-locations.sarif.json
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple-locations.sarif.json
@@ -15,10 +15,10 @@
                 "text": "blah"
               },
               "fullDescription": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "help": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "properties": {
                 "ruleset": "RuleSet",
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple.sarif.json b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple.sarif.json
index 108ac1578f..8fcab6485e 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple.sarif.json
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected-multiple.sarif.json
@@ -15,10 +15,10 @@
                 "text": "blah"
               },
               "fullDescription": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "help": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "properties": {
                 "ruleset": "RuleSet",
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected.sarif.json b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected.sarif.json
index a99c6eca1f..7395beb6d8 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected.sarif.json
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/renderers/sarif/expected.sarif.json
@@ -15,10 +15,10 @@
                 "text": "blah"
               },
               "fullDescription": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "help": {
-                "text": "desc"
+                "text": "Description with Unicode Character U+2013: – ."
               },
               "properties": {
                 "ruleset": "RuleSet",

From bc19d2cc406ab626f75a1150baeaab07f0b909fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 1 Apr 2022 18:56:16 +0200
Subject: [PATCH 017/180] [java] Improve module grammar

Type names in "provides" directives are disambiguated
like any other type name.

ASTName is made redundant and removed for good.
---
 pmd-java/etc/grammar/Java.jjt                 | 59 +++++++++------
 .../pmd/lang/java/ast/ASTCompilationUnit.java | 10 ++-
 .../lang/java/ast/ASTModuleDeclaration.java   | 30 +++++++-
 .../pmd/lang/java/ast/ASTModuleDirective.java | 73 ++++++++++---------
 .../java/ast/ASTModuleExportsDirective.java   | 39 ++++++++++
 .../pmd/lang/java/ast/ASTModuleName.java      | 19 +++++
 .../java/ast/ASTModuleOpensDirective.java     | 40 ++++++++++
 .../java/ast/ASTModuleProvidesDirective.java  | 39 ++++++++++
 .../java/ast/ASTModuleRequiresDirective.java  | 57 +++++++++++++++
 .../lang/java/ast/ASTModuleUsesDirective.java | 26 +++++++
 .../pmd/lang/java/ast/ASTName.java            | 46 ------------
 .../lang/java/ast/ASTPackageDeclaration.java  |  3 +-
 .../pmd/lang/java/ast/ASTYieldStatement.java  |  9 ---
 .../AbstractPackageNameModuleDirective.java   | 26 +++++++
 .../rule/bestpractices/LooseCouplingRule.java |  2 +
 .../lang/java/types/ast/LazyTypeResolver.java |  6 --
 .../java/ast/ASTModuleDeclarationTest.java    | 58 ++-------------
 .../pmd/lang/java/ast/JDKVersionTest.java     | 32 +++++---
 .../pmd/lang/java/ast/Java9TreeDumpTest.java  | 34 +++++++++
 .../pmd/lang/java/ast/SimpleNodeTest.java     | 39 ----------
 .../lang/java/ast/TypeDisambiguationTest.kt   | 26 +++++++
 .../{ => java9}/jdk9_anonymous_diamond.java   |  0
 .../{ => java9}/jdk9_invalid_identifier.java  |  0
 .../{ => java9}/jdk9_module_info.java         |  3 +-
 .../java9/jdk9_module_info.txt                | 20 +++++
 .../jdk9_module_info_with_annot.java          |  0
 .../java9/jdk9_module_info_with_annot.txt     | 10 +++
 .../jdk9_private_interface_methods.java       |  0
 .../{ => java9}/jdk9_try_with_resources.java  |  4 +
 29 files changed, 482 insertions(+), 228 deletions(-)
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
 create mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
 create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_anonymous_diamond.java (100%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_invalid_identifier.java (100%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_module_info.java (80%)
 create mode 100644 pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_module_info_with_annot.java (100%)
 create mode 100644 pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_private_interface_methods.java (100%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/{ => java9}/jdk9_try_with_resources.java (81%)

diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
index 5a3fc90bed..0563a698e4 100644
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -1,4 +1,9 @@
 /**
+ * Improve module grammar.
+ * Type names in "provides" directives are disambiguated like any other type name.
+ * ASTName is made redundant and removed for good.
+ * Clément Fournier 03/2022
+ *====================================================================
  * Support "JEP 420: Pattern Matching for switch (Second Preview)" for Java 18 Preview
  * There were no grammar changes between 18-preview and 17-preview
  * Remove support for Java 16 preview language features
@@ -2734,40 +2739,34 @@ void DefaultValue():
 }
 
 void ModuleDeclaration():
+{}
 {
-    StringBuilder s = new StringBuilder();
-    JavaccToken t;
-}
-{
-  ( Annotation() )* [LOOKAHEAD({isKeyword("open")}) <IDENTIFIER> {jjtThis.setOpen(true);}] LOOKAHEAD({isKeyword("module")}) <IDENTIFIER>
-  t=<IDENTIFIER> { s.append(t.getImage()); }
-  ( "." t=<IDENTIFIER> { s.append('.').append(t.getImage()); } )* { jjtThis.setImage(s.toString()); }
+  AnnotationList()
+  [LOOKAHEAD({isKeyword("open")}) <IDENTIFIER> {jjtThis.setOpen(true);}]
+  LOOKAHEAD({isKeyword("module")}) <IDENTIFIER>
+  ModuleName()
   "{" (ModuleDirective())* "}"
 }
 
-void ModuleDirective():
-{}
+void ModuleDirective() #void:
+{String packageName;}
 {
-    ( LOOKAHEAD({isKeyword("requires")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.REQUIRES); }
-            (LOOKAHEAD({isKeyword("transitive")}) <IDENTIFIER> { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.TRANSITIVE); } |
-             "static"     { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.STATIC);     } )?
-         ModuleName() ";" )
-  | ( LOOKAHEAD({isKeyword("exports")})  <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.EXPORTS); }  Name() [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())*] ";" )
-  | ( LOOKAHEAD({isKeyword("opens")})    <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.OPENS); }    Name() [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())*] ";" )
-  | ( LOOKAHEAD({isKeyword("uses")})     <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.USES); }     Name() ";" )
-  | ( LOOKAHEAD({isKeyword("provides")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.PROVIDES); } Name() LOOKAHEAD({isKeyword("with")}) <IDENTIFIER> Name() ("," Name() )* ";" )
+    ( LOOKAHEAD({isKeyword("requires")}) <IDENTIFIER>
+      [
+        LOOKAHEAD({isKeyword("transitive")}) <IDENTIFIER> { jjtThis.setTransitive(); }
+      |                                      "static"     { jjtThis.setStatic(); }
+      ]
+      ModuleName() ";" ) #ModuleRequiresDirective
+  | ( LOOKAHEAD({isKeyword("exports")})  <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())* ] ";" ) #ModuleExportsDirective
+  | ( LOOKAHEAD({isKeyword("opens")})    <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())* ] ";" ) #ModuleOpensDirective
+  | ( LOOKAHEAD({isKeyword("uses")})     <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} ";" ) #ModuleUsesDirective
+  | ( LOOKAHEAD({isKeyword("provides")}) <IDENTIFIER> ClassName() LOOKAHEAD({isKeyword("with")}) <IDENTIFIER> ClassName() ("," ClassName() )* ";" ) #ModuleProvidesDirective
 }
 
 void ModuleName():
 { String name; }
 {
-  name=VoidName() { jjtThis.setImage(name); }
-}
-
-void Name():
-{ String name; }
-{
-  name=VoidName() { jjtThis.setImage(name); }
+  name=VoidNameNoLookahead() { jjtThis.setImage(name); }
 }
 
 void AmbiguousName():
@@ -2793,6 +2792,18 @@ String VoidName() #void:
   {return s.toString();}
 }
 
+
+String VoidNameNoLookahead() #void:
+{
+  StringBuilder s = new StringBuilder();
+  JavaccToken t;
+}
+{
+  t=<IDENTIFIER>       { s.append(t.getImage()); }
+  ( "." t=<IDENTIFIER> { s.append('.').append(t.getImage()); } )*
+  {return s.toString();}
+}
+
 // Produces a ClassOrInterfaceType, possibly with an ambiguous LHS
 void ClassName() #void:
 {}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
index c50bb27f76..9d0f3987f4 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
@@ -73,8 +73,7 @@ public final class ASTCompilationUnit extends AbstractJavaTypeNode implements Ja
      * Returns the package name of this compilation unit. If there is no
      * package declaration, then returns the empty string.
      */
-    @NonNull
-    public String getPackageName() {
+    public @NonNull String getPackageName() {
         ASTPackageDeclaration pack = getPackageDeclaration();
         return pack == null ? "" : pack.getName();
     }
@@ -88,6 +87,13 @@ public final class ASTCompilationUnit extends AbstractJavaTypeNode implements Ja
         return children(ASTAnyTypeDeclaration.class);
     }
 
+    /**
+     * Returns the module declaration, if this is a modular compilation unit.
+     */
+    public @Nullable ASTModuleDeclaration getModuleDeclaration() {
+        return firstChild(ASTModuleDeclaration.class);
+    }
+
     @Override
     public @NonNull JSymbolTable getSymbolTable() {
         assert symbolTable != null : "Symbol table wasn't set";
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
index 074065a1e0..047d20d99d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
@@ -4,7 +4,21 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
-public final class ASTModuleDeclaration extends AbstractJavaNode {
+import net.sourceforge.pmd.lang.ast.NodeStream;
+
+/**
+ * A module declaration. This is found at the top-level of a
+ * {@linkplain ASTCompilationUnit modular compilation unit}.
+ *
+ * <pre clas="grammar">
+ *
+ * ModuleDeclaration ::= {@linkplain ASTModifierList AnnotationList} "open"?
+ *                       "module" {@linkplain ASTModuleName ModuleName}
+ *                       "{" {@linkplain ASTModuleDirective ModuleDirective}* "}"
+ *
+ * </pre>
+ */
+public final class ASTModuleDeclaration extends AbstractJavaNode implements Annotatable {
 
     private boolean open;
 
@@ -18,6 +32,20 @@ public final class ASTModuleDeclaration extends AbstractJavaNode {
         return visitor.visit(this, data);
     }
 
+    /**
+     * Returns the name of the declared module. Module names look
+     * like package names, eg {@code java.base}.
+     */
+    public String getName() {
+        return firstChild(ASTModuleName.class).getName();
+    }
+
+    /**
+     * Returns a stream with all directives declared by the module.
+     */
+    public NodeStream<ASTModuleDirective> getDirectives() {
+        return children(ASTModuleDirective.class);
+    }
 
     void setOpen(boolean open) {
         this.open = open;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
index 047f9ff964..41f6cc277d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
@@ -4,44 +4,47 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
-public final class ASTModuleDirective extends AbstractJavaNode {
 
+import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
+
+/**
+ * A directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ * Implementations provide more specific attributes.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleDirective ::= {@linkplain ASTModuleRequiresDirective ModuleRequiresDirective}
+ *                   | {@linkplain ASTModuleOpensDirective ModuleOpensDirective}
+ *                   | {@linkplain ASTModuleExportsDirective ModuleExportsDirective}
+ *                   | {@linkplain ASTModuleProvidesDirective ModuleProvidesDirective}
+ *                   | {@linkplain ASTModuleUsesDirective ModuleUsesDirective}
+ *
+ * </pre>
+ */
+public abstract class ASTModuleDirective extends AbstractJavaNode {
+
+    private final DirectiveType type;
+
+
+    ASTModuleDirective(int id, DirectiveType type) {
+        super(id);
+        this.type = type;
+    }
+
+    /**
+     * Returns the kind of the directive.
+     */
+    @NoAttribute
+    public DirectiveType getType() {
+        return type;
+    }
+
+    /**
+     * Kind of a module directive. Specific kinds are represented by
+     * specific subclasses.
+     */
     public enum DirectiveType {
         REQUIRES, EXPORTS, OPENS, USES, PROVIDES
     }
 
-    public enum RequiresModifier {
-        STATIC, TRANSITIVE
-    }
-
-    private DirectiveType type;
-
-    private RequiresModifier requiresModifier;
-
-    ASTModuleDirective(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        return visitor.visit(this, data);
-    }
-
-
-    void setType(DirectiveType type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return String.valueOf(type);
-    }
-
-    void setRequiresModifier(RequiresModifier requiresModifier) {
-        this.requiresModifier = requiresModifier;
-    }
-
-    public String getRequiresModifier() {
-        return requiresModifier == null ? null : requiresModifier.name();
-    }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
new file mode 100644
index 0000000000..ab2fe93fed
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
@@ -0,0 +1,39 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+import net.sourceforge.pmd.lang.ast.NodeStream;
+
+/**
+ * An "exports" directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleExportsDirective ::=
+ *     "exports" &lt;PACKAGE_NAME&gt;
+ *     ( "to" {@linkplain ASTModuleName ModuleName} ( "," {@linkplain ASTModuleName ModuleName})* )?
+ *     ";"
+ *
+ * </pre>
+ */
+public final class ASTModuleExportsDirective extends AbstractPackageNameModuleDirective {
+
+    ASTModuleExportsDirective(int id) {
+        super(id, DirectiveType.EXPORTS);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+
+    /**
+     * Returns a stream of the module names that are found after the "to" keyword.
+     * May be empty
+     */
+    public NodeStream<ASTModuleName> getTargetModules() {
+        return children(ASTModuleName.class);
+    }
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
index dfb9acc73f..69a24d555e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
@@ -4,6 +4,10 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
+/**
+ * The name of a module. Module names look like package names, eg
+ * {@code java.base}.
+ */
 public final class ASTModuleName extends AbstractJavaNode {
 
     ASTModuleName(int id) {
@@ -15,4 +19,19 @@ public final class ASTModuleName extends AbstractJavaNode {
     public <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
+
+    @Override
+    @Deprecated
+    public String getImage() {
+        return null;
+    }
+
+    /**
+     * Returns the name of the declared module. Module names look
+     * like package names, eg {@code java.base}.
+     */
+    public String getName() {
+        return super.getImage();
+    }
+
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
new file mode 100644
index 0000000000..b575c83de9
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
@@ -0,0 +1,40 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+import net.sourceforge.pmd.lang.ast.NodeStream;
+
+/**
+ * An "opens" directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleOpensDirective ::=
+ *     "opens" &lt;PACKAGE_NAME&gt;
+ *     ( "to" {@linkplain ASTModuleName ModuleName} ( "," {@linkplain ASTModuleName ModuleName})* )?
+ *     ";"
+ *
+ * </pre>
+ */
+public final class ASTModuleOpensDirective extends AbstractPackageNameModuleDirective {
+
+    ASTModuleOpensDirective(int id) {
+        super(id, DirectiveType.OPENS);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+
+    /**
+     * Returns a stream of the module names that are found after the "to" keyword.
+     * May be empty
+     */
+    public NodeStream<ASTModuleName> getTargetModules() {
+        return children(ASTModuleName.class);
+    }
+
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
new file mode 100644
index 0000000000..8c833733bc
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
@@ -0,0 +1,39 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+import net.sourceforge.pmd.lang.ast.NodeStream;
+
+/**
+ * A "provides" directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleProvidesDirective ::=
+ *     "provides" {@linkplain ASTClassOrInterfaceType ClassType}
+ *     "with" {@linkplain ASTClassOrInterfaceType ClassType} ( "," {@linkplain ASTClassOrInterfaceType ClassType} )*
+ *     ";"
+ *
+ * </pre>
+ */
+public final class ASTModuleProvidesDirective extends ASTModuleDirective {
+
+    ASTModuleProvidesDirective(int id) {
+        super(id, DirectiveType.PROVIDES);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+
+    public ASTClassOrInterfaceType getProvidedInterface() {
+        return firstChild(ASTClassOrInterfaceType.class);
+    }
+
+    public NodeStream<ASTClassOrInterfaceType> getImplementations() {
+        return children(ASTClassOrInterfaceType.class).drop(1);
+    }
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
new file mode 100644
index 0000000000..add47fa902
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
@@ -0,0 +1,57 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+import java.util.Objects;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+/**
+ * A "requires"  directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleRequiresDirective ::=
+ *     "requires" ( "transitive" | "static" )? {@linkplain ASTModuleName ModuleName} ";"
+ *
+ * </pre>
+ */
+public final class ASTModuleRequiresDirective extends ASTModuleDirective {
+
+    private boolean isStatic;
+    private boolean isTransitive;
+
+    ASTModuleRequiresDirective(int id) {
+        super(id, DirectiveType.REQUIRES);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+
+    /**
+     * Returns the name of the required module.
+     */
+    public @NonNull ASTModuleName getRequiredModule() {
+        return Objects.requireNonNull(firstChild(ASTModuleName.class));
+    }
+
+    public boolean isStatic() {
+        return isStatic;
+    }
+
+    public boolean isTransitive() {
+        return isTransitive;
+    }
+
+    void setTransitive() {
+        isTransitive = true;
+    }
+
+    void setStatic() {
+        isStatic = true;
+    }
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
new file mode 100644
index 0000000000..c7557f6e4a
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
@@ -0,0 +1,26 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+/**
+ * A "uses" directive of a {@linkplain ASTModuleDeclaration module declaration}.
+ *
+ * <pre class="grammar">
+ *
+ * ModuleUsesDirective ::= "uses" &lt;PACKAGE_NAME&gt; ";"
+ *
+ * </pre>
+ */
+public final class ASTModuleUsesDirective extends AbstractPackageNameModuleDirective {
+
+    ASTModuleUsesDirective(int id) {
+        super(id, DirectiveType.USES);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
deleted file mode 100644
index 55e5e9daf0..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import net.sourceforge.pmd.annotation.InternalApi;
-import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
-
-public class ASTName extends AbstractJavaTypeNode {
-
-    private NameDeclaration nd;
-
-
-    /**
-     * Constructor for a synthetic node.
-     * @param image Image of the new node
-     */
-    @InternalApi
-    @Deprecated
-    public ASTName(String image, AbstractJavaNode parent) {
-        super(JavaParserImplTreeConstants.JJTNAME);
-        setImage(image);
-        setParent(parent);
-    }
-
-    ASTName(int id) {
-        super(id);
-    }
-
-    @InternalApi
-    @Deprecated
-    public void setNameDeclaration(NameDeclaration nd) {
-        this.nd = nd;
-    }
-
-    public NameDeclaration getNameDeclaration() {
-        return this.nd;
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        return visitor.visit(this, data);
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
index 2f81ccb2ae..046101921e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
@@ -6,8 +6,7 @@ package net.sourceforge.pmd.lang.java.ast;
 
 /**
  * Package declaration at the top of a {@linkplain ASTCompilationUnit source file}.
- * Since 7.0, there is no {@linkplain ASTName Name} node anymore. Use
- * {@link #getName()} instead.
+ * Since 7.0, there is no Name node anymore. Use {@link #getName()} instead.
  *
  *
  * <pre class="grammar">
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTYieldStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTYieldStatement.java
index 657e0cd703..16fdd17582 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTYieldStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTYieldStatement.java
@@ -30,15 +30,6 @@ public class ASTYieldStatement extends AbstractStatement {
         return visitor.visit(this, data);
     }
 
-    @Override
-    public String getImage() {
-        String result = super.getImage();
-        if (result == null && hasDescendantOfType(ASTName.class)) {
-            result = getFirstDescendantOfType(ASTName.class).getImage();
-        }
-        return result;
-    }
-
 
     /** Returns the yielded expression. */
     public ASTExpression getExpr() {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
new file mode 100644
index 0000000000..6bf5a78bf3
--- /dev/null
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
@@ -0,0 +1,26 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+public abstract class AbstractPackageNameModuleDirective extends ASTModuleDirective {
+
+    AbstractPackageNameModuleDirective(int id, DirectiveType type) {
+        super(id, type);
+    }
+
+    public final String getPackageName() {
+        return super.getImage();
+    }
+
+    @Override
+    @Deprecated
+    public final String getImage() {
+        return null;
+    }
+
+    final void setPackageName(String name) {
+        super.setImage(name);
+    }
+}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
index 3024edaa48..78f4812477 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingRule.java
@@ -18,6 +18,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
 import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall;
 import net.sourceforge.pmd.lang.java.ast.ASTExtendsList;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
+import net.sourceforge.pmd.lang.java.ast.ASTModuleProvidesDirective;
 import net.sourceforge.pmd.lang.java.ast.ASTSuperExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTThisExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTTypeExpression;
@@ -62,6 +63,7 @@ public class LooseCouplingRule extends AbstractJavaRulechainRule {
             || parent instanceof ASTExtendsList          // extends AbstractMap<...>
             || parent instanceof ASTThisExpression       // Enclosing.this
             || parent instanceof ASTSuperExpression      // Enclosing.super
+            || parent instanceof ASTModuleProvidesDirective  // provides <interface> with <implementation>
             || parent instanceof ASTArrayType && parent.getParent() instanceof ASTArrayAllocation;
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
index 9fa259f112..d813bba861 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
@@ -42,7 +42,6 @@ import net.sourceforge.pmd.lang.java.ast.ASTLambdaExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTLambdaParameter;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodCall;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodReference;
-import net.sourceforge.pmd.lang.java.ast.ASTName;
 import net.sourceforge.pmd.lang.java.ast.ASTNullLiteral;
 import net.sourceforge.pmd.lang.java.ast.ASTNumericLiteral;
 import net.sourceforge.pmd.lang.java.ast.ASTPattern;
@@ -152,11 +151,6 @@ public final class LazyTypeResolver extends JavaVisitorBase<TypingContext, @NonN
         return ts.NO_TYPE; // TODO shouldn't be a typenode (do you mean type of variable, or type of initializer?)
     }
 
-    @Override
-    public JTypeMirror visit(ASTName node, TypingContext ctx) {
-        return ts.NO_TYPE; // TODO shouldn't be a typenode (basically an AmbiguousName)
-    }
-
     @Override
     public JTypeMirror visit(ASTCompilationUnit node, TypingContext ctx) {
         return ts.NO_TYPE; // TODO shouldn't be a typenode
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
index 4be1ebb900..38f4487927 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
@@ -1,14 +1,10 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
 package net.sourceforge.pmd.lang.java.ast;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.Test;
 
@@ -17,51 +13,11 @@ import net.sourceforge.pmd.lang.java.BaseParserTest;
 public class ASTModuleDeclarationTest extends BaseParserTest {
 
     @Test
-    public final void jdk9ModuleInfo() {
-        ASTCompilationUnit ast = java9.parseResource("jdkversiontests/jdk9_module_info.java");
-        ASTModuleDeclaration module = ast.descendants(ASTModuleDeclaration.class).firstOrThrow();
-        assertTrue(module.isOpen());
-        assertEquals("com.example.foo", module.getImage());
-        assertEquals(7, module.getNumChildren());
-        List<ASTModuleDirective> directives = module.children(ASTModuleDirective.class).toList();
-        assertEquals(7, directives.size());
-
-        // requires com.example.foo.http;
-        assertEquals(ASTModuleDirective.DirectiveType.REQUIRES.name(), directives.get(0).getType());
-        assertNull(directives.get(0).getRequiresModifier());
-        assertEquals("com.example.foo.http", directives.get(0).getFirstChildOfType(ASTModuleName.class).getImage());
-
-        // requires java.logging;
-        assertEquals(ASTModuleDirective.DirectiveType.REQUIRES.name(), directives.get(1).getType());
-        assertNull(directives.get(1).getRequiresModifier());
-        assertEquals("java.logging", directives.get(1).getFirstChildOfType(ASTModuleName.class).getImage());
-
-        // requires transitive com.example.foo.network;
-        assertEquals(ASTModuleDirective.DirectiveType.REQUIRES.name(), directives.get(2).getType());
-        assertEquals(ASTModuleDirective.RequiresModifier.TRANSITIVE.name(), directives.get(2).getRequiresModifier());
-        assertEquals("com.example.foo.network", directives.get(2).getFirstChildOfType(ASTModuleName.class).getImage());
-
-        // exports com.example.foo.bar;
-        assertEquals(ASTModuleDirective.DirectiveType.EXPORTS.name(), directives.get(3).getType());
-        assertNull(directives.get(3).getRequiresModifier());
-        assertEquals("com.example.foo.bar", directives.get(3).getFirstChildOfType(ASTName.class).getImage());
-
-        // exports com.example.foo.internal to com.example.foo.probe;
-        assertEquals(ASTModuleDirective.DirectiveType.EXPORTS.name(), directives.get(4).getType());
-        assertNull(directives.get(4).getRequiresModifier());
-        assertEquals("com.example.foo.internal", directives.get(4).getFirstChildOfType(ASTName.class).getImage());
-        assertEquals("com.example.foo.probe", directives.get(4).getFirstChildOfType(ASTModuleName.class).getImage());
-
-        // uses com.example.foo.spi.Intf;
-        assertEquals(ASTModuleDirective.DirectiveType.USES.name(), directives.get(5).getType());
-        assertNull(directives.get(5).getRequiresModifier());
-        assertEquals("com.example.foo.spi.Intf", directives.get(5).getFirstChildOfType(ASTName.class).getImage());
-
-        // provides com.example.foo.spi.Intf with com.example.foo.Impl;
-        assertEquals(ASTModuleDirective.DirectiveType.PROVIDES.name(), directives.get(6).getType());
-        assertNull(directives.get(6).getRequiresModifier());
-        assertEquals("com.example.foo.spi.Intf", directives.get(6).getFirstChildOfType(ASTName.class).getImage());
-        assertEquals("com.example.foo.Impl", directives.get(6).findChildrenOfType(ASTName.class).get(1).getImage());
+    public void testAnnotatable() {
+        ASTCompilationUnit root = java9.parse("@A @B module foo { } ");
+        ASTModuleDeclaration mod = root.getModuleDeclaration();
+        assertTrue(mod.isAnnotationPresent("A"));
+        assertTrue(mod.isAnnotationPresent("B"));
     }
 
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
index 832f51e87c..7a22b1c5d6 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
@@ -11,12 +11,15 @@ import static org.junit.Assert.fail;
 
 import java.util.List;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.ast.ParseException;
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest;
 import net.sourceforge.pmd.lang.java.JavaParsingHelper;
 
-public class JDKVersionTest {
+public class JDKVersionTest extends BaseJavaTreeDumpTest {
 
     private final JavaParsingHelper java3 = JavaParsingHelper.DEFAULT
         .withDefaultVersion("1.3")
@@ -210,7 +213,7 @@ public class JDKVersionTest {
 
     @Test(expected = ParseException.class)
     public final void jdk9PrivateInterfaceMethodsInJava18() {
-        java8.parseResource("jdk9_private_interface_methods.java");
+        java8.parseResource("java9/jdk9_private_interface_methods.java");
     }
 
     @Test
@@ -225,52 +228,52 @@ public class JDKVersionTest {
 
     @Test
     public final void jdk9PrivateInterfaceMethods() {
-        java9.parseResource("jdk9_private_interface_methods.java");
+        java9.parseResource("java9/jdk9_private_interface_methods.java");
     }
 
     @Test
     public final void jdk9InvalidIdentifierInJava18() {
-        java8.parseResource("jdk9_invalid_identifier.java");
+        java8.parseResource("java9/jdk9_invalid_identifier.java");
     }
 
     @Test(expected = ParseException.class)
     public final void jdk9InvalidIdentifier() {
-        java9.parseResource("jdk9_invalid_identifier.java");
+        java9.parseResource("java9/jdk9_invalid_identifier.java");
     }
 
     @Test(expected = ParseException.class)
     public final void jdk9AnonymousDiamondInJava8() {
-        java8.parseResource("jdk9_anonymous_diamond.java");
+        java8.parseResource("java9/jdk9_anonymous_diamond.java");
     }
 
     @Test
     public final void jdk9AnonymousDiamond() {
-        java9.parseResource("jdk9_anonymous_diamond.java");
+        java9.parseResource("java9/jdk9_anonymous_diamond.java");
     }
 
     @Test(expected = ParseException.class)
     public final void jdk9ModuleInfoInJava8() {
-        java8.parseResource("jdk9_module_info.java");
+        java8.parseResource("java9/jdk9_module_info.java");
     }
 
     @Test
     public final void jdk9ModuleInfo() {
-        java9.parseResource("jdk9_module_info.java");
+        java9.parseResource("java9/jdk9_module_info.java");
     }
 
     @Test
     public void testAnnotatedModule() {
-        java9.parseResource("jdk9_module_info_with_annot.java");
+        java9.parseResource("java9/jdk9_module_info_with_annot.java");
     }
 
     @Test(expected = ParseException.class)
     public final void jdk9TryWithResourcesInJava8() {
-        java8.parseResource("jdk9_try_with_resources.java");
+        java8.parseResource("java9/jdk9_try_with_resources.java");
     }
 
     @Test
     public final void jdk9TryWithResources() {
-        java9.parseResource("jdk9_try_with_resources.java");
+        java9.parseResource("java9/jdk9_try_with_resources.java");
     }
 
     @Test
@@ -292,4 +295,9 @@ public class JDKVersionTest {
             assertTrue(e.getMessage().startsWith("Line 19"));
         }
     }
+
+    @Override
+    public @NonNull BaseParsingHelper<?, ?> getParser() {
+        return java9;
+    }
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java
new file mode 100644
index 0000000000..26f6eeee4e
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java
@@ -0,0 +1,34 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest;
+import net.sourceforge.pmd.lang.java.JavaParsingHelper;
+
+public class Java9TreeDumpTest extends BaseJavaTreeDumpTest {
+
+    private final JavaParsingHelper java9 = JavaParsingHelper.DEFAULT
+        .withDefaultVersion("9")
+        .withResourceContext(Java9TreeDumpTest.class, "jdkversiontests/java9");
+
+    @Test
+    public void testModule() {
+        doTest("jdk9_module_info");
+    }
+
+    @Test
+    public void testAnnotatedModule() {
+        doTest("jdk9_module_info_with_annot");
+    }
+
+    @Override
+    public @NonNull BaseParsingHelper<?, ?> getParser() {
+        return java9;
+    }
+}
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
index f13a357ae9..1a0d051952 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
@@ -6,8 +6,6 @@ package net.sourceforge.pmd.lang.java.ast;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
@@ -66,27 +64,6 @@ public class SimpleNodeTest extends BaseParserTest {
         assertFalse(ucd.getChild(0) instanceof ASTImplementsList);
     }
 
-    @Test
-    public void testColumnsOnQualifiedName() {
-        for (Node node : java.getNodes(ASTName.class, QUALIFIED_NAME)) {
-            if (node.getImage().equals("java.io.File")) {
-                TestUtilsKt.assertPosition(node, 1, 8, 1, 20);
-            }
-        }
-    }
-
-    @Test
-    public void testLineNumbersForNameSplitOverTwoLines() {
-        for (Node node : java.getNodes(ASTName.class, BROKEN_LINE_IN_NAME)) {
-            if (node.getImage().equals("java.io.File")) {
-                TestUtilsKt.assertPosition(node, 1, 8, 2, 5);
-            }
-            if (node.getImage().equals("Foo")) {
-                TestUtilsKt.assertPosition(node, 2, 15, 2, 19);
-            }
-        }
-    }
-
     //    @Test
     //    public void testLineNumbersAreSetOnAllSiblings() {
     //        for (ASTBlock b : java.getNodes(ASTBlock.class, LINE_NUMBERS_ON_SIBLINGS)) {
@@ -172,22 +149,6 @@ public class SimpleNodeTest extends BaseParserTest {
     //        assertEquals(x2, n);
     //    }
 
-    @Test
-    public void testParentMethods() {
-        ASTCompilationUnit u = java.parse(TEST1);
-
-        ASTMethodDeclarator d = u.getFirstDescendantOfType(ASTMethodDeclarator.class);
-        assertSame("getFirstParentOfType ASTMethodDeclaration", d.getParent(),
-                d.getFirstParentOfType(ASTMethodDeclaration.class));
-        assertNull("getFirstParentOfType ASTName", d.getFirstParentOfType(ASTName.class));
-
-        assertSame("getNthParent 1", d.getParent(), d.getNthParent(1));
-        assertSame("getNthParent 2", d.getParent().getParent(), d.getNthParent(2));
-        assertSame("getNthParent 6", u, d.getNthParent(6));
-        assertNull("getNthParent 7", d.getNthParent(7));
-        assertNull("getNthParent 8", d.getNthParent(8));
-    }
-
     private static final String TEST1 = "public class Test {\n  void bar(String s) {\n   s = s.toLowerCase();\n  }\n}";
 
     @Ignore
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
index 3110b12be9..c400d74f2e 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TypeDisambiguationTest.kt
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.java.ast
 
+import io.kotest.matchers.collections.shouldBeEmpty
+import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeSameInstanceAs
 import net.sourceforge.pmd.lang.ast.test.*
@@ -70,6 +72,30 @@ class TypeDisambiguationTest : ParserTestSpec({
         }
     }
 
+    parserTest("Package names in module") {
+
+        val code = """
+            module java.base {
+               opens java.util;
+               provides java.util.Map with java.util.HashMap;
+               //       ^^^^^^^^^          ^^^^^^^^^
+            }
+        """
+
+        doTest("test without disambig") {
+            val acu = parser.parse(code)
+
+            acu.descendants(ASTAmbiguousName::class.java).toList().shouldHaveSize(2)
+        }
+
+        doTest("test with disambig") {
+            enableProcessing()
+            val acu = parser.parse(code)
+
+            acu.descendants(ASTAmbiguousName::class.java).toList().shouldBeEmpty()
+        }
+    }
+
 
     parserTest("Failures") {
         val logger = enableProcessing()
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_anonymous_diamond.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_anonymous_diamond.java
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_anonymous_diamond.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_anonymous_diamond.java
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_invalid_identifier.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_invalid_identifier.java
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_invalid_identifier.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_invalid_identifier.java
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_module_info.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.java
similarity index 80%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_module_info.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.java
index 891a78fe51..efb9436604 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_module_info.java
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.java
@@ -12,4 +12,5 @@ open module com.example.foo {
     uses com.example.foo.spi.Intf;
 
     provides com.example.foo.spi.Intf with com.example.foo.Impl;
-}
\ No newline at end of file
+    provides com.example.foo.spi.Intf2 with com.example.foo.Impl, com.example.foo.Impl2;
+}
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
new file mode 100644
index 0000000000..41fd39aff9
--- /dev/null
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
@@ -0,0 +1,20 @@
++- CompilationUnit[@PackageName = ""]
+   +- ModuleDeclaration[@Name = "com.example.foo", @Open = "true"]
+      +- ModuleName[@Name = "com.example.foo"]
+      +- ModuleRequiresDirective[@Static = "false", @Transitive = "false"]
+      |  +- ModuleName[@Name = "com.example.foo.http"]
+      +- ModuleRequiresDirective[@Static = "false", @Transitive = "false"]
+      |  +- ModuleName[@Name = "java.logging"]
+      +- ModuleRequiresDirective[@Static = "false", @Transitive = "true"]
+      |  +- ModuleName[@Name = "com.example.foo.network"]
+      +- ModuleExportsDirective[@PackageName = "com.example.foo.bar"]
+      +- ModuleExportsDirective[@PackageName = "com.example.foo.internal"]
+      |  +- ModuleName[@Name = "com.example.foo.probe"]
+      +- ModuleUsesDirective[@PackageName = "com.example.foo.spi.Intf"]
+      +- ModuleProvidesDirective[]
+      |  +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Intf"]
+      |  +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Impl"]
+      +- ModuleProvidesDirective[]
+         +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Intf2"]
+         +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Impl"]
+         +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Impl2"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_module_info_with_annot.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.java
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_module_info_with_annot.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.java
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
new file mode 100644
index 0000000000..122f27f1c3
--- /dev/null
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info_with_annot.txt
@@ -0,0 +1,10 @@
++- CompilationUnit[@PackageName = ""]
+   +- ModuleDeclaration[@Name = "jdk.pack", @Open = "false"]
+      +- Annotation[@SimpleName = "Deprecated"]
+      |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Deprecated"]
+      |  +- AnnotationMemberList[@Empty = "false", @Size = "2"]
+      |     +- MemberValuePair[@Image = "since", @Name = "since", @Shorthand = "false"]
+      |     |  +- StringLiteral[@CompileTimeConstant = "true", @ConstValue = "11", @Empty = "false", @Image = "\"11\"", @Length = "2", @ParenthesisDepth = "0", @Parenthesized = "false", @TextBlock = "false"]
+      |     +- MemberValuePair[@Image = "forRemoval", @Name = "forRemoval", @Shorthand = "false"]
+      |        +- BooleanLiteral[@CompileTimeConstant = "true", @ParenthesisDepth = "0", @Parenthesized = "false", @True = "true"]
+      +- ModuleName[@Name = "jdk.pack"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_private_interface_methods.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_private_interface_methods.java
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_private_interface_methods.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_private_interface_methods.java
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_try_with_resources.java
similarity index 81%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_try_with_resources.java
index fdc0d8fe60..7bc98d60f7 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_try_with_resources.java
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_try_with_resources.java
@@ -1,3 +1,7 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
 public class InputJava9TryWithResources {
  public static void main() {
   MyResource resource1 = new MyResource();

From 674353c716ae45436d72b7d6d3ea5d0666659bd4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 1 Apr 2022 19:19:44 +0200
Subject: [PATCH 018/180] [java] Catch LinkageError in
 UselessOverridingMethodRule

Might occur when the auxclasspath is incomplete
---
 .../pmd/lang/java/rule/design/UselessOverridingMethodRule.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodRule.java
index a40017e08c..5dbc048c17 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodRule.java
@@ -265,7 +265,7 @@ public class UselessOverridingMethodRule extends AbstractJavaRule {
         while (superType != null && declaredMethod == null) {
             try {
                 declaredMethod = superType.getDeclaredMethod(overriddenMethodName, typeArgumentArray);
-            } catch (NoSuchMethodException | SecurityException e) {
+            } catch (LinkageError | ReflectiveOperationException | SecurityException e) {
                 declaredMethod = null;
             }
             superType = superType.getSuperclass();

From 4d322b8fbaf8b6c5777a083c0beb8039b41dd861 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 1 Apr 2022 19:35:21 +0200
Subject: [PATCH 019/180] [doc] Update release notes (#3889)

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 262bf7df56..b9f4c5fa1b 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -17,6 +17,8 @@ This is a {{ site.pmd.release_type }} release.
 ### Fixed Issues
 * core
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
+* java
+  * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
 
 ### API Changes
 

From b7c3e47591a5d7d11a8cce6061e34ae546da78b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 1 Apr 2022 21:03:04 +0200
Subject: [PATCH 020/180] Add tests for module directives

---
 .../java/ast/ASTModuleDeclarationTest.java    |  23 ----
 .../lang/java/ast/ASTModuleDeclarationTest.kt | 120 ++++++++++++++++++
 .../pmd/lang/java/ast/KotlinTestingDsl.kt     |   3 +-
 .../pmd/lang/java/ast/NodeParsingCtx.kt       |  24 ++++
 4 files changed, 146 insertions(+), 24 deletions(-)
 delete mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
 create mode 100644 pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
deleted file mode 100644
index 38f4487927..0000000000
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.Test;
-
-import net.sourceforge.pmd.lang.java.BaseParserTest;
-
-public class ASTModuleDeclarationTest extends BaseParserTest {
-
-    @Test
-    public void testAnnotatable() {
-        ASTCompilationUnit root = java9.parse("@A @B module foo { } ");
-        ASTModuleDeclaration mod = root.getModuleDeclaration();
-        assertTrue(mod.isAnnotationPresent("A"));
-        assertTrue(mod.isAnnotationPresent("B"));
-    }
-
-}
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt
new file mode 100644
index 0000000000..9549e4b824
--- /dev/null
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt
@@ -0,0 +1,120 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.ast
+
+import com.github.oowekyala.treeutils.matchers.TreeNodeWrapper
+import io.kotest.matchers.collections.shouldBeEmpty
+import io.kotest.matchers.shouldBe
+import net.sourceforge.pmd.lang.ast.Node
+import net.sourceforge.pmd.lang.ast.test.NodeSpec
+import net.sourceforge.pmd.lang.ast.test.shouldBe
+import net.sourceforge.pmd.lang.java.ast.JavaVersion.Companion.since
+import net.sourceforge.pmd.lang.java.ast.JavaVersion.J9
+import net.sourceforge.pmd.lang.java.symbols.JClassSymbol
+
+/**
+ * @author Clément Fournier
+ * @since 7.0.0
+ */
+class ASTModuleDeclarationTest : ParserTestSpec({
+
+    parserTest("Test annotations on module", javaVersions = since(J9)) {
+        val root: ASTCompilationUnit = parser.withProcessing(true).parse("@A @a.B module foo { } ")
+        root.moduleDeclaration.shouldMatchNode<ASTModuleDeclaration> {
+            it.getAnnotation("A") shouldBe annotation("A")
+            it.getAnnotation("a.B") shouldBe annotation("B")
+            modName("foo")
+        }
+    }
+
+    parserTest("opens decl") {
+
+        inContext(ModuleDirectiveParsingContext) {
+            "opens a.package_ to a.module_;" should parseAs {
+                child<ASTModuleOpensDirective> {
+                    it::getPackageName shouldBe "a.package_"
+                    it.targetModules.toList() shouldBe listOf(modName("a.module_"))
+                }
+            }
+            "opens a to a.module_, another;" should parseAs {
+                child<ASTModuleOpensDirective> {
+                    it::getPackageName shouldBe "a"
+                    it.targetModules.toList() shouldBe listOf(
+                        modName("a.module_"),
+                        modName("another"),
+                    )
+                }
+            }
+            "opens a;" should parseAs {
+                child<ASTModuleOpensDirective> {
+                    it::getPackageName shouldBe "a"
+                    it.targetModules.toList().shouldBeEmpty()
+                }
+            }
+        }
+    }
+
+    parserTest("exports decl") {
+
+        inContext(ModuleDirectiveParsingContext) {
+            "exports a.package_ to a.module_;" should parseAs {
+                child<ASTModuleExportsDirective> {
+                    it::getPackageName shouldBe "a.package_"
+                    it.targetModules.toList() shouldBe listOf(modName("a.module_"))
+                }
+            }
+            "exports a to a.module_, another;" should parseAs {
+                child<ASTModuleExportsDirective> {
+                    it::getPackageName shouldBe "a"
+                    it.targetModules.toList() shouldBe listOf(
+                        modName("a.module_"),
+                        modName("another"),
+                    )
+                }
+            }
+            "exports a;" should parseAs {
+                child<ASTModuleExportsDirective> {
+                    it::getPackageName shouldBe "a"
+                    it.targetModules.toList().shouldBeEmpty()
+                }
+            }
+        }
+    }
+
+    parserTest("Test uses") {
+
+        inContext(ModuleDirectiveParsingContext) {
+            "uses a.package_;" should parseAs {
+                child<ASTModuleUsesDirective> {
+                    it::getPackageName shouldBe "a.package_"
+                }
+            }
+        }
+    }
+    parserTest("Test provides") {
+
+        inContext(ModuleDirectiveParsingContext) {
+            enableProcessing()
+            "provides an.Itf with imp1.Impl;" should parseAs {
+                child<ASTModuleProvidesDirective> {
+                    it::getProvidedInterface shouldBe classType("Itf")
+                    it.implementations.toList() shouldBe listOf(
+                        classType("Impl") {
+                            val sym = it.referencedSym as JClassSymbol
+                            sym.canonicalName shouldBe "imp1.Impl"
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+})
+
+fun TreeNodeWrapper<Node, *>.modName(name: String, assertions: NodeSpec<ASTModuleName> = EmptyAssertions) =
+    child<ASTModuleName> {
+        it::getName shouldBe name
+        assertions(this)
+    }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
index 953b5edf97..baced81a93 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
@@ -211,7 +211,8 @@ open class ParserTestCtx(val javaVersion: JavaVersion = JavaVersion.Latest,
         parser = parser.withProcessing(true).logTypeInference(verbose, to)
     }
 
-    var fullSource: String? = null
+    /** Populated after an [asIfIn] call, used by [TypeBodyParsingCtx]. */
+    internal var fullSource: String? = null
 
     /** Imports to add to the top of the parsing contexts. */
     internal val imports: List<String>
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/NodeParsingCtx.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/NodeParsingCtx.kt
index 0d16a7762c..4f1c72d546 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/NodeParsingCtx.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/NodeParsingCtx.kt
@@ -87,6 +87,27 @@ object ExpressionParsingCtx : NodeParsingCtx<ASTExpression>("expression") {
                     .firstOrThrow()
 }
 
+object RootParsingCtx : NodeParsingCtx<ASTCompilationUnit>("compilation unit") {
+
+    override fun getTemplate(construct: String, ctx: ParserTestCtx): String =
+            construct
+
+    override fun retrieveNode(acu: ASTCompilationUnit): ASTCompilationUnit = acu
+}
+
+object ModuleDirectiveParsingContext : NodeParsingCtx<ASTModuleDirective>("module directive") {
+
+    override fun getTemplate(construct: String, ctx: ParserTestCtx): String =
+            """
+                module test.module {
+                    $construct
+                }
+            """.trimIndent()
+
+    override fun retrieveNode(acu: ASTCompilationUnit): ASTModuleDirective =
+        acu.descendants(ASTModuleDirective::class.java).firstOrThrow()
+}
+
 object StatementParsingCtx : NodeParsingCtx<ASTStatement>("statement") {
 
     override fun getTemplate(construct: String, ctx: ParserTestCtx): String =
@@ -101,6 +122,9 @@ object StatementParsingCtx : NodeParsingCtx<ASTStatement>("statement") {
 
 object TypeBodyParsingCtx : NodeParsingCtx<ASTBodyDeclaration>("body declaration") {
 
+    /**
+     * Note: this code allows calling [ParserTestCtx.asIfIn]
+     */
     override fun getTemplate(construct: String, ctx: ParserTestCtx): String {
         val source = ctx.fullSource
         return if (source != null) {

From 31a341d9adcbf744f60a41b8616700e54e0935df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 1 Apr 2022 21:01:56 +0200
Subject: [PATCH 021/180] [java] force type resolution phase

---
 .../pmd/lang/java/ast/InternalApiBridge.java    | 17 +++++++++++++++++
 .../lang/java/internal/JavaAstProcessor.java    | 10 +++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
index 1d13accdfa..9dcc91966f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/InternalApiBridge.java
@@ -86,6 +86,23 @@ public final class InternalApiBridge {
         AstDisambiguationPass.disambigWithCtx(nodes, ctx);
     }
 
+    /**
+     * Forcing type resolution allows us to report errors more cleanly
+     * than if it was done completely lazy. All errors are reported, if
+     * the
+     */
+    public static void forceTypeResolutionPhase(JavaAstProcessor processor, ASTCompilationUnit root) {
+        root.descendants(TypeNode.class)
+            .crossFindBoundaries()
+            .forEach(it -> {
+                try {
+                    it.getTypeMirror();
+                } catch (Exception e) {
+                    processor.getLogger().error(it, "Error during type resolution of node " + it.getXPathNodeName());
+                }
+            });
+    }
+
     public static void usageResolution(JavaAstProcessor processor, ASTCompilationUnit root) {
         root.descendants(ASTNamedReferenceExpr.class)
             .crossFindBoundaries()
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
index 913f53b36e..05c71238de 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaAstProcessor.java
@@ -40,6 +40,9 @@ import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.Ve
  * <p>This is the root context object for file-specific context. Instances
  * do not need to be thread-safe. Global information about eg the classpath
  * is held in a {@link TypeSystem} instance.
+ *
+ * <p>The object lives as long as a file, it is accessible from nodes
+ * using {@link InternalApiBridge#getProcessor(JavaNode)}.
  */
 public final class JavaAstProcessor {
 
@@ -173,9 +176,10 @@ public final class JavaAstProcessor {
 
         TimeTracker.bench("2. Symbol table resolution", () -> SymbolTableResolver.traverse(this, acu));
         TimeTracker.bench("3. AST disambiguation", () -> InternalApiBridge.disambigWithCtx(NodeStream.of(acu), ReferenceCtx.root(this, acu)));
-        TimeTracker.bench("4. Comment assignment", () -> InternalApiBridge.assignComments(acu));
-        TimeTracker.bench("5. Usage resolution", () -> InternalApiBridge.usageResolution(this, acu));
-        TimeTracker.bench("6. Override resolution", () -> InternalApiBridge.overrideResolution(this, acu));
+        TimeTracker.bench("4. Force type resolution", () -> InternalApiBridge.forceTypeResolutionPhase(this, acu));
+        TimeTracker.bench("5. Comment assignment", () -> InternalApiBridge.assignComments(acu));
+        TimeTracker.bench("6. Usage resolution", () -> InternalApiBridge.usageResolution(this, acu));
+        TimeTracker.bench("7. Override resolution", () -> InternalApiBridge.overrideResolution(this, acu));
     }
 
     public TypeSystem getTypeSystem() {

From 4fa7db254e516059fda8d60bbb19269d4fee00dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 1 Apr 2022 21:01:23 +0200
Subject: [PATCH 022/180] [core] Abort on semantic errors

---
 .../pmd/lang/ast/SemanticErrorReporter.java     | 17 +++++++++++++++++
 .../sourceforge/pmd/processor/PmdRunnable.java  |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
index df76bfe1fc..2dfe1ddb36 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
@@ -17,6 +17,18 @@ public interface SemanticErrorReporter {
     // TODO use resource bundle keys instead of string messages.
 
 
+    /**
+     * Report an informational message at the given location.
+     *
+     * @param location   Location where the message should be reported
+     * @param message    Message (rendered using a {@link MessageFormat})
+     * @param formatArgs Format arguments
+     */
+    default void info(Node location, String message, Object... formatArgs) {
+        // noop
+    }
+
+
     /**
      * Report a warning at the given location. Warnings do not abort
      * the analysis.
@@ -87,6 +99,11 @@ public interface SemanticErrorReporter {
                 return fullMessage;
             }
 
+            @Override
+            public void info(Node location, String message, Object... formatArgs) {
+                logMessage(Level.INFO, location, message, formatArgs);
+            }
+
             @Override
             public void warning(Node location, String message, Object... args) {
                 logMessage(Level.WARN, location, message, args);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
index 87df7b0eb6..4e4015adc3 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
@@ -125,11 +125,12 @@ abstract class PmdRunnable implements Runnable {
                                LanguageVersion languageVersion,
                                String filename) throws FileAnalysisException {
 
+        SemanticErrorReporter reporter = SemanticErrorReporter.reportToLogger(LOGGER);
         ParserTask task = new ParserTask(
             languageVersion,
             filename,
             sourceCode,
-            SemanticErrorReporter.reportToLogger(LOGGER),
+            reporter,
             configuration.getClassLoader()
         );
 
@@ -143,6 +144,11 @@ abstract class PmdRunnable implements Runnable {
 
         RootNode rootNode = parse(parser, task);
 
+        if (reporter.hasError()) {
+            reporter.info(rootNode, "Errors occurred in file, skipping rule analysis");
+            return;
+        }
+
         ruleSets.apply(rootNode, listener);
     }
 

From a7582e5ac8f24e4fdb7f6137c159069333106af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 17:18:53 +0200
Subject: [PATCH 023/180] Fix scala module

---
 .../pmd/cpd/ScalaTokenAdapter.java            |   29 +-
 .../sourceforge/pmd/cpd/ScalaTokenizer.java   |   48 +-
 .../pmd/lang/scala/ast/AbstractScalaNode.java |    8 +-
 .../scala/cpd/testdata/sample-LiftActor.txt   | 4870 ++++++++---------
 .../scala/cpd/testdata/special_comments.txt   |   62 +-
 .../pmd/lang/scala/cpd/testdata/tabWidth.txt  |   46 +-
 6 files changed, 2532 insertions(+), 2531 deletions(-)

diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
index e6578d86dc..06853bbe71 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
@@ -5,6 +5,10 @@
 package net.sourceforge.pmd.cpd;
 
 import net.sourceforge.pmd.lang.ast.GenericToken;
+import net.sourceforge.pmd.lang.document.Chars;
+import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextDocument;
+import net.sourceforge.pmd.lang.document.TextRegion;
 
 import scala.meta.tokens.Token;
 
@@ -13,11 +17,13 @@ import scala.meta.tokens.Token;
  */
 public class ScalaTokenAdapter implements GenericToken<ScalaTokenAdapter> {
 
-    private Token token;
-    private ScalaTokenAdapter previousComment;
+    private final Token token;
+    private final TextDocument textDocument;
+    private final ScalaTokenAdapter previousComment;
 
-    ScalaTokenAdapter(Token token, ScalaTokenAdapter comment) {
+    ScalaTokenAdapter(Token token, TextDocument textDocument, ScalaTokenAdapter comment) {
         this.token = token;
+        this.textDocument = textDocument;
         this.previousComment = comment;
     }
 
@@ -37,23 +43,18 @@ public class ScalaTokenAdapter implements GenericToken<ScalaTokenAdapter> {
     }
 
     @Override
-    public int getBeginLine() {
-        return token.pos().startLine() + 1;
+    public Chars getImageCs() {
+        return textDocument.sliceText(getRegion());
     }
 
     @Override
-    public int getEndLine() {
-        return token.pos().endLine() + 1;
+    public TextRegion getRegion() {
+        return TextRegion.fromBothOffsets(token.pos().start(), token.pos().end());
     }
 
     @Override
-    public int getBeginColumn() {
-        return token.pos().startColumn() + 1;
-    }
-
-    @Override
-    public int getEndColumn() {
-        return token.pos().endColumn() + 2;
+    public FileLocation getReportLocation() {
+        return textDocument.toLocation(getRegion());
     }
 
     @Override
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
index e94ed84938..ef191cd85b 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
@@ -14,6 +14,8 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.TokenMgrError;
+import net.sourceforge.pmd.lang.document.CpdCompat;
+import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageHandler;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
 
@@ -63,20 +65,19 @@ public class ScalaTokenizer implements Tokenizer {
 
     @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) throws IOException {
-        String filename = sourceCode.getFileName();
-        // create the full code file
-        String fullCode = StringUtils.join(sourceCode.getCode(), "\n");
 
-        // create the input file for scala
-        Input.VirtualFile vf = new Input.VirtualFile(filename, fullCode);
-        ScalametaTokenizer tokenizer = new ScalametaTokenizer(vf, dialect);
 
-        // tokenize with a filter
-        try {
+        try (TextDocument textDoc = TextDocument.create(CpdCompat.cpdCompat(sourceCode))) {
+            String fullCode = textDoc.getText().toString();
+
+            // create the input file for scala
+            Input.VirtualFile vf = new Input.VirtualFile(sourceCode.getFileName(), fullCode);
+            ScalametaTokenizer tokenizer = new ScalametaTokenizer(vf, dialect);
+
+            // tokenize with a filter
             scala.meta.tokens.Tokens tokens = tokenizer.tokenize();
-
             // use extensions to the standard PMD TokenManager and Filter
-            ScalaTokenManager scalaTokenManager = new ScalaTokenManager(tokens.iterator());
+            ScalaTokenManager scalaTokenManager = new ScalaTokenManager(tokens.iterator(), textDoc);
             ScalaTokenFilter filter = new ScalaTokenFilter(scalaTokenManager);
 
             ScalaTokenAdapter token;
@@ -85,10 +86,7 @@ public class ScalaTokenizer implements Tokenizer {
                     continue;
                 }
                 TokenEntry cpdToken = new TokenEntry(token.getImage(),
-                                                     filename,
-                                                     token.getBeginLine(),
-                                                     token.getBeginColumn(),
-                                                     token.getEndColumn());
+                                                     token.getReportLocation());
                 tokenEntries.add(cpdToken);
             }
         } catch (Exception e) {
@@ -96,7 +94,7 @@ public class ScalaTokenizer implements Tokenizer {
                 // cannot catch it as it's a checked exception and Scala sneaky throws
                 TokenizeException tokE = (TokenizeException) e;
                 Position pos = tokE.pos();
-                throw new TokenMgrError(pos.startLine() + 1, pos.startColumn() + 1, filename, "Scalameta threw", tokE);
+                throw new TokenMgrError(pos.startLine() + 1, pos.startColumn() + 1, sourceCode.getFileName(), "Scalameta threw", tokE);
             } else {
                 throw e;
             }
@@ -107,21 +105,25 @@ public class ScalaTokenizer implements Tokenizer {
     }
 
     /**
-     * Implementation of the generic Token Manager, also skips un-helpful tokens and comments to only register important tokens
+     * Implementation of the generic Token Manager, also skips un-helpful tokens and comments to only register important
+     * tokens
      * and patterns.
      *
      * Keeps track of comments, for special comment processing
      */
     private static class ScalaTokenManager implements TokenManager<ScalaTokenAdapter> {
 
-        Iterator<Token> tokenIter;
-        Class<?>[] skippableTokens = new Class<?>[] { Token.Space.class, Token.Tab.class, Token.CR.class,
+        private final Iterator<Token> tokenIter;
+        private final TextDocument textDocument;
+        private static final Class<?>[] SKIPPABLE_TOKENS = {
+            Token.Space.class, Token.Tab.class, Token.CR.class,
             Token.LF.class, Token.FF.class, Token.LFLF.class, Token.EOF.class, Token.Comment.class };
 
-        ScalaTokenAdapter previousComment = null;
+        private ScalaTokenAdapter previousComment = null;
 
-        ScalaTokenManager(Iterator<Token> iterator) {
+        ScalaTokenManager(Iterator<Token> iterator, TextDocument textDocument) {
             this.tokenIter = iterator;
+            this.textDocument = textDocument;
         }
 
         @Override
@@ -134,17 +136,17 @@ public class ScalaTokenizer implements Tokenizer {
             do {
                 token = tokenIter.next();
                 if (isComment(token)) {
-                    previousComment = new ScalaTokenAdapter(token, previousComment);
+                    previousComment = new ScalaTokenAdapter(token, textDocument, previousComment);
                 }
             } while (token != null && skipToken(token) && tokenIter.hasNext());
 
-            return new ScalaTokenAdapter(token, previousComment);
+            return new ScalaTokenAdapter(token, textDocument, previousComment);
         }
 
         private boolean skipToken(Token token) {
             boolean skip = false;
             if (token.text() != null) {
-                for (Class<?> skipTokenClazz : skippableTokens) {
+                for (Class<?> skipTokenClazz : SKIPPABLE_TOKENS) {
                     skip |= skipTokenClazz.isInstance(token);
                 }
             }
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index bebabc3cb4..f1cc5bbf58 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -10,6 +10,7 @@ import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRegion;
 
 import scala.meta.Tree;
 import scala.meta.inputs.Position;
@@ -64,11 +65,8 @@ abstract class AbstractScalaNode<T extends Tree> extends AbstractNode<AbstractSc
 
     @Override
     public FileLocation getReportLocation() {
-        return FileLocation.location("TODO",
-                                     pos.startLine() + 1,
-                                     pos.startColumn() + 1,
-                                     pos.endLine() + 1,
-                                     pos.endColumn() + 1);
+        TextRegion region = TextRegion.fromBothOffsets(pos.start(), pos.end());
+        return getAstInfo().getTextDocument().toLocation(region);
     }
 
     @Override
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/sample-LiftActor.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/sample-LiftActor.txt
index 09f9208c75..6c4b243eb2 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/sample-LiftActor.txt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/sample-LiftActor.txt
@@ -1,2825 +1,2825 @@
     [Image] or [Truncated image[            Bcol      Ecol
 L19
-    [package]                               1         9
-    [net]                                   9         13
-    [.]                                     12        14
-    [liftweb]                               13        21
+    [package]                               1         8
+    [net]                                   9         12
+    [.]                                     12        13
+    [liftweb]                               13        20
 L20
-    [package]                               1         9
-    [actor]                                 9         15
+    [package]                               1         8
+    [actor]                                 9         14
 L22
-    [import]                                1         8
-    [common]                                8         15
-    [.]                                     14        16
-    [_]                                     15        17
+    [import]                                1         7
+    [common]                                8         14
+    [.]                                     14        15
+    [_]                                     15        16
 L24
-    [trait]                                 1         7
-    [ILAExecute]                            7         18
-    [{]                                     18        20
+    [trait]                                 1         6
+    [ILAExecute]                            7         17
+    [{]                                     18        19
 L25
-    [def]                                   3         7
-    [execute]                               7         15
-    [(]                                     14        16
-    [f]                                     15        17
-    [:]                                     16        18
-    [(]                                     18        20
-    [)]                                     19        21
-    [=>]                                    21        24
-    [Unit]                                  24        29
-    [)]                                     28        30
-    [:]                                     29        31
-    [Unit]                                  31        36
+    [def]                                   3         6
+    [execute]                               7         14
+    [(]                                     14        15
+    [f]                                     15        16
+    [:]                                     16        17
+    [(]                                     18        19
+    [)]                                     19        20
+    [=>]                                    21        23
+    [Unit]                                  24        28
+    [)]                                     28        29
+    [:]                                     29        30
+    [Unit]                                  31        35
 L26
-    [def]                                   3         7
-    [shutdown]                              7         16
-    [(]                                     15        17
-    [)]                                     16        18
-    [:]                                     17        19
-    [Unit]                                  19        24
+    [def]                                   3         6
+    [shutdown]                              7         15
+    [(]                                     15        16
+    [)]                                     16        17
+    [:]                                     17        18
+    [Unit]                                  19        23
 L27
-    [}]                                     1         3
+    [}]                                     1         2
 L32
-    [trait]                                 1         7
-    [LAScheduler]                           7         19
-    [{]                                     19        21
+    [trait]                                 1         6
+    [LAScheduler]                           7         18
+    [{]                                     19        20
 L38
-    [def]                                   3         7
-    [execute]                               7         15
-    [(]                                     14        16
-    [f]                                     15        17
-    [:]                                     16        18
-    [(]                                     18        20
-    [)]                                     19        21
-    [=>]                                    21        24
-    [Unit]                                  24        29
-    [)]                                     28        30
-    [:]                                     29        31
-    [Unit]                                  31        36
+    [def]                                   3         6
+    [execute]                               7         14
+    [(]                                     14        15
+    [f]                                     15        16
+    [:]                                     16        17
+    [(]                                     18        19
+    [)]                                     19        20
+    [=>]                                    21        23
+    [Unit]                                  24        28
+    [)]                                     28        29
+    [:]                                     29        30
+    [Unit]                                  31        35
 L39
-    [}]                                     1         3
+    [}]                                     1         2
 L41
-    [object]                                1         8
-    [LAScheduler]                           8         20
-    [extends]                               20        28
-    [LAScheduler]                           28        40
-    [with]                                  40        45
-    [Loggable]                              45        54
-    [{]                                     54        56
+    [object]                                1         7
+    [LAScheduler]                           8         19
+    [extends]                               20        27
+    [LAScheduler]                           28        39
+    [with]                                  40        44
+    [Loggable]                              45        53
+    [{]                                     54        55
 L42
-    [@]                                     3         5
-    [volatile]                              4         13
+    [@]                                     3         4
+    [volatile]                              4         12
 L43
-    [var]                                   3         7
-    [onSameThread]                          7         20
-    [=]                                     20        22
-    [false]                                 22        28
+    [var]                                   3         6
+    [onSameThread]                          7         19
+    [=]                                     20        21
+    [false]                                 22        27
 L48
-    [@]                                     3         5
-    [volatile]                              4         13
-    [var]                                   13        17
-    [threadPoolSize]                        17        32
-    [=]                                     32        34
-    [16]                                    34        37
+    [@]                                     3         4
+    [volatile]                              4         12
+    [var]                                   13        16
+    [threadPoolSize]                        17        31
+    [=]                                     32        33
+    [16]                                    34        36
 L50
-    [@]                                     3         5
-    [volatile]                              4         13
-    [var]                                   13        17
-    [maxThreadPoolSize]                     17        35
-    [=]                                     35        37
-    [threadPoolSize]                        37        52
-    [*]                                     52        54
-    [25]                                    54        57
+    [@]                                     3         4
+    [volatile]                              4         12
+    [var]                                   13        16
+    [maxThreadPoolSize]                     17        34
+    [=]                                     35        36
+    [threadPoolSize]                        37        51
+    [*]                                     52        53
+    [25]                                    54        56
 L57
-    [@]                                     3         5
-    [volatile]                              4         13
-    [var]                                   13        17
-    [blockingQueueSize]                     17        35
-    [:]                                     34        36
-    [Box]                                   36        40
-    [\[]                                    39        41
-    [Int]                                   40        44
-    [\]]                                    43        45
-    [=]                                     45        47
-    [Full]                                  47        52
-    [(]                                     51        53
-    [200000]                                52        59
-    [)]                                     58        60
+    [@]                                     3         4
+    [volatile]                              4         12
+    [var]                                   13        16
+    [blockingQueueSize]                     17        34
+    [:]                                     34        35
+    [Box]                                   36        39
+    [\[]                                    39        40
+    [Int]                                   40        43
+    [\]]                                    43        44
+    [=]                                     45        46
+    [Full]                                  47        51
+    [(]                                     51        52
+    [200000]                                52        58
+    [)]                                     58        59
 L59
-    [@]                                     3         5
-    [volatile]                              4         13
+    [@]                                     3         4
+    [volatile]                              4         12
 L60
-    [var]                                   3         7
-    [createExecutor]                        7         22
-    [:]                                     21        23
-    [(]                                     23        25
-    [)]                                     24        26
-    [=>]                                    26        29
-    [ILAExecute]                            29        40
-    [=]                                     40        42
-    [(]                                     42        44
-    [)]                                     43        45
-    [=>]                                    45        48
-    [{]                                     48        50
+    [var]                                   3         6
+    [createExecutor]                        7         21
+    [:]                                     21        22
+    [(]                                     23        24
+    [)]                                     24        25
+    [=>]                                    26        28
+    [ILAExecute]                            29        39
+    [=]                                     40        41
+    [(]                                     42        43
+    [)]                                     43        44
+    [=>]                                    45        47
+    [{]                                     48        49
 L61
-    [new]                                   5         9
-    [ILAExecute]                            9         20
-    [{]                                     20        22
+    [new]                                   5         8
+    [ILAExecute]                            9         19
+    [{]                                     20        21
 L62
-    [import]                                7         14
-    [java]                                  14        19
-    [.]                                     18        20
-    [util]                                  19        24
-    [.]                                     23        25
-    [concurrent]                            24        35
-    [.]                                     34        36
-    [_]                                     35        37
+    [import]                                7         13
+    [java]                                  14        18
+    [.]                                     18        19
+    [util]                                  19        23
+    [.]                                     23        24
+    [concurrent]                            24        34
+    [.]                                     34        35
+    [_]                                     35        36
 L64
-    [private]                               7         15
-    [val]                                   15        19
-    [es]                                    19        22
-    [=]                                     22        24
+    [private]                               7         14
+    [val]                                   15        18
+    [es]                                    19        21
+    [=]                                     22        23
 L65
-    [new]                                   9         13
-    [ThreadPoolExecutor]                    13        32
-    [(]                                     31        33
-    [threadPoolSize]                        32        47
-    [,]                                     46        48
+    [new]                                   9         12
+    [ThreadPoolExecutor]                    13        31
+    [(]                                     31        32
+    [threadPoolSize]                        32        46
+    [,]                                     46        47
 L66
-    [maxThreadPoolSize]                     32        50
-    [,]                                     49        51
+    [maxThreadPoolSize]                     32        49
+    [,]                                     49        50
 L67
-    [60]                                    32        35
-    [,]                                     34        36
+    [60]                                    32        34
+    [,]                                     34        35
 L68
-    [TimeUnit]                              32        41
-    [.]                                     40        42
-    [SECONDS]                               41        49
-    [,]                                     48        50
+    [TimeUnit]                              32        40
+    [.]                                     40        41
+    [SECONDS]                               41        48
+    [,]                                     48        49
 L69
-    [blockingQueueSize]                     32        50
-    [match]                                 50        56
-    [{]                                     56        58
+    [blockingQueueSize]                     32        49
+    [match]                                 50        55
+    [{]                                     56        57
 L70
-    [case]                                  34        39
-    [Full]                                  39        44
-    [(]                                     43        45
-    [x]                                     44        46
-    [)]                                     45        47
-    [=>]                                    47        50
+    [case]                                  34        38
+    [Full]                                  39        43
+    [(]                                     43        44
+    [x]                                     44        45
+    [)]                                     45        46
+    [=>]                                    47        49
 L71
-    [new]                                   36        40
-    [ArrayBlockingQueue]                    40        59
-    [(]                                     58        60
-    [x]                                     59        61
-    [)]                                     60        62
+    [new]                                   36        39
+    [ArrayBlockingQueue]                    40        58
+    [(]                                     58        59
+    [x]                                     59        60
+    [)]                                     60        61
 L72
-    [case]                                  34        39
-    [_]                                     39        41
-    [=>]                                    41        44
-    [new]                                   44        48
-    [LinkedBlockingQueue]                   48        68
+    [case]                                  34        38
+    [_]                                     39        40
+    [=>]                                    41        43
+    [new]                                   44        47
+    [LinkedBlockingQueue]                   48        67
 L73
-    [}]                                     32        34
-    [)]                                     33        35
+    [}]                                     32        33
+    [)]                                     33        34
 L75
-    [def]                                   7         11
-    [execute]                               11        19
-    [(]                                     18        20
-    [f]                                     19        21
-    [:]                                     20        22
-    [(]                                     22        24
-    [)]                                     23        25
-    [=>]                                    25        28
-    [Unit]                                  28        33
-    [)]                                     32        34
-    [:]                                     33        35
-    [Unit]                                  35        40
-    [=]                                     40        42
+    [def]                                   7         10
+    [execute]                               11        18
+    [(]                                     18        19
+    [f]                                     19        20
+    [:]                                     20        21
+    [(]                                     22        23
+    [)]                                     23        24
+    [=>]                                    25        27
+    [Unit]                                  28        32
+    [)]                                     32        33
+    [:]                                     33        34
+    [Unit]                                  35        39
+    [=]                                     40        41
 L76
-    [es]                                    7         10
-    [.]                                     9         11
-    [execute]                               10        18
-    [(]                                     17        19
-    [new]                                   18        22
-    [Runnable]                              22        31
-    [{]                                     30        32
-    [def]                                   31        35
-    [run]                                   35        39
-    [(]                                     38        40
-    [)]                                     39        41
-    [{]                                     41        43
+    [es]                                    7         9
+    [.]                                     9         10
+    [execute]                               10        17
+    [(]                                     17        18
+    [new]                                   18        21
+    [Runnable]                              22        30
+    [{]                                     30        31
+    [def]                                   31        34
+    [run]                                   35        38
+    [(]                                     38        39
+    [)]                                     39        40
+    [{]                                     41        42
 L77
-    [try]                                   9         13
-    [{]                                     13        15
+    [try]                                   9         12
+    [{]                                     13        14
 L78
-    [f]                                     11        13
-    [(]                                     12        14
-    [)]                                     13        15
+    [f]                                     11        12
+    [(]                                     12        13
+    [)]                                     13        14
 L79
-    [}]                                     9         11
-    [catch]                                 11        17
-    [{]                                     17        19
+    [}]                                     9         10
+    [catch]                                 11        16
+    [{]                                     17        18
 L80
-    [case]                                  11        16
-    [e]                                     16        18
-    [:]                                     17        19
-    [Exception]                             19        29
-    [=>]                                    29        32
-    [logger]                                32        39
-    [.]                                     38        40
-    [error]                                 39        45
-    [(]                                     44        46
-    ["Lift Actor Scheduler"]                45        68
-    [,]                                     67        69
-    [e]                                     69        71
-    [)]                                     70        72
+    [case]                                  11        15
+    [e]                                     16        17
+    [:]                                     17        18
+    [Exception]                             19        28
+    [=>]                                    29        31
+    [logger]                                32        38
+    [.]                                     38        39
+    [error]                                 39        44
+    [(]                                     44        45
+    ["Lift Actor Scheduler"]                45        67
+    [,]                                     67        68
+    [e]                                     69        70
+    [)]                                     70        71
 L81
-    [}]                                     9         11
+    [}]                                     9         10
 L82
-    [}]                                     7         9
-    [}]                                     8         10
-    [)]                                     9         11
+    [}]                                     7         8
+    [}]                                     8         9
+    [)]                                     9         10
 L84
-    [def]                                   7         11
-    [shutdown]                              11        20
-    [(]                                     19        21
-    [)]                                     20        22
-    [:]                                     21        23
-    [Unit]                                  23        28
-    [=]                                     28        30
-    [{]                                     30        32
+    [def]                                   7         10
+    [shutdown]                              11        19
+    [(]                                     19        20
+    [)]                                     20        21
+    [:]                                     21        22
+    [Unit]                                  23        27
+    [=]                                     28        29
+    [{]                                     30        31
 L85
-    [es]                                    9         12
-    [.]                                     11        13
-    [shutdown]                              12        21
-    [(]                                     20        22
-    [)]                                     21        23
+    [es]                                    9         11
+    [.]                                     11        12
+    [shutdown]                              12        20
+    [(]                                     20        21
+    [)]                                     21        22
 L86
-    [}]                                     7         9
+    [}]                                     7         8
 L87
-    [}]                                     5         7
+    [}]                                     5         6
 L88
-    [}]                                     3         5
+    [}]                                     3         4
 L90
-    [@]                                     3         5
-    [volatile]                              4         13
+    [@]                                     3         4
+    [volatile]                              4         12
 L91
-    [var]                                   3         7
-    [exec]                                  7         12
-    [:]                                     11        13
-    [ILAExecute]                            13        24
-    [=]                                     24        26
-    [_]                                     26        28
+    [var]                                   3         6
+    [exec]                                  7         11
+    [:]                                     11        12
+    [ILAExecute]                            13        23
+    [=]                                     24        25
+    [_]                                     26        27
 L98
-    [def]                                   3         7
-    [execute]                               7         15
-    [(]                                     14        16
-    [f]                                     15        17
-    [:]                                     16        18
-    [(]                                     18        20
-    [)]                                     19        21
-    [=>]                                    21        24
-    [Unit]                                  24        29
-    [)]                                     28        30
-    [{]                                     30        32
+    [def]                                   3         6
+    [execute]                               7         14
+    [(]                                     14        15
+    [f]                                     15        16
+    [:]                                     16        17
+    [(]                                     18        19
+    [)]                                     19        20
+    [=>]                                    21        23
+    [Unit]                                  24        28
+    [)]                                     28        29
+    [{]                                     30        31
 L99
-    [synchronized]                          5         18
-    [{]                                     18        20
+    [synchronized]                          5         17
+    [{]                                     18        19
 L100
-    [if]                                    7         10
-    [(]                                     10        12
-    [exec]                                  11        16
-    [eq]                                    16        19
-    [null]                                  19        24
-    [)]                                     23        25
-    [{]                                     25        27
+    [if]                                    7         9
+    [(]                                     10        11
+    [exec]                                  11        15
+    [eq]                                    16        18
+    [null]                                  19        23
+    [)]                                     23        24
+    [{]                                     25        26
 L101
-    [exec]                                  9         14
-    [=]                                     14        16
-    [createExecutor]                        16        31
-    [(]                                     30        32
-    [)]                                     31        33
+    [exec]                                  9         13
+    [=]                                     14        15
+    [createExecutor]                        16        30
+    [(]                                     30        31
+    [)]                                     31        32
 L102
-    [}]                                     7         9
+    [}]                                     7         8
 L103
-    [exec]                                  7         12
-    [.]                                     11        13
-    [execute]                               12        20
-    [(]                                     19        21
-    [f]                                     20        22
-    [)]                                     21        23
+    [exec]                                  7         11
+    [.]                                     11        12
+    [execute]                               12        19
+    [(]                                     19        20
+    [f]                                     20        21
+    [)]                                     21        22
 L104
-    [}]                                     5         7
+    [}]                                     5         6
 L105
-    [}]                                     3         5
+    [}]                                     3         4
 L107
-    [def]                                   3         7
-    [shutdown]                              7         16
-    [(]                                     15        17
-    [)]                                     16        18
-    [{]                                     18        20
+    [def]                                   3         6
+    [shutdown]                              7         15
+    [(]                                     15        16
+    [)]                                     16        17
+    [{]                                     18        19
 L108
-    [synchronized]                          5         18
-    [{]                                     18        20
+    [synchronized]                          5         17
+    [{]                                     18        19
 L109
-    [if]                                    7         10
-    [(]                                     10        12
-    [exec]                                  11        16
-    [ne]                                    16        19
-    [null]                                  19        24
-    [)]                                     23        25
-    [{]                                     25        27
+    [if]                                    7         9
+    [(]                                     10        11
+    [exec]                                  11        15
+    [ne]                                    16        18
+    [null]                                  19        23
+    [)]                                     23        24
+    [{]                                     25        26
 L110
-    [exec]                                  9         14
-    [.]                                     13        15
-    [shutdown]                              14        23
-    [(]                                     22        24
-    [)]                                     23        25
+    [exec]                                  9         13
+    [.]                                     13        14
+    [shutdown]                              14        22
+    [(]                                     22        23
+    [)]                                     23        24
 L111
-    [}]                                     7         9
+    [}]                                     7         8
 L113
-    [exec]                                  7         12
-    [=]                                     12        14
-    [null]                                  14        19
+    [exec]                                  7         11
+    [=]                                     12        13
+    [null]                                  14        18
 L114
-    [}]                                     5         7
+    [}]                                     5         6
 L115
-    [}]                                     3         5
+    [}]                                     3         4
 L116
-    [}]                                     1         3
+    [}]                                     1         2
 L118
-    [trait]                                 1         7
-    [SpecializedLiftActor]                  7         28
-    [\[]                                    27        29
-    [T]                                     28        30
-    [\]]                                    29        31
-    [extends]                               31        39
-    [SimpleActor]                           39        51
-    [\[]                                    50        52
-    [T]                                     51        53
-    [\]]                                    52        54
-    [{]                                     55        57
+    [trait]                                 1         6
+    [SpecializedLiftActor]                  7         27
+    [\[]                                    27        28
+    [T]                                     28        29
+    [\]]                                    29        30
+    [extends]                               31        38
+    [SimpleActor]                           39        50
+    [\[]                                    50        51
+    [T]                                     51        52
+    [\]]                                    52        53
+    [{]                                     55        56
 L119
-    [@]                                     3         5
-    [volatile]                              4         13
-    [private]                               13        21
-    [\[]                                    20        22
-    [this]                                  21        26
-    [\]]                                    25        27
-    [var]                                   27        31
-    [processing]                            31        42
-    [=]                                     42        44
-    [false]                                 44        50
+    [@]                                     3         4
+    [volatile]                              4         12
+    [private]                               13        20
+    [\[]                                    20        21
+    [this]                                  21        25
+    [\]]                                    25        26
+    [var]                                   27        30
+    [processing]                            31        41
+    [=]                                     42        43
+    [false]                                 44        49
 L120
-    [private]                               3         11
-    [\[]                                    10        12
-    [this]                                  11        16
-    [\]]                                    15        17
-    [val]                                   17        21
-    [baseMailbox]                           21        33
-    [:]                                     32        34
-    [MailboxItem]                           34        46
-    [=]                                     46        48
-    [new]                                   48        52
-    [SpecialMailbox]                        52        67
+    [private]                               3         10
+    [\[]                                    10        11
+    [this]                                  11        15
+    [\]]                                    15        16
+    [val]                                   17        20
+    [baseMailbox]                           21        32
+    [:]                                     32        33
+    [MailboxItem]                           34        45
+    [=]                                     46        47
+    [new]                                   48        51
+    [SpecialMailbox]                        52        66
 L121
-    [@]                                     3         5
-    [volatile]                              4         13
-    [private]                               13        21
-    [\[]                                    20        22
-    [this]                                  21        26
-    [\]]                                    25        27
-    [var]                                   27        31
-    [msgList]                               31        39
-    [:]                                     38        40
-    [List]                                  40        45
-    [\[]                                    44        46
-    [T]                                     45        47
-    [\]]                                    46        48
-    [=]                                     48        50
-    [Nil]                                   50        54
+    [@]                                     3         4
+    [volatile]                              4         12
+    [private]                               13        20
+    [\[]                                    20        21
+    [this]                                  21        25
+    [\]]                                    25        26
+    [var]                                   27        30
+    [msgList]                               31        38
+    [:]                                     38        39
+    [List]                                  40        44
+    [\[]                                    44        45
+    [T]                                     45        46
+    [\]]                                    46        47
+    [=]                                     48        49
+    [Nil]                                   50        53
 L122
-    [@]                                     3         5
-    [volatile]                              4         13
-    [private]                               13        21
-    [\[]                                    20        22
-    [this]                                  21        26
-    [\]]                                    25        27
-    [var]                                   27        31
-    [priorityMsgList]                       31        47
-    [:]                                     46        48
-    [List]                                  48        53
-    [\[]                                    52        54
-    [T]                                     53        55
-    [\]]                                    54        56
-    [=]                                     56        58
-    [Nil]                                   58        62
+    [@]                                     3         4
+    [volatile]                              4         12
+    [private]                               13        20
+    [\[]                                    20        21
+    [this]                                  21        25
+    [\]]                                    25        26
+    [var]                                   27        30
+    [priorityMsgList]                       31        46
+    [:]                                     46        47
+    [List]                                  48        52
+    [\[]                                    52        53
+    [T]                                     53        54
+    [\]]                                    54        55
+    [=]                                     56        57
+    [Nil]                                   58        61
 L123
-    [@]                                     3         5
-    [volatile]                              4         13
-    [private]                               13        21
-    [\[]                                    20        22
-    [this]                                  21        26
-    [\]]                                    25        27
-    [var]                                   27        31
-    [startCnt]                              31        40
-    [=]                                     40        42
-    [0]                                     42        44
+    [@]                                     3         4
+    [volatile]                              4         12
+    [private]                               13        20
+    [\[]                                    20        21
+    [this]                                  21        25
+    [\]]                                    25        26
+    [var]                                   27        30
+    [startCnt]                              31        39
+    [=]                                     40        41
+    [0]                                     42        43
 L125
-    [private]                               3         11
-    [class]                                 11        17
-    [MailboxItem]                           17        29
-    [(]                                     28        30
-    [val]                                   29        33
-    [item]                                  33        38
-    [:]                                     37        39
-    [T]                                     39        41
-    [)]                                     40        42
-    [{]                                     42        44
+    [private]                               3         10
+    [class]                                 11        16
+    [MailboxItem]                           17        28
+    [(]                                     28        29
+    [val]                                   29        32
+    [item]                                  33        37
+    [:]                                     37        38
+    [T]                                     39        40
+    [)]                                     40        41
+    [{]                                     42        43
 L126
-    [var]                                   5         9
-    [next]                                  9         14
-    [:]                                     13        15
-    [MailboxItem]                           15        27
-    [=]                                     27        29
-    [_]                                     29        31
+    [var]                                   5         8
+    [next]                                  9         13
+    [:]                                     13        14
+    [MailboxItem]                           15        26
+    [=]                                     27        28
+    [_]                                     29        30
 L127
-    [var]                                   5         9
-    [prev]                                  9         14
-    [:]                                     13        15
-    [MailboxItem]                           15        27
-    [=]                                     27        29
-    [_]                                     29        31
+    [var]                                   5         8
+    [prev]                                  9         13
+    [:]                                     13        14
+    [MailboxItem]                           15        26
+    [=]                                     27        28
+    [_]                                     29        30
 L134
-    [def]                                   5         9
-    [remove]                                9         16
-    [(]                                     15        17
-    [)]                                     16        18
-    [{]                                     18        20
+    [def]                                   5         8
+    [remove]                                9         15
+    [(]                                     15        16
+    [)]                                     16        17
+    [{]                                     18        19
 L135
-    [val]                                   7         11
-    [newPrev]                               11        19
-    [=]                                     19        21
-    [prev]                                  21        26
+    [val]                                   7         10
+    [newPrev]                               11        18
+    [=]                                     19        20
+    [prev]                                  21        25
 L136
-    [prev]                                  7         12
-    [.]                                     11        13
-    [next]                                  12        17
-    [=]                                     17        19
-    [next]                                  19        24
+    [prev]                                  7         11
+    [.]                                     11        12
+    [next]                                  12        16
+    [=]                                     17        18
+    [next]                                  19        23
 L137
-    [next]                                  7         12
-    [.]                                     11        13
-    [prev]                                  12        17
-    [=]                                     17        19
-    [prev]                                  19        24
+    [next]                                  7         11
+    [.]                                     11        12
+    [prev]                                  12        16
+    [=]                                     17        18
+    [prev]                                  19        23
 L138
-    [}]                                     5         7
+    [}]                                     5         6
 L140
-    [def]                                   5         9
-    [insertAfter]                           9         21
-    [(]                                     20        22
-    [newItem]                               21        29
-    [:]                                     28        30
-    [MailboxItem]                           30        42
-    [)]                                     41        43
-    [:]                                     42        44
-    [MailboxItem]                           44        56
-    [=]                                     56        58
-    [{]                                     58        60
+    [def]                                   5         8
+    [insertAfter]                           9         20
+    [(]                                     20        21
+    [newItem]                               21        28
+    [:]                                     28        29
+    [MailboxItem]                           30        41
+    [)]                                     41        42
+    [:]                                     42        43
+    [MailboxItem]                           44        55
+    [=]                                     56        57
+    [{]                                     58        59
 L141
-    [next]                                  7         12
-    [.]                                     11        13
-    [prev]                                  12        17
-    [=]                                     17        19
-    [newItem]                               19        27
+    [next]                                  7         11
+    [.]                                     11        12
+    [prev]                                  12        16
+    [=]                                     17        18
+    [newItem]                               19        26
 L142
-    [newItem]                               7         15
-    [.]                                     14        16
-    [prev]                                  15        20
-    [=]                                     20        22
-    [this]                                  22        27
+    [newItem]                               7         14
+    [.]                                     14        15
+    [prev]                                  15        19
+    [=]                                     20        21
+    [this]                                  22        26
 L143
-    [newItem]                               7         15
-    [.]                                     14        16
-    [next]                                  15        20
-    [=]                                     20        22
-    [this]                                  22        27
-    [.]                                     26        28
-    [next]                                  27        32
+    [newItem]                               7         14
+    [.]                                     14        15
+    [next]                                  15        19
+    [=]                                     20        21
+    [this]                                  22        26
+    [.]                                     26        27
+    [next]                                  27        31
 L144
-    [next]                                  7         12
-    [=]                                     12        14
-    [newItem]                               14        22
+    [next]                                  7         11
+    [=]                                     12        13
+    [newItem]                               14        21
 L145
-    [newItem]                               7         15
+    [newItem]                               7         14
 L146
-    [}]                                     5         7
+    [}]                                     5         6
 L148
-    [def]                                   5         9
-    [insertBefore]                          9         22
-    [(]                                     21        23
-    [newItem]                               22        30
-    [:]                                     29        31
-    [MailboxItem]                           31        43
-    [)]                                     42        44
-    [:]                                     43        45
-    [MailboxItem]                           45        57
-    [=]                                     57        59
-    [{]                                     59        61
+    [def]                                   5         8
+    [insertBefore]                          9         21
+    [(]                                     21        22
+    [newItem]                               22        29
+    [:]                                     29        30
+    [MailboxItem]                           31        42
+    [)]                                     42        43
+    [:]                                     43        44
+    [MailboxItem]                           45        56
+    [=]                                     57        58
+    [{]                                     59        60
 L149
-    [prev]                                  7         12
-    [.]                                     11        13
-    [next]                                  12        17
-    [=]                                     17        19
-    [newItem]                               19        27
+    [prev]                                  7         11
+    [.]                                     11        12
+    [next]                                  12        16
+    [=]                                     17        18
+    [newItem]                               19        26
 L150
-    [newItem]                               7         15
-    [.]                                     14        16
-    [prev]                                  15        20
-    [=]                                     20        22
-    [this]                                  22        27
-    [.]                                     26        28
-    [prev]                                  27        32
+    [newItem]                               7         14
+    [.]                                     14        15
+    [prev]                                  15        19
+    [=]                                     20        21
+    [this]                                  22        26
+    [.]                                     26        27
+    [prev]                                  27        31
 L151
-    [newItem]                               7         15
-    [.]                                     14        16
-    [next]                                  15        20
-    [=]                                     20        22
-    [this]                                  22        27
+    [newItem]                               7         14
+    [.]                                     14        15
+    [next]                                  15        19
+    [=]                                     20        21
+    [this]                                  22        26
 L152
-    [prev]                                  7         12
-    [=]                                     12        14
-    [newItem]                               14        22
+    [prev]                                  7         11
+    [=]                                     12        13
+    [newItem]                               14        21
 L153
-    [newItem]                               7         15
+    [newItem]                               7         14
 L154
-    [}]                                     5         7
+    [}]                                     5         6
 L155
-    [}]                                     3         5
+    [}]                                     3         4
 L157
-    [private]                               3         11
-    [class]                                 11        17
-    [SpecialMailbox]                        17        32
-    [extends]                               32        40
-    [MailboxItem]                           40        52
-    [(]                                     51        53
-    [null]                                  52        57
-    [.]                                     56        58
-    [asInstanceOf]                          57        70
-    [\[]                                    69        71
-    [T]                                     70        72
-    [\]]                                    71        73
-    [)]                                     72        74
-    [{]                                     74        76
+    [private]                               3         10
+    [class]                                 11        16
+    [SpecialMailbox]                        17        31
+    [extends]                               32        39
+    [MailboxItem]                           40        51
+    [(]                                     51        52
+    [null]                                  52        56
+    [.]                                     56        57
+    [asInstanceOf]                          57        69
+    [\[]                                    69        70
+    [T]                                     70        71
+    [\]]                                    71        72
+    [)]                                     72        73
+    [{]                                     74        75
 L159
-    [next]                                  5         10
-    [=]                                     10        12
-    [this]                                  12        17
+    [next]                                  5         9
+    [=]                                     10        11
+    [this]                                  12        16
 L160
-    [prev]                                  5         10
-    [=]                                     10        12
-    [this]                                  12        17
+    [prev]                                  5         9
+    [=]                                     10        11
+    [this]                                  12        16
 L161
-    [}]                                     3         5
+    [}]                                     3         4
 L163
-    [private]                               3         11
-    [def]                                   11        15
-    [findMailboxItem]                       15        31
-    [(]                                     30        32
-    [start]                                 31        37
-    [:]                                     36        38
-    [MailboxItem]                           38        50
-    [,]                                     49        51
-    [f]                                     51        53
-    [:]                                     52        54
-    [MailboxItem]                           54        66
-    [=>]                                    66        69
-    [Boolean]                               69        77
-    [)]                                     76        78
-    [:]                                     77        79
-    [Box]                                   79        83
-    [\[]                                    82        84
-    [MailboxItem]                           83        95
-    [\]]                                    94        96
-    [=]                                     96        98
+    [private]                               3         10
+    [def]                                   11        14
+    [findMailboxItem]                       15        30
+    [(]                                     30        31
+    [start]                                 31        36
+    [:]                                     36        37
+    [MailboxItem]                           38        49
+    [,]                                     49        50
+    [f]                                     51        52
+    [:]                                     52        53
+    [MailboxItem]                           54        65
+    [=>]                                    66        68
+    [Boolean]                               69        76
+    [)]                                     76        77
+    [:]                                     77        78
+    [Box]                                   79        82
+    [\[]                                    82        83
+    [MailboxItem]                           83        94
+    [\]]                                    94        95
+    [=]                                     96        97
 L164
-    [start]                                 5         11
-    [match]                                 11        17
-    [{]                                     17        19
+    [start]                                 5         10
+    [match]                                 11        16
+    [{]                                     17        18
 L165
-    [case]                                  7         12
-    [x]                                     12        14
-    [:]                                     13        15
-    [SpecialMailbox]                        15        30
-    [=>]                                    30        33
-    [Empty]                                 33        39
+    [case]                                  7         11
+    [x]                                     12        13
+    [:]                                     13        14
+    [SpecialMailbox]                        15        29
+    [=>]                                    30        32
+    [Empty]                                 33        38
 L166
-    [case]                                  7         12
-    [x]                                     12        14
-    [if]                                    14        17
-    [f]                                     17        19
-    [(]                                     18        20
-    [x]                                     19        21
-    [)]                                     20        22
-    [=>]                                    22        25
-    [Full]                                  25        30
-    [(]                                     29        31
-    [x]                                     30        32
-    [)]                                     31        33
+    [case]                                  7         11
+    [x]                                     12        13
+    [if]                                    14        16
+    [f]                                     17        18
+    [(]                                     18        19
+    [x]                                     19        20
+    [)]                                     20        21
+    [=>]                                    22        24
+    [Full]                                  25        29
+    [(]                                     29        30
+    [x]                                     30        31
+    [)]                                     31        32
 L167
-    [case]                                  7         12
-    [x]                                     12        14
-    [=>]                                    14        17
-    [findMailboxItem]                       17        33
-    [(]                                     32        34
-    [x]                                     33        35
-    [.]                                     34        36
-    [next]                                  35        40
-    [,]                                     39        41
-    [f]                                     41        43
-    [)]                                     42        44
+    [case]                                  7         11
+    [x]                                     12        13
+    [=>]                                    14        16
+    [findMailboxItem]                       17        32
+    [(]                                     32        33
+    [x]                                     33        34
+    [.]                                     34        35
+    [next]                                  35        39
+    [,]                                     39        40
+    [f]                                     41        42
+    [)]                                     42        43
 L168
-    [}]                                     5         7
+    [}]                                     5         6
 L175
-    [def]                                   3         7
-    [send]                                  7         12
-    [(]                                     11        13
-    [msg]                                   12        16
-    [:]                                     15        17
-    [T]                                     17        19
-    [)]                                     18        20
-    [:]                                     19        21
-    [Unit]                                  21        26
-    [=]                                     26        28
-    [this]                                  28        33
-    [!]                                     33        35
-    [msg]                                   35        39
+    [def]                                   3         6
+    [send]                                  7         11
+    [(]                                     11        12
+    [msg]                                   12        15
+    [:]                                     15        16
+    [T]                                     17        18
+    [)]                                     18        19
+    [:]                                     19        20
+    [Unit]                                  21        25
+    [=]                                     26        27
+    [this]                                  28        32
+    [!]                                     33        34
+    [msg]                                   35        38
 L182
-    [def]                                   3         7
-    [!]                                     7         9
-    [(]                                     8         10
-    [msg]                                   9         13
-    [:]                                     12        14
-    [T]                                     14        16
-    [)]                                     15        17
-    [:]                                     16        18
-    [Unit]                                  18        23
-    [=]                                     23        25
-    [{]                                     25        27
+    [def]                                   3         6
+    [!]                                     7         8
+    [(]                                     8         9
+    [msg]                                   9         12
+    [:]                                     12        13
+    [T]                                     14        15
+    [)]                                     15        16
+    [:]                                     16        17
+    [Unit]                                  18        22
+    [=]                                     23        24
+    [{]                                     25        26
 L183
-    [val]                                   5         9
-    [toDo]                                  9         14
-    [:]                                     13        15
-    [(]                                     15        17
-    [)]                                     16        18
-    [=>]                                    18        21
-    [Unit]                                  21        26
-    [=]                                     26        28
-    [baseMailbox]                           28        40
-    [.]                                     39        41
-    [synchronized]                          40        53
-    [{]                                     53        55
+    [val]                                   5         8
+    [toDo]                                  9         13
+    [:]                                     13        14
+    [(]                                     15        16
+    [)]                                     16        17
+    [=>]                                    18        20
+    [Unit]                                  21        25
+    [=]                                     26        27
+    [baseMailbox]                           28        39
+    [.]                                     39        40
+    [synchronized]                          40        52
+    [{]                                     53        54
 L184
-    [msgList]                               7         15
-    [::=]                                   15        19
-    [msg]                                   19        23
+    [msgList]                               7         14
+    [::=]                                   15        18
+    [msg]                                   19        22
 L185
-    [if]                                    7         10
-    [(]                                     10        12
-    [!]                                     11        13
-    [processing]                            12        23
-    [)]                                     22        24
-    [{]                                     24        26
+    [if]                                    7         9
+    [(]                                     10        11
+    [!]                                     11        12
+    [processing]                            12        22
+    [)]                                     22        23
+    [{]                                     24        25
 L186
-    [if]                                    9         12
-    [(]                                     12        14
-    [LAScheduler]                           13        25
-    [.]                                     24        26
-    [onSameThread]                          25        38
-    [)]                                     37        39
-    [{]                                     39        41
+    [if]                                    9         11
+    [(]                                     12        13
+    [LAScheduler]                           13        24
+    [.]                                     24        25
+    [onSameThread]                          25        37
+    [)]                                     37        38
+    [{]                                     39        40
 L187
-    [processing]                            11        22
-    [=]                                     22        24
-    [true]                                  24        29
+    [processing]                            11        21
+    [=]                                     22        23
+    [true]                                  24        28
 L188
-    [(]                                     11        13
-    [)]                                     12        14
-    [=>]                                    14        17
-    [processMailbox]                        17        32
-    [(]                                     31        33
-    [true]                                  32        37
-    [)]                                     36        38
+    [(]                                     11        12
+    [)]                                     12        13
+    [=>]                                    14        16
+    [processMailbox]                        17        31
+    [(]                                     31        32
+    [true]                                  32        36
+    [)]                                     36        37
 L189
-    [}]                                     9         11
-    [else]                                  11        16
-    [{]                                     16        18
+    [}]                                     9         10
+    [else]                                  11        15
+    [{]                                     16        17
 L190
-    [if]                                    11        14
-    [(]                                     14        16
-    [startCnt]                              15        24
-    [==]                                    24        27
-    [0]                                     27        29
-    [)]                                     28        30
-    [{]                                     30        32
+    [if]                                    11        13
+    [(]                                     14        15
+    [startCnt]                              15        23
+    [==]                                    24        26
+    [0]                                     27        28
+    [)]                                     28        29
+    [{]                                     30        31
 L191
-    [startCnt]                              13        22
-    [+=]                                    22        25
-    [1]                                     25        27
+    [startCnt]                              13        21
+    [+=]                                    22        24
+    [1]                                     25        26
 L192
-    [(]                                     13        15
-    [)]                                     14        16
-    [=>]                                    16        19
-    [LAScheduler]                           19        31
-    [.]                                     30        32
-    [execute]                               31        39
-    [(]                                     38        40
-    [(]                                     39        41
-    [)]                                     40        42
-    [=>]                                    42        45
-    [processMailbox]                        45        60
-    [(]                                     59        61
-    [false]                                 60        66
-    [)]                                     65        67
-    [)]                                     66        68
+    [(]                                     13        14
+    [)]                                     14        15
+    [=>]                                    16        18
+    [LAScheduler]                           19        30
+    [.]                                     30        31
+    [execute]                               31        38
+    [(]                                     38        39
+    [(]                                     39        40
+    [)]                                     40        41
+    [=>]                                    42        44
+    [processMailbox]                        45        59
+    [(]                                     59        60
+    [false]                                 60        65
+    [)]                                     65        66
+    [)]                                     66        67
 L193
-    [}]                                     11        13
-    [else]                                  13        18
+    [}]                                     11        12
+    [else]                                  13        17
 L194
-    [(]                                     11        13
-    [)]                                     12        14
-    [=>]                                    14        17
-    [{]                                     17        19
-    [}]                                     18        20
+    [(]                                     11        12
+    [)]                                     12        13
+    [=>]                                    14        16
+    [{]                                     17        18
+    [}]                                     18        19
 L195
-    [}]                                     9         11
+    [}]                                     9         10
 L196
-    [}]                                     7         9
+    [}]                                     7         8
 L197
-    [else]                                  7         12
-    [(]                                     12        14
-    [)]                                     13        15
-    [=>]                                    15        18
-    [{]                                     18        20
-    [}]                                     19        21
+    [else]                                  7         11
+    [(]                                     12        13
+    [)]                                     13        14
+    [=>]                                    15        17
+    [{]                                     18        19
+    [}]                                     19        20
 L198
-    [}]                                     5         7
+    [}]                                     5         6
 L199
-    [toDo]                                  5         10
-    [(]                                     9         11
-    [)]                                     10        12
+    [toDo]                                  5         9
+    [(]                                     9         10
+    [)]                                     10        11
 L200
-    [}]                                     3         5
+    [}]                                     3         4
 L207
-    [protected]                             3         13
-    [def]                                   13        17
-    [insertMsgAtHeadOfQueue_!]              17        42
-    [(]                                     41        43
-    [msg]                                   42        46
-    [:]                                     45        47
-    [T]                                     47        49
-    [)]                                     48        50
-    [:]                                     49        51
-    [Unit]                                  51        56
-    [=]                                     56        58
-    [{]                                     58        60
+    [protected]                             3         12
+    [def]                                   13        16
+    [insertMsgAtHeadOfQueue_!]              17        41
+    [(]                                     41        42
+    [msg]                                   42        45
+    [:]                                     45        46
+    [T]                                     47        48
+    [)]                                     48        49
+    [:]                                     49        50
+    [Unit]                                  51        55
+    [=]                                     56        57
+    [{]                                     58        59
 L208
-    [val]                                   6         10
-    [toDo]                                  10        15
-    [:]                                     14        16
-    [(]                                     16        18
-    [)]                                     17        19
-    [=>]                                    19        22
-    [Unit]                                  22        27
-    [=]                                     27        29
-    [baseMailbox]                           29        41
-    [.]                                     40        42
-    [synchronized]                          41        54
-    [{]                                     54        56
+    [val]                                   6         9
+    [toDo]                                  10        14
+    [:]                                     14        15
+    [(]                                     16        17
+    [)]                                     17        18
+    [=>]                                    19        21
+    [Unit]                                  22        26
+    [=]                                     27        28
+    [baseMailbox]                           29        40
+    [.]                                     40        41
+    [synchronized]                          41        53
+    [{]                                     54        55
 L209
-    [this]                                  7         12
-    [.]                                     11        13
-    [priorityMsgList]                       12        28
-    [::=]                                   28        32
-    [msg]                                   32        36
+    [this]                                  7         11
+    [.]                                     11        12
+    [priorityMsgList]                       12        27
+    [::=]                                   28        31
+    [msg]                                   32        35
 L210
-    [if]                                    7         10
-    [(]                                     10        12
-    [!]                                     11        13
-    [processing]                            12        23
-    [)]                                     22        24
-    [{]                                     24        26
+    [if]                                    7         9
+    [(]                                     10        11
+    [!]                                     11        12
+    [processing]                            12        22
+    [)]                                     22        23
+    [{]                                     24        25
 L211
-    [if]                                    9         12
-    [(]                                     12        14
-    [LAScheduler]                           13        25
-    [.]                                     24        26
-    [onSameThread]                          25        38
-    [)]                                     37        39
-    [{]                                     39        41
+    [if]                                    9         11
+    [(]                                     12        13
+    [LAScheduler]                           13        24
+    [.]                                     24        25
+    [onSameThread]                          25        37
+    [)]                                     37        38
+    [{]                                     39        40
 L212
-    [processing]                            11        22
-    [=]                                     22        24
-    [true]                                  24        29
+    [processing]                            11        21
+    [=]                                     22        23
+    [true]                                  24        28
 L213
-    [(]                                     11        13
-    [)]                                     12        14
-    [=>]                                    14        17
-    [processMailbox]                        17        32
-    [(]                                     31        33
-    [true]                                  32        37
-    [)]                                     36        38
+    [(]                                     11        12
+    [)]                                     12        13
+    [=>]                                    14        16
+    [processMailbox]                        17        31
+    [(]                                     31        32
+    [true]                                  32        36
+    [)]                                     36        37
 L214
-    [}]                                     9         11
-    [else]                                  11        16
-    [{]                                     16        18
+    [}]                                     9         10
+    [else]                                  11        15
+    [{]                                     16        17
 L215
-    [if]                                    11        14
-    [(]                                     14        16
-    [startCnt]                              15        24
-    [==]                                    24        27
-    [0]                                     27        29
-    [)]                                     28        30
-    [{]                                     30        32
+    [if]                                    11        13
+    [(]                                     14        15
+    [startCnt]                              15        23
+    [==]                                    24        26
+    [0]                                     27        28
+    [)]                                     28        29
+    [{]                                     30        31
 L216
-    [startCnt]                              13        22
-    [+=]                                    22        25
-    [1]                                     25        27
+    [startCnt]                              13        21
+    [+=]                                    22        24
+    [1]                                     25        26
 L217
-    [(]                                     13        15
-    [)]                                     14        16
-    [=>]                                    16        19
-    [LAScheduler]                           19        31
-    [.]                                     30        32
-    [execute]                               31        39
-    [(]                                     38        40
-    [(]                                     39        41
-    [)]                                     40        42
-    [=>]                                    42        45
-    [processMailbox]                        45        60
-    [(]                                     59        61
-    [false]                                 60        66
-    [)]                                     65        67
-    [)]                                     66        68
+    [(]                                     13        14
+    [)]                                     14        15
+    [=>]                                    16        18
+    [LAScheduler]                           19        30
+    [.]                                     30        31
+    [execute]                               31        38
+    [(]                                     38        39
+    [(]                                     39        40
+    [)]                                     40        41
+    [=>]                                    42        44
+    [processMailbox]                        45        59
+    [(]                                     59        60
+    [false]                                 60        65
+    [)]                                     65        66
+    [)]                                     66        67
 L218
-    [}]                                     11        13
-    [else]                                  13        18
+    [}]                                     11        12
+    [else]                                  13        17
 L219
-    [(]                                     11        13
-    [)]                                     12        14
-    [=>]                                    14        17
-    [{]                                     17        19
-    [}]                                     18        20
+    [(]                                     11        12
+    [)]                                     12        13
+    [=>]                                    14        16
+    [{]                                     17        18
+    [}]                                     18        19
 L220
-    [}]                                     9         11
+    [}]                                     9         10
 L221
-    [}]                                     7         9
+    [}]                                     7         8
 L222
-    [else]                                  7         12
-    [(]                                     12        14
-    [)]                                     13        15
-    [=>]                                    15        18
-    [{]                                     18        20
-    [}]                                     19        21
+    [else]                                  7         11
+    [(]                                     12        13
+    [)]                                     13        14
+    [=>]                                    15        17
+    [{]                                     18        19
+    [}]                                     19        20
 L223
-    [}]                                     5         7
+    [}]                                     5         6
 L224
-    [toDo]                                  5         10
-    [(]                                     9         11
-    [)]                                     10        12
+    [toDo]                                  5         9
+    [(]                                     9         10
+    [)]                                     10        11
 L225
-    [}]                                     3         5
+    [}]                                     3         4
 L227
-    [private]                               3         11
-    [def]                                   11        15
-    [processMailbox]                        15        30
-    [(]                                     29        31
-    [ignoreProcessing]                      30        47
-    [:]                                     46        48
-    [Boolean]                               48        56
-    [)]                                     55        57
-    [{]                                     57        59
+    [private]                               3         10
+    [def]                                   11        14
+    [processMailbox]                        15        29
+    [(]                                     29        30
+    [ignoreProcessing]                      30        46
+    [:]                                     46        47
+    [Boolean]                               48        55
+    [)]                                     55        56
+    [{]                                     57        58
 L228
-    [around]                                5         12
-    [{]                                     12        14
+    [around]                                5         11
+    [{]                                     12        13
 L229
-    [proc2]                                 7         13
-    [(]                                     12        14
-    [ignoreProcessing]                      13        30
-    [)]                                     29        31
+    [proc2]                                 7         12
+    [(]                                     12        13
+    [ignoreProcessing]                      13        29
+    [)]                                     29        30
 L230
-    [}]                                     5         7
+    [}]                                     5         6
 L231
-    [}]                                     3         5
+    [}]                                     3         4
 L236
-    [protected]                             3         13
-    [def]                                   13        17
-    [aroundLoans]                           17        29
-    [:]                                     28        30
-    [List]                                  30        35
-    [\[]                                    34        36
-    [CommonLoanWrapper]                     35        53
-    [\]]                                    52        54
-    [=]                                     54        56
-    [Nil]                                   56        60
+    [protected]                             3         12
+    [def]                                   13        16
+    [aroundLoans]                           17        28
+    [:]                                     28        29
+    [List]                                  30        34
+    [\[]                                    34        35
+    [CommonLoanWrapper]                     35        52
+    [\]]                                    52        53
+    [=]                                     54        55
+    [Nil]                                   56        59
 L242
-    [protected]                             3         13
-    [def]                                   13        17
-    [around]                                17        24
-    [\[]                                    23        25
-    [R]                                     24        26
-    [\]]                                    25        27
-    [(]                                     26        28
-    [f]                                     27        29
-    [:]                                     28        30
-    [=>]                                    30        33
-    [R]                                     33        35
-    [)]                                     34        36
-    [:]                                     35        37
-    [R]                                     37        39
-    [=]                                     39        41
-    [aroundLoans]                           41        53
-    [match]                                 53        59
-    [{]                                     59        61
+    [protected]                             3         12
+    [def]                                   13        16
+    [around]                                17        23
+    [\[]                                    23        24
+    [R]                                     24        25
+    [\]]                                    25        26
+    [(]                                     26        27
+    [f]                                     27        28
+    [:]                                     28        29
+    [=>]                                    30        32
+    [R]                                     33        34
+    [)]                                     34        35
+    [:]                                     35        36
+    [R]                                     37        38
+    [=]                                     39        40
+    [aroundLoans]                           41        52
+    [match]                                 53        58
+    [{]                                     59        60
 L243
-    [case]                                  5         10
-    [Nil]                                   10        14
-    [=>]                                    14        17
-    [f]                                     17        19
+    [case]                                  5         9
+    [Nil]                                   10        13
+    [=>]                                    14        16
+    [f]                                     17        18
 L244
-    [case]                                  5         10
-    [xs]                                    10        13
-    [=>]                                    13        16
-    [CommonLoanWrapper]                     16        34
-    [(]                                     33        35
-    [xs]                                    34        37
-    [)]                                     36        38
-    [(]                                     37        39
-    [f]                                     38        40
-    [)]                                     39        41
+    [case]                                  5         9
+    [xs]                                    10        12
+    [=>]                                    13        15
+    [CommonLoanWrapper]                     16        33
+    [(]                                     33        34
+    [xs]                                    34        36
+    [)]                                     36        37
+    [(]                                     37        38
+    [f]                                     38        39
+    [)]                                     39        40
 L245
-    [}]                                     3         5
+    [}]                                     3         4
 L246
-    [private]                               3         11
-    [def]                                   11        15
-    [proc2]                                 15        21
-    [(]                                     20        22
-    [ignoreProcessing]                      21        38
-    [:]                                     37        39
-    [Boolean]                               39        47
-    [)]                                     46        48
-    [{]                                     48        50
+    [private]                               3         10
+    [def]                                   11        14
+    [proc2]                                 15        20
+    [(]                                     20        21
+    [ignoreProcessing]                      21        37
+    [:]                                     37        38
+    [Boolean]                               39        46
+    [)]                                     46        47
+    [{]                                     48        49
 L247
-    [var]                                   5         9
-    [clearProcessing]                       9         25
-    [=]                                     25        27
-    [true]                                  27        32
+    [var]                                   5         8
+    [clearProcessing]                       9         24
+    [=]                                     25        26
+    [true]                                  27        31
 L248
-    [baseMailbox]                           5         17
-    [.]                                     16        18
-    [synchronized]                          17        30
-    [{]                                     30        32
+    [baseMailbox]                           5         16
+    [.]                                     16        17
+    [synchronized]                          17        29
+    [{]                                     30        31
 L249
-    [if]                                    7         10
-    [(]                                     10        12
-    [!]                                     11        13
-    [ignoreProcessing]                      12        29
-    [&&]                                    29        32
-    [processing]                            32        43
-    [)]                                     42        44
-    [return]                                44        51
+    [if]                                    7         9
+    [(]                                     10        11
+    [!]                                     11        12
+    [ignoreProcessing]                      12        28
+    [&&]                                    29        31
+    [processing]                            32        42
+    [)]                                     42        43
+    [return]                                44        50
 L250
-    [processing]                            7         18
-    [=]                                     18        20
-    [true]                                  20        25
+    [processing]                            7         17
+    [=]                                     18        19
+    [true]                                  20        24
 L251
-    [if]                                    7         10
-    [(]                                     10        12
-    [startCnt]                              11        20
-    [>]                                     20        22
-    [0]                                     22        24
-    [)]                                     23        25
-    [startCnt]                              25        34
-    [=]                                     34        36
-    [0]                                     36        38
+    [if]                                    7         9
+    [(]                                     10        11
+    [startCnt]                              11        19
+    [>]                                     20        21
+    [0]                                     22        23
+    [)]                                     23        24
+    [startCnt]                              25        33
+    [=]                                     34        35
+    [0]                                     36        37
 L252
-    [}]                                     5         7
+    [}]                                     5         6
 L254
-    [val]                                   5         9
-    [eh]                                    9         12
-    [=]                                     12        14
-    [exceptionHandler]                      14        31
+    [val]                                   5         8
+    [eh]                                    9         11
+    [=]                                     12        13
+    [exceptionHandler]                      14        30
 L256
-    [def]                                   5         9
-    [putListIntoMB]                         9         23
-    [(]                                     22        24
-    [)]                                     23        25
-    [:]                                     24        26
-    [Unit]                                  26        31
-    [=]                                     31        33
-    [{]                                     33        35
+    [def]                                   5         8
+    [putListIntoMB]                         9         22
+    [(]                                     22        23
+    [)]                                     23        24
+    [:]                                     24        25
+    [Unit]                                  26        30
+    [=]                                     31        32
+    [{]                                     33        34
 L257
-    [if]                                    7         10
-    [(]                                     10        12
-    [!]                                     11        13
-    [priorityMsgList]                       12        28
-    [.]                                     27        29
-    [isEmpty]                               28        36
-    [)]                                     35        37
-    [{]                                     37        39
+    [if]                                    7         9
+    [(]                                     10        11
+    [!]                                     11        12
+    [priorityMsgList]                       12        27
+    [.]                                     27        28
+    [isEmpty]                               28        35
+    [)]                                     35        36
+    [{]                                     37        38
 L258
-    [priorityMsgList]                       7         23
-    [.]                                     22        24
-    [foldRight]                             23        33
-    [(]                                     32        34
-    [baseMailbox]                           33        45
-    [)]                                     44        46
-    [(]                                     45        47
-    [(]                                     46        48
-    [msg]                                   47        51
-    [,]                                     50        52
-    [mb]                                    52        55
-    [)]                                     54        56
-    [=>]                                    56        59
-    [mb]                                    59        62
-    [.]                                     61        63
-    [insertAfter]                           62        74
-    [(]                                     73        75
-    [new]                                   74        78
-    [MailboxItem]                           78        90
-    [(]                                     89        91
-    [msg]                                   90        94
-    [)]                                     93        95
-    [)]                                     94        96
-    [)]                                     95        97
+    [priorityMsgList]                       7         22
+    [.]                                     22        23
+    [foldRight]                             23        32
+    [(]                                     32        33
+    [baseMailbox]                           33        44
+    [)]                                     44        45
+    [(]                                     45        46
+    [(]                                     46        47
+    [msg]                                   47        50
+    [,]                                     50        51
+    [mb]                                    52        54
+    [)]                                     54        55
+    [=>]                                    56        58
+    [mb]                                    59        61
+    [.]                                     61        62
+    [insertAfter]                           62        73
+    [(]                                     73        74
+    [new]                                   74        77
+    [MailboxItem]                           78        89
+    [(]                                     89        90
+    [msg]                                   90        93
+    [)]                                     93        94
+    [)]                                     94        95
+    [)]                                     95        96
 L259
-    [priorityMsgList]                       7         23
-    [=]                                     23        25
-    [Nil]                                   25        29
+    [priorityMsgList]                       7         22
+    [=]                                     23        24
+    [Nil]                                   25        28
 L260
-    [}]                                     7         9
+    [}]                                     7         8
 L262
-    [if]                                    7         10
-    [(]                                     10        12
-    [!]                                     11        13
-    [msgList]                               12        20
-    [.]                                     19        21
-    [isEmpty]                               20        28
-    [)]                                     27        29
-    [{]                                     29        31
+    [if]                                    7         9
+    [(]                                     10        11
+    [!]                                     11        12
+    [msgList]                               12        19
+    [.]                                     19        20
+    [isEmpty]                               20        27
+    [)]                                     27        28
+    [{]                                     29        30
 L263
-    [msgList]                               7         15
-    [.]                                     14        16
-    [foldLeft]                              15        24
-    [(]                                     23        25
-    [baseMailbox]                           24        36
-    [)]                                     35        37
-    [(]                                     36        38
-    [(]                                     37        39
-    [mb]                                    38        41
-    [,]                                     40        42
-    [msg]                                   42        46
-    [)]                                     45        47
-    [=>]                                    47        50
-    [mb]                                    50        53
-    [.]                                     52        54
-    [insertBefore]                          53        66
-    [(]                                     65        67
-    [new]                                   66        70
-    [MailboxItem]                           70        82
-    [(]                                     81        83
-    [msg]                                   82        86
-    [)]                                     85        87
-    [)]                                     86        88
-    [)]                                     87        89
+    [msgList]                               7         14
+    [.]                                     14        15
+    [foldLeft]                              15        23
+    [(]                                     23        24
+    [baseMailbox]                           24        35
+    [)]                                     35        36
+    [(]                                     36        37
+    [(]                                     37        38
+    [mb]                                    38        40
+    [,]                                     40        41
+    [msg]                                   42        45
+    [)]                                     45        46
+    [=>]                                    47        49
+    [mb]                                    50        52
+    [.]                                     52        53
+    [insertBefore]                          53        65
+    [(]                                     65        66
+    [new]                                   66        69
+    [MailboxItem]                           70        81
+    [(]                                     81        82
+    [msg]                                   82        85
+    [)]                                     85        86
+    [)]                                     86        87
+    [)]                                     87        88
 L264
-    [msgList]                               7         15
-    [=]                                     15        17
-    [Nil]                                   17        21
+    [msgList]                               7         14
+    [=]                                     15        16
+    [Nil]                                   17        20
 L265
-    [}]                                     7         9
+    [}]                                     7         8
 L266
-    [}]                                     5         7
+    [}]                                     5         6
 L268
-    [try]                                   5         9
-    [{]                                     9         11
+    [try]                                   5         8
+    [{]                                     9         10
 L269
-    [while]                                 7         13
-    [(]                                     13        15
-    [true]                                  14        19
-    [)]                                     18        20
-    [{]                                     20        22
+    [while]                                 7         12
+    [(]                                     13        14
+    [true]                                  14        18
+    [)]                                     18        19
+    [{]                                     20        21
 L270
-    [baseMailbox]                           9         21
-    [.]                                     20        22
-    [synchronized]                          21        34
-    [{]                                     34        36
+    [baseMailbox]                           9         20
+    [.]                                     20        21
+    [synchronized]                          21        33
+    [{]                                     34        35
 L271
-    [putListIntoMB]                         11        25
-    [(]                                     24        26
-    [)]                                     25        27
+    [putListIntoMB]                         11        24
+    [(]                                     24        25
+    [)]                                     25        26
 L272
-    [}]                                     9         11
+    [}]                                     9         10
 L274
-    [var]                                   13        17
-    [keepOnDoingHighPriory]                 17        39
-    [=]                                     39        41
-    [true]                                  41        46
+    [var]                                   13        16
+    [keepOnDoingHighPriory]                 17        38
+    [=]                                     39        40
+    [true]                                  41        45
 L276
-    [while]                                 13        19
-    [(]                                     19        21
-    [keepOnDoingHighPriory]                 20        42
-    [)]                                     41        43
-    [{]                                     43        45
+    [while]                                 13        18
+    [(]                                     19        20
+    [keepOnDoingHighPriory]                 20        41
+    [)]                                     41        42
+    [{]                                     43        44
 L277
-    [val]                                   15        19
-    [hiPriPfBox]                            19        30
-    [=]                                     30        32
-    [highPriorityReceive]                   32        52
+    [val]                                   15        18
+    [hiPriPfBox]                            19        29
+    [=]                                     30        31
+    [highPriorityReceive]                   32        51
 L278
-    [hiPriPfBox]                            15        26
-    [.]                                     25        27
-    [map]                                   26        30
-    [{]                                     29        31
+    [hiPriPfBox]                            15        25
+    [.]                                     25        26
+    [map]                                   26        29
+    [{]                                     29        30
 L279
-    [hiPriPf]                               17        25
-    [=>]                                    25        28
+    [hiPriPf]                               17        24
+    [=>]                                    25        27
 L280
-    [findMailboxItem]                       19        35
-    [(]                                     34        36
-    [baseMailbox]                           35        47
-    [.]                                     46        48
-    [next]                                  47        52
-    [,]                                     51        53
-    [mb]                                    53        56
-    [=>]                                    56        59
-    [testTranslate]                         59        73
-    [(]                                     72        74
-    [hiPriPf]                               73        81
-    [.]                                     80        82
-    [isDefinedAt]                           81        93
-    [)]                                     92        94
-    [(]                                     93        95
-    [mb]                                    94        97
-    [.]                                     96        98
-    [item]                                  97        102
-    [)]                                     101       103
-    [)]                                     102       104
-    [match]                                 104       110
-    [{]                                     110       112
+    [findMailboxItem]                       19        34
+    [(]                                     34        35
+    [baseMailbox]                           35        46
+    [.]                                     46        47
+    [next]                                  47        51
+    [,]                                     51        52
+    [mb]                                    53        55
+    [=>]                                    56        58
+    [testTranslate]                         59        72
+    [(]                                     72        73
+    [hiPriPf]                               73        80
+    [.]                                     80        81
+    [isDefinedAt]                           81        92
+    [)]                                     92        93
+    [(]                                     93        94
+    [mb]                                    94        96
+    [.]                                     96        97
+    [item]                                  97        101
+    [)]                                     101       102
+    [)]                                     102       103
+    [match]                                 104       109
+    [{]                                     110       111
 L281
-    [case]                                  21        26
-    [Full]                                  26        31
-    [(]                                     30        32
-    [mb]                                    31        34
-    [)]                                     33        35
-    [=>]                                    35        38
+    [case]                                  21        25
+    [Full]                                  26        30
+    [(]                                     30        31
+    [mb]                                    31        33
+    [)]                                     33        34
+    [=>]                                    35        37
 L282
-    [mb]                                    23        26
-    [.]                                     25        27
-    [remove]                                26        33
-    [(]                                     32        34
-    [)]                                     33        35
+    [mb]                                    23        25
+    [.]                                     25        26
+    [remove]                                26        32
+    [(]                                     32        33
+    [)]                                     33        34
 L283
-    [try]                                   23        27
-    [{]                                     27        29
+    [try]                                   23        26
+    [{]                                     27        28
 L284
-    [execTranslate]                         25        39
-    [(]                                     38        40
-    [hiPriPf]                               39        47
-    [)]                                     46        48
-    [(]                                     47        49
-    [mb]                                    48        51
-    [.]                                     50        52
-    [item]                                  51        56
-    [)]                                     55        57
+    [execTranslate]                         25        38
+    [(]                                     38        39
+    [hiPriPf]                               39        46
+    [)]                                     46        47
+    [(]                                     47        48
+    [mb]                                    48        50
+    [.]                                     50        51
+    [item]                                  51        55
+    [)]                                     55        56
 L285
-    [}]                                     23        25
-    [catch]                                 25        31
-    [{]                                     31        33
+    [}]                                     23        24
+    [catch]                                 25        30
+    [{]                                     31        32
 L286
-    [case]                                  25        30
-    [e]                                     30        32
-    [:]                                     31        33
-    [Exception]                             33        43
-    [=>]                                    43        46
-    [if]                                    46        49
-    [(]                                     49        51
-    [eh]                                    50        53
-    [.]                                     52        54
-    [isDefinedAt]                           53        65
-    [(]                                     64        66
-    [e]                                     65        67
-    [)]                                     66        68
-    [)]                                     67        69
-    [eh]                                    69        72
-    [(]                                     71        73
-    [e]                                     72        74
-    [)]                                     73        75
+    [case]                                  25        29
+    [e]                                     30        31
+    [:]                                     31        32
+    [Exception]                             33        42
+    [=>]                                    43        45
+    [if]                                    46        48
+    [(]                                     49        50
+    [eh]                                    50        52
+    [.]                                     52        53
+    [isDefinedAt]                           53        64
+    [(]                                     64        65
+    [e]                                     65        66
+    [)]                                     66        67
+    [)]                                     67        68
+    [eh]                                    69        71
+    [(]                                     71        72
+    [e]                                     72        73
+    [)]                                     73        74
 L287
-    [}]                                     23        25
+    [}]                                     23        24
 L288
-    [case]                                  21        26
-    [_]                                     26        28
-    [=>]                                    28        31
+    [case]                                  21        25
+    [_]                                     26        27
+    [=>]                                    28        30
 L289
-    [baseMailbox]                           23        35
-    [.]                                     34        36
-    [synchronized]                          35        48
-    [{]                                     48        50
+    [baseMailbox]                           23        34
+    [.]                                     34        35
+    [synchronized]                          35        47
+    [{]                                     48        49
 L290
-    [if]                                    25        28
-    [(]                                     28        30
-    [msgList]                               29        37
-    [.]                                     36        38
-    [isEmpty]                               37        45
-    [)]                                     44        46
-    [{]                                     46        48
+    [if]                                    25        27
+    [(]                                     28        29
+    [msgList]                               29        36
+    [.]                                     36        37
+    [isEmpty]                               37        44
+    [)]                                     44        45
+    [{]                                     46        47
 L291
-    [keepOnDoingHighPriory]                 27        49
-    [=]                                     49        51
-    [false]                                 51        57
+    [keepOnDoingHighPriory]                 27        48
+    [=]                                     49        50
+    [false]                                 51        56
 L292
-    [}]                                     25        27
+    [}]                                     25        26
 L293
-    [else]                                  25        30
-    [{]                                     30        32
+    [else]                                  25        29
+    [{]                                     30        31
 L294
-    [putListIntoMB]                         27        41
-    [(]                                     40        42
-    [)]                                     41        43
+    [putListIntoMB]                         27        40
+    [(]                                     40        41
+    [)]                                     41        42
 L295
-    [}]                                     25        27
+    [}]                                     25        26
 L296
-    [}]                                     23        25
+    [}]                                     23        24
 L297
-    [}]                                     19        21
+    [}]                                     19        20
 L298
-    [}]                                     15        17
-    [.]                                     16        18
-    [openOr]                                17        24
-    [{]                                     23        25
-    [keepOnDoingHighPriory]                 24        46
-    [=]                                     46        48
-    [false]                                 48        54
-    [}]                                     53        55
+    [}]                                     15        16
+    [.]                                     16        17
+    [openOr]                                17        23
+    [{]                                     23        24
+    [keepOnDoingHighPriory]                 24        45
+    [=]                                     46        47
+    [false]                                 48        53
+    [}]                                     53        54
 L299
-    [}]                                     13        15
+    [}]                                     13        14
 L301
-    [val]                                   13        17
-    [pf]                                    17        20
-    [=]                                     20        22
-    [messageHandler]                        22        37
+    [val]                                   13        16
+    [pf]                                    17        19
+    [=]                                     20        21
+    [messageHandler]                        22        36
 L303
-    [findMailboxItem]                       9         25
-    [(]                                     24        26
-    [baseMailbox]                           25        37
-    [.]                                     36        38
-    [next]                                  37        42
-    [,]                                     41        43
-    [mb]                                    43        46
-    [=>]                                    46        49
-    [testTranslate]                         49        63
-    [(]                                     62        64
-    [pf]                                    63        66
-    [.]                                     65        67
-    [isDefinedAt]                           66        78
-    [)]                                     77        79
-    [(]                                     78        80
-    [mb]                                    79        82
-    [.]                                     81        83
-    [item]                                  82        87
-    [)]                                     86        88
-    [)]                                     87        89
-    [match]                                 89        95
-    [{]                                     95        97
+    [findMailboxItem]                       9         24
+    [(]                                     24        25
+    [baseMailbox]                           25        36
+    [.]                                     36        37
+    [next]                                  37        41
+    [,]                                     41        42
+    [mb]                                    43        45
+    [=>]                                    46        48
+    [testTranslate]                         49        62
+    [(]                                     62        63
+    [pf]                                    63        65
+    [.]                                     65        66
+    [isDefinedAt]                           66        77
+    [)]                                     77        78
+    [(]                                     78        79
+    [mb]                                    79        81
+    [.]                                     81        82
+    [item]                                  82        86
+    [)]                                     86        87
+    [)]                                     87        88
+    [match]                                 89        94
+    [{]                                     95        96
 L304
-    [case]                                  11        16
-    [Full]                                  16        21
-    [(]                                     20        22
-    [mb]                                    21        24
-    [)]                                     23        25
-    [=>]                                    25        28
+    [case]                                  11        15
+    [Full]                                  16        20
+    [(]                                     20        21
+    [mb]                                    21        23
+    [)]                                     23        24
+    [=>]                                    25        27
 L305
-    [mb]                                    13        16
-    [.]                                     15        17
-    [remove]                                16        23
-    [(]                                     22        24
-    [)]                                     23        25
+    [mb]                                    13        15
+    [.]                                     15        16
+    [remove]                                16        22
+    [(]                                     22        23
+    [)]                                     23        24
 L306
-    [try]                                   13        17
-    [{]                                     17        19
+    [try]                                   13        16
+    [{]                                     17        18
 L307
-    [execTranslate]                         15        29
-    [(]                                     28        30
-    [pf]                                    29        32
-    [)]                                     31        33
-    [(]                                     32        34
-    [mb]                                    33        36
-    [.]                                     35        37
-    [item]                                  36        41
-    [)]                                     40        42
+    [execTranslate]                         15        28
+    [(]                                     28        29
+    [pf]                                    29        31
+    [)]                                     31        32
+    [(]                                     32        33
+    [mb]                                    33        35
+    [.]                                     35        36
+    [item]                                  36        40
+    [)]                                     40        41
 L308
-    [}]                                     13        15
-    [catch]                                 15        21
-    [{]                                     21        23
+    [}]                                     13        14
+    [catch]                                 15        20
+    [{]                                     21        22
 L309
-    [case]                                  15        20
-    [e]                                     20        22
-    [:]                                     21        23
-    [Exception]                             23        33
-    [=>]                                    33        36
-    [if]                                    36        39
-    [(]                                     39        41
-    [eh]                                    40        43
-    [.]                                     42        44
-    [isDefinedAt]                           43        55
-    [(]                                     54        56
-    [e]                                     55        57
-    [)]                                     56        58
-    [)]                                     57        59
-    [eh]                                    59        62
-    [(]                                     61        63
-    [e]                                     62        64
-    [)]                                     63        65
+    [case]                                  15        19
+    [e]                                     20        21
+    [:]                                     21        22
+    [Exception]                             23        32
+    [=>]                                    33        35
+    [if]                                    36        38
+    [(]                                     39        40
+    [eh]                                    40        42
+    [.]                                     42        43
+    [isDefinedAt]                           43        54
+    [(]                                     54        55
+    [e]                                     55        56
+    [)]                                     56        57
+    [)]                                     57        58
+    [eh]                                    59        61
+    [(]                                     61        62
+    [e]                                     62        63
+    [)]                                     63        64
 L310
-    [}]                                     13        15
+    [}]                                     13        14
 L311
-    [case]                                  11        16
-    [_]                                     16        18
-    [=>]                                    18        21
+    [case]                                  11        15
+    [_]                                     16        17
+    [=>]                                    18        20
 L312
-    [baseMailbox]                           13        25
-    [.]                                     24        26
-    [synchronized]                          25        38
-    [{]                                     38        40
+    [baseMailbox]                           13        24
+    [.]                                     24        25
+    [synchronized]                          25        37
+    [{]                                     38        39
 L313
-    [if]                                    15        18
-    [(]                                     18        20
-    [msgList]                               19        27
-    [.]                                     26        28
-    [isEmpty]                               27        35
-    [)]                                     34        36
-    [{]                                     36        38
+    [if]                                    15        17
+    [(]                                     18        19
+    [msgList]                               19        26
+    [.]                                     26        27
+    [isEmpty]                               27        34
+    [)]                                     34        35
+    [{]                                     36        37
 L314
-    [processing]                            17        28
-    [=]                                     28        30
-    [false]                                 30        36
+    [processing]                            17        27
+    [=]                                     28        29
+    [false]                                 30        35
 L315
-    [clearProcessing]                       17        33
-    [=]                                     33        35
-    [false]                                 35        41
+    [clearProcessing]                       17        32
+    [=]                                     33        34
+    [false]                                 35        40
 L316
-    [return]                                17        24
+    [return]                                17        23
 L317
-    [}]                                     15        17
+    [}]                                     15        16
 L318
-    [else]                                  15        20
-    [{]                                     20        22
+    [else]                                  15        19
+    [{]                                     20        21
 L319
-    [putListIntoMB]                         17        31
-    [(]                                     30        32
-    [)]                                     31        33
+    [putListIntoMB]                         17        30
+    [(]                                     30        31
+    [)]                                     31        32
 L320
-    [}]                                     15        17
+    [}]                                     15        16
 L321
-    [}]                                     13        15
+    [}]                                     13        14
 L322
-    [}]                                     9         11
+    [}]                                     9         10
 L323
-    [}]                                     7         9
+    [}]                                     7         8
 L324
-    [}]                                     5         7
-    [catch]                                 7         13
-    [{]                                     13        15
+    [}]                                     5         6
+    [catch]                                 7         12
+    [{]                                     13        14
 L325
-    [case]                                  7         12
-    [exception]                             12        22
-    [:]                                     21        23
-    [Throwable]                             23        33
-    [=>]                                    33        36
+    [case]                                  7         11
+    [exception]                             12        21
+    [:]                                     21        22
+    [Throwable]                             23        32
+    [=>]                                    33        35
 L326
-    [if]                                    9         12
-    [(]                                     12        14
-    [eh]                                    13        16
-    [.]                                     15        17
-    [isDefinedAt]                           16        28
-    [(]                                     27        29
-    [exception]                             28        38
-    [)]                                     37        39
-    [)]                                     38        40
+    [if]                                    9         11
+    [(]                                     12        13
+    [eh]                                    13        15
+    [.]                                     15        16
+    [isDefinedAt]                           16        27
+    [(]                                     27        28
+    [exception]                             28        37
+    [)]                                     37        38
+    [)]                                     38        39
 L327
-    [eh]                                    11        14
-    [(]                                     13        15
-    [exception]                             14        24
-    [)]                                     23        25
+    [eh]                                    11        13
+    [(]                                     13        14
+    [exception]                             14        23
+    [)]                                     23        24
 L329
-    [throw]                                 9         15
-    [exception]                             15        25
+    [throw]                                 9         14
+    [exception]                             15        24
 L330
-    [}]                                     5         7
-    [finally]                               7         15
-    [{]                                     15        17
+    [}]                                     5         6
+    [finally]                               7         14
+    [{]                                     15        16
 L331
-    [if]                                    7         10
-    [(]                                     10        12
-    [clearProcessing]                       11        27
-    [)]                                     26        28
-    [{]                                     28        30
+    [if]                                    7         9
+    [(]                                     10        11
+    [clearProcessing]                       11        26
+    [)]                                     26        27
+    [{]                                     28        29
 L332
-    [baseMailbox]                           9         21
-    [.]                                     20        22
-    [synchronized]                          21        34
-    [{]                                     34        36
+    [baseMailbox]                           9         20
+    [.]                                     20        21
+    [synchronized]                          21        33
+    [{]                                     34        35
 L333
-    [processing]                            11        22
-    [=]                                     22        24
-    [false]                                 24        30
+    [processing]                            11        21
+    [=]                                     22        23
+    [false]                                 24        29
 L334
-    [}]                                     9         11
+    [}]                                     9         10
 L335
-    [}]                                     7         9
+    [}]                                     7         8
 L336
-    [}]                                     5         7
+    [}]                                     5         6
 L337
-    [}]                                     3         5
+    [}]                                     3         4
 L339
-    [protected]                             3         13
-    [def]                                   13        17
-    [testTranslate]                         17        31
-    [(]                                     30        32
-    [f]                                     31        33
-    [:]                                     32        34
-    [T]                                     34        36
-    [=>]                                    36        39
-    [Boolean]                               39        47
-    [)]                                     46        48
-    [(]                                     47        49
-    [v]                                     48        50
-    [:]                                     49        51
-    [T]                                     51        53
-    [)]                                     52        54
-    [:]                                     53        55
-    [Boolean]                               55        63
-    [=]                                     63        65
-    [f]                                     65        67
-    [(]                                     66        68
-    [v]                                     67        69
-    [)]                                     68        70
+    [protected]                             3         12
+    [def]                                   13        16
+    [testTranslate]                         17        30
+    [(]                                     30        31
+    [f]                                     31        32
+    [:]                                     32        33
+    [T]                                     34        35
+    [=>]                                    36        38
+    [Boolean]                               39        46
+    [)]                                     46        47
+    [(]                                     47        48
+    [v]                                     48        49
+    [:]                                     49        50
+    [T]                                     51        52
+    [)]                                     52        53
+    [:]                                     53        54
+    [Boolean]                               55        62
+    [=]                                     63        64
+    [f]                                     65        66
+    [(]                                     66        67
+    [v]                                     67        68
+    [)]                                     68        69
 L341
-    [protected]                             3         13
-    [def]                                   13        17
-    [execTranslate]                         17        31
-    [(]                                     30        32
-    [f]                                     31        33
-    [:]                                     32        34
-    [T]                                     34        36
-    [=>]                                    36        39
-    [Unit]                                  39        44
-    [)]                                     43        45
-    [(]                                     44        46
-    [v]                                     45        47
-    [:]                                     46        48
-    [T]                                     48        50
-    [)]                                     49        51
-    [:]                                     50        52
-    [Unit]                                  52        57
-    [=]                                     57        59
-    [f]                                     59        61
-    [(]                                     60        62
-    [v]                                     61        63
-    [)]                                     62        64
+    [protected]                             3         12
+    [def]                                   13        16
+    [execTranslate]                         17        30
+    [(]                                     30        31
+    [f]                                     31        32
+    [:]                                     32        33
+    [T]                                     34        35
+    [=>]                                    36        38
+    [Unit]                                  39        43
+    [)]                                     43        44
+    [(]                                     44        45
+    [v]                                     45        46
+    [:]                                     46        47
+    [T]                                     48        49
+    [)]                                     49        50
+    [:]                                     50        51
+    [Unit]                                  52        56
+    [=]                                     57        58
+    [f]                                     59        60
+    [(]                                     60        61
+    [v]                                     61        62
+    [)]                                     62        63
 L343
-    [protected]                             3         13
-    [def]                                   13        17
-    [messageHandler]                        17        32
-    [:]                                     31        33
-    [PartialFunction]                       33        49
-    [\[]                                    48        50
-    [T]                                     49        51
-    [,]                                     50        52
-    [Unit]                                  52        57
-    [\]]                                    56        58
+    [protected]                             3         12
+    [def]                                   13        16
+    [messageHandler]                        17        31
+    [:]                                     31        32
+    [PartialFunction]                       33        48
+    [\[]                                    48        49
+    [T]                                     49        50
+    [,]                                     50        51
+    [Unit]                                  52        56
+    [\]]                                    56        57
 L345
-    [protected]                             3         13
-    [def]                                   13        17
-    [highPriorityReceive]                   17        37
-    [:]                                     36        38
-    [Box]                                   38        42
-    [\[]                                    41        43
-    [PartialFunction]                       42        58
-    [\[]                                    57        59
-    [T]                                     58        60
-    [,]                                     59        61
-    [Unit]                                  61        66
-    [\]]                                    65        67
-    [\]]                                    66        68
-    [=]                                     68        70
-    [Empty]                                 70        76
+    [protected]                             3         12
+    [def]                                   13        16
+    [highPriorityReceive]                   17        36
+    [:]                                     36        37
+    [Box]                                   38        41
+    [\[]                                    41        42
+    [PartialFunction]                       42        57
+    [\[]                                    57        58
+    [T]                                     58        59
+    [,]                                     59        60
+    [Unit]                                  61        65
+    [\]]                                    65        66
+    [\]]                                    66        67
+    [=]                                     68        69
+    [Empty]                                 70        75
 L347
-    [protected]                             3         13
-    [def]                                   13        17
-    [exceptionHandler]                      17        34
-    [:]                                     33        35
-    [PartialFunction]                       35        51
-    [\[]                                    50        52
-    [Throwable]                             51        61
-    [,]                                     60        62
-    [Unit]                                  62        67
-    [\]]                                    66        68
-    [=]                                     68        70
-    [{]                                     70        72
+    [protected]                             3         12
+    [def]                                   13        16
+    [exceptionHandler]                      17        33
+    [:]                                     33        34
+    [PartialFunction]                       35        50
+    [\[]                                    50        51
+    [Throwable]                             51        60
+    [,]                                     60        61
+    [Unit]                                  62        66
+    [\]]                                    66        67
+    [=]                                     68        69
+    [{]                                     70        71
 L348
-    [case]                                  5         10
-    [e]                                     10        12
-    [=>]                                    12        15
-    [ActorLogger]                           15        27
-    [.]                                     26        28
-    [error]                                 27        33
-    [(]                                     32        34
-    ["Actor threw an exception"]            33        60
-    [,]                                     59        61
-    [e]                                     61        63
-    [)]                                     62        64
+    [case]                                  5         9
+    [e]                                     10        11
+    [=>]                                    12        14
+    [ActorLogger]                           15        26
+    [.]                                     26        27
+    [error]                                 27        32
+    [(]                                     32        33
+    ["Actor threw an exception"]            33        59
+    [,]                                     59        60
+    [e]                                     61        62
+    [)]                                     62        63
 L349
-    [}]                                     3         5
+    [}]                                     3         4
 L350
-    [}]                                     1         3
+    [}]                                     1         2
 L362
-    [class]                                 1         7
-    [MockSpecializedLiftActor]              7         32
-    [\[]                                    31        33
-    [T]                                     32        34
-    [\]]                                    33        35
-    [extends]                               35        43
-    [SpecializedLiftActor]                  43        64
-    [\[]                                    63        65
-    [T]                                     64        66
-    [\]]                                    65        67
-    [{]                                     67        69
+    [class]                                 1         6
+    [MockSpecializedLiftActor]              7         31
+    [\[]                                    31        32
+    [T]                                     32        33
+    [\]]                                    33        34
+    [extends]                               35        42
+    [SpecializedLiftActor]                  43        63
+    [\[]                                    63        64
+    [T]                                     64        65
+    [\]]                                    65        66
+    [{]                                     67        68
 L363
-    [private]                               3         11
-    [\[]                                    10        12
-    [this]                                  11        16
-    [\]]                                    15        17
-    [var]                                   17        21
-    [messagesReceived]                      21        38
-    [:]                                     37        39
-    [List]                                  39        44
-    [\[]                                    43        45
-    [T]                                     44        46
-    [\]]                                    45        47
-    [=]                                     47        49
-    [Nil]                                   49        53
+    [private]                               3         10
+    [\[]                                    10        11
+    [this]                                  11        15
+    [\]]                                    15        16
+    [var]                                   17        20
+    [messagesReceived]                      21        37
+    [:]                                     37        38
+    [List]                                  39        43
+    [\[]                                    43        44
+    [T]                                     44        45
+    [\]]                                    45        46
+    [=]                                     47        48
+    [Nil]                                   49        52
 L369
-    [override]                              3         12
-    [def]                                   12        16
-    [!]                                     16        18
-    [(]                                     17        19
-    [msg]                                   18        22
-    [:]                                     21        23
-    [T]                                     23        25
-    [)]                                     24        26
-    [:]                                     25        27
-    [Unit]                                  27        32
-    [=]                                     32        34
-    [{]                                     34        36
+    [override]                              3         11
+    [def]                                   12        15
+    [!]                                     16        17
+    [(]                                     17        18
+    [msg]                                   18        21
+    [:]                                     21        22
+    [T]                                     23        24
+    [)]                                     24        25
+    [:]                                     25        26
+    [Unit]                                  27        31
+    [=]                                     32        33
+    [{]                                     34        35
 L370
-    [messagesReceived]                      5         22
-    [.]                                     21        23
-    [synchronized]                          22        35
-    [{]                                     35        37
+    [messagesReceived]                      5         21
+    [.]                                     21        22
+    [synchronized]                          22        34
+    [{]                                     35        36
 L371
-    [messagesReceived]                      7         24
-    [::=]                                   24        28
-    [msg]                                   28        32
+    [messagesReceived]                      7         23
+    [::=]                                   24        27
+    [msg]                                   28        31
 L372
-    [}]                                     5         7
+    [}]                                     5         6
 L373
-    [}]                                     3         5
+    [}]                                     3         4
 L377
-    [override]                              3         12
-    [def]                                   12        16
-    [messageHandler]                        16        31
-    [:]                                     30        32
-    [PartialFunction]                       32        48
-    [\[]                                    47        49
-    [T]                                     48        50
-    [,]                                     49        51
-    [Unit]                                  51        56
-    [\]]                                    55        57
-    [=]                                     57        59
-    [{]                                     59        61
+    [override]                              3         11
+    [def]                                   12        15
+    [messageHandler]                        16        30
+    [:]                                     30        31
+    [PartialFunction]                       32        47
+    [\[]                                    47        48
+    [T]                                     48        49
+    [,]                                     49        50
+    [Unit]                                  51        55
+    [\]]                                    55        56
+    [=]                                     57        58
+    [{]                                     59        60
 L378
-    [case]                                  5         10
-    [_]                                     10        12
-    [=>]                                    12        15
+    [case]                                  5         9
+    [_]                                     10        11
+    [=>]                                    12        14
 L379
-    [}]                                     3         5
+    [}]                                     3         4
 L384
-    [def]                                   3         7
-    [hasReceivedMessage_?]                  7         28
-    [(]                                     27        29
-    [msg]                                   28        32
-    [:]                                     31        33
-    [T]                                     33        35
-    [)]                                     34        36
-    [:]                                     35        37
-    [Boolean]                               37        45
-    [=]                                     45        47
-    [messagesReceived]                      47        64
-    [.]                                     63        65
-    [contains]                              64        73
-    [(]                                     72        74
-    [msg]                                   73        77
-    [)]                                     76        78
+    [def]                                   3         6
+    [hasReceivedMessage_?]                  7         27
+    [(]                                     27        28
+    [msg]                                   28        31
+    [:]                                     31        32
+    [T]                                     33        34
+    [)]                                     34        35
+    [:]                                     35        36
+    [Boolean]                               37        44
+    [=]                                     45        46
+    [messagesReceived]                      47        63
+    [.]                                     63        64
+    [contains]                              64        72
+    [(]                                     72        73
+    [msg]                                   73        76
+    [)]                                     76        77
 L389
-    [def]                                   3         7
-    [messages]                              7         16
-    [:]                                     15        17
-    [List]                                  17        22
-    [\[]                                    21        23
-    [T]                                     22        24
-    [\]]                                    23        25
-    [=]                                     25        27
-    [messagesReceived]                      27        44
+    [def]                                   3         6
+    [messages]                              7         15
+    [:]                                     15        16
+    [List]                                  17        21
+    [\[]                                    21        22
+    [T]                                     22        23
+    [\]]                                    23        24
+    [=]                                     25        26
+    [messagesReceived]                      27        43
 L394
-    [def]                                   3         7
-    [messageCount]                          7         20
-    [:]                                     19        21
-    [Int]                                   21        25
-    [=]                                     25        27
-    [messagesReceived]                      27        44
-    [.]                                     43        45
-    [size]                                  44        49
+    [def]                                   3         6
+    [messageCount]                          7         19
+    [:]                                     19        20
+    [Int]                                   21        24
+    [=]                                     25        26
+    [messagesReceived]                      27        43
+    [.]                                     43        44
+    [size]                                  44        48
 L395
-    [}]                                     1         3
+    [}]                                     1         2
 L397
-    [object]                                1         8
-    [ActorLogger]                           8         20
-    [extends]                               20        28
-    [Logger]                                28        35
-    [{]                                     35        37
+    [object]                                1         7
+    [ActorLogger]                           8         19
+    [extends]                               20        27
+    [Logger]                                28        34
+    [{]                                     35        36
 L398
-    [}]                                     1         3
+    [}]                                     1         2
 L400
-    [private]                               1         9
-    [final]                                 9         15
-    [case]                                  15        20
-    [class]                                 20        26
-    [MsgWithResp]                           26        38
-    [(]                                     37        39
-    [msg]                                   38        42
-    [:]                                     41        43
-    [Any]                                   43        47
-    [,]                                     46        48
-    [future]                                48        55
-    [:]                                     54        56
-    [LAFuture]                              56        65
-    [\[]                                    64        66
-    [Any]                                   65        69
-    [\]]                                    68        70
-    [)]                                     69        71
+    [private]                               1         8
+    [final]                                 9         14
+    [case]                                  15        19
+    [class]                                 20        25
+    [MsgWithResp]                           26        37
+    [(]                                     37        38
+    [msg]                                   38        41
+    [:]                                     41        42
+    [Any]                                   43        46
+    [,]                                     46        47
+    [future]                                48        54
+    [:]                                     54        55
+    [LAFuture]                              56        64
+    [\[]                                    64        65
+    [Any]                                   65        68
+    [\]]                                    68        69
+    [)]                                     69        70
 L402
-    [trait]                                 1         7
-    [LiftActor]                             7         17
-    [extends]                               17        25
-    [SpecializedLiftActor]                  25        46
-    [\[]                                    45        47
-    [Any]                                   46        50
-    [\]]                                    49        51
+    [trait]                                 1         6
+    [LiftActor]                             7         16
+    [extends]                               17        24
+    [SpecializedLiftActor]                  25        45
+    [\[]                                    45        46
+    [Any]                                   46        49
+    [\]]                                    49        50
 L403
-    [with]                                  1         6
-    [GenericActor]                          6         19
-    [\[]                                    18        20
-    [Any]                                   19        23
-    [\]]                                    22        24
+    [with]                                  1         5
+    [GenericActor]                          6         18
+    [\[]                                    18        19
+    [Any]                                   19        22
+    [\]]                                    22        23
 L404
-    [with]                                  1         6
-    [ForwardableActor]                      6         23
-    [\[]                                    22        24
-    [Any]                                   23        27
-    [,]                                     26        28
-    [Any]                                   28        32
-    [\]]                                    31        33
-    [{]                                     33        35
+    [with]                                  1         5
+    [ForwardableActor]                      6         22
+    [\[]                                    22        23
+    [Any]                                   23        26
+    [,]                                     26        27
+    [Any]                                   28        31
+    [\]]                                    31        32
+    [{]                                     33        34
 L405
-    [@]                                     3         5
-    [volatile]                              4         13
+    [@]                                     3         4
+    [volatile]                              4         12
 L406
-    [private]                               3         11
-    [\[]                                    10        12
-    [this]                                  11        16
-    [\]]                                    15        17
-    [var]                                   17        21
-    [responseFuture]                        21        36
-    [:]                                     35        37
-    [LAFuture]                              37        46
-    [\[]                                    45        47
-    [Any]                                   46        50
-    [\]]                                    49        51
-    [=]                                     51        53
-    [null]                                  53        58
+    [private]                               3         10
+    [\[]                                    10        11
+    [this]                                  11        15
+    [\]]                                    15        16
+    [var]                                   17        20
+    [responseFuture]                        21        35
+    [:]                                     35        36
+    [LAFuture]                              37        45
+    [\[]                                    45        46
+    [Any]                                   46        49
+    [\]]                                    49        50
+    [=]                                     51        52
+    [null]                                  53        57
 L410
-    [protected]                             3         13
-    [final]                                 13        19
-    [def]                                   19        23
-    [forwardMessageTo]                      23        40
-    [(]                                     39        41
-    [msg]                                   40        44
-    [:]                                     43        45
-    [Any]                                   45        49
-    [,]                                     48        50
-    [forwardTo]                             50        60
-    [:]                                     59        61
-    [TypedActor]                            61        72
-    [\[]                                    71        73
-    [Any]                                   72        76
-    [,]                                     75        77
-    [Any]                                   77        81
-    [\]]                                    80        82
-    [)]                                     81        83
-    [{]                                     83        85
+    [protected]                             3         12
+    [final]                                 13        18
+    [def]                                   19        22
+    [forwardMessageTo]                      23        39
+    [(]                                     39        40
+    [msg]                                   40        43
+    [:]                                     43        44
+    [Any]                                   45        48
+    [,]                                     48        49
+    [forwardTo]                             50        59
+    [:]                                     59        60
+    [TypedActor]                            61        71
+    [\[]                                    71        72
+    [Any]                                   72        75
+    [,]                                     75        76
+    [Any]                                   77        80
+    [\]]                                    80        81
+    [)]                                     81        82
+    [{]                                     83        84
 L411
-    [if]                                    5         8
-    [(]                                     8         10
-    [null]                                  9         14
-    [ne]                                    14        17
-    [responseFuture]                        17        32
-    [)]                                     31        33
-    [{]                                     33        35
+    [if]                                    5         7
+    [(]                                     8         9
+    [null]                                  9         13
+    [ne]                                    14        16
+    [responseFuture]                        17        31
+    [)]                                     31        32
+    [{]                                     33        34
 L412
-    [forwardTo]                             7         17
-    [match]                                 17        23
-    [{]                                     23        25
+    [forwardTo]                             7         16
+    [match]                                 17        22
+    [{]                                     23        24
 L413
-    [case]                                  9         14
-    [la]                                    14        17
-    [:]                                     16        18
-    [LiftActor]                             18        28
-    [=>]                                    28        31
-    [la]                                    31        34
-    [!]                                     34        36
-    [MsgWithResp]                           36        48
-    [(]                                     47        49
-    [msg]                                   48        52
-    [,]                                     51        53
-    [responseFuture]                        53        68
-    [)]                                     67        69
+    [case]                                  9         13
+    [la]                                    14        16
+    [:]                                     16        17
+    [LiftActor]                             18        27
+    [=>]                                    28        30
+    [la]                                    31        33
+    [!]                                     34        35
+    [MsgWithResp]                           36        47
+    [(]                                     47        48
+    [msg]                                   48        51
+    [,]                                     51        52
+    [responseFuture]                        53        67
+    [)]                                     67        68
 L414
-    [case]                                  9         14
-    [other]                                 14        20
-    [=>]                                    20        23
+    [case]                                  9         13
+    [other]                                 14        19
+    [=>]                                    20        22
 L415
-    [reply]                                 11        17
-    [(]                                     16        18
-    [other]                                 17        23
-    [!?]                                    23        26
-    [msg]                                   26        30
-    [)]                                     29        31
+    [reply]                                 11        16
+    [(]                                     16        17
+    [other]                                 17        22
+    [!?]                                    23        25
+    [msg]                                   26        29
+    [)]                                     29        30
 L416
-    [}]                                     7         9
+    [}]                                     7         8
 L417
-    [}]                                     5         7
-    [else]                                  7         12
-    [forwardTo]                             12        22
-    [!]                                     22        24
-    [msg]                                   24        28
+    [}]                                     5         6
+    [else]                                  7         11
+    [forwardTo]                             12        21
+    [!]                                     22        23
+    [msg]                                   24        27
 L418
-    [}]                                     3         5
+    [}]                                     3         4
 L425
-    [def]                                   3         7
-    [sendAndGetFuture]                      7         24
-    [(]                                     23        25
-    [msg]                                   24        28
-    [:]                                     27        29
-    [Any]                                   29        33
-    [)]                                     32        34
-    [:]                                     33        35
-    [LAFuture]                              35        44
-    [\[]                                    43        45
-    [Any]                                   44        48
-    [\]]                                    47        49
-    [=]                                     49        51
-    [this]                                  51        56
-    [!<]                                    56        59
-    [msg]                                   59        63
+    [def]                                   3         6
+    [sendAndGetFuture]                      7         23
+    [(]                                     23        24
+    [msg]                                   24        27
+    [:]                                     27        28
+    [Any]                                   29        32
+    [)]                                     32        33
+    [:]                                     33        34
+    [LAFuture]                              35        43
+    [\[]                                    43        44
+    [Any]                                   44        47
+    [\]]                                    47        48
+    [=]                                     49        50
+    [this]                                  51        55
+    [!<]                                    56        58
+    [msg]                                   59        62
 L431
-    [def]                                   3         7
-    [!<]                                    7         10
-    [(]                                     9         11
-    [msg]                                   10        14
-    [:]                                     13        15
-    [Any]                                   15        19
-    [)]                                     18        20
-    [:]                                     19        21
-    [LAFuture]                              21        30
-    [\[]                                    29        31
-    [Any]                                   30        34
-    [\]]                                    33        35
-    [=]                                     35        37
-    [{]                                     37        39
+    [def]                                   3         6
+    [!<]                                    7         9
+    [(]                                     9         10
+    [msg]                                   10        13
+    [:]                                     13        14
+    [Any]                                   15        18
+    [)]                                     18        19
+    [:]                                     19        20
+    [LAFuture]                              21        29
+    [\[]                                    29        30
+    [Any]                                   30        33
+    [\]]                                    33        34
+    [=]                                     35        36
+    [{]                                     37        38
 L432
-    [val]                                   5         9
-    [future]                                9         16
-    [=]                                     16        18
-    [new]                                   18        22
-    [LAFuture]                              22        31
-    [\[]                                    30        32
-    [Any]                                   31        35
-    [\]]                                    34        36
+    [val]                                   5         8
+    [future]                                9         15
+    [=]                                     16        17
+    [new]                                   18        21
+    [LAFuture]                              22        30
+    [\[]                                    30        31
+    [Any]                                   31        34
+    [\]]                                    34        35
 L433
-    [this]                                  5         10
-    [!]                                     10        12
-    [MsgWithResp]                           12        24
-    [(]                                     23        25
-    [msg]                                   24        28
-    [,]                                     27        29
-    [future]                                29        36
-    [)]                                     35        37
+    [this]                                  5         9
+    [!]                                     10        11
+    [MsgWithResp]                           12        23
+    [(]                                     23        24
+    [msg]                                   24        27
+    [,]                                     27        28
+    [future]                                29        35
+    [)]                                     35        36
 L434
-    [future]                                5         12
+    [future]                                5         11
 L435
-    [}]                                     3         5
+    [}]                                     3         4
 L442
-    [def]                                   3         7
-    [sendAndGetReply]                       7         23
-    [(]                                     22        24
-    [msg]                                   23        27
-    [:]                                     26        28
-    [Any]                                   28        32
-    [)]                                     31        33
-    [:]                                     32        34
-    [Any]                                   34        38
-    [=]                                     38        40
-    [this]                                  40        45
-    [!?]                                    45        48
-    [msg]                                   48        52
+    [def]                                   3         6
+    [sendAndGetReply]                       7         22
+    [(]                                     22        23
+    [msg]                                   23        26
+    [:]                                     26        27
+    [Any]                                   28        31
+    [)]                                     31        32
+    [:]                                     32        33
+    [Any]                                   34        37
+    [=]                                     38        39
+    [this]                                  40        44
+    [!?]                                    45        47
+    [msg]                                   48        51
 L448
-    [def]                                   3         7
-    [!?]                                    7         10
-    [(]                                     9         11
-    [msg]                                   10        14
-    [:]                                     13        15
-    [Any]                                   15        19
-    [)]                                     18        20
-    [:]                                     19        21
-    [Any]                                   21        25
-    [=]                                     25        27
-    [{]                                     27        29
+    [def]                                   3         6
+    [!?]                                    7         9
+    [(]                                     9         10
+    [msg]                                   10        13
+    [:]                                     13        14
+    [Any]                                   15        18
+    [)]                                     18        19
+    [:]                                     19        20
+    [Any]                                   21        24
+    [=]                                     25        26
+    [{]                                     27        28
 L449
-    [val]                                   5         9
-    [future]                                9         16
-    [=]                                     16        18
-    [new]                                   18        22
-    [LAFuture]                              22        31
-    [\[]                                    30        32
-    [Any]                                   31        35
-    [\]]                                    34        36
+    [val]                                   5         8
+    [future]                                9         15
+    [=]                                     16        17
+    [new]                                   18        21
+    [LAFuture]                              22        30
+    [\[]                                    30        31
+    [Any]                                   31        34
+    [\]]                                    34        35
 L450
-    [this]                                  5         10
-    [!]                                     10        12
-    [MsgWithResp]                           12        24
-    [(]                                     23        25
-    [msg]                                   24        28
-    [,]                                     27        29
-    [future]                                29        36
-    [)]                                     35        37
+    [this]                                  5         9
+    [!]                                     10        11
+    [MsgWithResp]                           12        23
+    [(]                                     23        24
+    [msg]                                   24        27
+    [,]                                     27        28
+    [future]                                29        35
+    [)]                                     35        36
 L451
-    [future]                                5         12
-    [.]                                     11        13
-    [get]                                   12        16
+    [future]                                5         11
+    [.]                                     11        12
+    [get]                                   12        15
 L452
-    [}]                                     3         5
+    [}]                                     3         4
 L461
-    [def]                                   3         7
-    [sendAndGetReply]                       7         23
-    [(]                                     22        24
-    [timeout]                               23        31
-    [:]                                     30        32
-    [Long]                                  32        37
-    [,]                                     36        38
-    [msg]                                   38        42
-    [:]                                     41        43
-    [Any]                                   43        47
-    [)]                                     46        48
-    [:]                                     47        49
-    [Any]                                   49        53
-    [=]                                     53        55
-    [this]                                  55        60
-    [.]                                     59        61
-    [!?]                                    60        63
-    [(]                                     62        64
-    [timeout]                               63        71
-    [,]                                     70        72
-    [msg]                                   72        76
-    [)]                                     75        77
+    [def]                                   3         6
+    [sendAndGetReply]                       7         22
+    [(]                                     22        23
+    [timeout]                               23        30
+    [:]                                     30        31
+    [Long]                                  32        36
+    [,]                                     36        37
+    [msg]                                   38        41
+    [:]                                     41        42
+    [Any]                                   43        46
+    [)]                                     46        47
+    [:]                                     47        48
+    [Any]                                   49        52
+    [=]                                     53        54
+    [this]                                  55        59
+    [.]                                     59        60
+    [!?]                                    60        62
+    [(]                                     62        63
+    [timeout]                               63        70
+    [,]                                     70        71
+    [msg]                                   72        75
+    [)]                                     75        76
 L468
-    [def]                                   3         7
-    [!?]                                    7         10
-    [(]                                     9         11
-    [timeout]                               10        18
-    [:]                                     17        19
-    [Long]                                  19        24
-    [,]                                     23        25
-    [message]                               25        33
-    [:]                                     32        34
-    [Any]                                   34        38
-    [)]                                     37        39
-    [:]                                     38        40
-    [Box]                                   40        44
-    [\[]                                    43        45
-    [Any]                                   44        48
-    [\]]                                    47        49
-    [=]                                     49        51
+    [def]                                   3         6
+    [!?]                                    7         9
+    [(]                                     9         10
+    [timeout]                               10        17
+    [:]                                     17        18
+    [Long]                                  19        23
+    [,]                                     23        24
+    [message]                               25        32
+    [:]                                     32        33
+    [Any]                                   34        37
+    [)]                                     37        38
+    [:]                                     38        39
+    [Box]                                   40        43
+    [\[]                                    43        44
+    [Any]                                   44        47
+    [\]]                                    47        48
+    [=]                                     49        50
 L469
-    [this]                                  5         10
-    [!!]                                    10        13
-    [(]                                     13        15
-    [message]                               14        22
-    [,]                                     21        23
-    [timeout]                               23        31
-    [)]                                     30        32
+    [this]                                  5         9
+    [!!]                                    10        12
+    [(]                                     13        14
+    [message]                               14        21
+    [,]                                     21        22
+    [timeout]                               23        30
+    [)]                                     30        31
 L477
-    [def]                                   3         7
-    [!!]                                    7         10
-    [(]                                     9         11
-    [msg]                                   10        14
-    [:]                                     13        15
-    [Any]                                   15        19
-    [,]                                     18        20
-    [timeout]                               20        28
-    [:]                                     27        29
-    [Long]                                  29        34
-    [)]                                     33        35
-    [:]                                     34        36
-    [Box]                                   36        40
-    [\[]                                    39        41
-    [Any]                                   40        44
-    [\]]                                    43        45
-    [=]                                     45        47
-    [{]                                     47        49
+    [def]                                   3         6
+    [!!]                                    7         9
+    [(]                                     9         10
+    [msg]                                   10        13
+    [:]                                     13        14
+    [Any]                                   15        18
+    [,]                                     18        19
+    [timeout]                               20        27
+    [:]                                     27        28
+    [Long]                                  29        33
+    [)]                                     33        34
+    [:]                                     34        35
+    [Box]                                   36        39
+    [\[]                                    39        40
+    [Any]                                   40        43
+    [\]]                                    43        44
+    [=]                                     45        46
+    [{]                                     47        48
 L478
-    [val]                                   5         9
-    [future]                                9         16
-    [=]                                     16        18
-    [new]                                   18        22
-    [LAFuture]                              22        31
-    [\[]                                    30        32
-    [Any]                                   31        35
-    [\]]                                    34        36
+    [val]                                   5         8
+    [future]                                9         15
+    [=]                                     16        17
+    [new]                                   18        21
+    [LAFuture]                              22        30
+    [\[]                                    30        31
+    [Any]                                   31        34
+    [\]]                                    34        35
 L479
-    [this]                                  5         10
-    [!]                                     10        12
-    [MsgWithResp]                           12        24
-    [(]                                     23        25
-    [msg]                                   24        28
-    [,]                                     27        29
-    [future]                                29        36
-    [)]                                     35        37
+    [this]                                  5         9
+    [!]                                     10        11
+    [MsgWithResp]                           12        23
+    [(]                                     23        24
+    [msg]                                   24        27
+    [,]                                     27        28
+    [future]                                29        35
+    [)]                                     35        36
 L480
-    [future]                                5         12
-    [.]                                     11        13
-    [get]                                   12        16
-    [(]                                     15        17
-    [timeout]                               16        24
-    [)]                                     23        25
+    [future]                                5         11
+    [.]                                     11        12
+    [get]                                   12        15
+    [(]                                     15        16
+    [timeout]                               16        23
+    [)]                                     23        24
 L481
-    [}]                                     3         5
+    [}]                                     3         4
 L487
-    [def]                                   3         7
-    [!!]                                    7         10
-    [(]                                     9         11
-    [msg]                                   10        14
-    [:]                                     13        15
-    [Any]                                   15        19
-    [)]                                     18        20
-    [:]                                     19        21
-    [Box]                                   21        25
-    [\[]                                    24        26
-    [Any]                                   25        29
-    [\]]                                    28        30
-    [=]                                     30        32
-    [{]                                     32        34
+    [def]                                   3         6
+    [!!]                                    7         9
+    [(]                                     9         10
+    [msg]                                   10        13
+    [:]                                     13        14
+    [Any]                                   15        18
+    [)]                                     18        19
+    [:]                                     19        20
+    [Box]                                   21        24
+    [\[]                                    24        25
+    [Any]                                   25        28
+    [\]]                                    28        29
+    [=]                                     30        31
+    [{]                                     32        33
 L488
-    [val]                                   5         9
-    [future]                                9         16
-    [=]                                     16        18
-    [new]                                   18        22
-    [LAFuture]                              22        31
-    [\[]                                    30        32
-    [Any]                                   31        35
-    [\]]                                    34        36
+    [val]                                   5         8
+    [future]                                9         15
+    [=]                                     16        17
+    [new]                                   18        21
+    [LAFuture]                              22        30
+    [\[]                                    30        31
+    [Any]                                   31        34
+    [\]]                                    34        35
 L489
-    [this]                                  5         10
-    [!]                                     10        12
-    [MsgWithResp]                           12        24
-    [(]                                     23        25
-    [msg]                                   24        28
-    [,]                                     27        29
-    [future]                                29        36
-    [)]                                     35        37
+    [this]                                  5         9
+    [!]                                     10        11
+    [MsgWithResp]                           12        23
+    [(]                                     23        24
+    [msg]                                   24        27
+    [,]                                     27        28
+    [future]                                29        35
+    [)]                                     35        36
 L490
-    [Full]                                  5         10
-    [(]                                     9         11
-    [future]                                10        17
-    [.]                                     16        18
-    [get]                                   17        21
-    [)]                                     20        22
+    [Full]                                  5         9
+    [(]                                     9         10
+    [future]                                10        16
+    [.]                                     16        17
+    [get]                                   17        20
+    [)]                                     20        21
 L491
-    [}]                                     3         5
+    [}]                                     3         4
 L493
-    [override]                              3         12
-    [protected]                             12        22
-    [def]                                   22        26
-    [testTranslate]                         26        40
-    [(]                                     39        41
-    [f]                                     40        42
-    [:]                                     41        43
-    [Any]                                   43        47
-    [=>]                                    47        50
-    [Boolean]                               50        58
-    [)]                                     57        59
-    [(]                                     58        60
-    [v]                                     59        61
-    [:]                                     60        62
-    [Any]                                   62        66
-    [)]                                     65        67
-    [=]                                     67        69
-    [v]                                     69        71
-    [match]                                 71        77
-    [{]                                     77        79
+    [override]                              3         11
+    [protected]                             12        21
+    [def]                                   22        25
+    [testTranslate]                         26        39
+    [(]                                     39        40
+    [f]                                     40        41
+    [:]                                     41        42
+    [Any]                                   43        46
+    [=>]                                    47        49
+    [Boolean]                               50        57
+    [)]                                     57        58
+    [(]                                     58        59
+    [v]                                     59        60
+    [:]                                     60        61
+    [Any]                                   62        65
+    [)]                                     65        66
+    [=]                                     67        68
+    [v]                                     69        70
+    [match]                                 71        76
+    [{]                                     77        78
 L494
-    [case]                                  5         10
-    [MsgWithResp]                           10        22
-    [(]                                     21        23
-    [msg]                                   22        26
-    [,]                                     25        27
-    [_]                                     27        29
-    [)]                                     28        30
-    [=>]                                    30        33
-    [f]                                     33        35
-    [(]                                     34        36
-    [msg]                                   35        39
-    [)]                                     38        40
+    [case]                                  5         9
+    [MsgWithResp]                           10        21
+    [(]                                     21        22
+    [msg]                                   22        25
+    [,]                                     25        26
+    [_]                                     27        28
+    [)]                                     28        29
+    [=>]                                    30        32
+    [f]                                     33        34
+    [(]                                     34        35
+    [msg]                                   35        38
+    [)]                                     38        39
 L495
-    [case]                                  5         10
-    [v]                                     10        12
-    [=>]                                    12        15
-    [f]                                     15        17
-    [(]                                     16        18
-    [v]                                     17        19
-    [)]                                     18        20
+    [case]                                  5         9
+    [v]                                     10        11
+    [=>]                                    12        14
+    [f]                                     15        16
+    [(]                                     16        17
+    [v]                                     17        18
+    [)]                                     18        19
 L496
-    [}]                                     3         5
+    [}]                                     3         4
 L498
-    [override]                              3         12
-    [protected]                             12        22
-    [def]                                   22        26
-    [execTranslate]                         26        40
-    [(]                                     39        41
-    [f]                                     40        42
-    [:]                                     41        43
-    [Any]                                   43        47
-    [=>]                                    47        50
-    [Unit]                                  50        55
-    [)]                                     54        56
-    [(]                                     55        57
-    [v]                                     56        58
-    [:]                                     57        59
-    [Any]                                   59        63
-    [)]                                     62        64
-    [=]                                     64        66
-    [v]                                     66        68
-    [match]                                 68        74
-    [{]                                     74        76
+    [override]                              3         11
+    [protected]                             12        21
+    [def]                                   22        25
+    [execTranslate]                         26        39
+    [(]                                     39        40
+    [f]                                     40        41
+    [:]                                     41        42
+    [Any]                                   43        46
+    [=>]                                    47        49
+    [Unit]                                  50        54
+    [)]                                     54        55
+    [(]                                     55        56
+    [v]                                     56        57
+    [:]                                     57        58
+    [Any]                                   59        62
+    [)]                                     62        63
+    [=]                                     64        65
+    [v]                                     66        67
+    [match]                                 68        73
+    [{]                                     74        75
 L499
-    [case]                                  5         10
-    [MsgWithResp]                           10        22
-    [(]                                     21        23
-    [msg]                                   22        26
-    [,]                                     25        27
-    [future]                                27        34
-    [)]                                     33        35
-    [=>]                                    35        38
+    [case]                                  5         9
+    [MsgWithResp]                           10        21
+    [(]                                     21        22
+    [msg]                                   22        25
+    [,]                                     25        26
+    [future]                                27        33
+    [)]                                     33        34
+    [=>]                                    35        37
 L500
-    [responseFuture]                        7         22
-    [=]                                     22        24
-    [future]                                24        31
+    [responseFuture]                        7         21
+    [=]                                     22        23
+    [future]                                24        30
 L501
-    [try]                                   7         11
-    [{]                                     11        13
+    [try]                                   7         10
+    [{]                                     11        12
 L502
-    [f]                                     9         11
-    [(]                                     10        12
-    [msg]                                   11        15
-    [)]                                     14        16
+    [f]                                     9         10
+    [(]                                     10        11
+    [msg]                                   11        14
+    [)]                                     14        15
 L503
-    [}]                                     7         9
-    [finally]                               9         17
-    [{]                                     17        19
+    [}]                                     7         8
+    [finally]                               9         16
+    [{]                                     17        18
 L504
-    [responseFuture]                        9         24
-    [=]                                     24        26
-    [null]                                  26        31
+    [responseFuture]                        9         23
+    [=]                                     24        25
+    [null]                                  26        30
 L505
-    [}]                                     7         9
+    [}]                                     7         8
 L506
-    [case]                                  5         10
-    [v]                                     10        12
-    [=>]                                    12        15
-    [f]                                     15        17
-    [(]                                     16        18
-    [v]                                     17        19
-    [)]                                     18        20
+    [case]                                  5         9
+    [v]                                     10        11
+    [=>]                                    12        14
+    [f]                                     15        16
+    [(]                                     16        17
+    [v]                                     17        18
+    [)]                                     18        19
 L507
-    [}]                                     3         5
+    [}]                                     3         4
 L513
-    [protected]                             3         13
-    [def]                                   13        17
-    [reply]                                 17        23
-    [(]                                     22        24
-    [v]                                     23        25
-    [:]                                     24        26
-    [Any]                                   26        30
-    [)]                                     29        31
-    [{]                                     31        33
+    [protected]                             3         12
+    [def]                                   13        16
+    [reply]                                 17        22
+    [(]                                     22        23
+    [v]                                     23        24
+    [:]                                     24        25
+    [Any]                                   26        29
+    [)]                                     29        30
+    [{]                                     31        32
 L514
-    [if]                                    5         8
-    [(]                                     8         10
-    [null]                                  9         14
-    [ne]                                    14        17
-    [responseFuture]                        17        32
-    [)]                                     31        33
-    [{]                                     33        35
+    [if]                                    5         7
+    [(]                                     8         9
+    [null]                                  9         13
+    [ne]                                    14        16
+    [responseFuture]                        17        31
+    [)]                                     31        32
+    [{]                                     33        34
 L515
-    [responseFuture]                        7         22
-    [.]                                     21        23
-    [satisfy]                               22        30
-    [(]                                     29        31
-    [v]                                     30        32
-    [)]                                     31        33
+    [responseFuture]                        7         21
+    [.]                                     21        22
+    [satisfy]                               22        29
+    [(]                                     29        30
+    [v]                                     30        31
+    [)]                                     31        32
 L516
-    [}]                                     5         7
+    [}]                                     5         6
 L517
-    [}]                                     3         5
+    [}]                                     3         4
 L518
-    [}]                                     1         3
+    [}]                                     1         2
 L529
-    [class]                                 1         7
-    [MockLiftActor]                         7         21
-    [extends]                               21        29
-    [MockSpecializedLiftActor]              29        54
-    [\[]                                    53        55
-    [Any]                                   54        58
-    [\]]                                    57        59
-    [with]                                  59        64
-    [LiftActor]                             64        74
+    [class]                                 1         6
+    [MockLiftActor]                         7         20
+    [extends]                               21        28
+    [MockSpecializedLiftActor]              29        53
+    [\[]                                    53        54
+    [Any]                                   54        57
+    [\]]                                    57        58
+    [with]                                  59        63
+    [LiftActor]                             64        73
 L531
-    [import]                                1         8
-    [java]                                  8         13
-    [.]                                     12        14
-    [lang]                                  13        18
-    [.]                                     17        19
-    [reflect]                               18        26
-    [.]                                     25        27
-    [_]                                     26        28
+    [import]                                1         7
+    [java]                                  8         12
+    [.]                                     12        13
+    [lang]                                  13        17
+    [.]                                     17        18
+    [reflect]                               18        25
+    [.]                                     25        26
+    [_]                                     26        27
 L533
-    [object]                                1         8
-    [LiftActorJ]                            8         19
-    [{]                                     19        21
+    [object]                                1         7
+    [LiftActorJ]                            8         18
+    [{]                                     19        20
 L534
-    [private]                               3         11
-    [var]                                   11        15
-    [methods]                               15        23
-    [:]                                     22        24
-    [Map]                                   24        28
-    [\[]                                    27        29
-    [Class]                                 28        34
-    [\[]                                    33        35
-    [_]                                     34        36
-    [\]]                                    35        37
-    [,]                                     36        38
-    [DispatchVendor]                        38        53
-    [\]]                                    52        54
-    [=]                                     54        56
-    [Map]                                   56        60
-    [(]                                     59        61
-    [)]                                     60        62
+    [private]                               3         10
+    [var]                                   11        14
+    [methods]                               15        22
+    [:]                                     22        23
+    [Map]                                   24        27
+    [\[]                                    27        28
+    [Class]                                 28        33
+    [\[]                                    33        34
+    [_]                                     34        35
+    [\]]                                    35        36
+    [,]                                     36        37
+    [DispatchVendor]                        38        52
+    [\]]                                    52        53
+    [=]                                     54        55
+    [Map]                                   56        59
+    [(]                                     59        60
+    [)]                                     60        61
 L536
-    [def]                                   3         7
-    [calculateHandler]                      7         24
-    [(]                                     23        25
-    [what]                                  24        29
-    [:]                                     28        30
-    [LiftActorJ]                            30        41
-    [)]                                     40        42
-    [:]                                     41        43
-    [PartialFunction]                       43        59
-    [\[]                                    58        60
-    [Any]                                   59        63
-    [,]                                     62        64
-    [Unit]                                  64        69
-    [\]]                                    68        70
-    [=]                                     70        72
+    [def]                                   3         6
+    [calculateHandler]                      7         23
+    [(]                                     23        24
+    [what]                                  24        28
+    [:]                                     28        29
+    [LiftActorJ]                            30        40
+    [)]                                     40        41
+    [:]                                     41        42
+    [PartialFunction]                       43        58
+    [\[]                                    58        59
+    [Any]                                   59        62
+    [,]                                     62        63
+    [Unit]                                  64        68
+    [\]]                                    68        69
+    [=]                                     70        71
 L537
-    [synchronized]                          5         18
-    [{]                                     18        20
+    [synchronized]                          5         17
+    [{]                                     18        19
 L538
-    [val]                                   7         11
-    [clz]                                   11        15
-    [=]                                     15        17
-    [what]                                  17        22
-    [.]                                     21        23
-    [getClass]                              22        31
+    [val]                                   7         10
+    [clz]                                   11        14
+    [=]                                     15        16
+    [what]                                  17        21
+    [.]                                     21        22
+    [getClass]                              22        30
 L539
-    [methods]                               7         15
-    [.]                                     14        16
-    [get]                                   15        19
-    [(]                                     18        20
-    [clz]                                   19        23
-    [)]                                     22        24
-    [match]                                 24        30
-    [{]                                     30        32
+    [methods]                               7         14
+    [.]                                     14        15
+    [get]                                   15        18
+    [(]                                     18        19
+    [clz]                                   19        22
+    [)]                                     22        23
+    [match]                                 24        29
+    [{]                                     30        31
 L540
-    [case]                                  9         14
-    [Some]                                  14        19
-    [(]                                     18        20
-    [pf]                                    19        22
-    [)]                                     21        23
-    [=>]                                    23        26
-    [pf]                                    26        29
-    [.]                                     28        30
-    [vend]                                  29        34
-    [(]                                     33        35
-    [what]                                  34        39
-    [)]                                     38        40
+    [case]                                  9         13
+    [Some]                                  14        18
+    [(]                                     18        19
+    [pf]                                    19        21
+    [)]                                     21        22
+    [=>]                                    23        25
+    [pf]                                    26        28
+    [.]                                     28        29
+    [vend]                                  29        33
+    [(]                                     33        34
+    [what]                                  34        38
+    [)]                                     38        39
 L541
-    [case]                                  9         14
-    [_]                                     14        16
-    [=>]                                    16        19
-    [{]                                     19        21
+    [case]                                  9         13
+    [_]                                     14        15
+    [=>]                                    16        18
+    [{]                                     19        20
 L542
-    [val]                                   11        15
-    [pf]                                    15        18
-    [=]                                     18        20
-    [buildPF]                               20        28
-    [(]                                     27        29
-    [clz]                                   28        32
-    [)]                                     31        33
+    [val]                                   11        14
+    [pf]                                    15        17
+    [=]                                     18        19
+    [buildPF]                               20        27
+    [(]                                     27        28
+    [clz]                                   28        31
+    [)]                                     31        32
 L543
-    [methods]                               11        19
-    [+=]                                    19        22
-    [clz]                                   22        26
-    [->]                                    26        29
-    [pf]                                    29        32
+    [methods]                               11        18
+    [+=]                                    19        21
+    [clz]                                   22        25
+    [->]                                    26        28
+    [pf]                                    29        31
 L544
-    [pf]                                    11        14
-    [.]                                     13        15
-    [vend]                                  14        19
-    [(]                                     18        20
-    [what]                                  19        24
-    [)]                                     23        25
+    [pf]                                    11        13
+    [.]                                     13        14
+    [vend]                                  14        18
+    [(]                                     18        19
+    [what]                                  19        23
+    [)]                                     23        24
 L545
-    [}]                                     9         11
+    [}]                                     9         10
 L546
-    [}]                                     7         9
+    [}]                                     7         8
 L547
-    [}]                                     5         7
+    [}]                                     5         6
 L549
-    [private]                               3         11
-    [def]                                   11        15
-    [getBaseClasses]                        15        30
-    [(]                                     29        31
-    [clz]                                   30        34
-    [:]                                     33        35
-    [Class]                                 35        41
-    [\[]                                    40        42
-    [_]                                     41        43
-    [\]]                                    42        44
-    [)]                                     43        45
-    [:]                                     44        46
-    [List]                                  46        51
-    [\[]                                    50        52
-    [Class]                                 51        57
-    [\[]                                    56        58
-    [_]                                     57        59
-    [\]]                                    58        60
-    [\]]                                    59        61
-    [=]                                     61        63
-    [clz]                                   63        67
-    [match]                                 67        73
-    [{]                                     73        75
+    [private]                               3         10
+    [def]                                   11        14
+    [getBaseClasses]                        15        29
+    [(]                                     29        30
+    [clz]                                   30        33
+    [:]                                     33        34
+    [Class]                                 35        40
+    [\[]                                    40        41
+    [_]                                     41        42
+    [\]]                                    42        43
+    [)]                                     43        44
+    [:]                                     44        45
+    [List]                                  46        50
+    [\[]                                    50        51
+    [Class]                                 51        56
+    [\[]                                    56        57
+    [_]                                     57        58
+    [\]]                                    58        59
+    [\]]                                    59        60
+    [=]                                     61        62
+    [clz]                                   63        66
+    [match]                                 67        72
+    [{]                                     73        74
 L550
-    [case]                                  5         10
-    [null]                                  10        15
-    [=>]                                    15        18
-    [Nil]                                   18        22
+    [case]                                  5         9
+    [null]                                  10        14
+    [=>]                                    15        17
+    [Nil]                                   18        21
 L551
-    [case]                                  5         10
-    [clz]                                   10        14
-    [=>]                                    14        17
-    [clz]                                   17        21
-    [::]                                    21        24
-    [getBaseClasses]                        24        39
-    [(]                                     38        40
-    [clz]                                   39        43
-    [.]                                     42        44
-    [getSuperclass]                         43        57
-    [)]                                     56        58
+    [case]                                  5         9
+    [clz]                                   10        13
+    [=>]                                    14        16
+    [clz]                                   17        20
+    [::]                                    21        23
+    [getBaseClasses]                        24        38
+    [(]                                     38        39
+    [clz]                                   39        42
+    [.]                                     42        43
+    [getSuperclass]                         43        56
+    [)]                                     56        57
 L552
-    [}]                                     3         5
+    [}]                                     3         4
 L554
-    [private]                               3         11
-    [def]                                   11        15
-    [receiver]                              15        24
-    [(]                                     23        25
-    [in]                                    24        27
-    [:]                                     26        28
-    [Method]                                28        35
-    [)]                                     34        36
-    [:]                                     35        37
-    [Boolean]                               37        45
-    [=]                                     45        47
-    [{]                                     47        49
+    [private]                               3         10
+    [def]                                   11        14
+    [receiver]                              15        23
+    [(]                                     23        24
+    [in]                                    24        26
+    [:]                                     26        27
+    [Method]                                28        34
+    [)]                                     34        35
+    [:]                                     35        36
+    [Boolean]                               37        44
+    [=]                                     45        46
+    [{]                                     47        48
 L555
-    [in]                                    5         8
-    [.]                                     7         9
-    [getParameterTypes]                     8         26
-    [(]                                     25        27
-    [)]                                     26        28
-    [.]                                     27        29
-    [length]                                28        35
-    [==]                                    35        38
-    [1]                                     38        40
-    [&&]                                    40        43
+    [in]                                    5         7
+    [.]                                     7         8
+    [getParameterTypes]                     8         25
+    [(]                                     25        26
+    [)]                                     26        27
+    [.]                                     27        28
+    [length]                                28        34
+    [==]                                    35        37
+    [1]                                     38        39
+    [&&]                                    40        42
 L556
-    [(]                                     5         7
-    [in]                                    6         9
-    [.]                                     8         10
-    [getAnnotation]                         9         23
-    [(]                                     22        24
-    [classOf]                               23        31
-    [\[]                                    30        32
-    [JavaActorBase]                         31        45
-    [.]                                     44        46
-    [Receive]                               45        53
-    [\]]                                    52        54
-    [)]                                     53        55
-    [!=]                                    55        58
-    [null]                                  58        63
-    [)]                                     62        64
+    [(]                                     5         6
+    [in]                                    6         8
+    [.]                                     8         9
+    [getAnnotation]                         9         22
+    [(]                                     22        23
+    [classOf]                               23        30
+    [\[]                                    30        31
+    [JavaActorBase]                         31        44
+    [.]                                     44        45
+    [Receive]                               45        52
+    [\]]                                    52        53
+    [)]                                     53        54
+    [!=]                                    55        57
+    [null]                                  58        62
+    [)]                                     62        63
 L557
-    [}]                                     3         5
+    [}]                                     3         4
 L559
-    [private]                               3         11
-    [def]                                   11        15
-    [buildPF]                               15        23
-    [(]                                     22        24
-    [clz]                                   23        27
-    [:]                                     26        28
-    [Class]                                 28        34
-    [\[]                                    33        35
-    [_]                                     34        36
-    [\]]                                    35        37
-    [)]                                     36        38
-    [:]                                     37        39
-    [DispatchVendor]                        39        54
-    [=]                                     54        56
-    [{]                                     56        58
+    [private]                               3         10
+    [def]                                   11        14
+    [buildPF]                               15        22
+    [(]                                     22        23
+    [clz]                                   23        26
+    [:]                                     26        27
+    [Class]                                 28        33
+    [\[]                                    33        34
+    [_]                                     34        35
+    [\]]                                    35        36
+    [)]                                     36        37
+    [:]                                     37        38
+    [DispatchVendor]                        39        53
+    [=]                                     54        55
+    [{]                                     56        57
 L560
-    [val]                                   5         9
-    [methods]                               9         17
-    [=]                                     17        19
-    [getBaseClasses]                        19        34
-    [(]                                     33        35
-    [clz]                                   34        38
-    [)]                                     37        39
-    [.]                                     38        40
+    [val]                                   5         8
+    [methods]                               9         16
+    [=]                                     17        18
+    [getBaseClasses]                        19        33
+    [(]                                     33        34
+    [clz]                                   34        37
+    [)]                                     37        38
+    [.]                                     38        39
 L561
-    [flatMap]                               5         13
-    [(]                                     12        14
-    [_]                                     13        15
-    [.]                                     14        16
-    [getDeclaredMethods]                    15        34
-    [.]                                     33        35
-    [toList]                                34        41
-    [.]                                     40        42
-    [filter]                                41        48
-    [(]                                     47        49
-    [receiver]                              48        57
-    [)]                                     56        58
-    [)]                                     57        59
+    [flatMap]                               5         12
+    [(]                                     12        13
+    [_]                                     13        14
+    [.]                                     14        15
+    [getDeclaredMethods]                    15        33
+    [.]                                     33        34
+    [toList]                                34        40
+    [.]                                     40        41
+    [filter]                                41        47
+    [(]                                     47        48
+    [receiver]                              48        56
+    [)]                                     56        57
+    [)]                                     57        58
 L563
-    [val]                                   5         9
-    [clzMap]                                9         16
-    [:]                                     15        17
-    [Map]                                   17        21
-    [\[]                                    20        22
-    [Class]                                 21        27
-    [\[]                                    26        28
-    [_]                                     27        29
-    [\]]                                    28        30
-    [,]                                     29        31
-    [Method]                                31        38
-    [\]]                                    37        39
-    [=]                                     39        41
+    [val]                                   5         8
+    [clzMap]                                9         15
+    [:]                                     15        16
+    [Map]                                   17        20
+    [\[]                                    20        21
+    [Class]                                 21        26
+    [\[]                                    26        27
+    [_]                                     27        28
+    [\]]                                    28        29
+    [,]                                     29        30
+    [Method]                                31        37
+    [\]]                                    37        38
+    [=]                                     39        40
 L564
-    [Map]                                   7         11
-    [(]                                     10        12
-    [methods]                               11        19
-    [.]                                     18        20
-    [map]                                   19        23
-    [{]                                     22        24
-    [m]                                     23        25
-    [=>]                                    25        28
+    [Map]                                   7         10
+    [(]                                     10        11
+    [methods]                               11        18
+    [.]                                     18        19
+    [map]                                   19        22
+    [{]                                     22        23
+    [m]                                     23        24
+    [=>]                                    25        27
 L565
-    [m]                                     9         11
-    [.]                                     10        12
-    [setAccessible]                         11        25
-    [(]                                     24        26
-    [true]                                  25        30
-    [)]                                     29        31
+    [m]                                     9         10
+    [.]                                     10        11
+    [setAccessible]                         11        24
+    [(]                                     24        25
+    [true]                                  25        29
+    [)]                                     29        30
 L566
-    [m]                                     9         11
-    [.]                                     10        12
-    [getParameterTypes]                     11        29
-    [(]                                     28        30
-    [)]                                     29        31
-    [.]                                     30        32
-    [apply]                                 31        37
-    [(]                                     36        38
-    [0]                                     37        39
-    [)]                                     38        40
-    [->]                                    40        43
-    [m]                                     43        45
-    [}]                                     44        46
-    [:]                                     46        48
-    [_]                                     47        49
-    [*]                                     48        50
-    [)]                                     49        51
+    [m]                                     9         10
+    [.]                                     10        11
+    [getParameterTypes]                     11        28
+    [(]                                     28        29
+    [)]                                     29        30
+    [.]                                     30        31
+    [apply]                                 31        36
+    [(]                                     36        37
+    [0]                                     37        38
+    [)]                                     38        39
+    [->]                                    40        42
+    [m]                                     43        44
+    [}]                                     44        45
+    [:]                                     46        47
+    [_]                                     47        48
+    [*]                                     48        49
+    [)]                                     49        50
 L568
-    [new]                                   5         9
-    [DispatchVendor]                        9         24
-    [(]                                     23        25
-    [clzMap]                                24        31
-    [)]                                     30        32
+    [new]                                   5         8
+    [DispatchVendor]                        9         23
+    [(]                                     23        24
+    [clzMap]                                24        30
+    [)]                                     30        31
 L569
-    [}]                                     3         5
+    [}]                                     3         4
 L570
-    [}]                                     1         3
+    [}]                                     1         2
 L572
-    [private]                               1         9
-    [final]                                 9         15
-    [class]                                 15        21
-    [DispatchVendor]                        21        36
-    [(]                                     35        37
-    [map]                                   36        40
-    [:]                                     39        41
-    [Map]                                   41        45
-    [\[]                                    44        46
-    [Class]                                 45        51
-    [\[]                                    50        52
-    [_]                                     51        53
-    [\]]                                    52        54
-    [,]                                     53        55
-    [Method]                                55        62
-    [\]]                                    61        63
-    [)]                                     62        64
-    [{]                                     64        66
+    [private]                               1         8
+    [final]                                 9         14
+    [class]                                 15        20
+    [DispatchVendor]                        21        35
+    [(]                                     35        36
+    [map]                                   36        39
+    [:]                                     39        40
+    [Map]                                   41        44
+    [\[]                                    44        45
+    [Class]                                 45        50
+    [\[]                                    50        51
+    [_]                                     51        52
+    [\]]                                    52        53
+    [,]                                     53        54
+    [Method]                                55        61
+    [\]]                                    61        62
+    [)]                                     62        63
+    [{]                                     64        65
 L573
-    [private]                               3         11
-    [val]                                   11        15
-    [baseMap]                               15        23
-    [:]                                     22        24
-    [Map]                                   24        28
-    [\[]                                    27        29
-    [Class]                                 28        34
-    [\[]                                    33        35
-    [_]                                     34        36
-    [\]]                                    35        37
-    [,]                                     36        38
-    [Option]                                38        45
-    [\[]                                    44        46
-    [Method]                                45        52
-    [\]]                                    51        53
-    [\]]                                    52        54
-    [=]                                     54        56
+    [private]                               3         10
+    [val]                                   11        14
+    [baseMap]                               15        22
+    [:]                                     22        23
+    [Map]                                   24        27
+    [\[]                                    27        28
+    [Class]                                 28        33
+    [\[]                                    33        34
+    [_]                                     34        35
+    [\]]                                    35        36
+    [,]                                     36        37
+    [Option]                                38        44
+    [\[]                                    44        45
+    [Method]                                45        51
+    [\]]                                    51        52
+    [\]]                                    52        53
+    [=]                                     54        55
 L574
-    [Map]                                   5         9
-    [(]                                     8         10
-    [map]                                   9         13
-    [.]                                     12        14
-    [map]                                   13        17
-    [{]                                     16        18
-    [case]                                  17        22
-    [(]                                     22        24
-    [k]                                     23        25
-    [,]                                     24        26
-    [v]                                     25        27
-    [)]                                     26        28
-    [=>]                                    28        31
-    [(]                                     31        33
-    [k]                                     32        34
-    [,]                                     33        35
-    [Some]                                  35        40
-    [(]                                     39        41
-    [v]                                     40        42
-    [)]                                     41        43
-    [)]                                     42        44
-    [}]                                     43        45
-    [.]                                     44        46
-    [toList]                                45        52
-    [:]                                     52        54
-    [_]                                     53        55
-    [*]                                     54        56
-    [)]                                     55        57
+    [Map]                                   5         8
+    [(]                                     8         9
+    [map]                                   9         12
+    [.]                                     12        13
+    [map]                                   13        16
+    [{]                                     16        17
+    [case]                                  17        21
+    [(]                                     22        23
+    [k]                                     23        24
+    [,]                                     24        25
+    [v]                                     25        26
+    [)]                                     26        27
+    [=>]                                    28        30
+    [(]                                     31        32
+    [k]                                     32        33
+    [,]                                     33        34
+    [Some]                                  35        39
+    [(]                                     39        40
+    [v]                                     40        41
+    [)]                                     41        42
+    [)]                                     42        43
+    [}]                                     43        44
+    [.]                                     44        45
+    [toList]                                45        51
+    [:]                                     52        53
+    [_]                                     53        54
+    [*]                                     54        55
+    [)]                                     55        56
 L576
-    [def]                                   3         7
-    [vend]                                  7         12
-    [(]                                     11        13
-    [actor]                                 12        18
-    [:]                                     17        19
-    [LiftActorJ]                            19        30
-    [)]                                     29        31
-    [:]                                     30        32
-    [PartialFunction]                       32        48
-    [\[]                                    47        49
-    [Any]                                   48        52
-    [,]                                     51        53
-    [Unit]                                  53        58
-    [\]]                                    57        59
-    [=]                                     59        61
+    [def]                                   3         6
+    [vend]                                  7         11
+    [(]                                     11        12
+    [actor]                                 12        17
+    [:]                                     17        18
+    [LiftActorJ]                            19        29
+    [)]                                     29        30
+    [:]                                     30        31
+    [PartialFunction]                       32        47
+    [\[]                                    47        48
+    [Any]                                   48        51
+    [,]                                     51        52
+    [Unit]                                  53        57
+    [\]]                                    57        58
+    [=]                                     59        60
 L577
-    [new]                                   5         9
-    [PartialFunction]                       9         25
-    [\[]                                    24        26
-    [Any]                                   25        29
-    [,]                                     28        30
-    [Unit]                                  30        35
-    [\]]                                    34        36
-    [{]                                     36        38
+    [new]                                   5         8
+    [PartialFunction]                       9         24
+    [\[]                                    24        25
+    [Any]                                   25        28
+    [,]                                     28        29
+    [Unit]                                  30        34
+    [\]]                                    34        35
+    [{]                                     36        37
 L578
-    [var]                                   7         11
-    [theMap]                                11        18
-    [:]                                     17        19
-    [Map]                                   19        23
-    [\[]                                    22        24
-    [Class]                                 23        29
-    [\[]                                    28        30
-    [_]                                     29        31
-    [\]]                                    30        32
-    [,]                                     31        33
-    [Option]                                33        40
-    [\[]                                    39        41
-    [Method]                                40        47
-    [\]]                                    46        48
-    [\]]                                    47        49
-    [=]                                     49        51
-    [baseMap]                               51        59
+    [var]                                   7         10
+    [theMap]                                11        17
+    [:]                                     17        18
+    [Map]                                   19        22
+    [\[]                                    22        23
+    [Class]                                 23        28
+    [\[]                                    28        29
+    [_]                                     29        30
+    [\]]                                    30        31
+    [,]                                     31        32
+    [Option]                                33        39
+    [\[]                                    39        40
+    [Method]                                40        46
+    [\]]                                    46        47
+    [\]]                                    47        48
+    [=]                                     49        50
+    [baseMap]                               51        58
 L580
-    [def]                                   7         11
-    [findClass]                             11        21
-    [(]                                     20        22
-    [clz]                                   21        25
-    [:]                                     24        26
-    [Class]                                 26        32
-    [\[]                                    31        33
-    [_]                                     32        34
-    [\]]                                    33        35
-    [)]                                     34        36
-    [:]                                     35        37
-    [Option]                                37        44
-    [\[]                                    43        45
-    [Method]                                44        51
-    [\]]                                    50        52
-    [=]                                     52        54
+    [def]                                   7         10
+    [findClass]                             11        20
+    [(]                                     20        21
+    [clz]                                   21        24
+    [:]                                     24        25
+    [Class]                                 26        31
+    [\[]                                    31        32
+    [_]                                     32        33
+    [\]]                                    33        34
+    [)]                                     34        35
+    [:]                                     35        36
+    [Option]                                37        43
+    [\[]                                    43        44
+    [Method]                                44        50
+    [\]]                                    50        51
+    [=]                                     52        53
 L581
-    [theMap]                                9         16
-    [.]                                     15        17
-    [find]                                  16        21
-    [(]                                     20        22
-    [_]                                     21        23
-    [.]                                     22        24
-    [_1]                                    23        26
-    [.]                                     25        27
-    [isAssignableFrom]                      26        43
-    [(]                                     42        44
-    [clz]                                   43        47
-    [)]                                     46        48
-    [)]                                     47        49
-    [.]                                     48        50
-    [flatMap]                               49        57
-    [(]                                     56        58
-    [_]                                     57        59
-    [.]                                     58        60
-    [_2]                                    59        62
-    [)]                                     61        63
+    [theMap]                                9         15
+    [.]                                     15        16
+    [find]                                  16        20
+    [(]                                     20        21
+    [_]                                     21        22
+    [.]                                     22        23
+    [_1]                                    23        25
+    [.]                                     25        26
+    [isAssignableFrom]                      26        42
+    [(]                                     42        43
+    [clz]                                   43        46
+    [)]                                     46        47
+    [)]                                     47        48
+    [.]                                     48        49
+    [flatMap]                               49        56
+    [(]                                     56        57
+    [_]                                     57        58
+    [.]                                     58        59
+    [_2]                                    59        61
+    [)]                                     61        62
 L583
-    [def]                                   7         11
-    [isDefinedAt]                           11        23
-    [(]                                     22        24
-    [v]                                     23        25
-    [:]                                     24        26
-    [Any]                                   26        30
-    [)]                                     29        31
-    [:]                                     30        32
-    [Boolean]                               32        40
-    [=]                                     40        42
-    [{]                                     42        44
+    [def]                                   7         10
+    [isDefinedAt]                           11        22
+    [(]                                     22        23
+    [v]                                     23        24
+    [:]                                     24        25
+    [Any]                                   26        29
+    [)]                                     29        30
+    [:]                                     30        31
+    [Boolean]                               32        39
+    [=]                                     40        41
+    [{]                                     42        43
 L584
-    [val]                                   9         13
-    [clz]                                   13        17
-    [=]                                     17        19
-    [v]                                     19        21
-    [.]                                     20        22
-    [asInstanceOf]                          21        34
-    [\[]                                    33        35
-    [Object]                                34        41
-    [\]]                                    40        42
-    [.]                                     41        43
-    [getClass]                              42        51
+    [val]                                   9         12
+    [clz]                                   13        16
+    [=]                                     17        18
+    [v]                                     19        20
+    [.]                                     20        21
+    [asInstanceOf]                          21        33
+    [\[]                                    33        34
+    [Object]                                34        40
+    [\]]                                    40        41
+    [.]                                     41        42
+    [getClass]                              42        50
 L585
-    [theMap]                                9         16
-    [.]                                     15        17
-    [get]                                   16        20
-    [(]                                     19        21
-    [clz]                                   20        24
-    [)]                                     23        25
-    [match]                                 25        31
-    [{]                                     31        33
+    [theMap]                                9         15
+    [.]                                     15        16
+    [get]                                   16        19
+    [(]                                     19        20
+    [clz]                                   20        23
+    [)]                                     23        24
+    [match]                                 25        30
+    [{]                                     31        32
 L586
-    [case]                                  11        16
-    [Some]                                  16        21
-    [(]                                     20        22
-    [Some]                                  21        26
-    [(]                                     25        27
-    [_]                                     26        28
-    [)]                                     27        29
-    [)]                                     28        30
-    [=>]                                    30        33
-    [true]                                  33        38
+    [case]                                  11        15
+    [Some]                                  16        20
+    [(]                                     20        21
+    [Some]                                  21        25
+    [(]                                     25        26
+    [_]                                     26        27
+    [)]                                     27        28
+    [)]                                     28        29
+    [=>]                                    30        32
+    [true]                                  33        37
 L587
-    [case]                                  11        16
-    [None]                                  16        21
-    [=>]                                    21        24
-    [{]                                     24        26
+    [case]                                  11        15
+    [None]                                  16        20
+    [=>]                                    21        23
+    [{]                                     24        25
 L588
-    [val]                                   13        17
-    [answer]                                17        24
-    [=]                                     24        26
-    [findClass]                             26        36
-    [(]                                     35        37
-    [clz]                                   36        40
-    [)]                                     39        41
+    [val]                                   13        16
+    [answer]                                17        23
+    [=]                                     24        25
+    [findClass]                             26        35
+    [(]                                     35        36
+    [clz]                                   36        39
+    [)]                                     39        40
 L589
-    [theMap]                                13        20
-    [+=]                                    20        23
-    [clz]                                   23        27
-    [->]                                    27        30
-    [answer]                                30        37
+    [theMap]                                13        19
+    [+=]                                    20        22
+    [clz]                                   23        26
+    [->]                                    27        29
+    [answer]                                30        36
 L590
-    [answer]                                13        20
-    [.]                                     19        21
-    [isDefined]                             20        30
+    [answer]                                13        19
+    [.]                                     19        20
+    [isDefined]                             20        29
 L591
-    [}]                                     11        13
+    [}]                                     11        12
 L592
-    [case]                                  11        16
-    [_]                                     16        18
-    [=>]                                    18        21
-    [false]                                 21        27
+    [case]                                  11        15
+    [_]                                     16        17
+    [=>]                                    18        20
+    [false]                                 21        26
 L593
-    [}]                                     9         11
+    [}]                                     9         10
 L594
-    [}]                                     7         9
+    [}]                                     7         8
 L596
-    [def]                                   7         11
-    [apply]                                 11        17
-    [(]                                     16        18
-    [v]                                     17        19
-    [:]                                     18        20
-    [Any]                                   20        24
-    [)]                                     23        25
-    [:]                                     24        26
-    [Unit]                                  26        31
-    [=]                                     31        33
-    [{]                                     33        35
+    [def]                                   7         10
+    [apply]                                 11        16
+    [(]                                     16        17
+    [v]                                     17        18
+    [:]                                     18        19
+    [Any]                                   20        23
+    [)]                                     23        24
+    [:]                                     24        25
+    [Unit]                                  26        30
+    [=]                                     31        32
+    [{]                                     33        34
 L597
-    [val]                                   9         13
-    [o]                                     13        15
-    [:]                                     14        16
-    [Object]                                16        23
-    [=]                                     23        25
-    [v]                                     25        27
-    [.]                                     26        28
-    [asInstanceOf]                          27        40
-    [\[]                                    39        41
-    [Object]                                40        47
-    [\]]                                    46        48
+    [val]                                   9         12
+    [o]                                     13        14
+    [:]                                     14        15
+    [Object]                                16        22
+    [=]                                     23        24
+    [v]                                     25        26
+    [.]                                     26        27
+    [asInstanceOf]                          27        39
+    [\[]                                    39        40
+    [Object]                                40        46
+    [\]]                                    46        47
 L598
-    [val]                                   9         13
-    [meth]                                  13        18
-    [=]                                     18        20
-    [theMap]                                20        27
-    [(]                                     26        28
-    [o]                                     27        29
-    [.]                                     28        30
-    [getClass]                              29        38
-    [)]                                     37        39
-    [.]                                     38        40
-    [get]                                   39        43
+    [val]                                   9         12
+    [meth]                                  13        17
+    [=]                                     18        19
+    [theMap]                                20        26
+    [(]                                     26        27
+    [o]                                     27        28
+    [.]                                     28        29
+    [getClass]                              29        37
+    [)]                                     37        38
+    [.]                                     38        39
+    [get]                                   39        42
 L599
-    [meth]                                  9         14
-    [.]                                     13        15
-    [invoke]                                14        21
-    [(]                                     20        22
-    [actor]                                 21        27
-    [,]                                     26        28
-    [o]                                     28        30
-    [)]                                     29        31
-    [match]                                 31        37
-    [{]                                     37        39
+    [meth]                                  9         13
+    [.]                                     13        14
+    [invoke]                                14        20
+    [(]                                     20        21
+    [actor]                                 21        26
+    [,]                                     26        27
+    [o]                                     28        29
+    [)]                                     29        30
+    [match]                                 31        36
+    [{]                                     37        38
 L600
-    [case]                                  11        16
-    [null]                                  16        21
-    [=>]                                    21        24
+    [case]                                  11        15
+    [null]                                  16        20
+    [=>]                                    21        23
 L601
-    [case]                                  11        16
-    [x]                                     16        18
-    [=>]                                    18        21
-    [actor]                                 21        27
-    [.]                                     26        28
-    [internalReply]                         27        41
-    [(]                                     40        42
-    [x]                                     41        43
-    [)]                                     42        44
+    [case]                                  11        15
+    [x]                                     16        17
+    [=>]                                    18        20
+    [actor]                                 21        26
+    [.]                                     26        27
+    [internalReply]                         27        40
+    [(]                                     40        41
+    [x]                                     41        42
+    [)]                                     42        43
 L602
-    [}]                                     9         11
+    [}]                                     9         10
 L603
-    [}]                                     7         9
+    [}]                                     7         8
 L604
-    [}]                                     5         7
+    [}]                                     5         6
 L605
-    [}]                                     1         3
+    [}]                                     1         2
 L612
-    [class]                                 1         7
-    [LiftActorJ]                            7         18
-    [extends]                               18        26
-    [JavaActorBase]                         26        40
-    [with]                                  40        45
-    [LiftActor]                             45        55
-    [{]                                     55        57
+    [class]                                 1         6
+    [LiftActorJ]                            7         17
+    [extends]                               18        25
+    [JavaActorBase]                         26        39
+    [with]                                  40        44
+    [LiftActor]                             45        54
+    [{]                                     55        56
 L613
-    [protected]                             3         13
-    [lazy]                                  13        18
-    [val]                                   18        22
-    [_messageHandler]                       22        38
-    [:]                                     37        39
-    [PartialFunction]                       39        55
-    [\[]                                    54        56
-    [Any]                                   55        59
-    [,]                                     58        60
-    [Unit]                                  60        65
-    [\]]                                    64        66
-    [=]                                     66        68
+    [protected]                             3         12
+    [lazy]                                  13        17
+    [val]                                   18        21
+    [_messageHandler]                       22        37
+    [:]                                     37        38
+    [PartialFunction]                       39        54
+    [\[]                                    54        55
+    [Any]                                   55        58
+    [,]                                     58        59
+    [Unit]                                  60        64
+    [\]]                                    64        65
+    [=]                                     66        67
 L614
-    [calculateJavaMessageHandler]           5         33
+    [calculateJavaMessageHandler]           5         32
 L616
-    [protected]                             3         13
-    [def]                                   13        17
-    [calculateJavaMessageHandler]           17        45
-    [=]                                     45        47
-    [LiftActorJ]                            47        58
-    [.]                                     57        59
-    [calculateHandler]                      58        75
-    [(]                                     74        76
-    [this]                                  75        80
-    [)]                                     79        81
+    [protected]                             3         12
+    [def]                                   13        16
+    [calculateJavaMessageHandler]           17        44
+    [=]                                     45        46
+    [LiftActorJ]                            47        57
+    [.]                                     57        58
+    [calculateHandler]                      58        74
+    [(]                                     74        75
+    [this]                                  75        79
+    [)]                                     79        80
 L618
-    [protected]                             3         13
-    [def]                                   13        17
-    [messageHandler]                        17        32
-    [=]                                     32        34
-    [_messageHandler]                       34        50
+    [protected]                             3         12
+    [def]                                   13        16
+    [messageHandler]                        17        31
+    [=]                                     32        33
+    [_messageHandler]                       34        49
 L620
-    [private]                               3         11
-    [\[]                                    10        12
-    [actor]                                 11        17
-    [\]]                                    16        18
-    [def]                                   18        22
-    [internalReply]                         22        36
-    [(]                                     35        37
-    [v]                                     36        38
-    [:]                                     37        39
-    [Any]                                   39        43
-    [)]                                     42        44
-    [=]                                     44        46
-    [reply]                                 46        52
-    [(]                                     51        53
-    [v]                                     52        54
-    [)]                                     53        55
+    [private]                               3         10
+    [\[]                                    10        11
+    [actor]                                 11        16
+    [\]]                                    16        17
+    [def]                                   18        21
+    [internalReply]                         22        35
+    [(]                                     35        36
+    [v]                                     36        37
+    [:]                                     37        38
+    [Any]                                   39        42
+    [)]                                     42        43
+    [=]                                     44        45
+    [reply]                                 46        51
+    [(]                                     51        52
+    [v]                                     52        53
+    [)]                                     53        54
 L621
-    [}]                                     1         3
+    [}]                                     1         2
 EOF
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/special_comments.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/special_comments.txt
index 1fcfdc6950..174012eb14 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/special_comments.txt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/special_comments.txt
@@ -1,40 +1,40 @@
     [Image] or [Truncated image[            Bcol      Ecol
 L7
-    [case]                                  1         6
-    [class]                                 6         12
-    [Foo]                                   12        16
-    [(]                                     15        17
-    [)]                                     16        18
-    [{]                                     18        20
+    [case]                                  1         5
+    [class]                                 6         11
+    [Foo]                                   12        15
+    [(]                                     15        16
+    [)]                                     16        17
+    [{]                                     18        19
 L14
-    [private]                               3         11
-    [def]                                   11        15
-    [bar]                                   15        19
-    [(]                                     18        20
-    [i]                                     19        21
-    [:]                                     20        22
-    [Int]                                   22        26
-    [)]                                     25        27
-    [:]                                     27        29
-    [Int]                                   29        33
-    [=]                                     33        35
-    [{]                                     35        37
+    [private]                               3         10
+    [def]                                   11        14
+    [bar]                                   15        18
+    [(]                                     18        19
+    [i]                                     19        20
+    [:]                                     20        21
+    [Int]                                   22        25
+    [)]                                     25        26
+    [:]                                     27        28
+    [Int]                                   29        32
+    [=]                                     33        34
+    [{]                                     35        36
 L15
-    [val]                                   5         9
-    [CPD]                                   9         13
-    [=]                                     13        15
-    [40]                                    15        18
+    [val]                                   5         8
+    [CPD]                                   9         12
+    [=]                                     13        14
+    [40]                                    15        17
 L16
-    [val]                                   5         9
-    [OFF]                                   9         13
-    [=]                                     13        15
-    [60]                                    15        18
+    [val]                                   5         8
+    [OFF]                                   9         12
+    [=]                                     13        14
+    [60]                                    15        17
 L17
-    [CPD]                                   5         9
-    [-]                                     8         10
-    [OFF]                                   9         13
+    [CPD]                                   5         8
+    [-]                                     8         9
+    [OFF]                                   9         12
 L18
-    [}]                                     3         5
+    [}]                                     3         4
 L24
-    [}]                                     1         3
+    [}]                                     1         2
 EOF
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/tabWidth.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/tabWidth.txt
index d0b00a8726..a8aaf43fce 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/tabWidth.txt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/cpd/testdata/tabWidth.txt
@@ -1,30 +1,30 @@
     [Image] or [Truncated image[            Bcol      Ecol
 L1
-    [object]                                1         8
-    [Main]                                  8         13
-    [{]                                     13        15
+    [object]                                1         7
+    [Main]                                  8         12
+    [{]                                     13        14
 L2
-    [def]                                   2         6
-    [main]                                  6         11
-    [(]                                     10        12
-    [args]                                  11        16
-    [:]                                     15        17
-    [Array]                                 17        23
-    [\[]                                    22        24
-    [String]                                23        30
-    [\]]                                    29        31
-    [)]                                     30        32
-    [:]                                     31        33
-    [Unit]                                  33        38
-    [=]                                     38        40
-    [{]                                     40        42
+    [def]                                   2         5
+    [main]                                  6         10
+    [(]                                     10        11
+    [args]                                  11        15
+    [:]                                     15        16
+    [Array]                                 17        22
+    [\[]                                    22        23
+    [String]                                23        29
+    [\]]                                    29        30
+    [)]                                     30        31
+    [:]                                     31        32
+    [Unit]                                  33        37
+    [=]                                     38        39
+    [{]                                     40        41
 L3
-    [println]                               3         11
-    [(]                                     10        12
-    ["Hello, World!"]                       11        27
-    [)]                                     26        28
+    [println]                               3         10
+    [(]                                     10        11
+    ["Hello, World!"]                       11        26
+    [)]                                     26        27
 L4
-    [}]                                     2         4
+    [}]                                     2         3
 L5
-    [}]                                     1         3
+    [}]                                     1         2
 EOF

From 0d4a56ea6bfa899726056c8e04da047652b657d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 17:43:32 +0200
Subject: [PATCH 024/180] Add method for designer

---
 .../net/sourceforge/pmd/lang/ast/Node.java    | 17 ++++++++++++
 .../pmd/lang/ast/TextAvailableNode.java       |  5 +++-
 .../pmd/lang/document/FileLocation.java       | 24 +++++++++++++++--
 .../pmd/lang/document/RootTextDocument.java   |  6 +++++
 .../pmd/lang/document/TextDocument.java       | 26 ++++++++++++++++---
 .../pmd/lang/document/TextRegion.java         | 11 ++++++++
 .../pmd/lang/document/TextDocumentTest.java   | 20 ++++++++++++++
 .../ast/AbstractEcmascriptNode.java           |  3 ++-
 8 files changed, 105 insertions(+), 7 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 0676fcb42d..01f555b02c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -121,6 +121,23 @@ public interface Node extends Reportable {
     @Override
     FileLocation getReportLocation();
 
+    /**
+     * Returns a region of text delimiting the node in the underlying
+     * text document. This does not necessarily match the
+     * {@link #getReportLocation() report location}.
+     *
+     * @implNote The default implementation uses the {@link #getReportLocation()}
+     *     to create a region.
+     */
+    default TextRegion getTextRegion() {
+        @SuppressWarnings("PMD.CloseResource")
+        TextDocument document = getAstInfo().getTextDocument();
+        FileLocation loc = getReportLocation();
+        int startOffset = document.offsetAtLineColumn(loc.getStartLine(), loc.getStartColumn());
+        int endOffset = document.offsetAtLineColumn(loc.getEndLine(), loc.getEndColumn());
+        return TextRegion.fromBothOffsets(startOffset, endOffset);
+    }
+
 
     // Those are kept here because they're handled specially as XPath
     // attributes
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
index 90a1e2a314..708b40db4b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
@@ -20,8 +20,11 @@ public interface TextAvailableNode extends Node {
      * Returns the exact region of text delimiting
      * the node in the underlying text document. Note
      * that {@link #getReportLocation()} does not need
-     * to match this region.
+     * to match this region. {@link #getReportLocation()}
+     * can be scoped down to a specific token, eg the
+     * class identifier.
      */
+    @Override
     TextRegion getTextRegion();
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
index 70848f8cc4..48d8c96c12 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
@@ -77,8 +77,18 @@ public final class FileLocation {
         return fileName;
     }
 
+    /**
+     * Inclusive, 1-based line number.
+     *
+     * @deprecated Use {@link #getStartLine()}.
+     */
+    @Deprecated
+    public int getBeginLine() { // todo rename to getStartLine
+        return getStartLine();
+    }
+
     /** Inclusive, 1-based line number. */
-    public int getBeginLine() {
+    public int getStartLine() {
         return beginLine;
     }
 
@@ -87,8 +97,18 @@ public final class FileLocation {
         return endLine;
     }
 
+    /**
+     * Inclusive, 1-based column number.
+     *
+     * @deprecated Use {@link #getStartColumn()}.
+     */
+    @Deprecated
+    public int getBeginColumn() { // todo rename to getStartLine
+        return getStartColumn();
+    }
+
     /** Inclusive, 1-based column number. */
-    public int getBeginColumn() {
+    public int getStartColumn() {
         return beginColumn;
     }
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index f4f7725e4c..2b581981cb 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -83,6 +83,12 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         );
     }
 
+    @Override
+    public int offsetAtLineColumn(int line, int column) {
+        SourceCodePositioner positioner = content.getPositioner();
+        return positioner.offsetFromLineColumn(line, column);
+    }
+
     @Override
     public TextRegion createLineRange(int startLineInclusive, int endLineInclusive) {
         SourceCodePositioner positioner = content.getPositioner();
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index a59fedd27d..e5254fc8c4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -111,7 +111,9 @@ public interface TextDocument extends Closeable {
 
 
     /**
-     * Turn a text region into a {@link FileLocation}.
+     * Turn a text region into a {@link FileLocation}. This computes
+     * the line/column information for both start and end offset of
+     * the region.
      *
      * @return A new file position
      *
@@ -119,8 +121,15 @@ public interface TextDocument extends Closeable {
      */
     FileLocation toLocation(TextRegion region);
 
-
-    // todo doc
+    /**
+     * Create a location from its positions as lines/columns. The file
+     * name is the display name of this document.
+     *
+     * @param bline Start line
+     * @param bcol  Start column
+     * @param eline End line
+     * @param ecol  End column
+     */
     default FileLocation createLocation(int bline, int bcol, int eline, int ecol) {
         return FileLocation.location(getDisplayName(), bline, bcol, eline, ecol);
     }
@@ -136,6 +145,17 @@ public interface TextDocument extends Closeable {
         return toLocation(TextRegion.fromOffsetLength(offset, 0)).getBeginLine();
     }
 
+    /**
+     * Returns the offset at the given line and column number. This is
+     * the dual of
+     *
+     * @param line   Line number (1-based)
+     * @param column Column number (1-based)
+     *
+     * @return an offset (0-based)
+     */
+    int offsetAtLineColumn(int line, int column);
+
     /**
      * Closing a document closes the underlying {@link TextFile}.
      * New editors cannot be produced after that, and the document otherwise
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
index d62454224f..5111c70863 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
@@ -194,6 +194,17 @@ public final class TextRegion implements Comparable<TextRegion> {
         return new TextRegion(startOffset, endOffset - startOffset);
     }
 
+    /**
+     * Builds a new region with zero length and placed at the given offset.
+     *
+     * @param startOffset Offset for start and end of the position.
+     *
+     * @throws AssertionError If the offset is negative
+     */
+    public static TextRegion caretAt(int startOffset) {
+        return new TextRegion(startOffset, 0);
+    }
+
     /**
      * Checks that the parameters are a valid region, this is provided
      * to debug, will be a noop unless assertions are enabled.
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index af8bb8894a..bf3408ff1d 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -140,6 +140,26 @@ public class TextDocumentTest {
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
     }
 
+    @Test
+    public void testOffsetFromLineColumn() {
+        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
+
+        assertEquals(0, doc.offsetAtLineColumn(1, 1));
+        assertEquals(1, doc.offsetAtLineColumn(1, 2));
+        assertEquals(2, doc.offsetAtLineColumn(1, 3));
+        assertEquals(3, doc.offsetAtLineColumn(1, 4));
+        assertEquals(4, doc.offsetAtLineColumn(1, 5));
+        assertEquals(5, doc.offsetAtLineColumn(1, 6));
+        assertEquals(6, doc.offsetAtLineColumn(1, 7));
+        assertEquals(7, doc.offsetAtLineColumn(1, 8));
+        assertEquals(8, doc.offsetAtLineColumn(1, 9));
+        assertEquals(8, doc.offsetAtLineColumn(2, 1));
+        assertEquals(9, doc.offsetAtLineColumn(2, 2));
+        assertEquals(10, doc.offsetAtLineColumn(2, 3));
+        assertEquals(11, doc.offsetAtLineColumn(2, 4));
+        assertEquals(11, doc.offsetAtLineColumn(3, 1));
+    }
+
     @Test
     public void testLineRange() {
         TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion);
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
index 9c1fa8ad9b..05b5f12370 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
@@ -39,7 +39,8 @@ abstract class AbstractEcmascriptNode<T extends AstNode> extends AbstractNode<Ab
         return getTextDocument().toLocation(getTextRegion());
     }
 
-    private TextRegion getTextRegion() {
+    @Override
+    public TextRegion getTextRegion() {
         return TextRegion.fromOffsetLength(node.getAbsolutePosition(), node.getLength());
     }
 

From 911347541e73e3c8ab25bc5ff5677e9641319ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 21:01:33 +0200
Subject: [PATCH 025/180] Add TextPos2d

---
 .../pmd/lang/apex/ast/ApexTreeBuilder.java    |  2 +-
 .../pmd/lang/document/FileLocation.java       |  8 ++
 .../pmd/lang/document/RootTextDocument.java   |  9 ++
 .../pmd/lang/document/TextDocument.java       | 57 +++++++++---
 .../pmd/lang/document/TextPos2d.java          | 91 +++++++++++++++++++
 .../pmd/lang/document/TextRegion.java         |  2 +-
 .../pmd/lang/document/TextRegionTest.java     | 10 +-
 7 files changed, 160 insertions(+), 19 deletions(-)
 create mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java

diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
index af7f2e927d..c9a921701e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
@@ -437,7 +437,7 @@ final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
                 Chars trimmed = commentText.subSequence("//".length(), commentText.length()).trimStart();
                 if (trimmed.startsWith(suppressMarker)) {
                     Chars userMessage = trimmed.subSequence(suppressMarker.length(), trimmed.length()).trim();
-                    suppressMap.put(source.lineNumberAt(startIdx), userMessage.toString());
+                    suppressMap.put(source.lineAtOffset(startIdx), userMessage.toString());
                 }
             }
         }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
index 48d8c96c12..94f3a56895 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
@@ -117,6 +117,14 @@ public final class FileLocation {
         return endColumn;
     }
 
+    public TextPos2d getStartPos() {
+        return TextPos2d.pos2d(beginLine, beginColumn);
+    }
+
+    public TextPos2d getEndPos() {
+        return TextPos2d.pos2d(endLine, endColumn);
+    }
+
     /** Returns the region in the file, or null if this was not available. */
     public @Nullable TextRegion getRegionInFile() {
         return region;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index 2b581981cb..119dbc994e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -89,6 +89,15 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         return positioner.offsetFromLineColumn(line, column);
     }
 
+    @Override
+    public TextPos2d lineColumnAtOffset(int offset) {
+        long longPos = content.getPositioner().lineColFromOffset(offset, true);
+        return TextPos2d.pos2d(
+            SourceCodePositioner.unmaskLine(longPos),
+            SourceCodePositioner.unmaskCol(longPos)
+        );
+    }
+
     @Override
     public TextRegion createLineRange(int startLineInclusive, int endLineInclusive) {
         SourceCodePositioner positioner = content.getPositioner();
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index e5254fc8c4..4f0091fb52 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -134,20 +134,9 @@ public interface TextDocument extends Closeable {
         return FileLocation.location(getDisplayName(), bline, bcol, eline, ecol);
     }
 
-    /**
-     * Determines the line number at the given offset (inclusive).
-     *
-     * @return the line number at the given index
-     *
-     * @throws IndexOutOfBoundsException If the argument is not a valid offset in this document
-     */
-    default int lineNumberAt(int offset) {
-        return toLocation(TextRegion.fromOffsetLength(offset, 0)).getBeginLine();
-    }
 
     /**
-     * Returns the offset at the given line and column number. This is
-     * the dual of
+     * Returns the offset at the given line and column number.
      *
      * @param line   Line number (1-based)
      * @param column Column number (1-based)
@@ -156,6 +145,50 @@ public interface TextDocument extends Closeable {
      */
     int offsetAtLineColumn(int line, int column);
 
+    /**
+     * Returns the offset at the line and number.
+     */
+    default int offsetAtLineColumn(TextPos2d pos2d) {
+        return offsetAtLineColumn(pos2d.getLine(), pos2d.getColumn());
+    }
+
+    /**
+     * Returns the line and column at the given offset (inclusive).
+     *
+     * @param offset A source offset (0-based), can range in {@code [0, length]}.
+     *
+     * @throws IndexOutOfBoundsException if the offset is out of bounds
+     */
+    TextPos2d lineColumnAtOffset(int offset);
+
+    /**
+     * Determines the line number at the given offset (inclusive).
+     *
+     * @return the line number at the given index
+     *
+     * @throws IndexOutOfBoundsException If the argument is not a valid offset in this document
+     */
+    default int lineAtOffset(int offset) {
+        return lineColumnAtOffset(offset).getLine();
+    }
+
+    /**
+     * Returns the region that spans from the given position to the other.
+     *
+     * @throws IllegalArgumentException if start > end
+     * @throws NullPointerException     If either argument is null
+     */
+    default TextRegion rangeBetween(TextPos2d start, TextPos2d end) {
+        if (start.compareTo(end) > 0) {
+            throw new IllegalArgumentException(start.toTupleString() + " comes after " + end.toTupleString());
+        }
+
+        int startPos = offsetAtLineColumn(start);
+        int endPos = offsetAtLineColumn(end) + 1;
+
+        return TextRegion.fromBothOffsets(startPos, endPos);
+    }
+
     /**
      * Closing a document closes the underlying {@link TextFile}.
      * New editors cannot be produced after that, and the document otherwise
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
new file mode 100644
index 0000000000..1119dbe70a
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
@@ -0,0 +1,91 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+/**
+ * A place in a text document, represented as line/column information.
+ */
+public final class TextPos2d implements Comparable<TextPos2d> {
+
+    private final int line;
+    private final int column;
+
+    private TextPos2d(int line, int column) {
+        this.line = line;
+        this.column = column;
+
+        assert line > 0 && column > 0 : "Invalid position" + parThis();
+    }
+
+    /**
+     * Returns the (1-based) line number.
+     */
+    public int getLine() {
+        return line;
+    }
+
+    /**
+     * Returns the (1-based) column number.
+     */
+    public int getColumn() {
+        return column;
+    }
+
+    /**
+     * Builds a new region from offset and length.
+     *
+     * @throws AssertionError If either parameter is negative
+     */
+    public static TextPos2d pos2d(int line, int column) {
+        return new TextPos2d(line, column);
+    }
+
+    private String parThis() {
+        return "(" + this + ")";
+    }
+
+
+    /** Compares the start offset, then the length of a region. */
+    @Override
+    public int compareTo(@NonNull TextPos2d that) {
+        int cmp = Integer.compare(this.getLine(), that.getLine());
+        if (cmp != 0) {
+            return cmp;
+        }
+        return Integer.compare(this.getColumn(), that.getColumn());
+    }
+
+    /**
+     * Returns a string looking like {@code (line=2, column=4)}.
+     */
+    public String toTupleString() {
+        return "(line=" + line + ", column=" + column + ")";
+    }
+
+    @Override
+    public String toString() {
+        return "!debug only! Pos2d(line=" + line + ", column=" + column + ")";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof TextPos2d)) {
+            return false;
+        }
+        TextPos2d that = (TextPos2d) o;
+        return line == that.getLine()
+            && column == that.getColumn();
+    }
+
+    @Override
+    public int hashCode() {
+        return line * 31 + column;
+    }
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
index 5111c70863..1411997a6a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
@@ -88,7 +88,7 @@ public final class TextRegion implements Comparable<TextRegion> {
      *
      * @param offset Offset of a character
      */
-    public boolean containsOffset(int offset) {
+    public boolean contains(int offset) {
         return getStartOffset() <= offset && offset < getEndOffset();
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java
index ebfa2c5764..33e4b56a29 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java
@@ -30,17 +30,17 @@ public class TextRegionTest {
     public void testEmptyContains() {
         TextRegion r1 = TextRegion.fromOffsetLength(0, 0);
 
-        assertFalse(r1.containsOffset(0));
+        assertFalse(r1.contains(0));
     }
 
     @Test
     public void testContains() {
         TextRegion r1 = TextRegion.fromOffsetLength(1, 2);
 
-        assertFalse(r1.containsOffset(0));
-        assertTrue(r1.containsOffset(1));
-        assertTrue(r1.containsOffset(2));
-        assertFalse(r1.containsOffset(3));
+        assertFalse(r1.contains(0));
+        assertTrue(r1.contains(1));
+        assertTrue(r1.contains(2));
+        assertFalse(r1.contains(3));
     }
 
     @Test

From 15d98409db651a8c9fb8b2b94d6e07864ea26509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 22:26:17 +0200
Subject: [PATCH 026/180] Add TextRange2d

---
 .../pmd/lang/apex/ast/ApexTreeBuilder.java    |   2 +-
 .../java/net/sourceforge/pmd/RuleContext.java |   3 +-
 .../pmd/cache/CachedRuleViolation.java        |   3 +-
 .../pmd/lang/document/FileLocation.java       |  10 +-
 .../pmd/lang/document/RootTextDocument.java   |  22 ++--
 .../lang/document/SourceCodePositioner.java   |   7 ++
 .../pmd/lang/document/TextDocument.java       | 100 ++++++++++++------
 .../pmd/lang/document/TextRange2d.java        |  92 ++++++++++++++++
 .../net/sourceforge/pmd/AbstractRuleTest.java |  15 ++-
 .../java/net/sourceforge/pmd/ReportTest.java  |   3 +-
 .../java/net/sourceforge/pmd/RuleSetTest.java |   2 +-
 .../pmd/RuleViolationComparatorTest.java      |   5 +-
 .../sourceforge/pmd/RuleViolationTest.java    |  24 ++---
 .../pmd/cache/FileAnalysisCacheTest.java      |   3 +-
 .../token/internal/BaseTokenFilterTest.java   |   3 +-
 .../pmd/lang/DummyLanguageModule.java         |   2 +-
 .../sourceforge/pmd/lang/ast/DummyNode.java   |   3 +-
 .../sourceforge/pmd/lang/ast/DummyRoot.java   |  32 ++++++
 .../pmd/lang/document/TextDocumentTest.java   |  27 +++++
 .../pmd/renderers/AbstractRendererTest.java   |   4 +-
 .../renderers/SummaryHTMLRendererTest.java    |   4 +-
 .../pmd/lang/java/ast/JavadocElement.java     |   3 +-
 .../pmd/test/lang/ast/DummyNode.java          |   3 +-
 23 files changed, 296 insertions(+), 76 deletions(-)
 create mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java

diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
index c9a921701e..e67bd65fb6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
@@ -437,7 +437,7 @@ final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
                 Chars trimmed = commentText.subSequence("//".length(), commentText.length()).trimStart();
                 if (trimmed.startsWith(suppressMarker)) {
                     Chars userMessage = trimmed.subSequence(suppressMarker.length(), trimmed.length()).trim();
-                    suppressMap.put(source.lineAtOffset(startIdx), userMessage.toString());
+                    suppressMap.put(source.lineColumnAtOffset(startIdx).getLine(), userMessage.toString());
                 }
             }
         }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
index 4bd80164f1..c8a700d2a1 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
@@ -14,6 +14,7 @@ import net.sourceforge.pmd.Report.SuppressedViolation;
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
 import net.sourceforge.pmd.processor.AbstractPMDProcessor;
@@ -131,7 +132,7 @@ public final class RuleContext {
 
         FileLocation location = node.getReportLocation();
         if (beginLine != -1 && endLine != -1) {
-            location = FileLocation.location(location.getFileName(), beginLine, 1, endLine, 1);
+            location = FileLocation.location(location.getFileName(), TextRange2d.range2d(beginLine, 1, endLine, 1));
         }
 
         RuleViolation violation = fact.createViolation(rule, node, location, makeMessage(message, formatArgs));
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
index c68fdf48e0..160d5f174a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
@@ -12,6 +12,7 @@ import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 
 /**
  * A {@link RuleViolation} implementation that is immutable, and therefore cache friendly
@@ -41,7 +42,7 @@ public final class CachedRuleViolation implements RuleViolation {
             final String className, final String methodName, final String variableName) {
         this.mapper = mapper;
         this.description = description;
-        this.location = FileLocation.location(fileName, beginLine, beginColumn, endLine, endColumn);
+        this.location = FileLocation.location(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
         this.ruleClassName = ruleClassName;
         this.ruleName = ruleName;
         this.ruleTargetLanguage = ruleTargetLanguage;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
index 94f3a56895..41062e4cb6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
@@ -153,8 +153,14 @@ public final class FileLocation {
      * @throws IllegalArgumentException If the line and column are not correctly ordered
      * @throws IllegalArgumentException If the start offset or length are negative
      */
-    public static FileLocation location(String fileName, int beginLine, int beginColumn, int endLine, int endColumn) {
-        return new FileLocation(fileName, beginLine, beginColumn, endLine, endColumn);
+    public static FileLocation location(String fileName, TextRange2d range2d) {
+        TextPos2d start = range2d.getStartPos();
+        TextPos2d end = range2d.getEndPos();
+        return new FileLocation(fileName,
+                                start.getLine(),
+                                start.getColumn(),
+                                end.getLine(),
+                                end.getColumn());
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index 119dbc994e..9e8ecbb3a3 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -64,7 +64,7 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
 
     @Override
     public FileLocation toLocation(TextRegion region) {
-        checkInRange(region);
+        checkInRange(region, this.getLength());
         SourceCodePositioner positioner = content.getPositioner();
 
         // We use longs to return both numbers at the same time
@@ -90,8 +90,18 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
     }
 
     @Override
-    public TextPos2d lineColumnAtOffset(int offset) {
-        long longPos = content.getPositioner().lineColFromOffset(offset, true);
+    public boolean isInRange(TextPos2d textPos2d) {
+        if (textPos2d.getLine() <= content.getPositioner().getNumLines()) {
+            int maxColumn = content.getPositioner().offsetOfEndOfLine(textPos2d.getLine());
+            return textPos2d.getColumn()
+                < content.getPositioner().columnFromOffset(textPos2d.getLine(), maxColumn);
+        }
+        return false;
+    }
+
+    @Override
+    public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
+        long longPos = content.getPositioner().lineColFromOffset(offset, inclusive);
         return TextPos2d.pos2d(
             SourceCodePositioner.unmaskLine(longPos),
             SourceCodePositioner.unmaskCol(longPos)
@@ -113,9 +123,9 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         return TextRegion.fromBothOffsets(first, last);
     }
 
-    void checkInRange(TextRegion region) {
-        if (region.getEndOffset() > getLength()) {
-            throw regionOutOfBounds(region.getStartOffset(), region.getEndOffset(), getLength());
+    static void checkInRange(TextRegion region, int length) {
+        if (region.getEndOffset() > length) {
+            throw regionOutOfBounds(region.getStartOffset(), region.getEndOffset(), length);
         }
     }
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
index 52600f4069..56ef19e26f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
@@ -131,6 +131,9 @@ final class SourceCodePositioner {
      */
     public int offsetFromLineColumn(final int line, final int column) {
         if (!isValidLine(line)) {
+            if (line == lineOffsets.length && column == 1) {
+                return sourceCodeLength;
+            }
             return -1;
         }
 
@@ -172,6 +175,10 @@ final class SourceCodePositioner {
         return lineOffsets.length - 1;
     }
 
+    public int getNumLines() {
+        return getLastLine();
+    }
+
     /**
      * Returns the last column number of the last line in the document.
      */
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index 4f0091fb52..1523d05356 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.document;
 
+import static net.sourceforge.pmd.lang.document.RootTextDocument.checkInRange;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Reader;
@@ -36,6 +38,26 @@ public interface TextDocument extends Closeable {
     // todo text edition (there are some reverted commits in the branch
     //  with part of this, including a lot of tests)
 
+    /*
+        Summary of different coordinate systems:
+        Coordinate system:   Line/column            Offset
+        ==============================================================
+        Position:            TextPos2d              int >= 0
+        Range:               TextRange2d            TextRegion
+
+        (FileLocation is similar to TextRange2d in terms of position info)
+
+        Conversions:
+          line/column -> offset: offsetAtLineColumn
+          offset -> line/column: lineColumnAtOffset
+        Range conversions:
+          TextRegion  -> TextRange2d: toRegion
+          TextRange2d -> TextRegion: toRange2d
+
+          TextRegion -> FileLocation: toLocation
+          TextRange2d -> FileLocation: toLocation
+     */
+
     /**
      * Returns the language version that should be used to parse this file.
      */
@@ -122,16 +144,40 @@ public interface TextDocument extends Closeable {
     FileLocation toLocation(TextRegion region);
 
     /**
-     * Create a location from its positions as lines/columns. The file
-     * name is the display name of this document.
+     * Turn a text region into a {@link FileLocation}. The file name is
+     * the display name of this document.
      *
-     * @param bline Start line
-     * @param bcol  Start column
-     * @param eline End line
-     * @param ecol  End column
+     * @return A new file position
+     *
+     * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
      */
-    default FileLocation createLocation(int bline, int bcol, int eline, int ecol) {
-        return FileLocation.location(getDisplayName(), bline, bcol, eline, ecol);
+    default FileLocation toLocation(TextRange2d range) {
+        int startOffset = offsetAtLineColumn(range.getEndPos());
+        if (startOffset < 0) {
+            throw new IndexOutOfBoundsException("Region out of bounds: " + range.displayString());
+        }
+        TextRegion region = TextRegion.caretAt(startOffset);
+        checkInRange(region, this.getLength());
+        return FileLocation.location(getDisplayName(), range);
+    }
+
+    /**
+     * Turn a text region to a {@link TextRange2d}.
+     */
+    default TextRange2d toRange2d(TextRegion region) {
+        TextPos2d start = lineColumnAtOffset(region.getStartOffset(), true);
+        TextPos2d end = lineColumnAtOffset(region.getEndOffset(), false);
+        return TextRange2d.range2d(start, end);
+    }
+
+    /**
+     * Turn a {@link TextRange2d} into a {@link TextRegion}.
+     */
+    default TextRegion toRegion(TextRange2d region) {
+        return TextRegion.fromBothOffsets(
+            offsetAtLineColumn(region.getStartPos()),
+            offsetAtLineColumn(region.getEndPos())
+        );
     }
 
 
@@ -145,6 +191,11 @@ public interface TextDocument extends Closeable {
      */
     int offsetAtLineColumn(int line, int column);
 
+    /**
+     * Returns true if the position is valid in this document.
+     */
+    boolean isInRange(TextPos2d textPos2d);
+
     /**
      * Returns the offset at the line and number.
      */
@@ -159,35 +210,24 @@ public interface TextDocument extends Closeable {
      *
      * @throws IndexOutOfBoundsException if the offset is out of bounds
      */
-    TextPos2d lineColumnAtOffset(int offset);
-
-    /**
-     * Determines the line number at the given offset (inclusive).
-     *
-     * @return the line number at the given index
-     *
-     * @throws IndexOutOfBoundsException If the argument is not a valid offset in this document
-     */
-    default int lineAtOffset(int offset) {
-        return lineColumnAtOffset(offset).getLine();
+    default TextPos2d lineColumnAtOffset(int offset) {
+        return lineColumnAtOffset(offset, true);
     }
 
     /**
-     * Returns the region that spans from the given position to the other.
+     * Returns the line and column at the given offset (inclusive).
      *
-     * @throws IllegalArgumentException if start > end
-     * @throws NullPointerException     If either argument is null
+     * @param offset    A source offset (0-based), can range in {@code [0, length]}.
+     * @param inclusive If the offset falls right after a line terminator,
+     *                  two behaviours are possible. If the parameter is true,
+     *                  choose the position at the start of the next line.
+     *                  Otherwise choose the offset at the end of the line.
+     *
+     * @throws IndexOutOfBoundsException if the offset is out of bounds
      */
-    default TextRegion rangeBetween(TextPos2d start, TextPos2d end) {
-        if (start.compareTo(end) > 0) {
-            throw new IllegalArgumentException(start.toTupleString() + " comes after " + end.toTupleString());
-        }
+    TextPos2d lineColumnAtOffset(int offset, boolean inclusive);
 
-        int startPos = offsetAtLineColumn(start);
-        int endPos = offsetAtLineColumn(end) + 1;
 
-        return TextRegion.fromBothOffsets(startPos, endPos);
-    }
 
     /**
      * Closing a document closes the underlying {@link TextFile}.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
new file mode 100644
index 0000000000..e30cb3e6b7
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
@@ -0,0 +1,92 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import java.util.Objects;
+
+/**
+ * A place in a text document, represented as line/column information.
+ */
+public final class TextRange2d implements Comparable<TextRange2d> {
+
+    private final int startLine;
+    private final int startCol;
+    private final int endLine;
+    private final int endCol;
+
+    public TextRange2d(int startLine, int startCol, int endLine, int endCol) {
+        this.startLine = startLine;
+        this.startCol = startCol;
+        this.endLine = endLine;
+        this.endCol = endCol;
+    }
+
+
+    public TextPos2d getStartPos() {
+        return TextPos2d.pos2d(startLine, startCol);
+    }
+
+    public TextPos2d getEndPos() {
+        return TextPos2d.pos2d(endLine, endCol);
+    }
+
+    public String displayString() {
+        return "(" + startCol + ", " + endCol
+            + ")-(" + endLine + ", " + endCol + ")";
+    }
+
+    public static TextRange2d range2d(TextPos2d start, TextPos2d end) {
+        return new TextRange2d(start.getLine(), start.getColumn(), end.getLine(), end.getColumn());
+    }
+
+    public static TextRange2d range2d(int bline, int bcol, int eline, int ecol) {
+        return new TextRange2d(bline, bcol, eline, ecol);
+    }
+
+    public static TextRange2d fullLine(int line, int lineLength) {
+        return new TextRange2d(line, 1, line, 1 + lineLength);
+    }
+
+    @Override
+    public int compareTo(TextRange2d o) {
+        int cmp = getStartPos().compareTo(o.getStartPos());
+        if (cmp != 0) {
+            return cmp;
+        }
+        return getEndPos().compareTo(o.getEndPos());
+    }
+
+    public boolean contains(TextRange2d range) {
+        return getStartPos().compareTo(range.getStartPos()) <= 0 && getEndPos().compareTo(range.getEndPos()) >= 0;
+    }
+
+    public boolean contains(TextPos2d pos) {
+        return getStartPos().compareTo(pos) <= 0 && getEndPos().compareTo(pos) >= 0;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        TextRange2d that = (TextRange2d) o;
+        return this.getStartPos().equals(that.getStartPos())
+            && this.getEndPos().equals(that.getEndPos());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getStartPos(), getEndPos());
+    }
+
+    @Override
+    public String toString() {
+        return "[" + getStartPos() + " - " + getEndPos() + ']';
+    }
+
+}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
index 237cbd949f..c774fa7b94 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
@@ -14,7 +14,6 @@ import java.util.Collections;
 import org.junit.Test;
 
 import net.sourceforge.pmd.Report.SuppressedViolation;
-import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
@@ -70,8 +69,8 @@ public class AbstractRuleTest {
     public void testCreateRV() {
         MyRule r = new MyRule();
         r.setRuleSetName("foo");
-        DummyNode s = new DummyRoot().withFileName("filename");
-        s.setCoords(5, 5, 5, 10);
+        DummyRoot s = new DummyRoot().withFileName("filename");
+        s.setCoordsReplaceText(5, 5, 5, 10);
         RuleViolation rv = new ParametricRuleViolation(r, s, r.getMessage());
         assertEquals("Line number mismatch!", 5, rv.getBeginLine());
         assertEquals("Filename mismatch!", "filename", rv.getFilename());
@@ -83,8 +82,8 @@ public class AbstractRuleTest {
     @Test
     public void testCreateRV2() {
         MyRule r = new MyRule();
-        DummyNode s = new DummyRoot().withFileName("filename");
-        s.setCoords(5, 5, 5, 10);
+        DummyRoot s = new DummyRoot().withFileName("filename");
+        s.setCoordsReplaceText(5, 5, 5, 10);
         RuleViolation rv = new ParametricRuleViolation(r, s, "specificdescription");
         assertEquals("Line number mismatch!", 5, rv.getBeginLine());
         assertEquals("Filename mismatch!", "filename", rv.getFilename());
@@ -103,8 +102,8 @@ public class AbstractRuleTest {
         r.definePropertyDescriptor(PropertyFactory.intProperty("testInt").desc("description").require(inRange(0, 100)).defaultValue(10).build());
         r.setMessage("Message ${packageName} ${className} ${methodName} ${variableName} ${testInt} ${noSuchProperty}");
 
-        DummyNode s = new DummyRoot().withFileName("filename");
-        s.setCoords(5, 1, 6, 1);
+        DummyRoot s = new DummyRoot().withFileName("filename");
+        s.setCoordsReplaceText(5, 1, 6, 1);
         s.setImage("TestImage");
 
         RuleViolation rv = RuleContextTest.getReportForRuleApply(r, s).getViolations().get(0);
@@ -114,7 +113,7 @@ public class AbstractRuleTest {
     @Test
     public void testRuleSuppress() {
         DummyRoot n = new DummyRoot().withNoPmdComments(Collections.singletonMap(5, ""));
-        n.setCoords(5, 1, 6, 1);
+        n.setCoordsReplaceText(5, 1, 6, 1);
         RuleViolation violation = DefaultRuleViolationFactory.defaultInstance().createViolation(new MyRule(), n, n.getReportLocation(), "specificdescription");
         SuppressedViolation suppressed = DefaultRuleViolationFactory.defaultInstance().suppressOrNull(n, violation);
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
index 404a7f9c49..57b8f59898 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
@@ -76,7 +76,8 @@ public class ReportTest {
     }
 
     private static DummyNode getNode(int line, int column) {
-        DummyNode parent = new DummyRoot();
+        DummyRoot parent = new DummyRoot();
+        parent.fakeTextWithNLines(line + 10, column);
         DummyNode s = new DummyNode();
         parent.setCoords(line, column, line, column + 1);
         parent.addChild(s, 0);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
index bc7c2a6a1c..22e2982dce 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
@@ -475,7 +475,7 @@ public class RuleSetTest {
 
     private RootNode makeCompilationUnits(String filename) {
         DummyRoot node = new DummyRoot();
-        node.setCoords(1, 1, 10, 1);
+        node.setCoordsReplaceText(1, 1, 2, 1);
         node.setImage("Foo");
         node.withFileName(filename);
         return node;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
index 15d181c1fb..cb194739e8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
@@ -15,7 +15,6 @@ import java.util.Random;
 
 import org.junit.Test;
 
-import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.rule.MockRule;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
@@ -70,8 +69,8 @@ public class RuleViolationComparatorTest {
 
     private RuleViolation createJavaRuleViolation(Rule rule, String fileName, int beginLine, String description,
             int beginColumn, int endLine, int endColumn) {
-        DummyNode simpleNode = new DummyRoot().withFileName(fileName);
-        simpleNode.setCoords(beginLine, beginColumn, endLine, endColumn);
+        DummyRoot simpleNode = new DummyRoot().withFileName(fileName);
+        simpleNode.setCoordsReplaceText(beginLine, beginColumn, endLine, endColumn);
         return new ParametricRuleViolation(rule, simpleNode, description);
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
index c9f4eb5583..25727daa14 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
@@ -24,8 +24,8 @@ public class RuleViolationTest {
     @Test
     public void testConstructor1() {
         Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
-        DummyNode s = new DummyRoot().withFileName("filename");
-        s.setCoords(2, 1, 2, 3);
+        DummyRoot s = new DummyRoot().withFileName("filename");
+        s.setCoordsReplaceText(2, 1, 2, 3);
         RuleViolation r = new ParametricRuleViolation(rule, s, rule.getMessage());
         assertEquals("object mismatch", rule, r.getRule());
         assertEquals("line number is wrong", 2, r.getBeginLine());
@@ -35,8 +35,8 @@ public class RuleViolationTest {
     @Test
     public void testConstructor2() {
         Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
-        DummyNode s = new DummyRoot().withFileName("filename");
-        s.setCoords(2, 1, 2, 3);
+        DummyRoot s = new DummyRoot().withFileName("filename");
+        s.setCoordsReplaceText(2, 1, 2, 3);
         RuleViolation r = new ParametricRuleViolation(rule, s, "description");
         assertEquals("object mismatch", rule, r.getRule());
         assertEquals("line number is wrong", 2, r.getBeginLine());
@@ -48,11 +48,11 @@ public class RuleViolationTest {
     public void testComparatorWithDifferentFilenames() {
         Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
         Comparator<RuleViolation> comp = RuleViolation.DEFAULT_COMPARATOR;
-        DummyNode s = new DummyRoot().withFileName("filename1");
-        s.setCoords(10, 1, 11, 3);
+        DummyRoot s = new DummyRoot().withFileName("filename1");
+        s.setCoordsReplaceText(10, 1, 11, 3);
         RuleViolation r1 = new ParametricRuleViolation(rule, s, "description");
-        DummyNode s1 = new DummyRoot().withFileName("filename2");
-        s1.setCoords(10, 1, 11, 3);
+        DummyRoot s1 = new DummyRoot().withFileName("filename2");
+        s1.setCoordsReplaceText(10, 1, 11, 3);
         RuleViolation r2 = new ParametricRuleViolation(rule, s1, "description");
         assertEquals(-1, comp.compare(r1, r2));
         assertEquals(1, comp.compare(r2, r1));
@@ -62,10 +62,10 @@ public class RuleViolationTest {
     public void testComparatorWithSameFileDifferentLines() {
         Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
         Comparator<RuleViolation> comp = RuleViolation.DEFAULT_COMPARATOR;
-        DummyNode s = new DummyRoot().withFileName("filename1");
-        s.setCoords(10, 1, 15, 10);
-        DummyNode s1 = new DummyRoot().withFileName("filename1");
-        s1.setCoords(20, 1, 25, 10);
+        DummyRoot s = new DummyRoot().withFileName("filename1");
+        s.setCoordsReplaceText(10, 1, 15, 10);
+        DummyRoot s1 = new DummyRoot().withFileName("filename1");
+        s1.setCoordsReplaceText(20, 1, 25, 10);
         RuleViolation r1 = new ParametricRuleViolation(rule, s, "description");
         RuleViolation r2 = new ParametricRuleViolation(rule, s1, "description");
         assertTrue(comp.compare(r1, r2) < 0);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
index b1eba4e054..a197ba9251 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
@@ -41,6 +41,7 @@ import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.lang.document.TextFileContent;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 
 @SuppressWarnings("deprecation")
 public class FileAnalysisCacheTest {
@@ -116,7 +117,7 @@ public class FileAnalysisCacheTest {
 
         final RuleViolation rv = mock(RuleViolation.class);
         when(rv.getFilename()).thenReturn(sourceFile.getDisplayName());
-        when(rv.getLocation()).thenReturn(FileLocation.location(sourceFile.getDisplayName(), 1, 2, 3, 4));
+        when(rv.getLocation()).thenReturn(FileLocation.location(sourceFile.getDisplayName(), TextRange2d.range2d(1, 2, 3, 4)));
         final net.sourceforge.pmd.Rule rule = mock(net.sourceforge.pmd.Rule.class, Mockito.RETURNS_SMART_NULLS);
         when(rule.getLanguage()).thenReturn(mock(Language.class));
         when(rv.getRule()).thenReturn(rule);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
index 606b7f38cb..b8d15b7cae 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.GenericToken;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.document.TextRegion;
 
 public class BaseTokenFilterTest {
@@ -58,7 +59,7 @@ public class BaseTokenFilterTest {
 
         @Override
         public FileLocation getReportLocation() {
-            return FileLocation.location("n/a", 0, 0, 0, 0);
+            return FileLocation.location("n/a", TextRange2d.range2d(0, 0, 0, 0));
         }
 
         @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index d365e70857..7981fdef89 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -49,7 +49,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
         public Parser getParser() {
             return task -> {
                 DummyRoot node = new DummyRoot();
-                node.setCoords(1, 1, 2, 10);
+                node.setCoords(1, 1, 1, 1);
                 node.setImage("Foo");
                 node.withFileName(task.getFileDisplayName());
                 node.withLanguage(task.getLanguageVersion());
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index 09f98aa541..71232a10d6 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -10,6 +10,7 @@ import java.util.Map;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
 import net.sourceforge.pmd.lang.ast.impl.GenericNode;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 
 public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements GenericNode<DummyNode> {
     private final boolean findBoundary;
@@ -58,7 +59,7 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements Gen
 
     @Override
     public FileLocation getReportLocation() {
-        return getTextDocument().createLocation(bline, bcol, eline, ecol);
+        return getTextDocument().toLocation(TextRange2d.range2d(bline, bcol, eline, ecol));
     }
 
     public void setImage(String image) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java
index a5948dec41..baf7c92b7c 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java
@@ -12,6 +12,7 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.impl.GenericNode;
 import net.sourceforge.pmd.lang.document.TextDocument;
+import net.sourceforge.pmd.lang.document.TextPos2d;
 
 public class DummyRoot extends DummyNode implements GenericNode<DummyNode>, RootNode {
 
@@ -31,11 +32,42 @@ public class DummyRoot extends DummyNode implements GenericNode<DummyNode>, Root
         return this;
     }
 
+
+    public DummyRoot fakeTextWithNLines(int numLines, int lineWidth) {
+        StringBuilder sb = new StringBuilder(numLines * lineWidth);
+        for (int i = 0; i < numLines; i++) {
+            for (int j = 0; j < lineWidth; j++) {
+                sb.append('@');
+            }
+            sb.append('\n');
+        }
+        this.sourceText = sb.toString();
+        return this;
+    }
+
     public DummyRoot withNoPmdComments(Map<Integer, String> suppressMap) {
         this.suppressMap = suppressMap;
         return this;
     }
 
+    @Override
+    public DummyNode setCoords(int bline, int bcol, int eline, int ecol) {
+        @SuppressWarnings("PMD.CloseResource")
+        TextDocument doc = getAstInfo().getTextDocument();
+        checkInRange(bline, bcol, doc);
+        checkInRange(eline, ecol, doc);
+        return super.setCoords(bline, bcol, eline, ecol);
+    }
+
+    public DummyNode setCoordsReplaceText(int bline, int bcol, int eline, int ecol) {
+        fakeTextWithNLines(eline, Math.max(bcol, ecol));
+        return setCoords(bline, bcol, eline, ecol);
+    }
+
+    private void checkInRange(int line, int col, TextDocument doc) {
+        TextPos2d start = TextPos2d.pos2d(line, col);
+        assert doc.isInRange(start) : "position out of range " + start + ", text:\n" + sourceText;
+    }
 
     public DummyRoot withFileName(String filename) {
         this.filename = filename;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index bf3408ff1d..377c140c76 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -160,6 +160,33 @@ public class TextDocumentTest {
         assertEquals(11, doc.offsetAtLineColumn(3, 1));
     }
 
+    @Test
+    public void testCoordinateRoundTripWithEndOfLine() {
+        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
+        TextRange2d inputRange = TextRange2d.fullLine(1, "bonjour\n".length());
+
+        TextRegion lineRange = doc.createLineRange(1, 1);
+        TextRegion region = doc.toRegion(inputRange);
+
+        assertEquals(TextRegion.fromOffsetLength(0, "bonjour\n".length()), region);
+        assertEquals(TextRegion.fromOffsetLength(0, "bonjour\n".length()), lineRange);
+        TextRange2d roundTrip = doc.toRange2d(region);
+        assertEquals(inputRange, roundTrip);
+
+    }
+
+    @Test
+    public void testCoordinateRoundTripSimple() {
+        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
+        TextRange2d inputRange = TextRange2d.fullLine(1, "bonjour".length());
+
+        TextRegion region = doc.toRegion(inputRange);
+        assertEquals(TextRegion.fromOffsetLength(0, "bonjour".length()), region);
+
+        TextRange2d roundTrip = doc.toRange2d(region);
+        assertEquals(inputRange, roundTrip);
+    }
+
     @Test
     public void testLineRange() {
         TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
index f78a80e14d..528ba46af7 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
@@ -81,8 +81,8 @@ public abstract class AbstractRendererTest {
     }
 
     protected DummyNode createNode(int beginLine, int beginColumn, int endLine, int endColumn) {
-        DummyNode node = new DummyRoot().withFileName(getSourceCodeFilename());
-        node.setCoords(beginLine, beginColumn, endLine, endColumn);
+        DummyRoot node = new DummyRoot().withFileName(getSourceCodeFilename());
+        node.setCoordsReplaceText(beginLine, beginColumn, endLine, endColumn);
         return node;
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
index 5e56ec4423..52d403882c 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
@@ -144,10 +144,10 @@ public class SummaryHTMLRendererTest extends AbstractRendererTest {
         assertEquals(getExpectedEmpty(), actual);
     }
 
-    private Consumer<FileAnalysisListener> createEmptyReportWithSuppression() throws Exception {
+    private Consumer<FileAnalysisListener> createEmptyReportWithSuppression() {
         return listener -> {
             DummyRoot root = new DummyRoot().withNoPmdComments(Collections.singletonMap(1, "test")).withFileName(getSourceCodeFilename());
-            root.setCoords(1, 10, 4, 5);
+            root.setCoordsReplaceText(1, 10, 4, 5);
 
             RuleContext ruleContext = RuleContext.create(listener, new FooRule());
             ruleContext.addViolationWithPosition(root, 1, 1, "suppress test");
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
index 7dcd9f828f..86e9ed268f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.java.ast;
 
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.java.javadoc.JavadocTag;
 
 public class JavadocElement extends Comment {
@@ -16,7 +17,7 @@ public class JavadocElement extends Comment {
     public JavadocElement(JavaccToken t, int theBeginLine, int theEndLine, int theBeginColumn, int theEndColumn, JavadocTag theTag) {
         super(t);
         this.tag = theTag;
-        this.reportLoc = FileLocation.location("TODO", theBeginLine, theBeginColumn, theEndLine, theEndColumn);
+        this.reportLoc = FileLocation.location("TODO", TextRange2d.range2d(theBeginLine, theBeginColumn, theEndLine, theEndColumn));
     }
 
     public JavadocTag tag() {
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
index 1373471b44..7bac3c7e33 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.test.lang.ast;
 
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 
 public class DummyNode extends AbstractNode<DummyNode, DummyNode> {
 
@@ -13,7 +14,7 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> {
     private FileLocation location;
 
     public void setCoords(int bline, int bcol, int eline, int ecol) {
-        this.location = FileLocation.location(":dummyFile:", bline, bcol, eline, ecol);
+        this.location = FileLocation.location(":dummyFile:", TextRange2d.range2d(bline, bcol, eline, ecol));
     }
 
     @Override

From 544f9c0c1b2488ec306f630eae3aa9abf91eaa73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 23:14:32 +0200
Subject: [PATCH 027/180] [scala] Fix build of pmd-scala-common

The project doesn't compile as it is
missing dependencies that are provided
in its children modules (version-specific
scala modules). This disables the java
compilation.
---
 pmd-scala-modules/pmd-scala-common/pom.xml | 27 ++++++++++++++++++++++
 pmd-scala-modules/pmd-scala_2.12/pom.xml   | 15 ++++++++++++
 pmd-scala-modules/pmd-scala_2.13/pom.xml   | 14 +++++++++++
 3 files changed, 56 insertions(+)

diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 60daacafd8..28eb61b22a 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -34,6 +34,24 @@
             </testResource>
         </testResources>
 
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -77,6 +95,15 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>8</source>
+                        <target>8</target>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index cfec80a6fc..4100c252d1 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -21,6 +21,21 @@
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index 3ec2f3a427..9d5a3b3625 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -21,6 +21,20 @@
                 <artifactId>kotlin-maven-plugin</artifactId>
                 <groupId>org.jetbrains.kotlin</groupId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

From 4620453fc81573af0e5272bc854387002128b396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 2 Apr 2022 23:37:12 +0200
Subject: [PATCH 028/180] Rename getStartLine/Column

---
 .../pmd/lang/apex/ast/ApexParserTest.java     |  6 ++-
 .../net/sourceforge/pmd/RuleViolation.java    |  8 ++--
 .../pmd/cache/CachedRuleViolation.java        |  8 ++--
 .../net/sourceforge/pmd/cpd/TokenEntry.java   |  4 +-
 .../net/sourceforge/pmd/lang/ast/Node.java    | 12 ++---
 .../pmd/lang/ast/ParseException.java          |  2 +-
 .../ast/impl/javacc/AbstractJjtreeNode.java   |  2 +-
 .../pmd/lang/document/FileLocation.java       | 44 +++++++----------
 .../pmd/lang/document/TextPos2d.java          | 16 ++++++-
 .../sourceforge/pmd/reporting/Reportable.java |  8 ++--
 .../pmd/lang/document/TextDocumentTest.java   | 48 ++++++++++++-------
 .../pmd/lang/java/metrics/JavaMetrics.java    |  3 +-
 .../pmd/lang/ast/test/NodeExtensions.kt       |  4 +-
 .../pmd/lang/ast/test/TestUtils.kt            | 10 +++-
 14 files changed, 104 insertions(+), 71 deletions(-)

diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
index 3fb653b003..a92c78b4e6 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
@@ -226,8 +226,10 @@ public class ApexParserTest extends ApexParserTestBase {
     private int visitPosition(Node node, int count) {
         int result = count + 1;
         FileLocation loc = node.getReportLocation();
-        Assert.assertTrue(loc.getBeginLine() > 0);
-        Assert.assertTrue(loc.getBeginColumn() > 0);
+        // todo rename to getStartLine
+        Assert.assertTrue(loc.getStartLine() > 0);
+        // todo rename to getStartLine
+        Assert.assertTrue(loc.getStartColumn() > 0);
         Assert.assertTrue(loc.getEndLine() > 0);
         Assert.assertTrue(loc.getEndColumn() > 0);
         for (int i = 0; i < node.getNumChildren(); i++) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java
index e9aa2d4773..bf984af869 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleViolation.java
@@ -71,7 +71,7 @@ public interface RuleViolation {
      * @return Begin line number.
      */
     default int getBeginLine() {
-        return getLocation().getBeginLine();
+        return getLocation().getStartPos().getLine();
     }
 
     /**
@@ -81,7 +81,7 @@ public interface RuleViolation {
      * @return Begin column number.
      */
     default int getBeginColumn() {
-        return getLocation().getBeginColumn();
+        return getLocation().getStartPos().getColumn();
     }
 
     /**
@@ -91,7 +91,7 @@ public interface RuleViolation {
      * @return End line number.
      */
     default int getEndLine() {
-        return getLocation().getEndLine();
+        return getLocation().getEndPos().getLine();
     }
 
     /**
@@ -101,7 +101,7 @@ public interface RuleViolation {
      * @return End column number.
      */
     default int getEndColumn() {
-        return getLocation().getEndColumn();
+        return getLocation().getEndPos().getColumn();
     }
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
index 160d5f174a..de24b675c4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
@@ -131,10 +131,10 @@ public final class CachedRuleViolation implements RuleViolation {
         stream.writeUTF(getValueOrEmpty(violation.getRule().getName()));
         stream.writeUTF(getValueOrEmpty(violation.getRule().getLanguage().getTerseName()));
         FileLocation location = violation.getLocation();
-        stream.writeInt(location.getBeginLine());
-        stream.writeInt(location.getBeginColumn());
-        stream.writeInt(location.getEndLine());
-        stream.writeInt(location.getEndColumn());
+        stream.writeInt(location.getStartPos().getLine());
+        stream.writeInt(location.getStartPos().getColumn());
+        stream.writeInt(location.getEndPos().getColumn());
+        stream.writeInt(location.getEndPos().getColumn());
         stream.writeUTF(getValueOrEmpty(violation.getPackageName()));
         stream.writeUTF(getValueOrEmpty(violation.getClassName()));
         stream.writeUTF(getValueOrEmpty(violation.getMethodName()));
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
index 2413717bbb..1fe15d8e5d 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
@@ -78,7 +78,9 @@ public class TokenEntry implements Comparable<TokenEntry> {
     }
 
     public TokenEntry(String image, FileLocation location) {
-        this(image, location.getFileName(), location.getBeginLine(), location.getBeginColumn(), location.getEndColumn());
+        // todo rename to getStartLine
+        // todo rename to getStartLine
+        this(image, location.getFileName(), location.getStartLine(), location.getStartColumn(), location.getEndColumn());
     }
 
     private boolean isOk(int coord) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 01f555b02c..276ae14ce9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -133,8 +133,8 @@ public interface Node extends Reportable {
         @SuppressWarnings("PMD.CloseResource")
         TextDocument document = getAstInfo().getTextDocument();
         FileLocation loc = getReportLocation();
-        int startOffset = document.offsetAtLineColumn(loc.getStartLine(), loc.getStartColumn());
-        int endOffset = document.offsetAtLineColumn(loc.getEndLine(), loc.getEndColumn());
+        int startOffset = document.offsetAtLineColumn(loc.getStartPos());
+        int endOffset = document.offsetAtLineColumn(loc.getStartPos());
         return TextRegion.fromBothOffsets(startOffset, endOffset);
     }
 
@@ -144,22 +144,22 @@ public interface Node extends Reportable {
 
     @Override
     default int getBeginLine() {
-        return getReportLocation().getBeginLine();
+        return Reportable.super.getBeginLine();
     }
 
     @Override
     default int getBeginColumn() {
-        return getReportLocation().getBeginColumn();
+        return Reportable.super.getBeginColumn();
     }
 
     @Override
     default int getEndLine() {
-        return getReportLocation().getEndLine();
+        return Reportable.super.getEndLine();
     }
 
     @Override
     default int getEndColumn() {
-        return getReportLocation().getEndColumn();
+        return Reportable.super.getEndColumn();
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java
index 506f755819..ece028bb13 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/ParseException.java
@@ -124,7 +124,7 @@ public class ParseException extends FileAnalysisException {
             retval.append(']');
         }
         FileLocation loc = currentToken.next.getReportLocation();
-        retval.append(" at line ").append(loc.getBeginLine()).append(", column ").append(loc.getBeginColumn());
+        retval.append(" at ").append(loc.getStartPos().toDisplayStringInEnglish());
         retval.append('.').append(eol);
         if (expectedTokenSequences.length == 1) {
             retval.append("Was expecting:").append(eol).append("    ");
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
index a8183aa322..ee3e02fea4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
@@ -157,7 +157,7 @@ public abstract class AbstractJjtreeNode<B extends AbstractJjtreeNode<B, N>, N e
     @Override
     public String toString() {
         FileLocation loc = getReportLocation();
-        return "!debug only! [" + getXPathNodeName() + ":" + loc.getBeginLine() + ":" + loc.getBeginColumn() + "]"
+        return "!debug only! [" + getXPathNodeName() + ":" + loc.getStartPos().toDisplayStringWithColon() + "]"
             + StringUtil.elide(getText().toString(), 150, "(truncated)");
     }
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
index 41062e4cb6..498a9e15a4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
@@ -30,10 +30,8 @@ import net.sourceforge.pmd.reporting.Reportable;
 public final class FileLocation {
 
     public static final Comparator<FileLocation> COORDS_COMPARATOR =
-        Comparator.comparingInt(FileLocation::getBeginLine)
-                  .thenComparingInt(FileLocation::getBeginColumn)
-                  .thenComparingInt(FileLocation::getEndLine)
-                  .thenComparingInt(FileLocation::getEndColumn);
+        Comparator.comparing(FileLocation::getStartPos)
+                  .thenComparing(FileLocation::getEndPos);
 
 
     public static final Comparator<FileLocation> COMPARATOR =
@@ -77,16 +75,6 @@ public final class FileLocation {
         return fileName;
     }
 
-    /**
-     * Inclusive, 1-based line number.
-     *
-     * @deprecated Use {@link #getStartLine()}.
-     */
-    @Deprecated
-    public int getBeginLine() { // todo rename to getStartLine
-        return getStartLine();
-    }
-
     /** Inclusive, 1-based line number. */
     public int getStartLine() {
         return beginLine;
@@ -97,16 +85,6 @@ public final class FileLocation {
         return endLine;
     }
 
-    /**
-     * Inclusive, 1-based column number.
-     *
-     * @deprecated Use {@link #getStartColumn()}.
-     */
-    @Deprecated
-    public int getBeginColumn() { // todo rename to getStartLine
-        return getStartColumn();
-    }
-
     /** Inclusive, 1-based column number. */
     public int getStartColumn() {
         return beginColumn;
@@ -117,14 +95,28 @@ public final class FileLocation {
         return endColumn;
     }
 
+    /**
+     * Returns the start position.
+     */
     public TextPos2d getStartPos() {
         return TextPos2d.pos2d(beginLine, beginColumn);
     }
 
+
+    /**
+     * Returns the end position.
+     */
     public TextPos2d getEndPos() {
         return TextPos2d.pos2d(endLine, endColumn);
     }
 
+    /**
+     * Turn this into a range country.
+     */
+    public TextRange2d toRange2d() {
+        return TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn);
+    }
+
     /** Returns the region in the file, or null if this was not available. */
     public @Nullable TextRegion getRegionInFile() {
         return region;
@@ -134,7 +126,7 @@ public final class FileLocation {
      * Formats the start position as e.g. {@code "line 1, column 2"}.
      */
     public String startPosToString() {
-        return "line " + getBeginLine() + ", column " + getBeginColumn();
+        return getStartPos().toDisplayStringInEnglish();
     }
 
 
@@ -142,7 +134,7 @@ public final class FileLocation {
      * Formats the start position as e.g. {@code "/path/to/file:1:2"}.
      */
     public String startPosToStringWithFile() {
-        return getFileName() + ":" + getBeginLine() + ":" + getBeginColumn();
+        return getFileName() + ":" + getStartPos().toDisplayStringWithColon();
     }
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
index 1119dbe70a..bdf767af3b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
@@ -60,12 +60,26 @@ public final class TextPos2d implements Comparable<TextPos2d> {
     }
 
     /**
-     * Returns a string looking like {@code (line=2, column=4)}.
+     * Returns a string looking like {@code "(line=2, column=4)"}.
      */
     public String toTupleString() {
         return "(line=" + line + ", column=" + column + ")";
     }
 
+    /**
+     * Returns a string looking like {@code "line 2, column 4")}.
+     */
+    public String toDisplayStringInEnglish() {
+        return "line " + line + ", column " + column;
+    }
+
+    /**
+     * Returns a string looking like {@code "2:4")}.
+     */
+    public String toDisplayStringWithColon() {
+        return line + ":" + column;
+    }
+
     @Override
     public String toString() {
         return "!debug only! Pos2d(line=" + line + ", column=" + column + ")";
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/Reportable.java b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/Reportable.java
index 933d80fa62..da4d8cd53a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/reporting/Reportable.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/reporting/Reportable.java
@@ -35,7 +35,7 @@ public interface Reportable {
     @Deprecated
     @DeprecatedUntil700
     default int getBeginLine() {
-        return getReportLocation().getBeginLine();
+        return getReportLocation().getStartPos().getLine();
     }
 
 
@@ -47,7 +47,7 @@ public interface Reportable {
     @Deprecated
     @DeprecatedUntil700
     default int getEndLine() {
-        return getReportLocation().getEndLine();
+        return getReportLocation().getEndPos().getLine();
     }
 
 
@@ -59,7 +59,7 @@ public interface Reportable {
     @Deprecated
     @DeprecatedUntil700
     default int getBeginColumn() {
-        return getReportLocation().getBeginColumn();
+        return getReportLocation().getStartPos().getColumn();
     }
 
 
@@ -71,7 +71,7 @@ public interface Reportable {
     @Deprecated
     @DeprecatedUntil700
     default int getEndColumn() {
-        return getReportLocation().getEndColumn();
+        return getReportLocation().getEndPos().getColumn();
     }
 
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index 377c140c76..888fc8760b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -32,11 +32,14 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        assertEquals(1, withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
-        assertEquals("bonjour".length(), withLines.getEndColumn() - withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals("bonjour".length(), withLines.getEndColumn() - withLines.getStartColumn());
     }
 
     @Test
@@ -47,11 +50,14 @@ public class TextDocumentTest {
         assertEquals("bonjour\n", doc.sliceText(region).toString());
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        assertEquals(1, withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + "bonjour\n".length(), withLines.getEndColumn());
-        assertEquals("bonjour\n".length(), withLines.getEndColumn() - withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals("bonjour\n".length(), withLines.getEndColumn() - withLines.getStartColumn());
     }
 
     @Test
@@ -65,9 +71,11 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(2, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(2, withLines.getStartLine());
         assertEquals(2, withLines.getEndLine());
-        assertEquals(1, withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartColumn());
         assertEquals(1, withLines.getEndColumn());
     }
 
@@ -83,9 +91,11 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        assertEquals(1 + "bonjour".length(), withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1 + "bonjour".length(), withLines.getStartColumn());
         assertEquals(1 + "bonjour\n".length(), withLines.getEndColumn());
     }
 
@@ -98,9 +108,11 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        assertEquals(1, withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + doc.getLength(), withLines.getEndColumn());
     }
 
@@ -116,9 +128,11 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(3, withLines.getEndLine());
-        assertEquals(1 + "bonjou".length(), withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1 + "bonjou".length(), withLines.getStartColumn());
         assertEquals(1 + "tri".length(), withLines.getEndColumn());
     }
 
@@ -134,9 +148,11 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        assertEquals(1, withLines.getBeginLine());
+        // todo rename to getStartLine
+        assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        assertEquals(1 + "bonjour".length(), withLines.getBeginColumn());
+        // todo rename to getStartLine
+        assertEquals(1 + "bonjour".length(), withLines.getStartColumn());
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
index 882138385a..59c9d66de6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
@@ -451,7 +451,8 @@ public final class JavaMetrics {
         // the report location is now not necessarily the entire node.
         FileLocation loc = node.getTextDocument().toLocation(node.getTextRegion());
 
-        return 1 + loc.getEndLine() - loc.getBeginLine();
+        // todo rename to getStartLine
+        return 1 + loc.getEndLine() - loc.getStartLine();
     }
 
 
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
index e186ab8c17..6a1ba946b2 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
@@ -41,8 +41,8 @@ fun Node.assertTextRangeIsOk() {
 
 fun Node.assertBounds(bline: Int, bcol: Int, eline: Int, ecol: Int) {
     reportLocation.apply {
-        this::getBeginLine shouldBe bline
-        this::getBeginColumn shouldBe bcol
+        this::getStartLine shouldBe bline
+        this::getStartColumn shouldBe bcol
         this::getEndLine shouldBe eline
         this::getEndColumn shouldBe ecol
     }
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
index 7a860f97f8..f96e2c7cd4 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
@@ -97,8 +97,14 @@ fun assertSuppressed(report: Report, size: Int): List<Report.SuppressedViolation
 /** Checks the coordinates of this node. */
 fun Node.assertPosition(bline: Int, bcol: Int, eline: Int, ecol: Int) {
     reportLocation.apply {
-        this::getBeginLine shouldBe bline
-        this::getBeginColumn shouldBe bcol
+        {
+            this. // todo rename to getStartLine
+            getStartLine()
+        } shouldBe bline
+        {
+            this. // todo rename to getStartLine
+            getStartColumn()
+        } shouldBe bcol
         this::getEndLine shouldBe eline
         this::getEndColumn shouldBe ecol
     }

From 27962debc0b971c08b1236fc3da8b92fa1e6a50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 00:52:12 +0200
Subject: [PATCH 029/180] Fix build

---
 .../net/sourceforge/pmd/lang/ast/test/TestUtils.kt     | 10 ++--------
 pmd-scala-modules/pmd-scala-common/pom.xml             | 10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
index f96e2c7cd4..d43e2b1f14 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
@@ -97,14 +97,8 @@ fun assertSuppressed(report: Report, size: Int): List<Report.SuppressedViolation
 /** Checks the coordinates of this node. */
 fun Node.assertPosition(bline: Int, bcol: Int, eline: Int, ecol: Int) {
     reportLocation.apply {
-        {
-            this. // todo rename to getStartLine
-            getStartLine()
-        } shouldBe bline
-        {
-            this. // todo rename to getStartLine
-            getStartColumn()
-        } shouldBe bcol
+        this::getStartLine shouldBe bline
+        this::getStartColumn shouldBe bcol
         this::getEndLine shouldBe eline
         this::getEndColumn shouldBe ecol
     }
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 94c9cf87ce..28eb61b22a 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -23,16 +23,6 @@
                 <directory>../pmd-scala-common/src/main/resources</directory>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
-        </plugins>
         <testSourceDirectory>../pmd-scala-common/src/test/java</testSourceDirectory>
         <testResources>
             <testResource>

From 24fe7053ef76c10b8390371fecaee6aee5c582f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 15:50:58 +0200
Subject: [PATCH 030/180] Fix type inference tests

---
 .../pmd/lang/java/types/TypeCreationDsl.kt    |  1 +
 .../lang/java/types/TypeTestMockingUtil.kt    | 44 +++++++++----------
 .../internal/infer/CaptureInferenceTest.kt    |  4 +-
 .../types/internal/infer/CtorInferenceTest.kt |  6 ++-
 .../internal/infer/MethodRefInferenceTest.kt  |  9 ++--
 .../types/internal/infer/OverridingTest.kt    |  5 +--
 .../internal/infer/SpecialMethodsTest.kt      |  2 -
 .../infer/UnresolvedTypesRecoveryTest.kt      | 23 +++++-----
 8 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeCreationDsl.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeCreationDsl.kt
index b763927e41..394c26d9ba 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeCreationDsl.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeCreationDsl.kt
@@ -115,6 +115,7 @@ interface TypeDslMixin {
 
 class TypeDslOf(override val ts: TypeSystem) : TypeDslMixin
 
+fun JavaNode.withTypeDsl(f: TypeDslMixin.() -> Unit) = with(TypeDslOf(this.typeSystem), f)
 
 class WildcardDsl(override val ts: TypeSystem) : JWildcardType by ts.UNBOUNDED_WILD, TypeDslMixin {
 
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeTestMockingUtil.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeTestMockingUtil.kt
index 509994b855..116f592e01 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeTestMockingUtil.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/TypeTestMockingUtil.kt
@@ -4,11 +4,14 @@
 
 package net.sourceforge.pmd.lang.java.types
 
+import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import net.sourceforge.pmd.lang.ast.NodeStream
 import net.sourceforge.pmd.lang.ast.NodeStream.*
 import net.sourceforge.pmd.lang.java.JavaParsingHelper
 import net.sourceforge.pmd.lang.java.ast.*
+import net.sourceforge.pmd.lang.java.types.internal.infer.ExprMirror.FunctionalExprMirror
+import net.sourceforge.pmd.lang.java.types.internal.infer.ExprMirror.InvocationMirror
 import net.sourceforge.pmd.lang.java.types.internal.infer.ResolutionFailure
 import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger
 import org.mockito.ArgumentCaptor
@@ -45,35 +48,28 @@ data class TypeInferenceSpy(private val spy: TypeInferenceLogger, val ts: TypeSy
         this.shouldHaveNoErrors()
     }
 
-    fun shouldTriggerMissingCtDecl(block: TypeDslMixin.() -> Unit) {
-        this.shouldHaveNoErrors()
-        TypeDslOf(ts).block()
-        verify(spy, times(1)).noCompileTimeDeclaration(any())
+    fun shouldHaveMissingCtDecl(node: InvocationNode) {
+        verify(spy, times(1))
+            .noCompileTimeDeclaration(argThat { it.expr.location == node })
     }
 
-    fun shouldTriggerNoApplicableMethods(block: TypeDslMixin.() -> Unit) {
-        this.shouldHaveNoErrors()
-        TypeDslOf(ts).block()
-        verify(spy, times(1)).noApplicableCandidates(any())
+    fun shouldHaveNoApplicableMethods(node: InvocationNode) {
+        verify(spy, times(1))
+            .noApplicableCandidates(argThat {
+                it.expr.location == node
+            })
     }
 
-    fun shouldTriggerNoLambdaCtx(block: TypeDslMixin.() -> Unit) {
-        this.shouldHaveNoErrors()
-        TypeDslOf(ts).block()
-        val captor = ArgumentCaptor.forClass(ResolutionFailure::class.java)
-        verify(spy, times(1)).logResolutionFail(captor.capture())
-        val failure: ResolutionFailure = captor.value
-        failure.reason shouldBe "Missing target type for functional expression"
+    fun shouldHaveNoLambdaCtx(lambdaOrMref: FunctionalExpression) {
+        verify(spy, times(1))
+            .logResolutionFail(argThat {
+                it.reason == "Missing target type for functional expression"
+                        && it.location == lambdaOrMref
+            })
     }
 
-    fun resetInteractions() {
-        reset(spy)
-        `when`(spy.isNoop).thenReturn(false) // enable log for exceptions though
-    }
-
-    fun shouldBeAmbiguous(block: TypeDslMixin.() -> Unit) {
-        this.shouldHaveNoErrors()
-        TypeDslOf(ts).block()
-        verify(spy, times(1)).ambiguityError(any(), any(), any())
+    fun shouldBeAmbiguous(node: InvocationNode) {
+        verify(spy, times(1))
+            .ambiguityError(argThat { it.expr.location==node }, any(), any())
     }
 }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CaptureInferenceTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CaptureInferenceTest.kt
index 602021a9aa..b10e4b1c17 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CaptureInferenceTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CaptureInferenceTest.kt
@@ -32,7 +32,9 @@ class CaptureInferenceTest : ProcessorTestSpec({
         val setCall = acu.firstMethodCall()
         val getCall = setCall.arguments[1] as ASTMethodCall
 
-        spy.shouldTriggerMissingCtDecl {
+        spy.shouldHaveMissingCtDecl(setCall)
+
+        acu.withTypeDsl {
             val capture1 = captureMatcher(`?`)
             getCall.methodType.shouldMatchMethod(
                     named = "get",
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CtorInferenceTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CtorInferenceTest.kt
index 0b1335e62a..004d0d0d8e 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CtorInferenceTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/CtorInferenceTest.kt
@@ -322,11 +322,13 @@ class CtorInferenceTest : ProcessorTestSpec({
         )
 
         val (_, inner) = acu.declaredTypeSignatures()
-        val tvar = acu.typeVar("T")
+        val enclosingMethodCall = acu.firstMethodCall()
         val ctorCall = acu.firstCtorCall()
         val ctorSymbol = inner.constructors.first().symbol
 
-        spy.shouldTriggerMissingCtDecl { // for the enclosing method call
+        spy.shouldHaveMissingCtDecl(enclosingMethodCall)
+
+        ctorCall.withTypeDsl { // for the enclosing method call
             ctorCall.methodType.symbol shouldBe ctorSymbol
         }
     }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/MethodRefInferenceTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/MethodRefInferenceTest.kt
index 10887a01f3..cdd40aaa18 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/MethodRefInferenceTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/MethodRefInferenceTest.kt
@@ -355,12 +355,15 @@ class MethodRefInferenceTest : ProcessorTestSpec({
 
         val t_Archive = acu.firstTypeSignature()
         val mref = acu.descendants(ASTMethodReference::class.java).firstOrThrow()
+        val call = acu.firstMethodCall()
 
-        spy.shouldTriggerMissingCtDecl {
+        spy.shouldHaveMissingCtDecl(call)
+
+        acu.withTypeDsl {
             mref.referencedMethod shouldBe ts.UNRESOLVED_METHOD
             mref shouldHaveType ts.UNKNOWN
-            acu.firstMethodCall().methodType shouldBe ts.UNRESOLVED_METHOD
-            acu.firstMethodCall().overloadSelectionInfo.apply {
+            call.methodType shouldBe ts.UNRESOLVED_METHOD
+            call.overloadSelectionInfo.apply {
                 isFailed shouldBe true
             }
         }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/OverridingTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/OverridingTest.kt
index 7f41415c79..4265682cfc 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/OverridingTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/OverridingTest.kt
@@ -217,9 +217,8 @@ class F<G> {
             TypeOps.overrides(subE, supE, subE.declaringType)
         }
 
-        spy.shouldBeAmbiguous {
-            acu.firstMethodCall().methodType shouldBeSomeInstantiationOf subE
-        }
+        spy.shouldBeAmbiguous(acu.firstMethodCall())
+        acu.firstMethodCall().methodType shouldBeSomeInstantiationOf subE
     }
 
 
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/SpecialMethodsTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/SpecialMethodsTest.kt
index 21236b020a..9250f087dd 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/SpecialMethodsTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/SpecialMethodsTest.kt
@@ -60,7 +60,6 @@ class SpecialMethodsTest : ProcessorTestSpec({
                     }
                 }
             }
-            spy.resetInteractions()
         }
 
         doTest("Test Scratch<K>::getClass") {
@@ -83,7 +82,6 @@ class SpecialMethodsTest : ProcessorTestSpec({
                     }
                 }
             }
-            spy.resetInteractions()
         }
 
         doTest("Test method call") {
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
index 38cba720e5..ac45794463 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
@@ -388,7 +388,8 @@ class C {
 
         val call = acu.firstMethodCall()
 
-        spy.shouldBeAmbiguous {
+        spy.shouldBeAmbiguous(call)
+        acu.withTypeDsl {
             call.shouldMatchN {
                 methodCall("append") {
 
@@ -562,14 +563,15 @@ class C {
         val (lambda) = acu.descendants(ASTLambdaExpression::class.java).toList()
         val (mref) = acu.descendants(ASTMethodReference::class.java).toList()
 
-        spy.shouldTriggerNoApplicableMethods {
+        val (lambdaCall, mrefCall) = acu.descendants(ASTMethodCall::class.java).toList()
+
+        spy.shouldHaveNoApplicableMethods(lambdaCall)
+        spy.shouldHaveNoApplicableMethods(mrefCall)
+
+        acu.withTypeDsl {
             lambda shouldHaveType ts.UNKNOWN
             lambda.functionalMethod shouldBe ts.UNRESOLVED_METHOD
-        }
 
-        spy.resetInteractions()
-
-        spy.shouldTriggerNoApplicableMethods {
             mref shouldHaveType ts.UNKNOWN
             mref.functionalMethod shouldBe ts.UNRESOLVED_METHOD
             mref.referencedMethod shouldBe ts.UNRESOLVED_METHOD
@@ -596,14 +598,13 @@ class C {
         val (lambda) = acu.descendants(ASTLambdaExpression::class.java).toList()
         val (mref) = acu.descendants(ASTMethodReference::class.java).toList()
 
-        spy.shouldTriggerNoLambdaCtx {
+        spy.shouldHaveNoLambdaCtx(lambda)
+        spy.shouldHaveNoLambdaCtx(mref)
+
+        acu.withTypeDsl {
             lambda shouldHaveType ts.UNKNOWN
             lambda.functionalMethod shouldBe ts.UNRESOLVED_METHOD
-        }
 
-        spy.resetInteractions()
-
-        spy.shouldTriggerNoLambdaCtx {
             mref shouldHaveType ts.UNKNOWN
             mref.functionalMethod shouldBe ts.UNRESOLVED_METHOD
             mref.referencedMethod shouldBe ts.UNRESOLVED_METHOD

From d30841b200676166f45678d367f5a061179076dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 16:21:15 +0200
Subject: [PATCH 031/180] [core] Fix ast-dump CLI when reading from stdin

Bug was introduced in e64d48
---
 .../net/sourceforge/pmd/util/treeexport/TreeExportCli.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
index b5bb1a759e..cf5bb8ea9b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
@@ -162,20 +162,23 @@ public class TreeExportCli {
 
         @SuppressWarnings("PMD.CloseResource")
         Reader source;
+        String fileName;
         if (file == null && !readStdin) {
             throw bail("One of --file or --read-stdin must be mentioned");
         } else if (readStdin) {
             System.err.println("Reading from stdin...");
             source = new StringReader(readFromSystemIn());
+            fileName = "stdin";
         } else {
             source = Files.newBufferedReader(new File(file).toPath(), Charset.forName(encoding));
+            fileName = file;
         }
 
         // disable warnings for deprecated attributes
         Logger.getLogger(Attribute.class.getName()).setLevel(Level.OFF);
 
         try (Reader reader = source) {
-            Node root = AbstractParser.doParse(parser, file, reader);
+            Node root = AbstractParser.doParse(parser, fileName, reader);
             languageHandler.getQualifiedNameResolutionFacade(this.getClass().getClassLoader()).start(root);
 
             renderer.renderSubtree(root, System.out);

From 41b03fec64b239029ca078cb1d047dd141fa9da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 17:07:36 +0200
Subject: [PATCH 032/180] Make dummy parser more useful

It builds a tree now, which allows building
valid trees more easily.

The syntax is lispish: balanced parentheses
create new nodes.
---
 .../sourceforge/pmd/lang/AbstractParser.java  |  6 +-
 .../pmd/lang/DummyLanguageModule.java         | 83 +++++++++++++++++--
 .../sourceforge/pmd/lang/ast/DummyNode.java   | 17 ++++
 .../pmd/util/designer/DesignerTest.java       |  5 +-
 4 files changed, 102 insertions(+), 9 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
index b6cc16a69b..c5c0f5bfff 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
@@ -42,9 +42,13 @@ public abstract class AbstractParser implements Parser {
     @Deprecated
     public static Node doParse(Parser parser, String fileName, Reader source) {
         Node rootNode = parser.parse(fileName, source);
+        setFileName(fileName, rootNode);
+        return rootNode;
+    }
+
+    public static void setFileName(String fileName, Node rootNode) {
         // remove prefixed path segments.
         String simpleFileName = Paths.get(fileName).getFileName().toString();
         rootNode.getUserMap().set(FileNameXPathFunction.FILE_NAME_KEY, simpleFileName);
-        return rootNode;
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index 491a0854cb..3e228011cd 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,14 +12,17 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.IOUtils;
 import org.jaxen.Navigator;
 
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.ast.DummyNode;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.ParseException;
+import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
 import net.sourceforge.pmd.lang.ast.xpath.AbstractASTXPathHandler;
 import net.sourceforge.pmd.lang.ast.xpath.DocumentNavigator;
 import net.sourceforge.pmd.lang.rule.AbstractRuleChainVisitor;
@@ -110,11 +114,14 @@ public class DummyLanguageModule extends BaseLanguageModule {
             return new AbstractParser(parserOptions) {
                 @Override
                 public Node parse(String fileName, Reader source) throws ParseException {
-                    DummyNode node = new DummyNode(1);
-                    node.testingOnlySetBeginLine(1);
-                    node.testingOnlySetBeginColumn(1);
-                    node.setImage("Foo");
-                    return node;
+                    try {
+                        String text = IOUtils.toString(source);
+                        DummyRootNode rootNode = readLispNode(text);
+                        AbstractParser.setFileName(fileName, rootNode);
+                        return rootNode;
+                    } catch (IOException e) {
+                        throw new ParseException(e);
+                    }
                 }
 
                 @Override
@@ -135,7 +142,71 @@ public class DummyLanguageModule extends BaseLanguageModule {
         }
     }
 
+    /**
+     * Creates a tree of nodes that corresponds to the nesting structures
+     * of parentheses in the text. The image of each node is also populated.
+     * This is useful to create non-trivial trees with all the relevant
+     * data (eg coordinates) set properly.
+     *
+     * Eg {@code (a(b)x(c))} will create a tree with a node "a", with two
+     * children "b" and "c". "x" is ignored. The node "a" is not the root
+     * node, it has a {@link DummyRootNode} as parent, whose image is "".
+     */
+    private static DummyRootNode readLispNode(String text) {
+        final DummyRootNode root = new DummyRootNode();
+        DummyNode top = root;
+        SourceCodePositioner positioner = new SourceCodePositioner(text);
+        top.setCoords(1, 1, positioner.getLastLine(), positioner.getLastLineColumn());
+        int lastNodeStart = 0;
+        for (int i = 0; i < text.length(); i++) {
+            char c = text.charAt(i);
+            if (c == '(') {
+                DummyNode node = new DummyNode();
+                node.setParent(top);
+                top.jjtAddChild(node, top.getNumChildren());
+                // setup coordinates
+                int bline = positioner.lineNumberFromOffset(i);
+                int bcol = positioner.columnFromOffset(bline, i);
+                node.setBeginLine(bline);
+                node.setBeginColumn(bcol);
+                // cut out image
+                if (top.getImage() == null) {
+                    // image may be non null if this is not the first child of 'top'
+                    // eg in (a(b)x(c)), the image of the parent is set to "a".
+                    // When we're processing "(c", we ignore "x".
+                    String image = text.substring(lastNodeStart, i);
+                    top.setImage(image);
+                }
+                lastNodeStart = i + 1;
+                // node is the top of the stack now
+                top = node;
+            } else if (c == ')') {
+                if (top == null) {
+                    throw new ParseException("Unbalanced parentheses: " + text);
+                }
+                // setup coordinates
+                int eline = positioner.lineNumberFromOffset(i);
+                int ecol = positioner.columnFromOffset(eline, i);
+                top.setEndLine(eline);
+                top.setEndColumn(ecol);
+
+                if (top.getImage() == null) {
+                    // cut out image (if node doesn't have children it hasn't been populated yet)
+                    String image = text.substring(lastNodeStart, i);
+                    top.setImage(image);
+                    lastNodeStart = i + 1;
+                }
+                top = top.getParent();
+            }
+        }
+        if (top != root) {
+            throw new ParseException("Unbalanced parentheses: " + text);
+        }
+        return root;
+    }
+
     public static class RuleViolationFactory extends AbstractRuleViolationFactory {
+
         @Override
         protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message) {
             return createRuleViolation(rule, ruleContext, node, message, 0, 0);
@@ -143,7 +214,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
 
         @Override
         protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
-                int beginLine, int endLine) {
+                                                    int beginLine, int endLine) {
             ParametricRuleViolation<Node> rv = new ParametricRuleViolation<Node>(rule, ruleContext, node, message) {
                 public String getPackageName() {
                     this.packageName = "foo"; // just for testing variable expansion
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index c94c647ca0..14c52efded 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -31,6 +31,15 @@ public class DummyNode extends AbstractNode {
         this.xpathName = xpathName;
     }
 
+    @Override
+    public DummyNode getParent() {
+        return (DummyNode) super.getParent();
+    }
+
+    public void setParent(DummyNode node) {
+        jjtSetParent(node);
+    }
+
     public void setBeginColumn(int i) {
         beginColumn = i;
     }
@@ -39,6 +48,14 @@ public class DummyNode extends AbstractNode {
         beginLine = i;
     }
 
+    public void setEndLine(int i) {
+        super.testingOnlySetEndColumn(i);
+    }
+
+    public void setEndColumn(int i) {
+        super.testingOnlySetEndColumn(i);
+    }
+
     public void setCoords(int bline, int bcol, int eline, int ecol) {
         beginLine = bline;
         beginColumn = bcol;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java
index 631257e21d..0ef1bd6d82 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/designer/DesignerTest.java
@@ -27,7 +27,8 @@ public class DesignerTest {
                 "doesn't matter");
         String xml = Designer.getXmlTreeCode(compilationUnit);
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                + "<dummyNode BeginColumn=\"1\" BeginLine=\"1\" EndColumn=\"0\" EndLine=\"0\" FindBoundary=\"false\"\n"
-                + "           Image=\"Foo\"\n" + "           SingleLine=\"false\"/>", xml);
+                     + "<dummyNode BeginColumn=\"1\" BeginLine=\"1\" EndColumn=\"14\" EndLine=\"1\" FindBoundary=\"false\"\n"
+                     + "           Image=\"\"\n"
+                     + "           SingleLine=\"true\"/>", xml);
     }
 }

From 13e2b3342c42dedae00353c78b4109a67b9be18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 16:49:02 +0200
Subject: [PATCH 033/180] Make tree dump cli testable

---
 .../sourceforge/pmd/util/treeexport/Io.java   |  29 +++
 .../pmd/util/treeexport/TreeExportCli.java    |  94 +++++----
 .../util/treeexport/TreeExportCliTest.java    | 188 ++++++++++++++++++
 3 files changed, 272 insertions(+), 39 deletions(-)
 create mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
new file mode 100644
index 0000000000..9c40776e06
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
@@ -0,0 +1,29 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.treeexport;
+
+import java.io.InputStream;
+import java.io.PrintStream;
+
+/**
+ * Abstraction over system streams. Useful to unit-test a CLI program.
+ *
+ * @author Clément Fournier
+ */
+final class Io {
+
+    public static final Io SYSTEM = new Io(System.out, System.err, System.in);
+    public final PrintStream stdout;
+    public final PrintStream stderr;
+    public final InputStream stdin;
+
+    public Io(PrintStream stdout,
+              PrintStream stderr,
+              InputStream stdin) {
+        this.stdout = stdout;
+        this.stderr = stderr;
+        this.stdin = stdin;
+    }
+}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
index cf5bb8ea9b..161d1a0e98 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
@@ -4,21 +4,20 @@
 
 package net.sourceforge.pmd.util.treeexport;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.commons.io.input.CloseShieldInputStream;
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import net.sourceforge.pmd.annotation.Experimental;
@@ -39,6 +38,7 @@ import com.beust.jcommander.ParameterException;
 
 @Experimental
 public class TreeExportCli {
+
     @Parameter(names = { "--format", "-f" }, description = "The output format.")
     private String format = "xml";
     @Parameter(names = { "--language", "-l" }, description = "Specify the language to use.")
@@ -47,6 +47,7 @@ public class TreeExportCli {
     private String encoding = StandardCharsets.UTF_8.name();
     @DynamicParameter(names = "-P", description = "Properties for the renderer.")
     private Map<String, String> properties = new HashMap<>();
+    private final Io io;
 
     @Parameter(names = { "--help", "-h" }, description = "Display usage.", help = true)
     private boolean help;
@@ -57,33 +58,54 @@ public class TreeExportCli {
     @Parameter(names = { "--read-stdin", "-i" }, description = "Read source from standard input")
     private boolean readStdin;
 
+    TreeExportCli(Io io) {
+        this.io = io;
+    }
 
-    public static void main(String[] args) throws IOException {
-        TreeExportCli cli = new TreeExportCli();
-        JCommander jcommander = new JCommander(cli);
+    public static void main(String... args) {
+        TreeExportCli cli = new TreeExportCli(Io.SYSTEM);
+        System.exit(cli.runMain(args));
+    }
+
+    public int runMain(String... args) {
+        try {
+            return runMainOrThrow(args);
+        } catch (AbortedError e) {
+            return 1;
+        } catch (IOException e) {
+            io.stderr.println("Error: " + e);
+            e.printStackTrace(io.stderr);
+            return 1;
+        }
+    }
+
+    private int runMainOrThrow(String[] args) throws IOException {
+
+        JCommander jcommander = new JCommander(this);
 
         try {
             jcommander.parse(args);
         } catch (ParameterException e) {
-            System.err.println(e.getMessage());
-            cli.usage(jcommander);
-            System.exit(1);
+            io.stderr.println(e.getMessage());
+            usage(jcommander);
+            return 1;
         }
 
-        if (cli.help) {
-            cli.usage(jcommander);
-            System.exit(0);
+        if (help) {
+            usage(jcommander);
+            return 0;
         }
 
 
-        TreeRendererDescriptor descriptor = TreeRenderers.findById(cli.format);
+        TreeRendererDescriptor descriptor = TreeRenderers.findById(this.format);
         if (descriptor == null) {
-            throw cli.bail("Unknown format '" + cli.format + "'");
+            throw this.bail("Unknown format '" + this.format + "'");
         }
 
-        PropertySource bundle = parseProperties(cli, descriptor);
+        PropertySource bundle = parseProperties(this, descriptor);
 
-        cli.run(descriptor.produceRenderer(bundle));
+        run(descriptor.produceRenderer(bundle));
+        return 0;
     }
 
     public static PropertySource parseProperties(TreeExportCli cli, TreeRendererDescriptor descriptor) {
@@ -166,8 +188,8 @@ public class TreeExportCli {
         if (file == null && !readStdin) {
             throw bail("One of --file or --read-stdin must be mentioned");
         } else if (readStdin) {
-            System.err.println("Reading from stdin...");
-            source = new StringReader(readFromSystemIn());
+            io.stderr.println("Reading from stdin...");
+            source = readFromSystemIn();
             fileName = "stdin";
         } else {
             source = Files.newBufferedReader(new File(file).toPath(), Charset.forName(encoding));
@@ -181,28 +203,19 @@ public class TreeExportCli {
             Node root = AbstractParser.doParse(parser, fileName, reader);
             languageHandler.getQualifiedNameResolutionFacade(this.getClass().getClassLoader()).start(root);
 
-            renderer.renderSubtree(root, System.out);
+            renderer.renderSubtree(root, io.stdout);
         }
     }
 
-    private String readFromSystemIn() {
-
-
-        StringBuilder sb = new StringBuilder();
-        try (Scanner scanner = new Scanner(new CloseShieldInputStream(System.in))) {
-            while (scanner.hasNextLine()) {
-                sb.append(scanner.nextLine());
-            }
-        }
-        return sb.toString();
-
+    private Reader readFromSystemIn() {
+        return new BufferedReader(new InputStreamReader(io.stdin));
     }
 
     private void printWarning() {
-        System.err.println("-------------------------------------------------------------------------------");
-        System.err.println("This command line utility is experimental. It might change at any time without");
-        System.err.println("prior notice.");
-        System.err.println("-------------------------------------------------------------------------------");
+        io.stderr.println("-------------------------------------------------------------------------------");
+        io.stderr.println("This command line utility is experimental. It might change at any time without");
+        io.stderr.println("prior notice.");
+        io.stderr.println("-------------------------------------------------------------------------------");
     }
 
     private static <T> void setProperty(PropertyDescriptor<T> descriptor, PropertySource bundle, String value) {
@@ -210,10 +223,13 @@ public class TreeExportCli {
     }
 
 
-    private RuntimeException bail(String message) {
-        System.err.println(message);
-        System.err.println("Use --help for usage information");
-        System.exit(1);
-        return new RuntimeException();
+    private AbortedError bail(String message) {
+        io.stderr.println(message);
+        io.stderr.println("Use --help for usage information");
+        return new AbortedError();
+    }
+
+    private static class AbortedError extends Error {
+
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
new file mode 100644
index 0000000000..b82713f200
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
@@ -0,0 +1,188 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util.treeexport;
+
+import static org.hamcrest.Matchers.containsString;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import net.sourceforge.pmd.lang.ast.DummyNode;
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.properties.PropertyDescriptor;
+import net.sourceforge.pmd.properties.PropertySource;
+
+/**
+ *
+ */
+public class TreeExportCliTest {
+
+    @Rule
+    public TemporaryFolder tmp = new TemporaryFolder();
+
+    @Test
+    public void testReadStandardInput() {
+        IoSpy spy = IoSpy.withStdin("(a(b))");
+        int status = spy.runMain("-i", "-f", "xml");
+        Assert.assertEquals(0, status);
+        spy.assertThatStdout(containsString("<?xml version='1.0' encoding='UTF-8' ?>\n"
+                                            + "<dummyNode Image=''>\n"
+                                            + "    <dummyNode Image='a'>\n"
+                                            + "        <dummyNode Image='b' />\n"
+                                            + "    </dummyNode>\n"
+                                            + "</dummyNode>"));
+    }
+
+    @Test
+    public void testReadFile() throws IOException {
+        File file = newFileWithContents("(a(b))");
+        IoSpy spy = new IoSpy();
+        int status = spy.runMain("--file", file.getAbsolutePath(), "-f", "xml");
+        Assert.assertEquals(0, status);
+        spy.assertThatStdout(containsString("<?xml version='1.0' encoding='UTF-8' ?>\n"
+                                            + "<dummyNode Image=''>\n"
+                                            + "    <dummyNode Image='a'>\n"
+                                            + "        <dummyNode Image='b' />\n"
+                                            + "    </dummyNode>\n"
+                                            + "</dummyNode>"));
+    }
+
+    private File newFileWithContents(String data) throws IOException {
+        File file = tmp.newFile();
+        try (BufferedWriter br = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
+            br.write(data);
+        }
+        return file;
+    }
+
+    private static InputStream stdinContaining(String input) {
+        return IOUtils.toInputStream(input, StandardCharsets.UTF_8);
+    }
+
+    static class IoSpy {
+
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final ByteArrayOutputStream err = new ByteArrayOutputStream();
+        final Io io;
+
+        IoSpy(InputStream stdin) {
+            io = new Io(new PrintStream(out), new PrintStream(err), stdin);
+        }
+
+        IoSpy() {
+            this(stdinContaining(""));
+        }
+
+        void assertThatStdout(Matcher<? super String> str) {
+            MatcherAssert.assertThat("stdout", out.toString(), str);
+        }
+
+        int runMain(String... args) {
+            return new TreeExportCli(io).runMain(args);
+        }
+
+        static IoSpy withStdin(String contents) {
+            return new IoSpy(stdinContaining(contents));
+        }
+    }
+
+    @Test
+    public void testXmlPropertiesAvailable() {
+
+
+        PropertySource properties = TreeRenderers.XML.newPropertyBundle();
+
+        MatcherAssert.assertThat(properties.getPropertyDescriptors(),
+                                 Matchers.<PropertyDescriptor<?>>containsInAnyOrder(TreeRenderers.XML_LINE_SEPARATOR,
+                                                                                    TreeRenderers.XML_RENDER_COMMON_ATTRIBUTES,
+                                                                                    TreeRenderers.XML_RENDER_PROLOG,
+                                                                                    TreeRenderers.XML_USE_SINGLE_QUOTES));
+
+    }
+
+    @Test
+    public void testXmlDescriptorDump() throws IOException {
+
+        PropertySource bundle = TreeRenderers.XML.newPropertyBundle();
+
+        bundle.setProperty(TreeRenderers.XML_RENDER_PROLOG, false);
+        bundle.setProperty(TreeRenderers.XML_USE_SINGLE_QUOTES, false);
+        bundle.setProperty(TreeRenderers.XML_LINE_SEPARATOR, "\n");
+
+        TreeRenderer renderer = TreeRenderers.XML.produceRenderer(bundle);
+
+        StringBuilder out = new StringBuilder();
+
+        renderer.renderSubtree(dummyTree1(), out);
+        Assert.assertEquals("<dummyNode foo=\"bar\" ohio=\"4\">\n"
+                            + "    <dummyNode o=\"ha\" />\n"
+                            + "    <dummyNode />\n"
+                            + "</dummyNode>\n", out.toString());
+
+    }
+
+
+    public MyDummyNode dummyTree1() {
+        MyDummyNode dummy = new MyDummyNode();
+
+        dummy.setXPathAttribute("foo", "bar");
+        dummy.setXPathAttribute("ohio", "4");
+
+        MyDummyNode dummy1 = new MyDummyNode();
+
+        dummy1.setXPathAttribute("o", "ha");
+
+        MyDummyNode dummy2 = new MyDummyNode();
+
+        dummy.jjtAddChild(dummy1, 0);
+        dummy.jjtAddChild(dummy2, 1);
+        return dummy;
+    }
+
+    private static class MyDummyNode extends DummyNode {
+
+
+        private final Map<String, String> attributes = new HashMap<>();
+
+        public void setXPathAttribute(String name, String value) {
+            attributes.put(name, value);
+        }
+
+        @Override
+        public Iterator<Attribute> getXPathAttributesIterator() {
+
+            List<Attribute> attrs = new ArrayList<>();
+            for (String name : attributes.keySet()) {
+                attrs.add(new Attribute(this, name, attributes.get(name)));
+            }
+
+            return attrs.iterator();
+        }
+
+
+    }
+
+
+}

From 5485794da51bfbe2f4ed039ade630eb4b4a26f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 3 Apr 2022 17:55:34 +0200
Subject: [PATCH 034/180] Cleanup some tests

---
 .../pmd/lang/DummyLanguageModule.java         | 17 +++-
 .../sourceforge/pmd/lang/ast/DummyNode.java   | 29 ++++++
 .../util/treeexport/TreeExportCliTest.java    | 89 -------------------
 .../util/treeexport/TreeRenderersTest.java    | 46 ++--------
 .../util/treeexport/XmlTreeRendererTest.java  | 66 +++-----------
 5 files changed, 62 insertions(+), 185 deletions(-)

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index 3e228011cd..a439fa10db 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -54,12 +54,27 @@ public class DummyLanguageModule extends BaseLanguageModule {
         addVersion("1.8", new Handler(), "8");
     }
 
+    public static Language getInstance() {
+        return LanguageRegistry.getLanguage(NAME);
+    }
+
+    public static DummyRootNode parse(String code) {
+        return parse(code, "nofilename");
+    }
+
+    public static DummyRootNode parse(String code, String filename) {
+        DummyRootNode rootNode = readLispNode(code);
+        AbstractParser.setFileName(filename, rootNode);
+        return rootNode;
+    }
+
     /**
      * @deprecated for removal with PMD 7. A language dependent rule chain visitor is not needed anymore.
-     *      See {@link RuleChainVisitor}.
+     *     See {@link RuleChainVisitor}.
      */
     @Deprecated
     public static class DummyRuleChainVisitor extends AbstractRuleChainVisitor {
+
         @Override
         protected void visit(Rule rule, Node node, RuleContext ctx) {
             rule.apply(Arrays.asList(node), ctx);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index 14c52efded..44a42b0691 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -5,13 +5,18 @@
 package net.sourceforge.pmd.lang.ast;
 
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 import net.sourceforge.pmd.lang.ast.xpath.internal.FileNameXPathFunction;
 
 public class DummyNode extends AbstractNode {
 
     private final boolean findBoundary;
     private final String xpathName;
+    private final List<Attribute> attributes = new ArrayList<>();
 
     public DummyNode(int id) {
         this(id, false);
@@ -29,6 +34,11 @@ public class DummyNode extends AbstractNode {
         super(id);
         this.findBoundary = findBoundary;
         this.xpathName = xpathName;
+
+        Iterator<Attribute> iter = super.getXPathAttributesIterator();
+        while (iter.hasNext()) {
+            attributes.add(iter.next());
+        }
     }
 
     @Override
@@ -36,6 +46,11 @@ public class DummyNode extends AbstractNode {
         return (DummyNode) super.getParent();
     }
 
+    @Override
+    public DummyNode getChild(int index) {
+        return (DummyNode) super.getChild(index);
+    }
+
     public void setParent(DummyNode node) {
         jjtSetParent(node);
     }
@@ -78,6 +93,20 @@ public class DummyNode extends AbstractNode {
         return findBoundary;
     }
 
+    public void setXPathAttribute(String name, String value) {
+        attributes.add(new Attribute(this, name, value));
+    }
+
+
+    public void clearXPathAttributes() {
+        attributes.clear();
+    }
+
+    @Override
+    public Iterator<Attribute> getXPathAttributesIterator() {
+        return attributes.iterator();
+    }
+
     public static class DummyRootNode extends DummyNode implements RootNode {
 
         public DummyRootNode() {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
index b82713f200..5cdbc54839 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
@@ -14,26 +14,15 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-import net.sourceforge.pmd.properties.PropertyDescriptor;
-import net.sourceforge.pmd.properties.PropertySource;
-
 /**
  *
  */
@@ -107,82 +96,4 @@ public class TreeExportCliTest {
             return new IoSpy(stdinContaining(contents));
         }
     }
-
-    @Test
-    public void testXmlPropertiesAvailable() {
-
-
-        PropertySource properties = TreeRenderers.XML.newPropertyBundle();
-
-        MatcherAssert.assertThat(properties.getPropertyDescriptors(),
-                                 Matchers.<PropertyDescriptor<?>>containsInAnyOrder(TreeRenderers.XML_LINE_SEPARATOR,
-                                                                                    TreeRenderers.XML_RENDER_COMMON_ATTRIBUTES,
-                                                                                    TreeRenderers.XML_RENDER_PROLOG,
-                                                                                    TreeRenderers.XML_USE_SINGLE_QUOTES));
-
-    }
-
-    @Test
-    public void testXmlDescriptorDump() throws IOException {
-
-        PropertySource bundle = TreeRenderers.XML.newPropertyBundle();
-
-        bundle.setProperty(TreeRenderers.XML_RENDER_PROLOG, false);
-        bundle.setProperty(TreeRenderers.XML_USE_SINGLE_QUOTES, false);
-        bundle.setProperty(TreeRenderers.XML_LINE_SEPARATOR, "\n");
-
-        TreeRenderer renderer = TreeRenderers.XML.produceRenderer(bundle);
-
-        StringBuilder out = new StringBuilder();
-
-        renderer.renderSubtree(dummyTree1(), out);
-        Assert.assertEquals("<dummyNode foo=\"bar\" ohio=\"4\">\n"
-                            + "    <dummyNode o=\"ha\" />\n"
-                            + "    <dummyNode />\n"
-                            + "</dummyNode>\n", out.toString());
-
-    }
-
-
-    public MyDummyNode dummyTree1() {
-        MyDummyNode dummy = new MyDummyNode();
-
-        dummy.setXPathAttribute("foo", "bar");
-        dummy.setXPathAttribute("ohio", "4");
-
-        MyDummyNode dummy1 = new MyDummyNode();
-
-        dummy1.setXPathAttribute("o", "ha");
-
-        MyDummyNode dummy2 = new MyDummyNode();
-
-        dummy.jjtAddChild(dummy1, 0);
-        dummy.jjtAddChild(dummy2, 1);
-        return dummy;
-    }
-
-    private static class MyDummyNode extends DummyNode {
-
-
-        private final Map<String, String> attributes = new HashMap<>();
-
-        public void setXPathAttribute(String name, String value) {
-            attributes.put(name, value);
-        }
-
-        @Override
-        public Iterator<Attribute> getXPathAttributesIterator() {
-
-            List<Attribute> attrs = new ArrayList<>();
-            for (String name : attributes.keySet()) {
-                attrs.add(new Attribute(this, name, attributes.get(name)));
-            }
-
-            return attrs.iterator();
-        }
-
-
-    }
-
-
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeRenderersTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeRenderersTest.java
index 8b3dd7178b..53f09b5b33 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeRenderersTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeRenderersTest.java
@@ -5,11 +5,6 @@
 package net.sourceforge.pmd.util.treeexport;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -18,8 +13,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.properties.PropertySource;
 
@@ -74,45 +69,18 @@ public class TreeRenderersTest {
     }
 
 
-    public MyDummyNode dummyTree1() {
-        MyDummyNode dummy = new MyDummyNode();
-
+    public static DummyNode dummyTree1() {
+        DummyNode dummy = DummyLanguageModule.parse("(parent(child1)(child2))").getChild(0);
+        dummy.clearXPathAttributes();
         dummy.setXPathAttribute("foo", "bar");
         dummy.setXPathAttribute("ohio", "4");
 
-        MyDummyNode dummy1 = new MyDummyNode();
-
+        DummyNode dummy1 = dummy.getChild(0);
+        dummy1.clearXPathAttributes();
         dummy1.setXPathAttribute("o", "ha");
-
-        MyDummyNode dummy2 = new MyDummyNode();
-
-        dummy.jjtAddChild(dummy1, 0);
-        dummy.jjtAddChild(dummy2, 1);
+        dummy.getChild(1).clearXPathAttributes();
         return dummy;
     }
 
-    private static class MyDummyNode extends DummyNode {
-
-
-        private final Map<String, String> attributes = new HashMap<>();
-
-        public void setXPathAttribute(String name, String value) {
-            attributes.put(name, value);
-        }
-
-        @Override
-        public Iterator<Attribute> getXPathAttributesIterator() {
-
-            List<Attribute> attrs = new ArrayList<>();
-            for (String name : attributes.keySet()) {
-                attrs.add(new Attribute(this, name, attributes.get(name)));
-            }
-
-            return attrs.iterator();
-        }
-
-
-    }
-
 
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java
index d327cf8dfb..e8aa02cb15 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/XmlTreeRendererTest.java
@@ -5,11 +5,6 @@
 package net.sourceforge.pmd.util.treeexport;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Rule;
@@ -31,7 +26,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testRenderWithAttributes() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlRenderingConfig strat = new XmlRenderingConfig();
         strat.lineSeparator("\n");
@@ -53,7 +48,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testRenderWithCustomLineSep() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlRenderingConfig strat = new XmlRenderingConfig();
         strat.lineSeparator("\r\n");
@@ -75,7 +70,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testRenderWithCustomIndent() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlRenderingConfig strat = new XmlRenderingConfig().lineSeparator("").indentWith("");
 
@@ -97,7 +92,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testRenderWithNoAttributes() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlRenderingConfig strat = new XmlRenderingConfig() {
             @Override
@@ -124,7 +119,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testRenderFilterAttributes() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlRenderingConfig strategy = new XmlRenderingConfig() {
             @Override
@@ -150,7 +145,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testInvalidAttributeName() throws IOException {
 
-        MyDummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         dummy.setXPathAttribute("&notAName", "foo");
 
@@ -171,7 +166,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testEscapeAttributes() throws IOException {
 
-        MyDummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         dummy.setXPathAttribute("eh", " 'a &> b\" ");
 
@@ -194,7 +189,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testEscapeDoubleAttributes() throws IOException {
 
-        MyDummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         dummy.setXPathAttribute("eh", " 'a &> b\" ");
 
@@ -217,7 +212,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testNoProlog() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
 
         XmlRenderingConfig strat = new XmlRenderingConfig().lineSeparator("\n").renderProlog(false);
@@ -239,7 +234,7 @@ public class XmlTreeRendererTest {
     @Test
     public void testDefaultLineSep() throws IOException {
 
-        DummyNode dummy = dummyTree1();
+        DummyNode dummy = TreeRenderersTest.dummyTree1();
 
         XmlTreeRenderer renderer = new XmlTreeRenderer();
 
@@ -257,45 +252,4 @@ public class XmlTreeRendererTest {
     }
 
 
-    public MyDummyNode dummyTree1() {
-        MyDummyNode dummy = new MyDummyNode();
-
-        dummy.setXPathAttribute("foo", "bar");
-        dummy.setXPathAttribute("ohio", "4");
-
-        MyDummyNode dummy1 = new MyDummyNode();
-
-        dummy1.setXPathAttribute("o", "ha");
-
-        MyDummyNode dummy2 = new MyDummyNode();
-
-        dummy.jjtAddChild(dummy1, 0);
-        dummy.jjtAddChild(dummy2, 1);
-        return dummy;
-    }
-
-    private static class MyDummyNode extends DummyNode {
-
-
-        private final Map<String, String> attributes = new HashMap<>();
-
-        public void setXPathAttribute(String name, String value) {
-            attributes.put(name, value);
-        }
-
-        @Override
-        public Iterator<Attribute> getXPathAttributesIterator() {
-
-            List<Attribute> attrs = new ArrayList<>();
-            for (String name : attributes.keySet()) {
-                attrs.add(new Attribute(this, name, attributes.get(name)));
-            }
-
-            return attrs.iterator();
-        }
-
-
-    }
-
-
 }

From 9888ca485183f3c55885916d6e4093b8f3aa6f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 5 Apr 2022 00:00:00 +0200
Subject: [PATCH 035/180] checkstyle

---
 .../src/main/java/net/sourceforge/pmd/util/treeexport/Io.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
index 9c40776e06..74380498f3 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/Io.java
@@ -19,9 +19,7 @@ final class Io {
     public final PrintStream stderr;
     public final InputStream stdin;
 
-    public Io(PrintStream stdout,
-              PrintStream stderr,
-              InputStream stdin) {
+    Io(PrintStream stdout, PrintStream stderr, InputStream stdin) {
         this.stdout = stdout;
         this.stderr = stderr;
         this.stdin = stdin;

From 00da4fe48aad85f115e5475976d9f2e2f1aee8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Wed, 6 Apr 2022 09:08:55 +0200
Subject: [PATCH 036/180] Add names for line separators

---
 .../pmd/util/treeexport/TreeRenderers.java    |  4 +++-
 .../pmd/util/treeexport/XmlTreeRenderer.java  | 24 +++++++++++++++++--
 .../util/treeexport/TreeExportCliTest.java    |  4 ++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeRenderers.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeRenderers.java
index 8f47c9c9e8..bf5226686a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeRenderers.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeRenderers.java
@@ -50,7 +50,9 @@ public final class TreeRenderers {
 
     static final PropertyDescriptor<String> XML_LINE_SEPARATOR =
         PropertyFactory.stringProperty("lineSeparator")
-                       .desc("Line separator to use. The default is platform-specific.")
+                       .desc("Line separator to use. The default is platform-specific. "
+                             + "The values 'CR', 'CRLF', 'LF', '\\r', '\\r\\n' and '\\n' can be used "
+                             + "to represent a carriage return, line feed and their combination more easily.")
                        .defaultValue(System.lineSeparator())
                        .build();
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/XmlTreeRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/XmlTreeRenderer.java
index 3c41cf6ea4..076b7eb525 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/XmlTreeRenderer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/XmlTreeRenderer.java
@@ -221,15 +221,35 @@ public final class XmlTreeRenderer implements TreeRenderer {
 
         /**
          * Sets the string that should be used to separate lines. The
-         * default is the platform-specific line separator.
+         * default is the platform-specific line separator. The following
+         * special values are interpreted specially: {@code CR}, {@code CRLF},
+         * {@code LF}, {@code \r}, {@code \r\n} and {@code \n}. The latter
+         * three use literal backslashes and are interpreted like Java
+         * escapes. The former three are named aliases for the same.
          *
          * @throws NullPointerException If the argument is null
          */
         public XmlRenderingConfig lineSeparator(String lineSeparator) {
-            this.lineSeparator = Objects.requireNonNull(lineSeparator);
+            this.lineSeparator = interpretLineSep(lineSeparator);
             return this;
         }
 
+        private static String interpretLineSep(String lineSeparator) {
+            switch (lineSeparator) {
+            case "CR":
+            case "\\r":
+                return "\r";
+            case "CRLF":
+            case "\\r\\n":
+                return "\r\n";
+            case "LF":
+            case "\\n":
+                return "\n";
+            default:
+                return lineSeparator;
+            }
+        }
+
         /**
          * Sets the delimiters use for attribute values. The default is
          * to use single quotes.
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
index 5cdbc54839..edcf3e660b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/treeexport/TreeExportCliTest.java
@@ -34,7 +34,7 @@ public class TreeExportCliTest {
     @Test
     public void testReadStandardInput() {
         IoSpy spy = IoSpy.withStdin("(a(b))");
-        int status = spy.runMain("-i", "-f", "xml");
+        int status = spy.runMain("-i", "-f", "xml", "-PlineSeparator=LF");
         Assert.assertEquals(0, status);
         spy.assertThatStdout(containsString("<?xml version='1.0' encoding='UTF-8' ?>\n"
                                             + "<dummyNode Image=''>\n"
@@ -48,7 +48,7 @@ public class TreeExportCliTest {
     public void testReadFile() throws IOException {
         File file = newFileWithContents("(a(b))");
         IoSpy spy = new IoSpy();
-        int status = spy.runMain("--file", file.getAbsolutePath(), "-f", "xml");
+        int status = spy.runMain("--file", file.getAbsolutePath(), "-f", "xml", "-PlineSeparator=LF");
         Assert.assertEquals(0, status);
         spy.assertThatStdout(containsString("<?xml version='1.0' encoding='UTF-8' ?>\n"
                                             + "<dummyNode Image=''>\n"

From 1ed96bb52bf4137f8c5e98e4d05dadce0ac077a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 7 Apr 2022 22:07:00 +0200
Subject: [PATCH 037/180] Move misplaced field

---
 .../net/sourceforge/pmd/util/treeexport/TreeExportCli.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
index 161d1a0e98..2916bde9e0 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
@@ -47,17 +47,15 @@ public class TreeExportCli {
     private String encoding = StandardCharsets.UTF_8.name();
     @DynamicParameter(names = "-P", description = "Properties for the renderer.")
     private Map<String, String> properties = new HashMap<>();
-    private final Io io;
-
     @Parameter(names = { "--help", "-h" }, description = "Display usage.", help = true)
     private boolean help;
-
     @Parameter(names = "--file", description = "The file to dump")
     private String file;
-
     @Parameter(names = { "--read-stdin", "-i" }, description = "Read source from standard input")
     private boolean readStdin;
 
+    private final Io io;
+
     TreeExportCli(Io io) {
         this.io = io;
     }

From ddb0ecfceb7c4bdb3c07c8a23d4078877244b7a1 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 8 Apr 2022 15:30:25 +0200
Subject: [PATCH 038/180] [java] Fix UseArraysAsList with method calls

- Fixes #3867
---
 docs/pages/release_notes.md                   |  2 ++
 .../resources/category/java/performance.xml   | 12 ++++++----
 .../rule/performance/xml/UseArraysAsList.xml  | 24 +++++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 262bf7df56..66deb1df5f 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -17,6 +17,8 @@ This is a {{ site.pmd.release_type }} release.
 ### Fixed Issues
 * core
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
+* java-performance
+  * [#3867](https://github.com/pmd/pmd/issues/3867): \[java] UseArraysAsList with method call
 
 ### API Changes
 
diff --git a/pmd-java/src/main/resources/category/java/performance.xml b/pmd-java/src/main/resources/category/java/performance.xml
index 6f2f1f49d5..de0987520d 100644
--- a/pmd-java/src/main/resources/category/java/performance.xml
+++ b/pmd-java/src/main/resources/category/java/performance.xml
@@ -998,6 +998,8 @@ You must use `new ArrayList<>(Arrays.asList(...))` if that is inconvenient for y
                 PrimaryPrefix/Name/@Image = ancestor::MethodDeclaration[1]//FormalParameter/VariableDeclaratorId[@ArrayType=true()]/@Name
                 and PrimarySuffix/Expression/PrimaryExpression/PrimaryPrefix/Name
             ]
+            (: ignore method calls :)
+            [not(PrimarySuffix/Arguments)]
         ]
       ]
 ]]>
@@ -1009,12 +1011,14 @@ You must use `new ArrayList<>(Arrays.asList(...))` if that is inconvenient for y
 public class Test {
     public void foo(Integer[] ints) {
         // could just use Arrays.asList(ints)
-        List<Integer> l= new ArrayList<>(100);
-        for (int i=0; i< 100; i++) {
+        List<Integer> l = new ArrayList<>(100);
+        for (int i = 0; i < 100; i++) {
             l.add(ints[i]);
         }
-        for (int i=0; i< 100; i++) {
-            l.add(a[i].toString()); // won't trigger the rule
+
+        List<Integer> anotherList = new ArrayList<>();
+        for (int i = 0; i < 100; i++) {
+            anotherList.add(ints[i].toString()); // won't trigger the rule
         }
     }
 }
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/performance/xml/UseArraysAsList.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/performance/xml/UseArraysAsList.xml
index 467a414020..df5c9d6c0a 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/performance/xml/UseArraysAsList.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/performance/xml/UseArraysAsList.xml
@@ -163,6 +163,30 @@ public class UseArraysAsListFN {
         }
         return result;
     }
+}
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>[java] UseArraysAsList with method call #3867</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>9</expected-linenumbers>
+        <code><![CDATA[
+import java.util.ArrayList;
+import java.util.List;
+
+public class Test {
+    public void foo(Integer[] ints) {
+        // could just use Arrays.asList(ints)
+        List<Integer> l = new ArrayList<>(100);
+        for (int i = 0; i < 100; i++) {
+            l.add(ints[i]); // line 9, here is the violation
+        }
+        List<Integer> anotherList = new ArrayList<>();
+        for (int i = 0; i < 100; i++) {
+            anotherList.add(ints[i].toString()); // line 13 - false positive
+        }
+    }
 }
         ]]></code>
     </test-code>

From eab61f9f0697cf387421e3cd3a244edd8896370b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 8 Apr 2022 15:44:14 +0200
Subject: [PATCH 039/180] Revert "[core] Make Report mutable"

This reverts commit 8998d0e3a4a0a8e7010d2d758a69e420f47f29af.
---
 .../main/java/net/sourceforge/pmd/Report.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index 799c763533..cd4c3c5b96 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -548,38 +548,38 @@ public class Report implements Iterable<RuleViolation> {
 
 
     /**
-     * Returns a list of violations that were suppressed.
+     * Returns an unmodifiable list of violations that were suppressed.
      */
     public final List<SuppressedViolation> getSuppressedViolations() {
-        return suppressedRuleViolations;
+        return Collections.unmodifiableList(suppressedRuleViolations);
     }
 
     /**
-     * Returns a list of violations that have been
+     * Returns an unmodifiable list of violations that have been
      * recorded until now. None of those violations were suppressed.
      *
      * <p>The violations list is sorted with {@link RuleViolation#DEFAULT_COMPARATOR}.
      */
     public final List<RuleViolation> getViolations() {
-        return violations;
+        return Collections.unmodifiableList(violations);
     }
 
 
     /**
-     * Returns a list of processing errors that have been
+     * Returns an unmodifiable list of processing errors that have been
      * recorded until now.
      */
     public final List<ProcessingError> getProcessingErrors() {
-        return errors;
+        return Collections.unmodifiableList(errors);
     }
 
 
     /**
-     * Returns a list of configuration errors that have
+     * Returns an unmodifiable list of configuration errors that have
      * been recorded until now.
      */
     public final List<ConfigurationError> getConfigurationErrors() {
-        return configErrors;
+        return Collections.unmodifiableList(configErrors);
     }
 
 

From 12508a209e00629d00ca58a1db6a7d2dad0e40f4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 8 Apr 2022 16:38:03 +0200
Subject: [PATCH 040/180] [core] Add Report#filterViolations and Report#union

- Fixes #3792
---
 .../main/java/net/sourceforge/pmd/Report.java | 81 +++++++++++++++++++
 .../net/sourceforge/pmd/util/Predicate.java   | 16 ++++
 .../java/net/sourceforge/pmd/ReportTest.java  | 43 ++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index cd4c3c5b96..fc097d2ae9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -26,6 +26,7 @@ import net.sourceforge.pmd.renderers.AbstractAccumulatingRenderer;
 import net.sourceforge.pmd.stat.Metric;
 import net.sourceforge.pmd.util.DateTimeUtil;
 import net.sourceforge.pmd.util.NumericConstants;
+import net.sourceforge.pmd.util.Predicate;
 
 /**
  * A {@link Report} is the output of a PMD execution. This
@@ -34,6 +35,15 @@ import net.sourceforge.pmd.util.NumericConstants;
  * a report (see {@link PmdAnalysis#performAnalysisAndCollectReport()})
  * The mutation methods on this class are deprecated, as they will be
  * internalized in PMD 7.
+ *
+ * <p>For special use cases, like filtering the report after PMD analysis and
+ * before rendering the report, some limited mutating operations are provided:
+ * <ul>
+ *     <li>{@link #filterViolations(Predicate)}</li>
+ *     <li>{@link #union(Report)}</li>
+ * </ul>
+ * These methods create a new {@link Report} rather than modifying it.
+ * </p>
  */
 public class Report implements Iterable<RuleViolation> {
 
@@ -682,4 +692,75 @@ public class Report implements Iterable<RuleViolation> {
     public void addListeners(List<ThreadSafeReportListener> allListeners) {
         listeners.addAll(allListeners);
     }
+
+    /**
+     * Creates a new report taking all the information from this report,
+     * but filtering the violations.
+     *
+     * @param filter when true, the violation will be kept.
+     * @return copy of this report
+     */
+    public Report filterViolations(Predicate<RuleViolation> filter) {
+        Report copy = new Report();
+        copy.start = start;
+        copy.end = end;
+
+        for (RuleViolation violation : violations) {
+            if (filter.test(violation)) {
+                copy.addRuleViolation(violation);
+            }
+        }
+
+        copy.linesToSuppress.putAll(linesToSuppress);
+        copy.suppressedRuleViolations.addAll(suppressedRuleViolations);
+        copy.metrics.addAll(metrics);
+        copy.errors.addAll(errors);
+        copy.configErrors.addAll(configErrors);
+        return copy;
+    }
+
+    /**
+     * Creates a new report by combining this report with another report.
+     * This is similar to {@link #merge(Report)}, but instead a new report
+     * is created.
+     *
+     * @param other the other report to combine
+     * @return
+     */
+    public Report union(Report other) {
+        Report copy = new Report();
+
+        if (other.start < start) {
+            copy.start = other.start;
+        } else {
+            copy.start = start;
+        }
+        if (other.end > end) {
+            copy.end = other.end;
+        } else {
+            copy.end = end;
+        }
+
+        for (RuleViolation violation : violations) {
+            copy.addRuleViolation(violation);
+        }
+        for (RuleViolation violation : other.violations) {
+            copy.addRuleViolation(violation);
+        }
+
+        copy.linesToSuppress.putAll(linesToSuppress);
+        copy.linesToSuppress.putAll(other.linesToSuppress);
+
+        copy.suppressedRuleViolations.addAll(suppressedRuleViolations);
+        copy.suppressedRuleViolations.addAll(other.suppressedRuleViolations);
+
+        copy.metrics.addAll(metrics);
+        copy.metrics.addAll(other.metrics);
+        copy.errors.addAll(errors);
+        copy.errors.addAll(other.errors);
+        copy.configErrors.addAll(configErrors);
+        copy.configErrors.addAll(other.configErrors);
+
+        return copy;
+    }
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java
new file mode 100644
index 0000000000..524958f415
--- /dev/null
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java
@@ -0,0 +1,16 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util;
+
+/**
+ * Simple predicate of one argument.
+ *
+ * @param <T> the type of the input to the predicate
+ */
+// TODO java8 - replace with java.util.function.Predicate
+public interface Predicate<T> {
+
+    boolean test(T t);
+}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
index 41575d8a38..ad4af56ad0 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
@@ -23,6 +23,7 @@ import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.renderers.XMLRenderer;
 import net.sourceforge.pmd.stat.Metric;
+import net.sourceforge.pmd.util.Predicate;
 
 public class ReportTest implements ThreadSafeReportListener {
 
@@ -168,6 +169,48 @@ public class ReportTest implements ThreadSafeReportListener {
         assertEquals(2, treeCount);
     }
 
+    @Test
+    public void testFilterViolations() {
+        Report r = new Report();
+        RuleContext ctx = new RuleContext();
+        Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
+        Node node1 = getNode(5, 5);
+        r.addRuleViolation(new ParametricRuleViolation<>(rule, ctx, node1, rule.getMessage()));
+        Node node2 = getNode(5, 6);
+        r.addRuleViolation(new ParametricRuleViolation<>(rule, ctx, node2, "to be filtered"));
+
+        Report filtered = r.filterViolations(new Predicate<RuleViolation>() {
+            @Override
+            public boolean test(RuleViolation ruleViolation) {
+                return !("to be filtered".equals(ruleViolation.getDescription()));
+            }
+        });
+
+        assertEquals(1, filtered.getViolations().size());
+        assertEquals("msg", filtered.getViolations().get(0).getDescription());
+    }
+
+    @Test
+    public void testUnion() {
+        RuleContext ctx = new RuleContext();
+        Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
+
+        Report report1 = new Report();
+        report1.start();
+        Node node1 = getNode(1, 2);
+        report1.addRuleViolation(new ParametricRuleViolation<>(rule, ctx, node1, rule.getMessage()));
+        report1.end();
+
+        Report report2 = new Report();
+        report2.start();
+        Node node2 = getNode(2, 1);
+        report2.addRuleViolation(new ParametricRuleViolation<>(rule, ctx, node2, rule.getMessage()));
+        report2.end();
+
+        Report union = report1.union(report2);
+        assertEquals(2, union.getViolations().size());
+    }
+
     private static Node getNode(int line, int column) {
         DummyNode s = new DummyNode(2);
         DummyNode parent = new DummyNode(1);

From bdcde56857213bcfbcda9aa769972b67ce71dc50 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 8 Apr 2022 17:11:32 +0200
Subject: [PATCH 041/180] [core] Add Report#empty

---
 pmd-core/src/main/java/net/sourceforge/pmd/Report.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index fc097d2ae9..106e36efa7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -763,4 +763,11 @@ public class Report implements Iterable<RuleViolation> {
 
         return copy;
     }
+
+    /**
+     * Creates an empty report.
+     */
+    public static Report empty() {
+        return new Report();
+    }
 }

From 32a02cecaafab30deb61a30f187ffb8d3b87fc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 9 Apr 2022 14:57:54 +0200
Subject: [PATCH 042/180] Add some log statements

---
 .../java/net/sourceforge/pmd/processor/PmdRunnable.java   | 8 ++++++--
 .../pmd/lang/java/types/JIntersectionType.java            | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
index 87df7b0eb6..84c14f5f10 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
@@ -34,7 +34,7 @@ import net.sourceforge.pmd.util.datasource.DataSource;
  */
 abstract class PmdRunnable implements Runnable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PmdRunnable.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PmdRunnable.class);
     private final DataSource dataSource;
     private final File file;
     private final GlobalAnalysisListener globalListener;
@@ -74,8 +74,10 @@ abstract class PmdRunnable implements Runnable {
             // Coarse check to see if any RuleSet applies to file, will need to do a finer RuleSet specific check later
             if (ruleSets.applies(file)) {
                 if (configuration.getAnalysisCache().isUpToDate(file)) {
+                    LOG.trace("Skipping file (lang: {}) because it was found in the cache: {}", langVersion, dataSource.getNiceFileName(false, null));
                     reportCachedRuleViolations(listener, file);
                 } else {
+                    LOG.trace("Processing file (lang: {}): {}", langVersion, dataSource.getNiceFileName(false, null));
                     try {
                         processSource(listener, langVersion, ruleSets);
                     } catch (Exception | StackOverflowError | AssertionError e) {
@@ -88,6 +90,8 @@ abstract class PmdRunnable implements Runnable {
                         listener.onError(new Report.ProcessingError(e, file.getPath()));
                     }
                 }
+            } else {
+                LOG.trace("Skipping file (lang: {}) because no rule applies: {}", langVersion, dataSource.getNiceFileName(false, null));
             }
         } catch (FileAnalysisException e) {
             throw e; // bubble managed exceptions, they were already reported
@@ -129,7 +133,7 @@ abstract class PmdRunnable implements Runnable {
             languageVersion,
             filename,
             sourceCode,
-            SemanticErrorReporter.reportToLogger(LOGGER),
+            SemanticErrorReporter.reportToLogger(LOG),
             configuration.getClassLoader()
         );
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/JIntersectionType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/JIntersectionType.java
index 86e30d8229..4908fdeebd 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/JIntersectionType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/JIntersectionType.java
@@ -176,7 +176,8 @@ public final class JIntersectionType implements JTypeMirror {
     }
 
     private static void checkWellFormed(JTypeMirror primary, List<? extends JTypeMirror> flattened) {
-        assert flattened.get(0) == primary || primary == primary.getTypeSystem().OBJECT;
+        assert flattened.get(0) == primary || primary == primary.getTypeSystem().OBJECT
+            : "Not a well-formed intersection " + flattened;
         for (int i = 0; i < flattened.size(); i++) {
             JTypeMirror ci = flattened.get(i);
             Objects.requireNonNull(ci, "Null intersection component");

From b6ac0aadee31944fa1bec0f9c2aa7eab2f1e38c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 9 Apr 2022 16:06:26 +0200
Subject: [PATCH 043/180] Remove deprecated nodes

---
 .../lang/java/ast/ASTAdditiveExpression.java  |  67 ----
 .../java/ast/ASTAllocationExpression.java     |  36 ---
 .../pmd/lang/java/ast/ASTAndExpression.java   |  36 ---
 .../ast/ASTAnnotationMethodDeclaration.java   |  25 --
 .../pmd/lang/java/ast/ASTArguments.java       |  44 ---
 .../lang/java/ast/ASTArrayDimsAndInits.java   |  40 ---
 .../lang/java/ast/ASTAssignmentOperator.java  |  36 ---
 .../pmd/lang/java/ast/ASTBlockStatement.java  |  35 ---
 .../pmd/lang/java/ast/ASTBodyDeclaration.java |   2 +-
 .../ASTClassOrInterfaceBodyDeclaration.java   |  26 --
 .../pmd/lang/java/ast/ASTCompilationUnit.java |  42 ++-
 .../java/ast/ASTConditionalAndExpression.java |  34 ---
 .../java/ast/ASTConditionalOrExpression.java  |  34 ---
 .../lang/java/ast/ASTEqualityExpression.java  |  47 ---
 .../java/ast/ASTExclusiveOrExpression.java    |  35 ---
 .../java/ast/ASTInclusiveOrExpression.java    |  36 ---
 .../java/ast/ASTInstanceOfExpression.java     |  48 ---
 .../pmd/lang/java/ast/ASTMemberSelector.java  |  20 --
 .../lang/java/ast/ASTMethodDeclaration.java   |  14 +-
 .../lang/java/ast/ASTMethodDeclarator.java    |  61 ----
 .../java/ast/ASTMultiplicativeExpression.java |  55 ----
 .../pmd/lang/java/ast/ASTNameList.java        |  22 --
 .../pmd/lang/java/ast/ASTPrimaryPrefix.java   |  31 --
 .../pmd/lang/java/ast/ASTPrimarySuffix.java   |  46 ---
 .../pmd/lang/java/ast/ASTRSIGNEDSHIFT.java    |  22 --
 .../pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java  |  22 --
 .../pmd/lang/java/ast/ASTRecordBody.java      |   2 +-
 .../java/ast/ASTRelationalExpression.java     |  36 ---
 .../pmd/lang/java/ast/ASTResources.java       |  19 --
 .../pmd/lang/java/ast/ASTResultType.java      |  49 ---
 .../pmd/lang/java/ast/ASTShiftExpression.java |  46 ---
 .../lang/java/ast/ASTStatementExpression.java |  23 --
 .../pmd/lang/java/ast/ASTTypeArgument.java    |  48 ---
 .../pmd/lang/java/ast/ASTTypeBound.java       |  42 ---
 .../ast/ASTUnaryExpressionNotPlusMinus.java   |  44 ---
 .../lang/java/ast/ASTVariableInitializer.java |  22 --
 .../pmd/lang/java/ast/ASTWildcardBounds.java  |  58 ----
 .../pmd/lang/java/ast/JavaParserVisitor.java  | 131 --------
 .../pmd/lang/java/rule/AbstractJavaRule.java  |  20 --
 .../pmd/lang/java/ast/SimpleNodeTest.java     | 288 ------------------
 .../ast/jdkversiontests/java17/LocalVars.txt  |   2 +-
 .../java17/SealedInnerClasses.txt             |   2 +-
 .../java17/expression/Expr.txt                |   2 +-
 .../jdkversiontests/java17/geometry/Shape.txt |   2 +-
 .../java17/geometry/Square.txt                |   2 +-
 .../java17p/DealingWithNull.txt               |   2 +-
 .../java17p/EnhancedTypeCheckingSwitch.txt    |   2 +-
 .../GuardedAndParenthesizedPatterns.txt       |   2 +-
 .../java17p/PatternsInSwitchLabels.txt        |   2 +-
 .../ScopeOfPatternVariableDeclarations.txt    |   2 +-
 .../java18p/DealingWithNull.txt               |   2 +-
 .../java18p/EnhancedTypeCheckingSwitch.txt    |   2 +-
 .../java18p/ExhaustiveSwitch.txt              |   2 +-
 .../GuardedAndParenthesizedPatterns.txt       |   2 +-
 .../java18p/PatternsInSwitchLabels.txt        |   2 +-
 .../java18p/RefiningPatternsInSwitch.txt      |   2 +-
 .../ScopeOfPatternVariableDeclarations.txt    |   2 +-
 .../pmd/lang/java/types/IteratorUtilCopy.txt  |   2 +-
 58 files changed, 49 insertions(+), 1731 deletions(-)
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
 delete mode 100644 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
 delete mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
deleted file mode 100644
index 197a63ec92..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import net.sourceforge.pmd.lang.rule.xpath.DeprecatedAttribute;
-
-/**
- * Represents an addition operation on two or more values, or string concatenation.
- * This has a precedence greater than {@link ASTShiftExpression}, and lower
- * than {@link ASTMultiplicativeExpression}.
- *
- *
- * <pre class="grammar">
- *
- * AdditiveExpression ::= {@linkplain ASTAdditiveExpression AdditiveExpression} ( ( "+" | "-" ) {@linkplain ASTMultiplicativeExpression MultiplicativeExpression} )+
- *
- * </pre>
- *
- * <p>Note that the children of this node are not necessarily {@link ASTMultiplicativeExpression},
- * rather, they are expressions with an operator precedence greater or equal to MultiplicativeExpression.
- *
- * <p>The first child may be another AdditiveExpression only
- * if its operator is different. For example, if parentheses represent
- * nesting:
- * <table summary="Nesting examples">
- * <tr><th></th><th>Parses as</th></tr>
- *     <tr><td>{@code 1 + 2 + 3}</td><td>{@code (1 + 2 + 3)}</td></tr>
- *     <tr><td>{@code 1 + 2 / 3}</td><td>{@code (1 + (2 / 3))}</td></tr>
- *     <tr><td>{@code 1 + 2 - 3 / 4}</td><td>{@code ((1 + 2) - 3)}</td></tr>
- *     <tr><td>{@code 1 + 2 - 3 - 4}</td><td>{@code ((1 + 2) - 3 - 4)}</td></tr>
- *     <tr><td>{@code 1 + 2 - 3 - 4 + 5}</td><td>{@code (((1 + 2) - 3 - 4) + 5)}</td></tr>
- * </table>
- *
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTAdditiveExpression extends AbstractJavaExpr {
-
-    ASTAdditiveExpression(int id) {
-        super(id);
-    }
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-    /**
-     * @deprecated Use {@link #getOperator()}
-     */
-    @Override
-    @Deprecated
-    @DeprecatedAttribute(replaceWith = "@Operator")
-    public String getImage() {
-        return getOperator();
-    }
-
-    /**
-     * Returns the image of the operator, i.e. "+" or "-".
-     */
-    public String getOperator() {
-        return super.getImage();
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
deleted file mode 100644
index bea8135d2d..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Replaced with {@link ASTArrayAllocation} and {@link ASTConstructorCall}
- */
-@Deprecated
-public class ASTAllocationExpression extends AbstractJavaTypeNode {
-
-    ASTAllocationExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    /**
-     * Returns true if this expression defines a body,
-     * which is compiled to an anonymous class. If this
-     * method returns false, then {@link #getQualifiedName()}
-     * returns {@code null}.
-     */
-    public boolean isAnonymousClass() {
-        // check the last child
-        return getNumChildren() > 1 && getChild(getNumChildren() - 1) instanceof ASTClassOrInterfaceBody;
-    }
-
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
deleted file mode 100644
index e97f8aa7a3..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a non-shortcut boolean AND-expression.
- * This has a precedence greater than {@link ASTExclusiveOrExpression},
- * and lower than {@link ASTEqualityExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTEqualityExpression},
- * rather, they are expressions with an operator precedence greater or equal to EqualityExpression.
- *
- *
- * <pre class="grammar">
- *
- * AndExpression ::=  {@linkplain ASTEqualityExpression EqualityExpression} ( "&" {@linkplain ASTEqualityExpression EqualityExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTAndExpression extends AbstractJavaExpr implements ASTExpression {
-
-    ASTAndExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    public <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
deleted file mode 100644
index c84e9201f8..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Represented directly by {@link ASTMethodDeclaration MethodDeclaration}.
- *     An annotation method is just {@link ASTMethodDeclaration MethodDeclaration} whose
- *     enclosing type is an annotation.
- */
-@Deprecated
-public final class ASTAnnotationMethodDeclaration extends AbstractJavaNode implements AccessNode {
-
-    ASTAnnotationMethodDeclaration(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
deleted file mode 100644
index b6ec7e2648..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import net.sourceforge.pmd.lang.rule.xpath.DeprecatedAttribute;
-
-/**
- * @deprecated Replaced by {@link ASTArgumentList}
- */
-@Deprecated
-public class ASTArguments extends AbstractJavaNode {
-
-    ASTArguments(int id) {
-        super(id);
-    }
-
-    /**
-     * Gets the number of arguments.
-     * @return
-     */
-    public int size() {
-        if (this.getNumChildren() == 0) {
-            return 0;
-        }
-        return ((ASTArgumentList) this.getChild(0)).size();
-    }
-
-    /**
-     * @deprecated for removal. Use {@link #size()} or {@link ASTArgumentList#size()} instead.
-     */
-    @Deprecated
-    @DeprecatedAttribute(replaceWith = "@Size")
-    public int getArgumentCount() {
-        return size();
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
deleted file mode 100644
index 541f793dbe..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Replaced by {@link ASTArrayDimensions}
- */
-@Deprecated
-public class ASTArrayDimsAndInits extends AbstractJavaNode {
-
-    private int arrayDepth;
-
-    ASTArrayDimsAndInits(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    @Deprecated
-    public void bumpArrayDepth() {
-        arrayDepth++;
-    }
-
-    @Deprecated
-    public int getArrayDepth() {
-        return arrayDepth;
-    }
-
-    @Deprecated
-    public boolean isArray() {
-        return arrayDepth > 0; // should always be true...
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
deleted file mode 100644
index 55680278cf..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents an assignment operator in an {@linkplain ASTExpression assignment expression}.
- *
- * <pre>
- *
- *  AssignmentOperator ::= "=" | "*=" | "/=" | "%=" | "+=" | "-=" | "<<=" | ">>=" | ">>>=" | "&=" | "^=" | "|="
- *
- * </pre>
- * @deprecated Superseded by {@link ASTAssignmentExpression}
- */
-@Deprecated
-public class ASTAssignmentOperator extends AbstractJavaNode {
-
-    private boolean isCompound;
-
-    ASTAssignmentOperator(int id) {
-        super(id);
-    }
-
-
-    public boolean isCompound() {
-        return this.isCompound;
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
deleted file mode 100644
index 479d5139e8..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated {@link ASTStatement} has been turned into an interface. Usages of BlockStatement can
- *  either be replaced with Statement if you don't care about the specific statement, or removed if
- *  you were extracting the contained node anyway.
- */
-@Deprecated
-public final class ASTBlockStatement extends AbstractJavaNode {
-
-    ASTBlockStatement(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    /**
-     * Tells if this BlockStatement is an allocation statement. This is done by
-     *
-     * @return the result of
-     *     containsDescendantOfType(ASTAllocationExpression.class)
-     */
-    public boolean isAllocation() {
-        return hasDescendantOfType(ASTAllocationExpression.class);
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBodyDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBodyDeclaration.java
index 37c458a614..f28fb1ca46 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBodyDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBodyDeclaration.java
@@ -14,7 +14,7 @@ package net.sourceforge.pmd.lang.java.ast;
  * BodyDeclaration ::= {@link ASTAnyTypeDeclaration AnyTypeDeclaration}
  *                   | {@link ASTMethodDeclaration MethodDeclaration}
  *                   | {@link ASTConstructorDeclaration ConstructorDeclaration}
- *                   | {@link ASTRecordConstructorDeclaration RecordConstructorDeclaration}
+ *                   | {@link ASTCompactConstructorDeclaration CompactConstructorDeclaration}
  *                   | {@link ASTInitializer Initializer}
  *                   | {@link ASTFieldDeclaration FieldDeclaration}
  *                   | {@link ASTEnumConstant EnumConstant}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
deleted file mode 100644
index 98e4f8ee76..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-public final class ASTClassOrInterfaceBodyDeclaration extends AbstractTypeBodyDeclaration implements JavaNode {
-
-    ASTClassOrInterfaceBodyDeclaration(int id) {
-        super(id);
-    }
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    public boolean isAnonymousInnerClass() {
-        return getParent().getParent() instanceof ASTAllocationExpression;
-    }
-
-    public boolean isEnumChild() {
-        return getParent().getParent() instanceof ASTEnumConstant;
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
index c50bb27f76..7f0da14b9b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
@@ -17,8 +17,27 @@ import net.sourceforge.pmd.lang.java.symbols.table.JSymbolTable;
 import net.sourceforge.pmd.lang.java.types.TypeSystem;
 import net.sourceforge.pmd.lang.java.types.ast.LazyTypeResolver;
 
-// FUTURE Change this class to extend from SimpleJavaNode, as TypeNode is not appropriate (unless I'm wrong)
-public final class ASTCompilationUnit extends AbstractJavaTypeNode implements JavaNode, GenericNode<JavaNode>, RootNode {
+
+/**
+ * The root node of all Java ASTs.
+ *
+ * <pre class="grammar">
+ *
+ * CompilationUnit ::= RegularCompilationUnit
+ *                   | ModularCompilationUnit
+ *
+ * RegularCompilationUnit ::=
+ *   {@linkplain ASTPackageDeclaration PackageDeclaration}?
+ *   {@linkplain ASTImportDeclaration ImportDeclaration}*
+ *   {@linkplain ASTAnyTypeDeclaration TypeDeclaration}*
+ *
+ * ModularCompilationUnit ::=
+ *   {@linkplain ASTImportDeclaration ImportDeclaration}*
+ *   {@linkplain ASTModuleDeclaration ModuleDeclaration}
+ *
+ * </pre>
+ */
+public final class ASTCompilationUnit extends AbstractJavaNode implements JavaNode, GenericNode<JavaNode>, RootNode {
 
     private LazyTypeResolver lazyTypeResolver;
     private List<Comment> comments;
@@ -52,15 +71,9 @@ public final class ASTCompilationUnit extends AbstractJavaTypeNode implements Ja
     }
 
     /**
-     * @deprecated Use {@code getPackageName().isEmpty()}
+     * Returns the package declaration, if there is one.
      */
-    @Deprecated
-    public boolean declarationsAreInDefaultPackage() {
-        return getPackageDeclaration() == null;
-    }
-
-    @Nullable
-    public ASTPackageDeclaration getPackageDeclaration() {
+    public @Nullable ASTPackageDeclaration getPackageDeclaration() {
         return AstImplUtil.getChildAs(this, 0, ASTPackageDeclaration.class);
     }
 
@@ -73,16 +86,15 @@ public final class ASTCompilationUnit extends AbstractJavaTypeNode implements Ja
      * Returns the package name of this compilation unit. If there is no
      * package declaration, then returns the empty string.
      */
-    @NonNull
-    public String getPackageName() {
+    public @NonNull String getPackageName() {
         ASTPackageDeclaration pack = getPackageDeclaration();
         return pack == null ? "" : pack.getName();
     }
 
     /**
-     * Returns the type declarations declared in this compilation unit.
-     * This may be empty if this a package-info.java, or a modular
-     * compilation unit. Note that this only cares for top-level types
+     * Returns the top-level type declarations declared in this compilation
+     * unit. This may be empty, eg if this a package-info.java, or a modular
+     * compilation unit (but ordinary compilation units may also be empty).
      */
     public NodeStream<ASTAnyTypeDeclaration> getTypeDeclarations() {
         return children(ASTAnyTypeDeclaration.class);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
deleted file mode 100644
index 07a5705fd2..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a boolean AND-expression. This has a precedence greater than {@link ASTConditionalOrExpression},
- * and lower than {@link ASTInclusiveOrExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTInclusiveOrExpression},
- * rather, they are expressions with an operator precedence greater or equal to InclusiveOrExpression.
- *
- *
- * <pre class="grammar">
- *
- * ConditionalAndExpression ::=  {@linkplain ASTInclusiveOrExpression InclusiveOrExpression} ( "&amp;&amp;" {@linkplain ASTInclusiveOrExpression InclusiveOrExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTConditionalAndExpression extends AbstractJavaExpr implements ASTExpression {
-    ASTConditionalAndExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
deleted file mode 100644
index abca28f60e..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a boolean OR-expression. This has a precedence greater than {@link ASTConditionalExpression},
- * and lower than {@link ASTConditionalAndExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTConditionalAndExpression},
- * rather, they are expressions with an operator precedence greater or equal to ConditionalAndExpression.
- *
- *
- * <pre class="grammar">
- *
- * ConditionalOrExpression ::=  {@linkplain ASTConditionalAndExpression ConditionalAndExpression} ( "||" {@linkplain ASTConditionalAndExpression ConditionalAndExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTConditionalOrExpression extends AbstractJavaExpr implements ASTExpression {
-    ASTConditionalOrExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
deleted file mode 100644
index 436ce31fc3..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents an identity test between two values or more values.
- * This has a precedence greater than {@link ASTAndExpression},
- * and lower than {@link ASTInstanceOfExpression} and {@link ASTRelationalExpression}.
- *
- * <pre class="grammar">
- *
- * EqualityExpression ::=  {@linkplain ASTEqualityExpression EqualityExpression}  ( ( "==" | "!=" ) {@linkplain ASTInstanceOfExpression InstanceOfExpression}  )+
- *
- * </pre>
- *
- * <p>Note that the children of this node are not necessarily {@link ASTInstanceOfExpression},
- * rather, they are expressions with an operator precedence greater or equal to InstanceOfExpression.
- *
- * <p>The first child may be another EqualityExpression only
- * if its operator is different. For example, if parentheses represent
- * nesting:
- * <table summary="Nesting examples">
- * <tr><th></th><th>Parses as</th></tr>
- *     <tr><td>{@code 1 == 2 == 3}</td><td>{@code (1 == 2 == 3)}</td></tr>
- *     <tr><td>{@code 1 == 2 != 3}</td><td>{@code ((1 == 2) != 3)}</td></tr>
- *     <tr><td>{@code 1 == 2 != 3 + 4}</td><td>{@code ((1 == 2) != (3 + 4))}</td></tr>
- *     <tr><td>{@code 1 == 2 != 3 != 4}</td><td>{@code ((1 == 2) != 3 != 4)}</td></tr>
- *     <tr><td>{@code 1 == 2 != 3 != 4 == 5}</td><td>{@code (((1 == 2) != 3 != 4) == 5)}</td></tr>
- * </table>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTEqualityExpression extends AbstractJavaExpr implements ASTExpression {
-    ASTEqualityExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
deleted file mode 100644
index f29dffe782..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a boolean XOR-expression. This has a precedence greater than {@link ASTInclusiveOrExpression},
- * and lower than {@link ASTAndExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTAndExpression},
- * rather, they are expressions with an operator precedence greater or equal to AndExpression.
- *
- *
- * <pre class="grammar">
- *
- * ExclusiveOrExpression ::=  {@linkplain ASTAndExpression AndExpression} ( "^" {@linkplain ASTAndExpression AndExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTExclusiveOrExpression extends AbstractJavaExpr implements ASTExpression {
-
-    ASTExclusiveOrExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
deleted file mode 100644
index 1203ae469e..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a non-shortcut boolean OR-expression. This has a precedence
- * greater than {@link ASTConditionalAndExpression}, and lower than
- * {@link ASTExclusiveOrExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTExclusiveOrExpression},
- * rather, they are expressions with an operator precedence greater or equal to ExclusiveOrExpression.
- *
- *
- * <pre class="grammar">
- *
- * InclusiveOrExpression ::=  {@linkplain ASTExclusiveOrExpression ExclusiveOrExpression} ( "|" {@linkplain ASTExclusiveOrExpression ExclusiveOrExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTInclusiveOrExpression extends AbstractJavaExpr implements ASTExpression {
-
-    ASTInclusiveOrExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
deleted file mode 100644
index 17320f5f4e..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a type test on an object.
- *
- * <pre class="grammar">
- *
- * InstanceOfExpression ::= {@linkplain ASTExpression Expression} "instanceof" ({@linkplain ASTTypeExpression TypeExpression} | {@link ASTPattern Pattern})
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public class ASTInstanceOfExpression extends AbstractJavaExpr implements ASTExpression {
-
-    ASTInstanceOfExpression(int id) {
-        super(id);
-    }
-
-
-    public BinaryOp getOperator() {
-        return BinaryOp.INSTANCEOF;
-    }
-
-    @Override
-    public <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-
-    public ASTTypeExpression getRightOperand() {
-        return (ASTTypeExpression) getChild(1);
-    }
-
-    /**
-     * Gets the type against which the expression is tested.
-     */
-    public ASTType getTypeNode() {
-        return getRightOperand().getTypeNode();
-    }
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
deleted file mode 100644
index ef98adcf74..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/** @deprecated not a node */
-@Deprecated
-public class ASTMemberSelector extends AbstractJavaNode {
-
-    public ASTMemberSelector(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
index f72dde1362..d6f78fa5f4 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
@@ -118,7 +118,7 @@ public final class ASTMethodDeclaration extends AbstractMethodOrConstructorDecla
             return null;
         }
 
-        return components.toStream().first(it -> it.getVarId().getVariableName().equals(this.getName()));
+        return components.toStream().first(it -> it.getVarId().getName().equals(this.getName()));
     }
 
 
@@ -139,21 +139,11 @@ public final class ASTMethodDeclaration extends AbstractMethodOrConstructorDecla
         return AstImplUtil.getChildAs(this, getNumChildren() - 1, ASTDefaultValue.class);
     }
 
-    /**
-     * Returns the result type node of the method.
-     *
-     * @deprecated todo When removed from java-grammar, rename the other to this good name
-     */
-    @Deprecated
-    public ASTResultType getResultType() {
-        return getFirstChildOfType(ASTResultType.class);
-    }
-
     /**
      * Returns the result type node of the method. This may be a {@link ASTVoidType}.
      */
     public @NonNull ASTType getResultTypeNode() {
-        return getFirstChildOfType(ASTType.class);
+        return firstChild(ASTType.class);
     }
 
     /**
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
deleted file mode 100644
index 649c2699cb..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import net.sourceforge.pmd.lang.rule.xpath.DeprecatedAttribute;
-
-/**
- * Child of an {@link ASTMethodDeclaration}.
- *
- * <p>
- *
- * MethodDeclarator ::=  &lt;IDENTIFIER&gt; {@link ASTFormalParameters FormalParameters} ( "[" "]" )*
- *
- * </p>
- *
- * @deprecated Removed, former children are direct children of {@link ASTMethodDeclaration}.
- * This is because the node is not even shared with {@link ASTAnnotationMethodDeclaration} and is
- * really not useful, mostly worked around everywhere.
- */
-@Deprecated
-public final class ASTMethodDeclarator extends AbstractJavaNode {
-
-    ASTMethodDeclarator(int id) {
-        super(id);
-    }
-
-    /**
-     * @deprecated Use {@link ASTMethodDeclaration#getArity()}
-     */
-    @DeprecatedAttribute(replaceWith = "MethodDeclaration/@Arity")
-    @Deprecated
-    public int getParameterCount() {
-        return getFormalParameters().size();
-    }
-
-    public ASTFormalParameters getFormalParameters() {
-        return (ASTFormalParameters) getChild(0);
-    }
-
-    /**
-     * @deprecated Use {@link ASTMethodDeclaration#getName()}
-     */
-    @Deprecated
-    @DeprecatedAttribute(replaceWith = "MethodDeclaration/@Name")
-    @Override
-    public String getImage() {
-        return super.getImage();
-    }
-
-    @Override
-    public ASTMethodDeclaration getParent() {
-        return (ASTMethodDeclaration) super.getParent();
-    }
-
-    @Override
-    public <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
deleted file mode 100644
index 8a298afaac..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a multiplication, division, or modulo operation on
- * two or more values. This has a precedence greater than {@link ASTAdditiveExpression},
- * and lower than {@linkplain ASTUnaryExpression UnaryExpression}.
- *
- * <pre class="grammar">
- *
- * MultiplicativeExpression ::= {@linkplain ASTMultiplicativeExpression MultiplicativeExpression} ( ( "*" | "/" | "%" ) {@linkplain ASTUnaryExpression UnaryExpression} )+
- *
- * </pre>
- *
- * <p>Note that the children of this node are not necessarily {@link ASTUnaryExpression}s,
- * rather, they are expressions with an operator precedence greater or equal to UnaryExpression.
- *
- * <p>The first child may be another MultiplicativeExpression only
- * if its operator is different. For example, if parentheses represent
- * nesting:
- * <table summary="Nesting examples">
- * <tr><th></th><th>Parses as</th></tr>
- *     <tr><td>{@code 1 * 2 * 3}</td><td>{@code (1 * 2 * 3)}</td></tr>
- *     <tr><td>{@code 1 * 2 / 3}</td><td>{@code ((1 * 2) / 3)}</td></tr>
- *     <tr><td>{@code 1 * 2 / 3 / 4}</td><td>{@code ((1 * 2) / 3 / 4)}</td></tr>
- * </table>
- *
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTMultiplicativeExpression extends AbstractJavaExpr {
-
-
-    ASTMultiplicativeExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    /**
-     * Returns the image of the operator, i.e. "*", "/" or "%".
-     */
-    public String getOperator() {
-        return getImage();
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
deleted file mode 100644
index 1493114eb5..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Replaced with {@link ASTThrowsList}
- */
-@Deprecated
-public final class ASTNameList extends AbstractJavaNode {
-
-    ASTNameList(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
deleted file mode 100644
index 29fdba5455..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-@Deprecated
-public class ASTPrimaryPrefix extends AbstractJavaTypeNode {
-
-    private boolean usesThisModifier;
-    private boolean usesSuperModifier;
-
-    ASTPrimaryPrefix(int id) {
-        super(id);
-    }
-
-
-    public boolean usesThisModifier() {
-        return this.usesThisModifier;
-    }
-
-    public boolean usesSuperModifier() {
-        return this.usesSuperModifier;
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
deleted file mode 100644
index 029ac7c30e..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-@Deprecated
-public class ASTPrimarySuffix extends AbstractJavaTypeNode {
-
-    private boolean isArguments;
-    private boolean isArrayDereference;
-
-    ASTPrimarySuffix(int id) {
-        super(id);
-    }
-
-    public boolean isArrayDereference() {
-        return isArrayDereference;
-    }
-
-
-    public boolean isArguments() {
-        return this.isArguments;
-    }
-
-    /**
-     * Get the number of arguments for this primary suffix. One should call
-     * {@link #isArguments()} to see if there are arguments. If this method is
-     * called when there are no arguments it returns <code>-1</code>.
-     *
-     * @return A non-negative argument number when there are arguments,
-     *     <code>-1</code> otherwise.
-     */
-    public int getArgumentCount() {
-        if (!this.isArguments()) {
-            return -1;
-        }
-        return ((ASTArguments) getChild(getNumChildren() - 1)).size();
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
deleted file mode 100644
index 391e4cd2dc..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Will be removed in 7.0.0. Use {@link ASTShiftExpression#getOperator()}
- */
-@Deprecated
-public final class ASTRSIGNEDSHIFT extends AbstractJavaNode {
-
-    ASTRSIGNEDSHIFT(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
deleted file mode 100644
index 332f043188..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Will be removed in 7.0.0. Use {@link ASTShiftExpression#getOperator()}
- */
-@Deprecated
-public final class ASTRUNSIGNEDSHIFT extends AbstractJavaNode {
-
-    ASTRUNSIGNEDSHIFT(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordBody.java
index b3830f16ab..8307ae2ab4 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordBody.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordBody.java
@@ -12,7 +12,7 @@ package net.sourceforge.pmd.lang.java.ast;
  * <pre class="grammar">
  *
  * RecordBody ::= "{" (   {@linkplain ASTCompactConstructorDeclaration CompactConstructorDeclaration}
- *                      | {@linkplain ASTClassOrInterfaceBodyDeclaration ClassOrInterfaceBodyDeclaration} )* "}"
+ *                      | {@linkplain ASTBodyDeclaration BodyDeclaration} )* "}"
  *
  * </pre>
  *
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
deleted file mode 100644
index 42c266eeb4..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a comparison on two numeric values. This has a precedence greater than {@link ASTEqualityExpression},
- * and lower than {@link ASTShiftExpression}. This has the same precedence as a {@link ASTInstanceOfExpression}.
- *
- * <p>Note that the children of this node are not necessarily {@link ASTShiftExpression},
- * rather, they are expressions with an operator precedence greater or equal to ShiftExpression.
- *
- *
- * <pre class="grammar">
- *
- * RelationalExpression ::=  {@linkplain ASTShiftExpression ShiftExpression} ( ( "&lt;" | "&gt;" | "&lt;=" | "&gt;=" ) {@linkplain ASTShiftExpression ShiftExpression} )+
- *
- * </pre>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTRelationalExpression extends AbstractJavaExpr implements ASTExpression {
-
-    ASTRelationalExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
deleted file mode 100644
index fa05ec4492..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-@Deprecated
-public final class ASTResources extends AbstractJavaNode {
-
-    ASTResources(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
deleted file mode 100644
index ec66e20841..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * Return type of a method. TODO remove, the method declaration could have no type node if it's void
- *
- * <pre class="grammar">
- *
- * ResultType ::= "void" | {@link ASTType Type}
- *
- * </pre>
- *
- * @deprecated This has been replaced by an unwrapped {@link ASTType},
- *     "void" being represented by {@link ASTVoidType}.
- */
-@Deprecated
-public final class ASTResultType extends AbstractJavaTypeNode {
-
-    ASTResultType(int id) {
-        super(id);
-    }
-
-    public boolean returnsArray() {
-        return !isVoid() && ((ASTType) getChild(0)).isArrayType();
-    }
-
-    public boolean isVoid() {
-        return getNumChildren() == 0;
-    }
-
-
-    /**
-     * Returns the enclosed type node, or an null if this is void.
-     */
-    public @Nullable ASTType getTypeNode() {
-        return isVoid() ? null : (ASTType) getChild(0);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
deleted file mode 100644
index e69f45f203..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a shift expression on a numeric value. This has a precedence greater than {@link
- * ASTRelationalExpression}, and lower than {@link ASTAdditiveExpression}.
- *
- * <pre class="grammar">
- *
- * ShiftExpression ::=  {@linkplain ASTShiftExpression ShiftExpression} ( ( "&lt;&lt;"  | "&gt;&gt;" | "&gt;&gt;&gt;" ) {@linkplain ASTAdditiveExpression AdditiveExpression} )+
- *
- * </pre>
- *
- * <p>Note that the children of this node are not necessarily {@link ASTAdditiveExpression},
- * rather, they are expressions with an operator precedence greater or equal to AdditiveExpression.
- *
- * <p>The first child may be another ShiftExpression only
- * if its operator is different. For example, if parentheses represent
- * nesting:
- * <table summary="Nesting examples">
- * <tr><th></th><th>Parses as</th></tr>
- *     <tr><td>{@code 1 >> 2 >> 3}</td><td>{@code (1 >> 2 >> 3)}</td></tr>
- *     <tr><td>{@code 1 >> 2 << 3}</td><td>{@code ((1 >> 2) << 3)}</td></tr>
- *     <tr><td>{@code 1 >> 2 << 3 + 4}</td><td>{@code ((1 >> 2) << (3 + 4))}</td></tr>
- *     <tr><td>{@code 1 >> 2 << 3 << 4}</td><td>{@code ((1 >> 2) << 3 << 4)}</td></tr>
- *     <tr><td>{@code 1 >> 2 << 3 << 4 >> 5}</td><td>{@code (((1 >> 2) << 3 << 4) >> 5)}</td></tr>
- * </table>
- *
- * @deprecated Replaced with {@link ASTInfixExpression}
- */
-@Deprecated
-public final class ASTShiftExpression extends AbstractJavaExpr implements ASTExpression {
-    ASTShiftExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
deleted file mode 100644
index f2eaf02ad6..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * @deprecated Use {@link ASTExpression} inside {@link ASTStatementExpressionList},
- *     or {@link ASTExpressionStatement} inside {@link ASTBlock}
- */
-@Deprecated
-public final class ASTStatementExpression extends AbstractJavaTypeNode {
-
-    ASTStatementExpression(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
deleted file mode 100644
index 8e415dd892..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-
-/**
- * Represents a single type argument in a {@linkplain ASTTypeArguments type arguments list}.
- *
- * <pre class="grammar">
- *
- * TypeArgument ::= ( {@linkplain ASTAnnotation Annotation} )* ( {@linkplain ASTReferenceType ReferenceType} | "?" {@linkplain ASTWildcardBounds WildcardBounds}? )
- *
- * </pre>
- *
- * @deprecated Replaced by just an {@link ASTType}
- */
-@Deprecated
-public final class ASTTypeArgument extends AbstractJavaTypeNode {
-
-    ASTTypeArgument(int id) {
-        super(id);
-    }
-
-
-    /**
-     * Returns true if this node is a wildcard argument (bounded or not).
-     */
-    public boolean isWildcard() {
-        return getTypeNode() == null;
-    }
-
-
-    /**
-     * Returns the type node of this type argument.
-     * Returns {@code null} if this is a wildcard argument.
-     */
-    public ASTReferenceType getTypeNode() {
-        return getFirstChildOfType(ASTReferenceType.class);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
deleted file mode 100644
index bc4315826f..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a type bound on a {@linkplain ASTTypeParameter type parameter}.
- * Type bounds specify the type of the type variable to which they apply as
- * an <a href="https://docs.oracle.com/javase/specs/jls/se9/html/jls-4.html#jls-4.9">intersection type</a>.
- * The first bound type is a class or interface type, while the additional
- * bounds are necessarily interface types.
- *
- * <pre class="grammar">
- *
- * TypeBound ::= "extends" {@linkplain ASTAnnotation Annotation}* {@linkplain ASTType Type}
- *
- * </pre>
- *
- * @deprecated Since the annotations now nest inside the type, this is just replaced by the type node alone.
- */
-@Deprecated
-public final class ASTTypeBound extends AbstractJavaTypeNode {
-    public ASTTypeBound(int id) {
-        super(id);
-    }
-
-
-    /**
-     * Returns a list with the type bounds of this node.
-     * The returned list has at least one element.
-     */
-    public ASTType getTypeNode() {
-        return getFirstChildOfType(ASTType.class);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
deleted file mode 100644
index 604d91213a..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a boolean negation or bitwise inverse operation.
- * This has the same precedence as {@linkplain ASTUnaryExpression UnaryExpression}
- * and the like.
- *
- * <p>Note that the child of this node is not necessarily an {@link ASTUnaryExpression},
- * rather, it can be an expression with an operator precedence greater or equal to a UnaryExpression.
- *
- * <pre class="grammar">
- *
- * UnaryExpressionNotPlusMinus ::=  ( "~" | "!" ) {@linkplain ASTUnaryExpression UnaryExpression}
- *
- * </pre>
- * @deprecated Merged into {@link ASTUnaryExpression}
- */
-@Deprecated
-public final class ASTUnaryExpressionNotPlusMinus extends AbstractJavaTypeNode {
-
-    ASTUnaryExpressionNotPlusMinus(int id) {
-        super(id);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-
-
-    /**
-     * Returns the image of this unary operator, i.e. "~" or "!".
-     */
-    public String getOperator() {
-        return getImage();
-    }
-
-
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
deleted file mode 100644
index 9957958715..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Marker interface for nodes that can occur as the initializer of a variable or field declaration.
- *
- * <pre class="grammar">
- *
- * VariableInitializer ::= {@link ASTExpression Expression} | {@link ASTArrayInitializer ArrayInitializer}
- *
- * </pre>
- *
- * @deprecated Array initializers behave exactly as expressions, except they're restricted to one specific
- * syntactic context. Such a syntactic distinction is not useful for analysis. This also simplifies the type
- * hierarchy. This interface can be completely substituted by {@link ASTExpression}
- */
-@Deprecated
-public interface ASTVariableInitializer extends JavaNode {
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
deleted file mode 100644
index 14f4c3ecc0..0000000000
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-/**
- * Represents a type bound on a wildcard {@linkplain ASTTypeArgument type argument}.
- *
- * <pre class="grammar">
- *
- * WildcardBounds ::=  ( "extends" | "super" ) ( {@linkplain ASTAnnotation Annotation} )* {@linkplain ASTReferenceType ReferenceType}
- *
- * </pre>
- * @deprecated Replaced by {@link ASTWildcardType}
- */
-@Deprecated
-public final class ASTWildcardBounds extends AbstractJavaTypeNode {
-
-    private boolean isUpperBound;
-
-    ASTWildcardBounds(int id) {
-        super(id);
-    }
-
-
-    /**
-     * Returns true if this is an upper type bound, e.g.
-     * in {@code <? extends Integer>}.
-     */
-    public boolean isUpperBound() {
-        return isUpperBound;
-    }
-
-
-    /**
-     * Returns true if this is a lower type bound, e.g.
-     * in {@code <? super Node>}.
-     */
-    public boolean isLowerBound() {
-        return !isUpperBound();
-    }
-
-
-    /**
-     * Returns the type node representing the bound, e.g.
-     * the {@code Node} in {@code <? super Node>}.
-     */
-    public ASTReferenceType getTypeBoundNode() {
-        return getFirstChildOfType(ASTReferenceType.class);
-    }
-
-
-    @Override
-    protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
-        throw new UnsupportedOperationException("Node was removed from grammar");
-    }
-}
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java
index b3c774eece..4dcc144ef7 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java
@@ -47,146 +47,15 @@ public interface JavaParserVisitor extends JavaVisitor<Object, Object> {
         return null;
     }
 
-    @Deprecated
-    default Object visit(ASTConditionalOrExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTVariableInitializer node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTAssignmentOperator node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTConditionalAndExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTInclusiveOrExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTExclusiveOrExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTAndExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTEqualityExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTRelationalExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTShiftExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTAdditiveExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTMultiplicativeExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTAnnotationMethodDeclaration node, Object data) {
-        return null;
-    }
-
     default Object visit(ASTStatement node, Object data) {
         return null;
     }
 
-    @Deprecated
-    default Object visit(ASTPrimaryPrefix node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTPrimarySuffix node, Object data) {
-        return null;
-    }
-
-
     @Deprecated
     default Object visit(ASTPrimaryExpression node, Object data) {
         return null;
     }
 
 
-    @Deprecated
-    default Object visit(ASTAllocationExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTTypeArgument node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTWildcardBounds node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTUnaryExpressionNotPlusMinus node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTBlockStatement node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTInstanceOfExpression node, Object data) {
-        return null;
-    }
-
-
-    @Deprecated
-    default Object visit(ASTStatementExpression node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTMethodDeclarator node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTArguments node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTClassOrInterfaceBodyDeclaration node, Object data) {
-        return null;
-    }
-
-    @Deprecated
-    default Object visit(ASTResultType node, Object data) {
-        return null;
-    }
 
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
index 0da448c81b..166e515cb3 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
@@ -4,16 +4,10 @@
 
 package net.sourceforge.pmd.lang.java.rule;
 
-import java.util.List;
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.java.JavaLanguageModule;
-import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
-import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
 import net.sourceforge.pmd.lang.java.ast.JavaParserVisitor;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 
@@ -36,18 +30,4 @@ public abstract class AbstractJavaRule extends AbstractRule implements JavaParse
         target.acceptVisitor(this, ctx);
     }
 
-    public static boolean isQualifiedName(@Nullable String node) {
-        return node != null && node.indexOf('.') != -1;
-    }
-
-    public static boolean importsPackage(ASTCompilationUnit node, String packageName) {
-        List<ASTImportDeclaration> nodes = node.findChildrenOfType(ASTImportDeclaration.class);
-        for (ASTImportDeclaration n : nodes) {
-            if (n.getPackageName().startsWith(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
deleted file mode 100644
index f13a357ae9..0000000000
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.java.ast;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.test.TestUtilsKt;
-import net.sourceforge.pmd.lang.java.BaseParserTest;
-
-@Ignore("This test is Java specific even though parts of it should apply to any language implementation")
-// The Java specific parts depend on the grammar and are subject to breaking during the grammar update process
-// Most of it is just garbage though
-public class SimpleNodeTest extends BaseParserTest {
-
-    @Test
-    public void testMethodDiffLines() {
-        List<ASTMethodDeclaration> methods = java.getNodes(ASTMethodDeclaration.class, METHOD_DIFF_LINES);
-        TestUtilsKt.assertPosition(methods.iterator().next(), 2, 9, 4, 3);
-    }
-
-    @Test
-    public void testMethodSameLine() {
-        List<ASTMethodDeclaration> methods = java.getNodes(ASTMethodDeclaration.class, METHOD_SAME_LINE);
-        TestUtilsKt.assertPosition(methods.iterator().next(), 2, 9, 2, 22);
-    }
-
-    @Test
-    public void testNoLookahead() {
-        List<ASTClassOrInterfaceDeclaration> uCD = java.getNodes(ASTClassOrInterfaceDeclaration.class, NO_LOOKAHEAD);
-        TestUtilsKt.assertPosition(uCD.iterator().next(), 1, 8, 1, 21);
-    }
-
-    @Test
-    public void testHasExplicitExtends() {
-        ASTClassOrInterfaceDeclaration ucd = java.getNodes(ASTClassOrInterfaceDeclaration.class, HAS_EXPLICIT_EXTENDS).iterator().next();
-        assertTrue(ucd.getChild(0) instanceof ASTExtendsList);
-    }
-
-    @Test
-    public void testNoExplicitExtends() {
-        ASTClassOrInterfaceDeclaration ucd = java.getNodes(ASTClassOrInterfaceDeclaration.class, NO_EXPLICIT_EXTENDS).iterator().next();
-        assertFalse(ucd.getChild(0) instanceof ASTExtendsList);
-    }
-
-    @Test
-    public void testHasExplicitImplements() {
-        ASTClassOrInterfaceDeclaration ucd = java.getNodes(ASTClassOrInterfaceDeclaration.class, HAS_EXPLICIT_IMPLEMENTS).iterator().next();
-        assertTrue(ucd.getChild(0) instanceof ASTImplementsList);
-    }
-
-    @Test
-    public void testNoExplicitImplements() {
-        ASTClassOrInterfaceDeclaration ucd = java.getNodes(ASTClassOrInterfaceDeclaration.class, NO_EXPLICIT_IMPLEMENTS).iterator().next();
-        assertFalse(ucd.getChild(0) instanceof ASTImplementsList);
-    }
-
-    @Test
-    public void testColumnsOnQualifiedName() {
-        for (Node node : java.getNodes(ASTName.class, QUALIFIED_NAME)) {
-            if (node.getImage().equals("java.io.File")) {
-                TestUtilsKt.assertPosition(node, 1, 8, 1, 20);
-            }
-        }
-    }
-
-    @Test
-    public void testLineNumbersForNameSplitOverTwoLines() {
-        for (Node node : java.getNodes(ASTName.class, BROKEN_LINE_IN_NAME)) {
-            if (node.getImage().equals("java.io.File")) {
-                TestUtilsKt.assertPosition(node, 1, 8, 2, 5);
-            }
-            if (node.getImage().equals("Foo")) {
-                TestUtilsKt.assertPosition(node, 2, 15, 2, 19);
-            }
-        }
-    }
-
-    //    @Test
-    //    public void testLineNumbersAreSetOnAllSiblings() {
-    //        for (ASTBlock b : java.getNodes(ASTBlock.class, LINE_NUMBERS_ON_SIBLINGS)) {
-    //            assertTrue(b.getBeginLine() > 0);
-    //        }
-    //        for (ASTVariableInitializer b : java.getNodes(ASTVariableInitializer.class, LINE_NUMBERS_ON_SIBLINGS)) {
-    //            assertTrue(b.getBeginLine() > 0);
-    //        }
-    //        for (ASTExpression b : java.getNodes(ASTExpression.class, LINE_NUMBERS_ON_SIBLINGS)) {
-    //            assertTrue(b.getBeginLine() > 0);
-    //        }
-    //    }
-    //
-    //    @Test
-    //    public void testFindDescendantsOfType() {
-    //        ASTBlock block = new ASTBlock(2);
-    //        block.addChild(new ASTReturnStatement(1), 0);
-    //        assertEquals(1, block.findDescendantsOfType(ASTReturnStatement.class).size());
-    //    }
-    //
-    //    @Test
-    //    public void testFindDescendantsOfTypeMultiple() {
-    //        ASTBlock block = new ASTBlock(1);
-    //        block.addChild(new ASTBlockStatement(2), 0);
-    //        block.addChild(new ASTBlockStatement(3), 1);
-    //        List<ASTBlockStatement> nodes = block.findDescendantsOfType(ASTBlockStatement.class);
-    //        assertEquals(2, nodes.size());
-    //    }
-    //
-    //    @Test
-    //    public void testFindDescendantsOfTypeRecurse() {
-    //        ASTBlock block = new ASTBlock(1);
-    //        ASTBlock childBlock = new ASTBlock(2);
-    //        block.addChild(childBlock, 0);
-    //        childBlock.addChild(new ASTMethodDeclaration(3), 0);
-    //        List<ASTMethodDeclaration> nodes = block.findDescendantsOfType(ASTMethodDeclaration.class);
-    //        assertEquals(1, nodes.size());
-    //    }
-    //
-    //    @Test
-    //    public void testGetFirstChild() {
-    //        ASTBlock block = new ASTBlock(1);
-    //        ASTStatement x = new ASTStatement(2);
-    //        block.addChild(x, 0);
-    //        block.addChild(new ASTStatement(3), 1);
-    //
-    //        Node n = block.getFirstDescendantOfType(ASTStatement.class);
-    //        assertNotNull(n);
-    //        assertTrue(n instanceof ASTStatement);
-    //        assertEquals(x, n);
-    //    }
-    //
-    //    @Test
-    //    public void testGetFirstChildNested() {
-    //        ASTBlock block = new ASTBlock(1);
-    //        ASTStatement x = new ASTStatement(2);
-    //        ASTAssignmentOperator x1 = new ASTAssignmentOperator(4);
-    //        x.addChild(x1, 0);
-    //        block.addChild(x, 0);
-    //        block.addChild(new ASTStatement(3), 1);
-    //
-    //        Node n = block.getFirstDescendantOfType(ASTAssignmentOperator.class);
-    //        assertNotNull(n);
-    //        assertTrue(n instanceof ASTAssignmentOperator);
-    //        assertEquals(x1, n);
-    //    }
-    //
-    //    @Test
-    //    public void testGetFirstChildNestedDeeper() {
-    //        ASTBlock block = new ASTBlock(1);
-    //        ASTStatement x = new ASTStatement(2);
-    //        ASTAssignmentOperator x1 = new ASTAssignmentOperator(4);
-    //        ASTName x2 = new ASTName(5);
-    //
-    //        x.addChild(x1, 0);
-    //        x1.addChild(x2, 0);
-    //        block.addChild(x, 0);
-    //        block.addChild(new ASTStatement(3), 1);
-    //
-    //        Node n = block.getFirstDescendantOfType(ASTName.class);
-    //        assertNotNull(n);
-    //        assertTrue(n instanceof ASTName);
-    //        assertEquals(x2, n);
-    //    }
-
-    @Test
-    public void testParentMethods() {
-        ASTCompilationUnit u = java.parse(TEST1);
-
-        ASTMethodDeclarator d = u.getFirstDescendantOfType(ASTMethodDeclarator.class);
-        assertSame("getFirstParentOfType ASTMethodDeclaration", d.getParent(),
-                d.getFirstParentOfType(ASTMethodDeclaration.class));
-        assertNull("getFirstParentOfType ASTName", d.getFirstParentOfType(ASTName.class));
-
-        assertSame("getNthParent 1", d.getParent(), d.getNthParent(1));
-        assertSame("getNthParent 2", d.getParent().getParent(), d.getNthParent(2));
-        assertSame("getNthParent 6", u, d.getNthParent(6));
-        assertNull("getNthParent 7", d.getNthParent(7));
-        assertNull("getNthParent 8", d.getNthParent(8));
-    }
-
-    private static final String TEST1 = "public class Test {\n  void bar(String s) {\n   s = s.toLowerCase();\n  }\n}";
-
-    @Ignore
-    @Test
-    public void testContainsNoInner() {
-        ASTCompilationUnit c = java.getNodes(ASTCompilationUnit.class, CONTAINS_NO_INNER).iterator().next();
-        List<ASTFieldDeclaration> res = c.findDescendantsOfType(ASTFieldDeclaration.class);
-        assertTrue(res.isEmpty());
-        /*
-         * String expectedXml =
-         * "<CompilationUnit BeginColumn=\"1\" BeginLine=\"5\" EndColumn=\"1\" EndLine=\"5\">"
-         * +
-         * "<TypeDeclaration BeginColumn=\"1\" BeginLine=\"1\" EndColumn=\"1\" EndLine=\"5\">"
-         * +
-         * "<ClassOrInterfaceDeclaration Abstract=\"false\" BeginColumn=\"8\" BeginLine=\"1\" EndColumn=\"1\" "
-         * +
-         * "EndLine=\"5\" Final=\"false\" Image=\"Test\" Interface=\"false\" Native=\"false\" Nested=\"false\" PackagePrivate=\"false\" Private=\"false\" Protected=\"false\" Public=\"true\" Static=\"false\" Strictfp=\"false\" Synchronized=\"false\" Transient=\"false\" Volatile=\"false\">"
-         * +
-         * "<ClassOrInterfaceBody BeginColumn=\"19\" BeginLine=\"1\" EndColumn=\"1\" EndLine=\"5\">"
-         * +
-         * "<ClassOrInterfaceBodyDeclaration AnonymousInnerClass=\"false\" BeginColumn=\"3\" BeginLine=\"2\" EndColumn=\"3\" EndLine=\"4\">"
-         * +
-         * "<ClassOrInterfaceDeclaration Abstract=\"false\" BeginColumn=\"10\" BeginLine=\"2\" EndColumn=\"3\" EndLine=\"4\" Final=\"false\" "
-         * +
-         * "Image=\"Inner\" Interface=\"false\" Native=\"false\" Nested=\"true\" PackagePrivate=\"false\" Private=\"false\" Protected=\"false\" "
-         * +
-         * "Public=\"true\" Static=\"false\" Strictfp=\"false\" Synchronized=\"false\" Transient=\"false\" Volatile=\"false\">"
-         * +
-         * "<ClassOrInterfaceBody BeginColumn=\"22\" BeginLine=\"2\" EndColumn=\"3\" EndLine=\"4\">"
-         * +
-         * "<ClassOrInterfaceBodyDeclaration AnonymousInnerClass=\"false\" BeginColumn=\"4\" BeginLine=\"3\" EndColumn=\"11\" EndLine=\"3\">"
-         * +
-         * "<FieldDeclaration Abstract=\"false\" Array=\"false\" ArrayDepth=\"0\" BeginColumn=\"4\" BeginLine=\"3\" EndColumn=\"11\" EndLine=\"3\" Final=\"false\" Native=\"false\" PackagePrivate=\"true\" Private=\"false\" Protected=\"false\" Public=\"false\" Static=\"false\" Strictfp=\"false\" Synchronized=\"false\" Transient=\"false\" VariableName=\"foo\" Volatile=\"false\"><Type Array=\"false\" ArrayDepth=\"0\" BeginColumn=\"4\" BeginLine=\"3\" EndColumn=\"6\" EndLine=\"3\">"
-         * +
-         * "<PrimitiveType Array=\"false\" ArrayDepth=\"0\" BeginColumn=\"4\" BeginLine=\"3\" Boolean=\"false\" EndColumn=\"6\" EndLine=\"3\" Image=\"int\"/>"
-         * + "</Type>" +
-         * "<VariableDeclarator BeginColumn=\"8\" BeginLine=\"3\" EndColumn=\"10\" EndLine=\"3\">"
-         * +
-         * "<VariableDeclaratorId Array=\"false\" ArrayDepth=\"0\" BeginColumn=\"8\" BeginLine=\"3\" EndColumn=\"10\" EndLine=\"3\" ExceptionBlockParameter=\"false\" Image=\"foo\"/>"
-         * +
-         * "</VariableDeclarator></FieldDeclaration></ClassOrInterfaceBodyDeclaration></ClassOrInterfaceBody>"
-         * +
-         * "</ClassOrInterfaceDeclaration></ClassOrInterfaceBodyDeclaration></ClassOrInterfaceBody></ClassOrInterfaceDeclaration>"
-         * + "</TypeDeclaration></CompilationUnit>"; assertEquals( expectedXml,
-         * getXmlString( c ) );
-         */ }
-
-    @Test
-    public void testContainsNoInnerWithAnonInner() {
-        ASTCompilationUnit c = java.parse(CONTAINS_NO_INNER_WITH_ANON_INNER);
-        List<ASTFieldDeclaration> res = c.findDescendantsOfType(ASTFieldDeclaration.class);
-        assertTrue(res.isEmpty());
-    }
-
-    @Test
-    public void testContainsChildOfType() {
-        ASTClassOrInterfaceDeclaration c = java.getNodes(ASTClassOrInterfaceDeclaration.class, CONTAINS_CHILDREN_OF_TYPE)
-                .iterator().next();
-        assertTrue(c.hasDescendantOfType(ASTFieldDeclaration.class));
-    }
-
-    @Test
-    public void testXPathNodeSelect() {
-        ASTClassOrInterfaceDeclaration c = java.getNodes(ASTClassOrInterfaceDeclaration.class, TEST_XPATH).iterator().next();
-        List<Node> nodes = c.findChildNodesWithXPath("//FieldDeclaration");
-        assertEquals(2, nodes.size());
-        assertTrue(nodes.get(0) instanceof ASTFieldDeclaration);
-    }
-
-    private static final String HAS_EXPLICIT_EXTENDS = "public class Test extends Foo {}";
-
-    private static final String NO_EXPLICIT_EXTENDS = "public class Test {}";
-
-    private static final String HAS_EXPLICIT_IMPLEMENTS = "public class Test implements Foo {}";
-
-    private static final String NO_EXPLICIT_IMPLEMENTS = "public class Test {}";
-
-    private static final String METHOD_SAME_LINE = "public class Test {\n public void foo() {}\n}";
-
-    private static final String QUALIFIED_NAME = "import java.io.File;\npublic class Foo{}";
-
-    private static final String BROKEN_LINE_IN_NAME = "import java.io.\nFile;\npublic class Foo{}";
-
-    //    private static final String LINE_NUMBERS_ON_SIBLINGS =
-    //        "public class Foo {\n void bar() {\n  try {\n  } catch (Exception1 e) {\n   int x =2;\n  }\n if (x != null) {}\n }\n}";
-
-    private static final String NO_LOOKAHEAD = "public class Foo { }";
-
-    private static final String METHOD_DIFF_LINES = "public class Test {\n public void foo() {\n  int x;\n }\n}";
-
-    private static final String CONTAINS_CHILDREN_OF_TYPE = "public class Test {\n  int x;\n}";
-
-    private static final String CONTAINS_NO_INNER = "public class Test {\n  public class Inner {\n   int foo;\n  }\n}";
-
-    private static final String CONTAINS_NO_INNER_WITH_ANON_INNER = "public class Test {\n  void bar() {\n   foo(new Fuz() { int x = 2;});\n  }\n}";
-
-    private static final String TEST_XPATH = "public class Test {\n  int x = 2;\n  int y = 42;\n}";
-}
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
index e21945fdd5..d9cb4518bc 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/LocalVars.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "LocalVars", @CanonicalName = "LocalVars", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "LocalVars", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "LocalVars", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "1"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
index 9600364eb2..f998644732 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/SealedInnerClasses.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "SealedInnerClasses", @CanonicalName = "SealedInnerClasses", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "SealedInnerClasses", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "SealedInnerClasses", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "2"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
index 14c9f260d6..e6aa34de5d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/expression/Expr.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "com.example.expression", @declarationsAreInDefaultPackage = "false"]
++- CompilationUnit[@PackageName = "com.example.expression"]
    +- PackageDeclaration[@Name = "com.example.expression"]
    |  +- ModifierList[]
    +- ClassOrInterfaceDeclaration[@Abstract = "true", @Annotation = "false", @Anonymous = "false", @BinaryName = "com.example.expression.Expr", @CanonicalName = "com.example.expression.Expr", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "Expr", @Interface = "true", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "com.example.expression", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "false", @RegularInterface = "true", @SimpleName = "Expr", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
index 78c0de4b18..ca06099a93 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Shape.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "com.example.geometry", @declarationsAreInDefaultPackage = "false"]
++- CompilationUnit[@PackageName = "com.example.geometry"]
    +- PackageDeclaration[@Name = "com.example.geometry"]
    |  +- ModifierList[]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "com.example.geometry.Shape", @CanonicalName = "com.example.geometry.Shape", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "Shape", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "com.example.geometry", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "Shape", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
index 508cb52b9c..1037af8af4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17/geometry/Square.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "com.example.geometry", @declarationsAreInDefaultPackage = "false"]
++- CompilationUnit[@PackageName = "com.example.geometry"]
    +- PackageDeclaration[@Name = "com.example.geometry"]
    |  +- ModifierList[]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "com.example.geometry.Square", @CanonicalName = "com.example.geometry.Square", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "Square", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "com.example.geometry", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "Square", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
index c946588f75..9dc6820c2e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "DealingWithNull", @CanonicalName = "DealingWithNull", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "DealingWithNull", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "DealingWithNull", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "4"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
index 0cf85c5739..aa941ed25c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "EnhancedTypeCheckingSwitch", @CanonicalName = "EnhancedTypeCheckingSwitch", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "EnhancedTypeCheckingSwitch", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "EnhancedTypeCheckingSwitch", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
    |  +- ModifierList[]
    |  +- ClassOrInterfaceBody[@Empty = "false", @Size = "2"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
index e00634a4c4..fadf5331c2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "GuardedAndParenthesizedPatterns", @CanonicalName = "GuardedAndParenthesizedPatterns", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "GuardedAndParenthesizedPatterns", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "GuardedAndParenthesizedPatterns", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "3"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
index 37f3dbb202..55497933f8 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "PatternsInSwitchLabels", @CanonicalName = "PatternsInSwitchLabels", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "PatternsInSwitchLabels", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "PatternsInSwitchLabels", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "1"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
index 056465cc5e..363a7f5cc1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "ScopeOfPatternVariableDeclarations", @CanonicalName = "ScopeOfPatternVariableDeclarations", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "ScopeOfPatternVariableDeclarations", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "ScopeOfPatternVariableDeclarations", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "3"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
index d2506f01c6..29e144bea8 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "DealingWithNull", @CanonicalName = "DealingWithNull", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "DealingWithNull", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "DealingWithNull", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "6"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
index 0cf85c5739..aa941ed25c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "EnhancedTypeCheckingSwitch", @CanonicalName = "EnhancedTypeCheckingSwitch", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "EnhancedTypeCheckingSwitch", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "EnhancedTypeCheckingSwitch", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
    |  +- ModifierList[]
    |  +- ClassOrInterfaceBody[@Empty = "false", @Size = "2"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
index bf53de045f..279415aaa1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "ExhaustiveSwitch", @CanonicalName = "ExhaustiveSwitch", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "ExhaustiveSwitch", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "ExhaustiveSwitch", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "13"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
index c78ad66ac2..74db71dce9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "GuardedAndParenthesizedPatterns", @CanonicalName = "GuardedAndParenthesizedPatterns", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "GuardedAndParenthesizedPatterns", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "GuardedAndParenthesizedPatterns", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "4"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
index 37f3dbb202..55497933f8 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "PatternsInSwitchLabels", @CanonicalName = "PatternsInSwitchLabels", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "PatternsInSwitchLabels", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "PatternsInSwitchLabels", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "1"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
index df94e0ed14..f446b254d9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "RefiningPatternsInSwitch", @CanonicalName = "RefiningPatternsInSwitch", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "RefiningPatternsInSwitch", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "RefiningPatternsInSwitch", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "7"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
index 056465cc5e..363a7f5cc1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@PackageName = "", @declarationsAreInDefaultPackage = "true"]
++- CompilationUnit[@PackageName = ""]
    +- ClassOrInterfaceDeclaration[@Abstract = "false", @Annotation = "false", @Anonymous = "false", @BinaryName = "ScopeOfPatternVariableDeclarations", @CanonicalName = "ScopeOfPatternVariableDeclarations", @EffectiveVisibility = "public", @Enum = "false", @Final = "false", @Image = "ScopeOfPatternVariableDeclarations", @Interface = "false", @Local = "false", @Native = "false", @Nested = "false", @PackageName = "", @PackagePrivate = "false", @Private = "false", @Protected = "false", @Public = "true", @Record = "false", @RegularClass = "true", @RegularInterface = "false", @SimpleName = "ScopeOfPatternVariableDeclarations", @Static = "false", @Strictfp = "false", @Synchronized = "false", @SyntacticallyAbstract = "false", @SyntacticallyFinal = "false", @SyntacticallyPublic = "true", @SyntacticallyStatic = "false", @TopLevel = "true", @Transient = "false", @Visibility = "public", @Volatile = "false"]
       +- ModifierList[]
       +- ClassOrInterfaceBody[@Empty = "false", @Size = "3"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
index 929b45f6f5..2c68c5249e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/types/IteratorUtilCopy.txt
@@ -1,4 +1,4 @@
-+- CompilationUnit[@TypeMirror = "void"]
++- CompilationUnit[]
    +- PackageDeclaration[]
    |  +- ModifierList[]
    +- ImportDeclaration[]

From 0d72f8a37d5963b3073dcea2c7a8558ba048e035 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 09:03:57 +0200
Subject: [PATCH 044/180] Revert "[core] Add Report#empty"

This reverts commit bdcde56857213bcfbcda9aa769972b67ce71dc50.
---
 pmd-core/src/main/java/net/sourceforge/pmd/Report.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index 106e36efa7..fc097d2ae9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -763,11 +763,4 @@ public class Report implements Iterable<RuleViolation> {
 
         return copy;
     }
-
-    /**
-     * Creates an empty report.
-     */
-    public static Report empty() {
-        return new Report();
-    }
 }

From 55e674cb0e6355506d3791f71a5d7329f08a378c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 09:29:46 +0200
Subject: [PATCH 045/180] [doc] Update release notes (#3792, #3862)

---
 docs/pages/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 262bf7df56..2067995f83 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -16,6 +16,7 @@ This is a {{ site.pmd.release_type }} release.
 
 ### Fixed Issues
 * core
+  * [#3792](https://github.com/pmd/pmd/issues/3792): \[core] Allow to filter violations in Report
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
 
 ### API Changes

From 6890cb13a4645fbc5bcba6571c8c74e53c1b7ff1 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Tue, 12 Apr 2022 11:47:54 +0200
Subject: [PATCH 046/180] Update
 pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
index a1e018718c..fc8accd1e3 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/FooRule.java
@@ -18,7 +18,7 @@ public class FooRule extends AbstractRule {
     public FooRule() {
         setLanguage(LanguageRegistry.getLanguage(DummyLanguageModule.NAME));
         setName("Foo");
-        setDescription("Description with Unicode Character U+2013: – .");
+        setDescription("Description with Unicode Character U+2013: \u2013 .");
     }
 
     @Override

From d09a48ad5f1e150a009f70ca7e307b9c5ebec7e2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 12:17:01 +0200
Subject: [PATCH 047/180] Update regression-tester and other gems

pmd-tester 1.4.1
nokogiri 1.13.4

Fixes the following security alerts:
- Out-of-bounds Write in zlib affects Nokogiri
- XML Injection in Xerces Java affects Nokogiri
- Inefficient Regular Expression Complexity in Nokogiri
- Denial of Service (DoS) in Nokogiri on JRuby
---
 Gemfile.lock      | 12 ++++++------
 docs/Gemfile.lock | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 751d2e9be4..453188095e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,8 +53,8 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    fugit (1.5.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     git (1.10.2)
       rchardet (~> 1.8)
@@ -68,21 +68,21 @@ GEM
     multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    pmdtester (1.4.0)
+    pmdtester (1.4.1)
       differ (~> 0.1)
       liquid (~> 5.2)
       logger-colors (~> 1.0)
       nokogiri (~> 1.13)
       rufus-scheduler (~> 3.8)
       slop (~> 4.6)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     raabro (1.4.0)
     racc (1.6.0)
     rchardet (1.8.0)
@@ -95,7 +95,7 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    slop (4.9.1)
+    slop (4.9.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.4)
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 48cf85a1d9..9c0396cead 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
     coffee-script-source (1.11.1)
     colorator (1.1.0)
     commonmarker (0.23.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
     em-websocket (0.5.3)
@@ -102,7 +102,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.0)
+    html-pipeline (2.14.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
@@ -232,7 +232,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
@@ -240,7 +240,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     racc (1.6.0)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -269,7 +269,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     unicode-display_width (1.8.0)
     zeitwerk (2.5.4)
 

From aa4e76cb710d149bf0a76a12a1ce6025b892f1cb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 16:55:55 +0200
Subject: [PATCH 048/180] [doc] Update release notes (#2505, #3883)

---
 docs/pages/release_notes.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..44cb34fb14 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -15,10 +15,13 @@ This is a {{ site.pmd.release_type }} release.
 ### New and noteworthy
 
 ### Fixed Issues
+* doc
+  * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 
 ### API Changes
 
 ### External Contributions
+* [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
 
 {% endtocmaker %}
 

From 95a3eaf90f874ab1bb820f13536fa535de6beebb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 16:56:32 +0200
Subject: [PATCH 049/180]  Add @jasonqiu98 as a contributor

---
 .all-contributorsrc                   |  10 ++
 docs/pages/pmd/projectdocs/credits.md | 139 +++++++++++++-------------
 2 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index e4cd253c2b..530ae5a2be 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6584,6 +6584,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jasonqiu98",
+      "name": "Jason Qiu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26801257?v=4",
+      "profile": "https://github.com/jasonqiu98",
+      "contributions": [
+        "code",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index 98d12f8cb2..10b84a28bf 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -314,624 +314,625 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/CrazyUnderdog"><img src="https://avatars.githubusercontent.com/u/23554953?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Brümmer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ACrazyUnderdog" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triskaj"><img src="https://avatars.githubusercontent.com/u/21357785?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan Tříska</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atriskaj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://jlelse.dev/"><img src="https://avatars.githubusercontent.com/u/8822316?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jan-Lukas Else</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajlelse" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/jasonqiu98"><img src="https://avatars.githubusercontent.com/u/26801257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Qiu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jasonqiu98" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=jasonqiu98" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/jdwill"><img src="https://avatars.githubusercontent.com/u/7173290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Williams</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajdwill" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mayerj"><img src="https://avatars.githubusercontent.com/u/4032461?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jean-Paul Mayer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amayerj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jslaroch"><img src="https://avatars.githubusercontent.com/u/49211137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jean-Simon Larochelle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajslaroch" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jbartolotta-sfdc"><img src="https://avatars.githubusercontent.com/u/18196574?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeff Bartolotta</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jbartolotta-sfdc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajbartolotta-sfdc" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jbartolotta-sfdc"><img src="https://avatars.githubusercontent.com/u/18196574?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeff Bartolotta</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jbartolotta-sfdc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajbartolotta-sfdc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jeffhube"><img src="https://avatars.githubusercontent.com/u/1283264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeff Hube</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jeffhube" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajeffhube" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jeffjensen"><img src="https://avatars.githubusercontent.com/u/63805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeff Jensen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajeffjensen" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/JeffMTI"><img src="https://avatars.githubusercontent.com/u/8986912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeff May</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AJeffMTI" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dpa.com/"><img src="https://avatars.githubusercontent.com/u/30986864?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jens Gerdes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajensgerdes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jborgers"><img src="https://avatars.githubusercontent.com/u/24591067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jeroen Borgers</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajborgers" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jerome-d-russ"><img src="https://avatars.githubusercontent.com/u/10404699?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jerome Russ</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajerome-d-russ" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/JerritEic"><img src="https://avatars.githubusercontent.com/u/60690273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JerritEic</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=JerritEic" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=JerritEic" title="Documentation">📖</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/JerritEic"><img src="https://avatars.githubusercontent.com/u/60690273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JerritEic</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=JerritEic" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=JerritEic" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/jiri-pejchal"><img src="https://avatars.githubusercontent.com/u/1450087?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jiri Pejchal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajiri-pejchal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jithinqburst"><img src="https://avatars.githubusercontent.com/u/15030774?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jithin Sunny</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajithinqburst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/JiriSko"><img src="https://avatars.githubusercontent.com/u/997061?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jiří Škorpil</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AJiriSko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/machadoit"><img src="https://avatars.githubusercontent.com/u/13315199?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joao Machado</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amachadoit" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kraussjo"><img src="https://avatars.githubusercontent.com/u/38663002?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jochen Krauss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akraussjo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://about.me/johanhammar/"><img src="https://avatars.githubusercontent.com/u/69011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Johan Hammar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajohanhammar" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/john-karp"><img src="https://avatars.githubusercontent.com/u/6526886?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Karp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajohn-karp" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/john-karp"><img src="https://avatars.githubusercontent.com/u/6526886?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Karp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajohn-karp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://au.linkedin.com/in/johnjiabinzhang"><img src="https://avatars.githubusercontent.com/u/3710709?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John Zhang</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajohn5f35" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/John-Teng"><img src="https://avatars.githubusercontent.com/u/16723151?v=4?s=100" width="100px;" alt=""/><br /><sub><b>John-Teng</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=John-Teng" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AJohn-Teng" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://darakian.github.io/"><img src="https://avatars.githubusercontent.com/u/3607524?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Moroney</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=darakian" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adarakian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jonasgeiregat"><img src="https://avatars.githubusercontent.com/u/288105?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonas Geiregat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajonasgeiregat" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jonathanwiesel"><img src="https://avatars.githubusercontent.com/u/1326781?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan Wiesel</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jonathanwiesel" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajonathanwiesel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://nightfirec.at/"><img src="https://avatars.githubusercontent.com/u/2199511?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jordan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANightfirecat" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jordillachmrf"><img src="https://avatars.githubusercontent.com/u/33347279?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jordi Llach</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajordillachmrf" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jordillachmrf"><img src="https://avatars.githubusercontent.com/u/33347279?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jordi Llach</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajordillachmrf" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.jorsol.com/"><img src="https://avatars.githubusercontent.com/u/3739977?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jorge Solórzano</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajorsol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/JorneVL"><img src="https://avatars.githubusercontent.com/u/27012293?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JorneVL</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AJorneVL" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/josepalafox"><img src="https://avatars.githubusercontent.com/u/1505000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jose Palafox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajosepalafox" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://oitsjustjose.com/"><img src="https://avatars.githubusercontent.com/u/3887324?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jose Stovall</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoitsjustjose" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/joseph-allen-9602671/"><img src="https://avatars.githubusercontent.com/u/3989748?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=JosephAllen" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/jogu"><img src="https://avatars.githubusercontent.com/u/316456?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Heenan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajogu" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jfeingold35"><img src="https://avatars.githubusercontent.com/u/4054488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Feingold</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jfeingold35" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajfeingold35" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jfeingold35"><img src="https://avatars.githubusercontent.com/u/4054488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Feingold</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jfeingold35" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajfeingold35" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/holthauj"><img src="https://avatars.githubusercontent.com/u/2595766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Josh Holthaus</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aholthauj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jarquile"><img src="https://avatars.githubusercontent.com/u/16008477?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joshua S Arquilevich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajarquile" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jtjeferreira"><img src="https://avatars.githubusercontent.com/u/943051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>João Ferreira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jtjeferreira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajtjeferreira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://joaoschmitt.wordpress.com/"><img src="https://avatars.githubusercontent.com/u/2640413?v=4?s=100" width="100px;" alt=""/><br /><sub><b>João Pedro Schmitt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aschmittjoaopedro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jsotuyod"><img src="https://avatars.githubusercontent.com/u/802626?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Juan Martín Sotuyo Dodero</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=jsotuyod" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=jsotuyod" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajsotuyod" title="Bug reports">🐛</a> <a href="#maintenance-jsotuyod" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://twitter.com/elchampo"><img src="https://avatars.githubusercontent.com/u/202728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Juan Pablo Civile</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achampo" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Rest0"><img src="https://avatars.githubusercontent.com/u/6252887?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julian Voronetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARest0" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Rest0"><img src="https://avatars.githubusercontent.com/u/6252887?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julian Voronetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARest0" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://julien.gunnm.org/"><img src="https://avatars.githubusercontent.com/u/993972?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julien</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajuli1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/julius-d"><img src="https://avatars.githubusercontent.com/u/30121440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajulius-d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/JustPRV"><img src="https://avatars.githubusercontent.com/u/3972281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JustPRV</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AJustPRV" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lilith.huxhorn.de/"><img src="https://avatars.githubusercontent.com/u/119647?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jörn Huxhorn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahuxi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/KThompso"><img src="https://avatars.githubusercontent.com/u/2643885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>KThompso</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AKThompso" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yippie"><img src="https://avatars.githubusercontent.com/u/2078328?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kai Amundsen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayippie" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/karel1980"><img src="https://avatars.githubusercontent.com/u/153021?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karel Vervaeke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarel1980" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/karel1980"><img src="https://avatars.githubusercontent.com/u/153021?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karel Vervaeke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarel1980" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anddero"><img src="https://avatars.githubusercontent.com/u/9193126?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karl-Andero Mere</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanddero" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krichter722"><img src="https://avatars.githubusercontent.com/u/4369372?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karl-Philipp Richter</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrichter722" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://betterprojectsfaster.com/"><img src="https://avatars.githubusercontent.com/u/1061209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Karsten Silz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aksilz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://sil.hatenablog.com/"><img src="https://avatars.githubusercontent.com/u/9624059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kazuma Watanabe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awata727" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://siege.gg/"><img src="https://avatars.githubusercontent.com/u/28510368?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kev</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AKevSlashNull" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kevemueller"><img src="https://avatars.githubusercontent.com/u/15782588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Keve Müller</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akevemueller" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/kevingnet"><img src="https://avatars.githubusercontent.com/u/5151740?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Guerra</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kevingnet" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/kevingnet"><img src="https://avatars.githubusercontent.com/u/5151740?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Guerra</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kevingnet" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/nawforce"><img src="https://avatars.githubusercontent.com/u/25647167?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Jones</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anawforce" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.princeton.edu/~wayne"><img src="https://avatars.githubusercontent.com/u/5225666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Wayne</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akevin-wayne" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kieranlblack"><img src="https://avatars.githubusercontent.com/u/48463323?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kieran Black</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akieranlblack" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/KirillZubov"><img src="https://avatars.githubusercontent.com/u/12683885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirill Zubov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AKirillZubov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/clem0110"><img src="https://avatars.githubusercontent.com/u/7726426?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirk Clemens</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=clem0110" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aclem0110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carhartl"><img src="https://avatars.githubusercontent.com/u/21918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Klaus Hartl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarhartl" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vanlooverenkoen"><img src="https://avatars.githubusercontent.com/u/21172855?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Koen Van Looveren</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanlooverenkoen" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vanlooverenkoen"><img src="https://avatars.githubusercontent.com/u/21172855?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Koen Van Looveren</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanlooverenkoen" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kris-scheibe"><img src="https://avatars.githubusercontent.com/u/20039785?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kris Scheibe</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kris-scheibe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akris-scheibe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kthanky"><img src="https://avatars.githubusercontent.com/u/13259828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kunal Thanki</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akthanky" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/larry-diamond-3964042/"><img src="https://avatars.githubusercontent.com/u/1066589?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Larry Diamond</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=larrydiamond" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alarrydiamond" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lars-sh.de/"><img src="https://avatars.githubusercontent.com/u/880198?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lars Knickrehm</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alars-sh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgabrielgr"><img src="https://avatars.githubusercontent.com/u/760959?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Gutierrez</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algabrielgr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lintsi"><img src="https://avatars.githubusercontent.com/u/6848650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lintsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALintsi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://linusfernandes.com/"><img src="https://avatars.githubusercontent.com/u/24714685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Linus Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AFernal73" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://linusfernandes.com/"><img src="https://avatars.githubusercontent.com/u/24714685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Linus Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AFernal73" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/LixonLookose"><img src="https://avatars.githubusercontent.com/u/66419481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lixon Lookose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALixonLookose" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/logesh14"><img src="https://avatars.githubusercontent.com/u/30902439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Logesh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alogesh14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lolgab"><img src="https://avatars.githubusercontent.com/u/5793054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lorenzo Gabriele</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alolgab" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ledoyen"><img src="https://avatars.githubusercontent.com/u/6298315?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Loïc Ledoyen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aledoyen" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lssilva"><img src="https://avatars.githubusercontent.com/u/7464888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Silva</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alssilva" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lsoncini"><img src="https://avatars.githubusercontent.com/u/12226579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Soncini</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lsoncini" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alsoncini" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lslonina"><img src="https://avatars.githubusercontent.com/u/12303865?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukasz Slonina</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alslonina" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lslonina"><img src="https://avatars.githubusercontent.com/u/12303865?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukasz Slonina</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alslonina" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lukebray"><img src="https://avatars.githubusercontent.com/u/39488446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukebray</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALukebray" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgoldstein"><img src="https://avatars.githubusercontent.com/u/1436205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lyor Goldstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algoldstein" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mcmics.jnet24.de/"><img src="https://avatars.githubusercontent.com/u/4604206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MCMicS</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMCMicS" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Macarse"><img src="https://avatars.githubusercontent.com/u/24915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Macarse</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMacarse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pmd.github.io/"><img src="https://avatars.githubusercontent.com/u/26070915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Machine account for PMD</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pmd-bot" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/msiemczyk"><img src="https://avatars.githubusercontent.com/u/5693250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciek Siemczyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsiemczyk" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/maikelsteneker"><img src="https://avatars.githubusercontent.com/u/2788927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maikel Steneker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=maikelsteneker" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amaikelsteneker" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/maikelsteneker"><img src="https://avatars.githubusercontent.com/u/2788927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maikel Steneker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=maikelsteneker" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amaikelsteneker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maksim-m"><img src="https://avatars.githubusercontent.com/u/1863269?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maksim Moiseikin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaksim-m" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/koma0277"><img src="https://avatars.githubusercontent.com/u/35556790?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manfred Koch</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akoma0277" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/manuel-moya-ferrer-11163168/"><img src="https://avatars.githubusercontent.com/u/15876612?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Moya Ferrer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=mmoyaferrer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ammoyaferrer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mryan43"><img src="https://avatars.githubusercontent.com/u/223869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Ryan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amryan43" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/touzoku"><img src="https://avatars.githubusercontent.com/u/1285662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marat Vyshegorodtsev</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atouzoku" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelhaerle"><img src="https://avatars.githubusercontent.com/u/5338817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcel Härle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelhaerle" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/marcello-fialho"><img src="https://avatars.githubusercontent.com/u/28719666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcello Fialho</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcello-fialho" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/marcello-fialho"><img src="https://avatars.githubusercontent.com/u/28719666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcello Fialho</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcello-fialho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lidel.org/"><img src="https://avatars.githubusercontent.com/u/157609?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcin Rataj</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alidel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/adamcin"><img src="https://avatars.githubusercontent.com/u/524972?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Adamcin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aadamcin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/markhall82"><img src="https://avatars.githubusercontent.com/u/22261511?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=markhall82" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarkhall82" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mark.koli.ch/"><img src="https://avatars.githubusercontent.com/u/1202420?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Kolich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkkolich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/markpritchard"><img src="https://avatars.githubusercontent.com/u/8234070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Pritchard</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkpritchard" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maggu2810"><img src="https://avatars.githubusercontent.com/u/204670?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Markus Rathgeb</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaggu2810" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://marquiswang.com/"><img src="https://avatars.githubusercontent.com/u/358220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marquis Wang</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarquiswang" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://marquiswang.com/"><img src="https://avatars.githubusercontent.com/u/358220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marquis Wang</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarquiswang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martofeld"><img src="https://avatars.githubusercontent.com/u/5756343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Feldsztejn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartofeld" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://twitter.com/theneva"><img src="https://avatars.githubusercontent.com/u/1404650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Lehmann</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheneva" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.spamer.me.uk/"><img src="https://avatars.githubusercontent.com/u/2852862?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Spamer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMartin-Spamer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martin-tarjanyi"><img src="https://avatars.githubusercontent.com/u/17810336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Tarjányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartin-tarjanyi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MatFl"><img src="https://avatars.githubusercontent.com/u/8408624?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatFl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMatFl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mateusz-stefanski"><img src="https://avatars.githubusercontent.com/u/28163508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Stefanski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amateusz-stefanski" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mathieugouin"><img src="https://avatars.githubusercontent.com/u/11562302?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathieu Gouin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amathieugouin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mathieugouin"><img src="https://avatars.githubusercontent.com/u/11562302?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathieu Gouin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amathieugouin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MatiasComercio"><img src="https://avatars.githubusercontent.com/u/9677633?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatiasComercio</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=MatiasComercio" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AMatiasComercio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mbenson"><img src="https://avatars.githubusercontent.com/u/487462?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Benson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ambenson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MPoorter"><img src="https://avatars.githubusercontent.com/u/25356097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt De Poorter</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMPoorter" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frizbog"><img src="https://avatars.githubusercontent.com/u/2901857?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Harrah</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrizbog" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mattnelson"><img src="https://avatars.githubusercontent.com/u/1894657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Nelson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amattnelson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/blackmamo"><img src="https://avatars.githubusercontent.com/u/35695811?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Amos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ablackmamo" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mduggan"><img src="https://avatars.githubusercontent.com/u/3765590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Duggan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amduggan" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mduggan"><img src="https://avatars.githubusercontent.com/u/3765590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Duggan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amduggan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/qualidafial"><img src="https://avatars.githubusercontent.com/u/38629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aqualidafial" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matifraga"><img src="https://avatars.githubusercontent.com/u/7543268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matías Fraga</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=matifraga" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amatifraga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marob"><img src="https://avatars.githubusercontent.com/u/3486231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maxime Robert</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=marob" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MetaBF"><img src="https://avatars.githubusercontent.com/u/101029254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MetaBF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMetaBF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://boyl.es/"><img src="https://avatars.githubusercontent.com/u/17732072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelboyles" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikebell90"><img src="https://avatars.githubusercontent.com/u/780301?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikebell90" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://reifyworks.com/"><img src="https://avatars.githubusercontent.com/u/2878?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bernstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrb" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://reifyworks.com/"><img src="https://avatars.githubusercontent.com/u/2878?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bernstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mclay"><img src="https://avatars.githubusercontent.com/u/393727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Clay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amclay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mikedombrowski.com/"><img src="https://avatars.githubusercontent.com/u/3926405?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Dombrowski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMikeDombo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TheRealHaui"><img src="https://avatars.githubusercontent.com/u/6312834?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hausegger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheRealHaui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/michaelhoefer"><img src="https://avatars.githubusercontent.com/u/479449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hoefer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelhoefer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.rrsoftware.de/"><img src="https://avatars.githubusercontent.com/u/1881640?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Möbius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARocketRider" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mnlipp.github.io/"><img src="https://avatars.githubusercontent.com/u/1446020?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael N. Lipp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnlipp" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mpellegrini"><img src="https://avatars.githubusercontent.com/u/466696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Pellegrini</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ampellegrini" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mpellegrini"><img src="https://avatars.githubusercontent.com/u/466696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Pellegrini</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ampellegrini" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pl.linkedin.com/in/mkordas/"><img src="https://avatars.githubusercontent.com/u/5467276?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michal Kordas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkordas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.greenpath.pl/"><img src="https://avatars.githubusercontent.com/u/986194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Borek</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichalborek" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coola"><img src="https://avatars.githubusercontent.com/u/83182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Kuliński</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoola" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mnunezdm.com/"><img src="https://avatars.githubusercontent.com/u/10410852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Miguel Núñez Díaz-Montes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnunezdm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/impmihai"><img src="https://avatars.githubusercontent.com/u/22995337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihai Ionut</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aimpmihai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mhankus"><img src="https://avatars.githubusercontent.com/u/6095361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mirek Hankus</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amhankus" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ImmortalPawn"><img src="https://avatars.githubusercontent.com/u/30688679?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mladjan Gadzic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AImmortalPawn" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ImmortalPawn"><img src="https://avatars.githubusercontent.com/u/30688679?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mladjan Gadzic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AImmortalPawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MrAngry52"><img src="https://avatars.githubusercontent.com/u/30026386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MrAngry52</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMrAngry52" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/muminc"><img src="https://avatars.githubusercontent.com/u/934067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muminur Choudhury</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amuminc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Drofff"><img src="https://avatars.githubusercontent.com/u/45700628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mykhailo Palahuta</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Drofff" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADrofff" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nagendra080389"><img src="https://avatars.githubusercontent.com/u/6088582?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nagendra Kumar Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANagendra080389" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://bit.ly/nahuelbarrios"><img src="https://avatars.githubusercontent.com/u/196234?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nahuel Barrios</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abarriosnahuel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nbraun-Google"><img src="https://avatars.githubusercontent.com/u/52723353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Braun</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anbraun-Google" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/nathanspectacular"><img src="https://avatars.githubusercontent.com/u/88563519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anathanspectacular" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nathanspectacular"><img src="https://avatars.githubusercontent.com/u/88563519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anathanspectacular" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/numeralnathan"><img src="https://avatars.githubusercontent.com/u/1236594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anumeralnathan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mastodon.tetaneutral.net/@roipoussiere"><img src="https://avatars.githubusercontent.com/u/1665542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathanaël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aroipoussiere" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nazdravi"><img src="https://avatars.githubusercontent.com/u/273093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nazdravi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANazdravi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Neha-Dhonde"><img src="https://avatars.githubusercontent.com/u/31505059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neha-Dhonde</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANeha-Dhonde" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/njdoyle"><img src="https://avatars.githubusercontent.com/u/316852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Doyle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anjdoyle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/NickButcher1"><img src="https://avatars.githubusercontent.com/u/8671565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Butcher</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANickButcher1" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/nicoabie"><img src="https://avatars.githubusercontent.com/u/2797992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Gallinal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicoabie" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nicoabie"><img src="https://avatars.githubusercontent.com/u/2797992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Gallinal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicoabie" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niktekusho"><img src="https://avatars.githubusercontent.com/u/18280135?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicola Dal Maso</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniktekusho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/1997376/nicolas-filotto"><img src="https://avatars.githubusercontent.com/u/1618116?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Filotto</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=essobedo" title="Code">💻</a></td>
     <td align="center"><a href="https://www.salesforcecraft.dev/"><img src="https://avatars.githubusercontent.com/u/8916229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Chursin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anchursin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://vanniktech.com/"><img src="https://avatars.githubusercontent.com/u/5759366?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niklas Baudy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanniktech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/havrikov"><img src="https://avatars.githubusercontent.com/u/29175267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolas Havrikov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahavrikov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://nileshvirkar.github.io/"><img src="https://avatars.githubusercontent.com/u/24671786?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nilesh Virkar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANileshVirkar" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/nimit-patel"><img src="https://avatars.githubusercontent.com/u/13987001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nimit Patel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Animit-patel" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nimit-patel"><img src="https://avatars.githubusercontent.com/u/13987001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nimit Patel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Animit-patel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niranjanh"><img src="https://avatars.githubusercontent.com/u/23009945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Harpale</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniranjanh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noahsussman"><img src="https://avatars.githubusercontent.com/u/31490710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sussman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoahsussman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Noah0120"><img src="https://avatars.githubusercontent.com/u/86766856?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah0120</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANoah0120" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://noamtamim.com/"><img src="https://avatars.githubusercontent.com/u/10047237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noam Tamim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoamtamim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/grandinj"><img src="https://avatars.githubusercontent.com/u/796121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noel Grandin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agrandinj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OlafHaalstra"><img src="https://avatars.githubusercontent.com/u/6420723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olaf Haalstra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOlafHaalstra" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Oleg-Pavlenko-EPAM"><img src="https://avatars.githubusercontent.com/u/82513963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleg Pavlenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOleg-Pavlenko-EPAM" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Oleg-Pavlenko-EPAM"><img src="https://avatars.githubusercontent.com/u/82513963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleg Pavlenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOleg-Pavlenko-EPAM" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dykov"><img src="https://avatars.githubusercontent.com/u/36415196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleksii Dykov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dykov" title="Code">💻</a></td>
     <td align="center"><a href="http://www.eikemeier.com/"><img src="https://avatars.githubusercontent.com/u/604196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Eikemeier</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeikemeier" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pyxide"><img src="https://avatars.githubusercontent.com/u/9992381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olivier Parent</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pyxide" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apyxide" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ollieabbey"><img src="https://avatars.githubusercontent.com/u/52665918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ollie Abbey</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ollieabbey" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aollieabbey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OverDrone"><img src="https://avatars.githubusercontent.com/u/8506029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OverDrone</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOverDrone" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ozangulle"><img src="https://avatars.githubusercontent.com/u/1334150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ozan Gulle</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ozangulle" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aozangulle" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/PJ17101"><img src="https://avatars.githubusercontent.com/u/31703044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PUNEET JAIN</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APJ17101" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/PJ17101"><img src="https://avatars.githubusercontent.com/u/31703044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PUNEET JAIN</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APJ17101" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parbatiSF"><img src="https://avatars.githubusercontent.com/u/37078591?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Parbati Bose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AparbatiSF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/paulberg"><img src="https://avatars.githubusercontent.com/u/3239883?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Berg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apaulberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbludov"><img src="https://avatars.githubusercontent.com/u/900805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Bludov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbludov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/malejpavouk"><img src="https://avatars.githubusercontent.com/u/4127023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Mička</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amalejpavouk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pnsantos"><img src="https://avatars.githubusercontent.com/u/630567?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Nuno Santos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apnsantos" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pedrorijo.com/"><img src="https://avatars.githubusercontent.com/u/1999050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Rijo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apedrorijo91" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://belaran.eu/wordpress/"><img src="https://avatars.githubusercontent.com/u/117836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pelisse Romain</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arpelisse" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://belaran.eu/wordpress/"><img src="https://avatars.githubusercontent.com/u/117836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pelisse Romain</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arpelisse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MisterSquishy"><img src="https://avatars.githubusercontent.com/u/5599894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pete Davids</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMisterSquishy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://blog.bruin.sg/"><img src="https://avatars.githubusercontent.com/u/4156901?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Bruin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auncletall" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pchittum"><img src="https://avatars.githubusercontent.com/u/1127876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Chittum</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pchittum" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apchittum" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/petercudmore"><img src="https://avatars.githubusercontent.com/u/12710815?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Cudmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apetercudmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pkasson"><img src="https://avatars.githubusercontent.com/u/3072247?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kasson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apkasson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.code-cop.org/"><img src="https://avatars.githubusercontent.com/u/830028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kofler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acodecop" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/gpbp"><img src="https://avatars.githubusercontent.com/u/18648177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pham Hai Trung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agpbp" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/gpbp"><img src="https://avatars.githubusercontent.com/u/18648177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pham Hai Trung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agpbp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/acanda"><img src="https://avatars.githubusercontent.com/u/174978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Graf</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=acanda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aacanda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krallus"><img src="https://avatars.githubusercontent.com/u/29927450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Hachey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrallus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pozil.github.io/"><img src="https://avatars.githubusercontent.com/u/5071767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philippe Ozil</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apozil" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phinehasz"><img src="https://avatars.githubusercontent.com/u/36982629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phinehas Artemix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphinehasz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fluxroot"><img src="https://avatars.githubusercontent.com/u/247365?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phokham Nonava</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afluxroot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szyman23"><img src="https://avatars.githubusercontent.com/u/4140681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Szymański</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszyman23" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pzygielo"><img src="https://avatars.githubusercontent.com/u/11896137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotrek Żygieło</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pzygielo" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apzygielo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pzygielo"><img src="https://avatars.githubusercontent.com/u/11896137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotrek Żygieło</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pzygielo" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apzygielo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/pranayjaiswal"><img src="https://avatars.githubusercontent.com/u/1728493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pranay Jaiswal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apranayjswl007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kamath-prasad"><img src="https://avatars.githubusercontent.com/u/28445395?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasad Kamath</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akamath-prasad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Prasanna-Loga"><img src="https://avatars.githubusercontent.com/u/36530081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasanna</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APrasanna-Loga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Presh-AR"><img src="https://avatars.githubusercontent.com/u/20354066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Presh-AR</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APresh-AR" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Puneet1726"><img src="https://avatars.githubusercontent.com/u/26565880?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet1726</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APuneet1726" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrfyda"><img src="https://avatars.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael Cortês</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrfyda" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/RaheemShaik999"><img src="https://avatars.githubusercontent.com/u/43146735?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RaheemShaik999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARaheemShaik999" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/RaheemShaik999"><img src="https://avatars.githubusercontent.com/u/43146735?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RaheemShaik999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARaheemShaik999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshggwp"><img src="https://avatars.githubusercontent.com/u/8025160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RajeshR</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rajeshggwp" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshggwp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ramachandra-mohan"><img src="https://avatars.githubusercontent.com/u/22360770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ramachandra Mohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aramachandra-mohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.walkmod.com/"><img src="https://avatars.githubusercontent.com/u/1483433?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raquel Pau</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arpau" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://ravikiranj.net/"><img src="https://avatars.githubusercontent.com/u/389491?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ravikiran Janardhana</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aravikiranj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/reda_benh"><img src="https://avatars.githubusercontent.com/u/1609466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reda Benhemmouche</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARedaBenh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dogeforce.com/"><img src="https://avatars.githubusercontent.com/u/6956403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Oliveira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=renatoliveira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arenatoliveira" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rdicroce"><img src="https://avatars.githubusercontent.com/u/1458922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rich DiCroce</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ardicroce" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rdicroce"><img src="https://avatars.githubusercontent.com/u/1458922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rich DiCroce</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ardicroce" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://developer.riotgames.com/"><img src="https://avatars.githubusercontent.com/u/33143437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Riot R1cket</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARiotR1cket" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rishjain.me/"><img src="https://avatars.githubusercontent.com/u/25207823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabh Jain</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajainrish" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rishabhdeepsingh"><img src="https://avatars.githubusercontent.com/u/28526643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RishabhDeep Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arishabhdeepsingh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmartinus"><img src="https://avatars.githubusercontent.com/u/12573669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robbie Martinus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmartinus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armartinus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RobertHenry6bev"><img src="https://avatars.githubusercontent.com/u/4371939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Henry</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobertHenry6bev" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertpainsi"><img src="https://avatars.githubusercontent.com/u/1794599?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Painsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertpainsi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Sebanisu"><img src="https://avatars.githubusercontent.com/u/1035905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Russell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASebanisu" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Sebanisu"><img src="https://avatars.githubusercontent.com/u/1035905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Russell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASebanisu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsoesemann"><img src="https://avatars.githubusercontent.com/u/8180281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Sösemann</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Documentation">📖</a> <a href="#talk-rsoesemann" title="Talks">📢</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsoesemann" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertwhitebit"><img src="https://avatars.githubusercontent.com/u/11049034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Whitebit</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertwhitebit" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://androbin.de/"><img src="https://avatars.githubusercontent.com/u/16437156?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Richtsfeld</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AAndrobin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.whatsthistimestamp.com/"><img src="https://avatars.githubusercontent.com/u/16778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Stocker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=robinst" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arobinst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.robinwils.com/"><img src="https://avatars.githubusercontent.com/u/5617025?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Wils</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobin-Wils" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RochusOest"><img src="https://avatars.githubusercontent.com/u/65393072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RochusOest</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARochusOest" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rodolfonoviski"><img src="https://avatars.githubusercontent.com/u/7316374?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodolfo Noviski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arodolfonoviski" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rodolfonoviski"><img src="https://avatars.githubusercontent.com/u/7316374?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodolfo Noviski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arodolfonoviski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Casara"><img src="https://avatars.githubusercontent.com/u/2224686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Casara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ACasara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rtfpessoa.xyz/"><img src="https://avatars.githubusercontent.com/u/902384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Artfpessoa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsalvador"><img src="https://avatars.githubusercontent.com/u/1301827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roman Salvador</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsalvador" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsalvador" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.rblasch.org/"><img src="https://avatars.githubusercontent.com/u/52590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ronald Blaschke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arblasch" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TWiStErRob"><img src="https://avatars.githubusercontent.com/u/2906988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Róbert Papp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATWiStErRob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://saikat.hashnode.dev/"><img src="https://avatars.githubusercontent.com/u/41847480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saikat Sengupta</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3As4ik4t" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://miplodder.github.io/"><img src="https://avatars.githubusercontent.com/u/22195621?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saksham Handu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AmiPlodder" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://miplodder.github.io/"><img src="https://avatars.githubusercontent.com/u/22195621?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saksham Handu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AmiPlodder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Saladoc"><img src="https://avatars.githubusercontent.com/u/36816545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saladoc</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASaladoc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SalesforceBobLightning"><img src="https://avatars.githubusercontent.com/u/39457343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Salesforce Bob Lightning</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASalesforceBobLightning" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SamCarlberg"><img src="https://avatars.githubusercontent.com/u/6320992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Carlberg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASamCarlberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://d.hatena.ne.jp/megascus/"><img src="https://avatars.githubusercontent.com/u/976085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Kubo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amegascus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scottkennedy"><img src="https://avatars.githubusercontent.com/u/881690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Kennedy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascottkennedy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sschuberth"><img src="https://avatars.githubusercontent.com/u/349154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schuberth</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asschuberth" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itsmebasti"><img src="https://avatars.githubusercontent.com/u/12232063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schwarz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitsmebasti" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
     <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zzzzfeng"><img src="https://avatars.githubusercontent.com/u/8851007?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zzzzfeng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azzzzfeng" title="Bug reports">🐛</a></td>

From 45cb0a0a3550d70867046b2807727a6de872b22f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 12 Apr 2022 19:20:56 +0200
Subject: [PATCH 050/180] [ci] Fix pmd-regression-tester calls for PRs against
 pmd/7.0.x

In that case, we should run the regression tests against master
with the same ruleset as used for pmd/7.0.x in the previous
run.
---
 Dangerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dangerfile b/Dangerfile
index 735dc7d737..f0fd4eb8a5 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -42,7 +42,7 @@ def run_pmdtester
         @base_branch = 'master'
         @logger.info "\n\n--------------------------------------"
         @logger.info "Run against #{@base_branch}"
-        @summary = PmdTester::Runner.new(get_args(@base_branch)).run
+        @summary = PmdTester::Runner.new(get_args(@base_branch, FALSE, 'target/diff1/patch_config.xml')).run
 
         # move the generated report out of the way
         FileUtils.mv 'target/reports/diff', 'target/diff2'

From c1dad89317b54eecc1d7d9f5c73ec5b6eabd3194 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Wed, 13 Apr 2022 09:33:50 +0200
Subject: [PATCH 051/180] Update
 pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java

---
 .../net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
index d6f78fa5f4..921b3b697c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
@@ -142,7 +142,7 @@ public final class ASTMethodDeclaration extends AbstractMethodOrConstructorDecla
     /**
      * Returns the result type node of the method. This may be a {@link ASTVoidType}.
      */
-    public @NonNull ASTType getResultTypeNode() {
+    public @NonNull ASTType getResultTypeNode() { // TODO rename to getResultType()
         return firstChild(ASTType.class);
     }
 

From 7bf44c69ac4528c91ee2b561143894dd16350776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 19:49:48 +0200
Subject: [PATCH 052/180] Replace package name with class name

Co-authored-by: Andreas Dangel <andreas.dangel@adangel.org>
---
 pmd-java/etc/grammar/Java.jjt                                   | 2 +-
 .../sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
index 0563a698e4..d175247c17 100644
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -2759,7 +2759,7 @@ void ModuleDirective() #void:
       ModuleName() ";" ) #ModuleRequiresDirective
   | ( LOOKAHEAD({isKeyword("exports")})  <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())* ] ";" ) #ModuleExportsDirective
   | ( LOOKAHEAD({isKeyword("opens")})    <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())* ] ";" ) #ModuleOpensDirective
-  | ( LOOKAHEAD({isKeyword("uses")})     <IDENTIFIER> packageName=VoidNameNoLookahead() {jjtThis.setPackageName(packageName);} ";" ) #ModuleUsesDirective
+  | ( LOOKAHEAD({isKeyword("uses")})     <IDENTIFIER> ClassName() ";" ) #ModuleUsesDirective
   | ( LOOKAHEAD({isKeyword("provides")}) <IDENTIFIER> ClassName() LOOKAHEAD({isKeyword("with")}) <IDENTIFIER> ClassName() ("," ClassName() )* ";" ) #ModuleProvidesDirective
 }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
index c7557f6e4a..19541af597 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
@@ -13,7 +13,7 @@ package net.sourceforge.pmd.lang.java.ast;
  *
  * </pre>
  */
-public final class ASTModuleUsesDirective extends AbstractPackageNameModuleDirective {
+public final class ASTModuleUsesDirective extends ASTModuleDirective {
 
     ASTModuleUsesDirective(int id) {
         super(id, DirectiveType.USES);

From 1b54b35441cc7f4d810cd775cbfe92a0f983adaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 19:52:42 +0200
Subject: [PATCH 053/180] Remove DirectiveType enum

---
 .../pmd/lang/java/ast/ASTModuleDirective.java | 23 +------------------
 .../java/ast/ASTModuleExportsDirective.java   |  2 +-
 .../java/ast/ASTModuleOpensDirective.java     |  2 +-
 .../java/ast/ASTModuleProvidesDirective.java  |  2 +-
 .../java/ast/ASTModuleRequiresDirective.java  |  2 +-
 .../lang/java/ast/ASTModuleUsesDirective.java |  2 +-
 .../AbstractPackageNameModuleDirective.java   |  4 ++--
 7 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
index 41f6cc277d..a9bf8c5d91 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
@@ -5,8 +5,6 @@
 package net.sourceforge.pmd.lang.java.ast;
 
 
-import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
-
 /**
  * A directive of a {@linkplain ASTModuleDeclaration module declaration}.
  * Implementations provide more specific attributes.
@@ -23,28 +21,9 @@ import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
  */
 public abstract class ASTModuleDirective extends AbstractJavaNode {
 
-    private final DirectiveType type;
 
-
-    ASTModuleDirective(int id, DirectiveType type) {
+    ASTModuleDirective(int id) {
         super(id);
-        this.type = type;
-    }
-
-    /**
-     * Returns the kind of the directive.
-     */
-    @NoAttribute
-    public DirectiveType getType() {
-        return type;
-    }
-
-    /**
-     * Kind of a module directive. Specific kinds are represented by
-     * specific subclasses.
-     */
-    public enum DirectiveType {
-        REQUIRES, EXPORTS, OPENS, USES, PROVIDES
     }
 
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
index ab2fe93fed..e20dbf2269 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java
@@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream;
 public final class ASTModuleExportsDirective extends AbstractPackageNameModuleDirective {
 
     ASTModuleExportsDirective(int id) {
-        super(id, DirectiveType.EXPORTS);
+        super(id);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
index b575c83de9..d412faa88c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java
@@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream;
 public final class ASTModuleOpensDirective extends AbstractPackageNameModuleDirective {
 
     ASTModuleOpensDirective(int id) {
-        super(id, DirectiveType.OPENS);
+        super(id);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
index 8c833733bc..939914cf2d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
@@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream;
 public final class ASTModuleProvidesDirective extends ASTModuleDirective {
 
     ASTModuleProvidesDirective(int id) {
-        super(id, DirectiveType.PROVIDES);
+        super(id);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
index add47fa902..c696aba3b3 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java
@@ -24,7 +24,7 @@ public final class ASTModuleRequiresDirective extends ASTModuleDirective {
     private boolean isTransitive;
 
     ASTModuleRequiresDirective(int id) {
-        super(id, DirectiveType.REQUIRES);
+        super(id);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
index 19541af597..447985fb67 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
@@ -16,7 +16,7 @@ package net.sourceforge.pmd.lang.java.ast;
 public final class ASTModuleUsesDirective extends ASTModuleDirective {
 
     ASTModuleUsesDirective(int id) {
-        super(id, DirectiveType.USES);
+        super(id);
     }
 
     @Override
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
index 6bf5a78bf3..38a66d9f1d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java
@@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.java.ast;
 
 public abstract class AbstractPackageNameModuleDirective extends ASTModuleDirective {
 
-    AbstractPackageNameModuleDirective(int id, DirectiveType type) {
-        super(id, type);
+    AbstractPackageNameModuleDirective(int id) {
+        super(id);
     }
 
     public final String getPackageName() {

From 8b67ab93a7015bd279efe6c28be00f83e1bfc8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 19:54:40 +0200
Subject: [PATCH 054/180] Rename getters

---
 .../pmd/lang/java/ast/ASTModuleProvidesDirective.java | 11 +++++++++--
 .../pmd/lang/java/ast/ASTModuleUsesDirective.java     |  9 +++++++++
 .../pmd/lang/java/ast/ASTModuleDeclarationTest.kt     |  8 ++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
index 939914cf2d..5e58bb0e7c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java
@@ -29,11 +29,18 @@ public final class ASTModuleProvidesDirective extends ASTModuleDirective {
         return visitor.visit(this, data);
     }
 
-    public ASTClassOrInterfaceType getProvidedInterface() {
+    /**
+     * Returns the node representing the provided interface.
+     */
+    public ASTClassOrInterfaceType getService() {
         return firstChild(ASTClassOrInterfaceType.class);
     }
 
-    public NodeStream<ASTClassOrInterfaceType> getImplementations() {
+    /**
+     * Returns the nodes representing the service providers, that is,
+     * the service implementations.
+     */
+    public NodeStream<ASTClassOrInterfaceType> getServiceProviders() {
         return children(ASTClassOrInterfaceType.class).drop(1);
     }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
index 447985fb67..b1020e0fa7 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java
@@ -23,4 +23,13 @@ public final class ASTModuleUsesDirective extends ASTModuleDirective {
     protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
+
+
+    /**
+     * Returns the node representing the consumed service.
+     */
+    public ASTClassOrInterfaceType getService() {
+        return firstChild(ASTClassOrInterfaceType.class);
+    }
+
 }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt
index 9549e4b824..ec40f586ec 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclarationTest.kt
@@ -86,9 +86,9 @@ class ASTModuleDeclarationTest : ParserTestSpec({
     parserTest("Test uses") {
 
         inContext(ModuleDirectiveParsingContext) {
-            "uses a.package_;" should parseAs {
+            "uses a.clazz.Name;" should parseAs {
                 child<ASTModuleUsesDirective> {
-                    it::getPackageName shouldBe "a.package_"
+                    it::getService shouldBe classType("Name")
                 }
             }
         }
@@ -99,8 +99,8 @@ class ASTModuleDeclarationTest : ParserTestSpec({
             enableProcessing()
             "provides an.Itf with imp1.Impl;" should parseAs {
                 child<ASTModuleProvidesDirective> {
-                    it::getProvidedInterface shouldBe classType("Itf")
-                    it.implementations.toList() shouldBe listOf(
+                    it::getService shouldBe classType("Itf")
+                    it.serviceProviders.toList() shouldBe listOf(
                         classType("Impl") {
                             val sym = it.referencedSym as JClassSymbol
                             sym.canonicalName shouldBe "imp1.Impl"

From 35d5eca1cacad9cc87391f694aa5ca395e76b732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 20:09:24 +0200
Subject: [PATCH 055/180] Fix tests

---
 .../lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
index 41fd39aff9..c069c4d11c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java9/jdk9_module_info.txt
@@ -10,7 +10,8 @@
       +- ModuleExportsDirective[@PackageName = "com.example.foo.bar"]
       +- ModuleExportsDirective[@PackageName = "com.example.foo.internal"]
       |  +- ModuleName[@Name = "com.example.foo.probe"]
-      +- ModuleUsesDirective[@PackageName = "com.example.foo.spi.Intf"]
+      +- ModuleUsesDirective[]
+      |  +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Intf"]
       +- ModuleProvidesDirective[]
       |  +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Intf"]
       |  +- ClassOrInterfaceType[@FullyQualified = "true", @SimpleName = "Impl"]

From 38d731cac2764c44626f506d3714316e12afa974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 20:27:26 +0200
Subject: [PATCH 056/180] Add tests, use MessageReporter in
 SemanticErrorReporter

---
 .../main/java/net/sourceforge/pmd/PMD.java    | 51 +++++++++++--------
 .../net/sourceforge/pmd/PMDConfiguration.java | 23 +++++++++
 .../java/net/sourceforge/pmd/PmdAnalysis.java | 16 ++----
 .../pmd/lang/ast/SemanticErrorReporter.java   | 18 +++++--
 .../pmd/processor/PmdRunnable.java            |  2 +-
 .../pmd/lang/DummyLanguageModule.java         | 13 +++++
 .../pmd/processor/PmdRunnableTest.java        | 29 ++++++++++-
 .../pmd/lang/java/JavaParsingHelper.java      | 20 ++++++--
 8 files changed, 129 insertions(+), 43 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
index 9c1b261c88..8d65ebb4ce 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
@@ -14,7 +14,9 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Objects;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
@@ -189,7 +191,12 @@ public final class PMD {
             System.err.println(CliMessages.runWithHelpFlagMessage());
             return StatusCode.ERROR;
         }
-        return runPmd(parseResult.toConfiguration());
+
+        PMDConfiguration configuration = Objects.requireNonNull(parseResult.toConfiguration());
+        MessageReporter pmdReporter = setupMessageReporter(configuration);
+        configuration.setReporter(pmdReporter);
+
+        return runPmd(configuration);
     }
 
     private static void printErrorDetected(int errors) {
@@ -213,28 +220,11 @@ public final class PMD {
             TimeTracker.startGlobalTracking();
         }
 
-        // only reconfigure logging, if debug flag was used on command line
-        // otherwise just use whatever is in conf/simplelogger.properties which happens automatically
-        if (configuration.isDebug()) {
-            Slf4jSimpleConfiguration.reconfigureDefaultLogLevel(Level.TRACE);
-            // need to reload the logger with the new configuration
-            log = LoggerFactory.getLogger(PMD.class);
-        }
-        // create a top-level reporter
-        // TODO CLI errors should also be reported through this
-        // TODO this should not use the logger as backend, otherwise without
-        //  slf4j implementation binding, errors are entirely ignored.
-        MessageReporter pmdReporter = new SimpleMessageReporter(log);
-        // always install java.util.logging to slf4j bridge
-        Slf4jSimpleConfiguration.installJulBridge();
-        // logging, mostly for testing purposes
-        Level defaultLogLevel = Slf4jSimpleConfiguration.getDefaultLogLevel();
-        log.info("Log level is at {}", defaultLogLevel);
-
+        MessageReporter pmdReporter = configuration.getReporter();
         try {
             PmdAnalysis pmd;
             try {
-                pmd = PmdAnalysis.create(configuration, pmdReporter);
+                pmd = PmdAnalysis.create(configuration);
             } catch (Exception e) {
                 pmdReporter.errorEx("Could not initialize analysis", e);
                 return StatusCode.ERROR;
@@ -263,6 +253,27 @@ public final class PMD {
         }
     }
 
+    private static @NonNull MessageReporter setupMessageReporter(PMDConfiguration configuration) {
+        // only reconfigure logging, if debug flag was used on command line
+        // otherwise just use whatever is in conf/simplelogger.properties which happens automatically
+        if (configuration.isDebug()) {
+            Slf4jSimpleConfiguration.reconfigureDefaultLogLevel(Level.TRACE);
+            // need to reload the logger with the new configuration
+            log = LoggerFactory.getLogger(PMD.class);
+        }
+        // create a top-level reporter
+        // TODO CLI errors should also be reported through this
+        // TODO this should not use the logger as backend, otherwise without
+        //  slf4j implementation binding, errors are entirely ignored.
+        MessageReporter pmdReporter = new SimpleMessageReporter(log);
+        // always install java.util.logging to slf4j bridge
+        Slf4jSimpleConfiguration.installJulBridge();
+        // logging, mostly for testing purposes
+        Level defaultLogLevel = Slf4jSimpleConfiguration.getDefaultLogLevel();
+        log.info("Log level is at {}", defaultLogLevel);
+        return pmdReporter;
+    }
+
     private static void finishBenchmarker(PMDConfiguration configuration) {
         if (configuration.isBenchmark()) {
             final TimingReport timingReport = TimeTracker.stopGlobalTracking();
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
index bc6e618aa2..ee24a9cb8e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
@@ -14,6 +14,7 @@ import java.util.Properties;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.annotation.DeprecatedUntil700;
 import net.sourceforge.pmd.cache.AnalysisCache;
@@ -27,6 +28,8 @@ import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.renderers.RendererFactory;
 import net.sourceforge.pmd.util.ClasspathClassLoader;
+import net.sourceforge.pmd.util.log.MessageReporter;
+import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter;
 
 /**
  * This class contains the details for the runtime configuration of a PMD run.
@@ -100,6 +103,7 @@ public class PMDConfiguration extends AbstractConfiguration {
     private ClassLoader classLoader = getClass().getClassLoader();
     private LanguageVersionDiscoverer languageVersionDiscoverer = new LanguageVersionDiscoverer();
     private LanguageVersion forceLanguageVersion;
+    private MessageReporter reporter = new SimpleMessageReporter(LoggerFactory.getLogger(PMD.class));
 
     // Rule and source file options
     private List<String> ruleSets = new ArrayList<>();
@@ -246,6 +250,25 @@ public class PMDConfiguration extends AbstractConfiguration {
         }
     }
 
+    /**
+     * Returns the message reporter that is to be used while running
+     * the analysis.
+     */
+    public @NonNull MessageReporter getReporter() {
+        return reporter;
+    }
+
+    /**
+     * Sets the message reporter that is to be used while running
+     * the analysis.
+     *
+     * @param reporter A non-null message reporter
+     */
+    public void setReporter(@NonNull MessageReporter reporter) {
+        AssertionUtil.requireParamNotNull("reporter", reporter);
+        this.reporter = reporter;
+    }
+
     /**
      * Get the LanguageVersionDiscoverer, used to determine the LanguageVersion
      * of a source file.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
index 1b74fa5ab8..dd80641c41 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PmdAnalysis.java
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.Report.GlobalReportBuilderListener;
-import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.benchmark.TimeTracker;
 import net.sourceforge.pmd.benchmark.TimedOperation;
 import net.sourceforge.pmd.benchmark.TimedOperationCategory;
@@ -36,7 +35,6 @@ import net.sourceforge.pmd.util.ClasspathClassLoader;
 import net.sourceforge.pmd.util.IOUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
 import net.sourceforge.pmd.util.log.MessageReporter;
-import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter;
 
 /**
  * Main programmatic API of PMD. Create and configure a {@link PMDConfiguration},
@@ -87,9 +85,9 @@ public final class PmdAnalysis implements AutoCloseable {
      * the file collector ({@link #files()}), but more can be added
      * programmatically using the file collector.
      */
-    private PmdAnalysis(PMDConfiguration config, MessageReporter reporter) {
+    private PmdAnalysis(PMDConfiguration config) {
         this.configuration = config;
-        this.reporter = reporter;
+        this.reporter = config.getReporter();
         this.collector = FileCollector.newCollector(
             config.getLanguageVersionDiscoverer(),
             reporter
@@ -110,15 +108,7 @@ public final class PmdAnalysis implements AutoCloseable {
      * </ul>
      */
     public static PmdAnalysis create(PMDConfiguration config) {
-        return create(
-            config,
-            new SimpleMessageReporter(LoggerFactory.getLogger(PmdAnalysis.class))
-        );
-    }
-
-    @InternalApi
-    static PmdAnalysis create(PMDConfiguration config, MessageReporter reporter) {
-        PmdAnalysis pmd = new PmdAnalysis(config, reporter);
+        PmdAnalysis pmd = new PmdAnalysis(config);
 
         // note: do not filter files by language
         // they could be ignored later. The problem is if you call
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
index 2dfe1ddb36..979ae36c6c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
@@ -9,6 +9,9 @@ import java.text.MessageFormat;
 import org.slf4j.Logger;
 import org.slf4j.event.Level;
 
+import net.sourceforge.pmd.util.StringUtil;
+import net.sourceforge.pmd.util.log.MessageReporter;
+
 /**
  * Reports errors that occur after parsing. This may be used to implement
  * semantic checks in a language specific way.
@@ -81,12 +84,17 @@ public interface SemanticErrorReporter {
     }
 
 
-    static SemanticErrorReporter reportToLogger(Logger logger) {
+    /**
+     * Forwards to a {@link MessageReporter}, except trace and debug
+     * messages which are reported on a logger.
+     */
+    static SemanticErrorReporter reportToLogger(MessageReporter reporter, Logger logger) {
         return new SemanticErrorReporter() {
             private boolean hasError = false;
 
             private String locPrefix(Node loc) {
-                return "at " + loc.getAstInfo().getFileName() + " :" + loc.getBeginLine() + ":" + loc.getBeginColumn() + ": ";
+                return "at " + loc.getAstInfo().getFileName() + " :" + loc.getBeginLine() + ":" + loc.getBeginColumn()
+                    + ": ";
             }
 
             private String makeMessage(Node location, String message, Object[] args) {
@@ -95,7 +103,11 @@ public interface SemanticErrorReporter {
 
             private String logMessage(Level level, Node location, String message, Object[] args) {
                 String fullMessage = makeMessage(location, message, args);
-                logger.atLevel(level).log(fullMessage);
+                if (level.compareTo(Level.INFO) < 0) {
+                    logger.atLevel(level).log(fullMessage);
+                } else {
+                    reporter.log(level, StringUtil.quoteMessageFormat(fullMessage)); // already formatted
+                }
                 return fullMessage;
             }
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
index ac4aec1b8f..20173a5247 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/processor/PmdRunnable.java
@@ -129,7 +129,7 @@ abstract class PmdRunnable implements Runnable {
                                LanguageVersion languageVersion,
                                String filename) throws FileAnalysisException {
 
-        SemanticErrorReporter reporter = SemanticErrorReporter.reportToLogger(LOGGER);
+        SemanticErrorReporter reporter = SemanticErrorReporter.reportToLogger(configuration.getReporter(), LOG);
         ParserTask task = new ParserTask(
             languageVersion,
             filename,
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index 3b9d4f6d72..c2a2a8a4b8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -11,6 +11,7 @@ import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.Parser;
+import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 import net.sourceforge.pmd.lang.rule.impl.DefaultRuleViolationFactory;
 
@@ -34,6 +35,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
         addDefaultVersion("1.7", new Handler(), "7");
         addVersion("1.8", new Handler(), "8");
         addVersion("1.9-throws", new HandlerWithParserThatThrows());
+        addVersion("1.9-semantic_error", new HandlerWithParserThatReportsSemanticError());
     }
 
     public static class Handler extends AbstractPmdLanguageVersionHandler {
@@ -67,6 +69,17 @@ public class DummyLanguageModule extends BaseLanguageModule {
         }
     }
 
+    public static class HandlerWithParserThatReportsSemanticError extends Handler {
+        @Override
+        public Parser getParser() {
+            return task -> {
+                RootNode root = super.getParser().parse(task);
+                task.getReporter().error(root, "An error occurred!");
+                return root;
+            };
+        }
+    }
+
     public static class RuleViolationFactory extends DefaultRuleViolationFactory {
 
         @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
index 4ef12433e3..fab2edd9ab 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/processor/PmdRunnableTest.java
@@ -7,6 +7,12 @@ package net.sourceforge.pmd.processor;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
+import static org.mockito.Mockito.contains;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import java.util.List;
 
@@ -15,6 +21,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 import org.junit.rules.TestRule;
+import org.mockito.Mockito;
+import org.slf4j.event.Level;
 
 import net.sourceforge.pmd.PMDConfiguration;
 import net.sourceforge.pmd.Report;
@@ -34,6 +42,7 @@ import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 import net.sourceforge.pmd.processor.MonoThreadProcessor.MonothreadRunnable;
 import net.sourceforge.pmd.util.datasource.DataSource;
+import net.sourceforge.pmd.util.log.MessageReporter;
 
 public class PmdRunnableTest {
 
@@ -42,20 +51,27 @@ public class PmdRunnableTest {
 
     private LanguageVersion dummyThrows;
     private LanguageVersion dummyDefault;
+    private LanguageVersion dummySemanticError;
     private PMDConfiguration configuration;
     private PmdRunnable pmdRunnable;
     private GlobalReportBuilderListener reportBuilder;
+    private MessageReporter reporter;
+    private Rule rule;
 
     @Before
     public void prepare() {
         Language dummyLanguage = LanguageRegistry.findLanguageByTerseName(DummyLanguageModule.TERSE_NAME);
         dummyDefault = dummyLanguage.getDefaultVersion();
         dummyThrows = dummyLanguage.getVersion("1.9-throws");
+        dummySemanticError = dummyLanguage.getVersion("1.9-semantic_error");
         DataSource dataSource = DataSource.forString("test", "test.dummy");
 
-        Rule rule = new RuleThatThrows();
+
+        rule = spy(new RuleThatThrows());
         configuration = new PMDConfiguration();
         reportBuilder = new GlobalReportBuilderListener();
+        reporter = mock(MessageReporter.class);
+        configuration.setReporter(reporter);
         pmdRunnable = new MonothreadRunnable(new RuleSets(RuleSet.forSingleRule(rule)),
                                              dataSource,
                                              reportBuilder,
@@ -102,6 +118,17 @@ public class PmdRunnableTest {
         Assert.assertThrows(AssertionError.class, pmdRunnable::run);
     }
 
+
+    @Test
+    public void semanticErrorShouldAbortTheRun() {
+        configuration.setDefaultLanguageVersion(dummySemanticError);
+
+        pmdRunnable.run();
+
+        verify(reporter).log(eq(Level.INFO), contains("skipping rule analysis"));
+        verify(rule, never()).apply(Mockito.any(), Mockito.any());
+    }
+
     private static class RuleThatThrows extends AbstractRule {
 
         RuleThatThrows() {
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
index 3e9a884637..f6df0c19c9 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
@@ -30,6 +30,8 @@ import net.sourceforge.pmd.lang.java.types.TypeSystem;
 import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger;
 import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.SimpleLogger;
 import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.VerboseLogger;
+import net.sourceforge.pmd.util.log.MessageReporter;
+import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter;
 
 import kotlin.Pair;
 
@@ -110,12 +112,20 @@ public class JavaParsingHelper extends BaseParsingHelper<JavaParsingHelper, ASTC
         }
 
         public TestCheckLogger(boolean doLogOnConsole) {
-            if (doLogOnConsole) {
-                Logger consoleLogger = LoggerFactory.getLogger(TestCheckLogger.class);
-                baseLogger = SemanticErrorReporter.reportToLogger(consoleLogger);
-            } else {
-                baseLogger = SemanticErrorReporter.noop();
+            this(defaultMessageReporter(doLogOnConsole));
+        }
+
+        public TestCheckLogger(SemanticErrorReporter baseLogger) {
+            this.baseLogger = baseLogger;
+        }
+
+        private static SemanticErrorReporter defaultMessageReporter(boolean doLog) {
+            if (!doLog) {
+                return SemanticErrorReporter.noop();
             }
+            Logger consoleLogger = LoggerFactory.getLogger(TestCheckLogger.class);
+            MessageReporter reporter = new SimpleMessageReporter(consoleLogger);
+            return SemanticErrorReporter.reportToLogger(reporter, consoleLogger);
         }
 
         @Override

From d599a7d6f76c34776e583eab9bb7eaa11ecc71f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 21:03:52 +0200
Subject: [PATCH 057/180] Add tests for Sem error reporter

---
 .../pmd/lang/ast/SemanticErrorReporter.java   |  2 +-
 .../lang/ast/SemanticErrorReporterTest.java   | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporterTest.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
index 979ae36c6c..84df3a625c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporter.java
@@ -103,7 +103,7 @@ public interface SemanticErrorReporter {
 
             private String logMessage(Level level, Node location, String message, Object[] args) {
                 String fullMessage = makeMessage(location, message, args);
-                if (level.compareTo(Level.INFO) < 0) {
+                if (level.compareTo(Level.INFO) > 0) {
                     logger.atLevel(level).log(fullMessage);
                 } else {
                     reporter.log(level, StringUtil.quoteMessageFormat(fullMessage)); // already formatted
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporterTest.java
new file mode 100644
index 0000000000..5497c9b93a
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/SemanticErrorReporterTest.java
@@ -0,0 +1,80 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast;
+
+import static org.mockito.Mockito.contains;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.event.Level;
+import org.slf4j.helpers.NOPLogger;
+
+import net.sourceforge.pmd.lang.DummyLanguageModule;
+import net.sourceforge.pmd.lang.Language;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
+import net.sourceforge.pmd.util.log.MessageReporter;
+
+/**
+ * Reports errors that occur after parsing. This may be used to implement
+ * semantic checks in a language specific way.
+ */
+public class SemanticErrorReporterTest {
+
+    private static final String MOCK_FILENAME = "dummy/file.txt";
+    MessageReporter mockReporter;
+    Logger mockLogger;
+
+    @Before
+    public void setup() {
+        mockReporter = mock(MessageReporter.class);
+        mockLogger = spy(NOPLogger.class);
+    }
+
+    @Test
+    public void testErrorLogging() {
+        SemanticErrorReporter reporter = SemanticErrorReporter.reportToLogger(mockReporter, mockLogger);
+        RootNode node = parseMockNode(reporter);
+
+        String message = "an error occurred";
+        reporter.error(node, message);
+
+        verify(mockReporter).log(eq(Level.ERROR), contains(message));
+        verifyNoMoreInteractions(mockLogger);
+    }
+
+    @Test
+    public void testEscaping() {
+        SemanticErrorReporter reporter = SemanticErrorReporter.reportToLogger(mockReporter, mockLogger);
+        RootNode node = parseMockNode(reporter);
+
+        // this is a MessageFormat string
+        // what ends up being logged is just '
+        String message = "an apostrophe '' ";
+        reporter.error(node, message);
+
+        // The backend reporter will do its own formatting once again
+        verify(mockReporter).log(eq(Level.ERROR), contains("an apostrophe ''"));
+        verifyNoMoreInteractions(mockLogger);
+    }
+
+    private RootNode parseMockNode(SemanticErrorReporter reporter) {
+        Language language = LanguageRegistry.getLanguage(DummyLanguageModule.NAME);
+        Parser parser = language.getDefaultVersion().getLanguageVersionHandler().getParser();
+        return parser.parse(new ParserTask(
+            language.getDefaultVersion(),
+            MOCK_FILENAME,
+            "(mock (node))",
+            reporter
+        ));
+    }
+
+}

From 6d152b1552c4d2f682f0cd7cedbb631746db0630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 21:23:19 +0200
Subject: [PATCH 058/180] Fix IndexOutOfBoundsException with lambda that has
 wrong shape

---
 .../lang/java/ast/ASTLambdaExpression.java    |  7 ++++++
 .../pmd/lang/java/ast/ASTLambdaParameter.java |  6 +++++
 .../lang/java/types/ast/LazyTypeResolver.java |  3 +++
 .../infer/UnresolvedTypesRecoveryTest.kt      | 24 +++++++++++++++++++
 .../ReturnEmptyCollectionRatherThanNull.xml   |  4 ++--
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
index 49fae5b924..df3d91f50e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
@@ -110,6 +110,13 @@ public final class ASTLambdaExpression extends AbstractJavaExpr implements Funct
     }
 
 
+    /**
+     * Returns the number of formal parameters of this lambda.
+     */
+    public int getArity() {
+        return getParameters().size();
+    }
+
     @Override
     protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaParameter.java
index cf5e3be93b..bae2b9c035 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaParameter.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaParameter.java
@@ -41,6 +41,12 @@ public final class ASTLambdaParameter extends AbstractJavaTypeNode
         return visitor.visit(this, data);
     }
 
+    /**
+     * Returns the lambda that owns this parameter.
+     */
+    public ASTLambdaExpression getOwner() {
+        return (ASTLambdaExpression) getParent().getParent();
+    }
 
     /**
      * Returns the declarator ID of this formal parameter.
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
index 9fa259f112..3b55c7af23 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
@@ -565,6 +565,9 @@ public final class LazyTypeResolver extends JavaVisitorBase<TypingContext, @NonN
 
         JMethodSig m = lambda.getFunctionalMethod(); // this forces resolution of the lambda
         if (!isUnresolved(m)) {
+            if (m.getArity() != node.getOwner().getArity()) {
+                return ts.ERROR;
+            }
             return m.getFormalParameters().get(node.getIndexInParent());
         }
         return ts.UNKNOWN;
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
index ac45794463..8cba5c2203 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/types/internal/infer/UnresolvedTypesRecoveryTest.kt
@@ -629,4 +629,28 @@ class C {
         }
     }
 
+    parserTest("Lambda with wrong form") {
+
+        val (acu, _) = parser.parseWithTypeInferenceSpy("""
+                interface Lambda {
+                    void call();
+                }
+                class Foo {
+                    {
+                        Lambda l = () -> {}; // ok
+                        Lambda l = x -> {};  // wrong form!
+                    }
+                }
+        """)
+
+        val (ok, wrong) = acu.descendants(ASTLambdaExpression::class.java).toList()
+        val t_Lambda = acu.typeDeclarations.firstOrThrow().typeMirror
+
+        acu.withTypeDsl {
+            ok shouldHaveType t_Lambda
+            wrong shouldHaveType t_Lambda
+            wrong.parameters[0] shouldHaveType ts.ERROR
+        }
+    }
+
 })
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ReturnEmptyCollectionRatherThanNull.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ReturnEmptyCollectionRatherThanNull.xml
index 5f90a26f72..effc4e57d1 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ReturnEmptyCollectionRatherThanNull.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/errorprone/xml/ReturnEmptyCollectionRatherThanNull.xml
@@ -191,7 +191,7 @@ import java.util.concurrent.*;
 import java.nio.file.Path;
 
 public class Foo {
-    private Map<Path, List<String>> joinFutures(Map<String, List<Future<String>>> map) {
+    private Map<String, List<String>> joinFutures(Map<String, List<Future<String>>> map) {
         Map<String, List<String>> joined = new HashMap<>();
 
         for (String p : map.keySet()) {
@@ -214,7 +214,7 @@ public class Foo {
         }
 
         // checking basic lambdas and anonymous classes as well
-        Callable<Object> c = a -> { return null; }; // <----- false positive here
+        Callable<Object> c = () -> { return null; }; // <----- false positive here
         Callable<Object> c2 = new Callable<Object>() {
             public Object call() {
                 return null; // <----- false positive here

From 6d2858da8e06ec5fc51fcaae8f878c6687fb8bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 21:30:24 +0200
Subject: [PATCH 059/180] Initial work to report typing errors in Java

This should be done more thoroughly in a future PR
---
 .../pmd/lang/java/types/ast/LazyTypeResolver.java          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
index 3b55c7af23..f25d15ff27 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/ast/LazyTypeResolver.java
@@ -15,6 +15,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.annotation.InternalApi;
+import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.java.ast.ASTAmbiguousName;
 import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
 import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
@@ -100,15 +101,18 @@ public final class LazyTypeResolver extends JavaVisitorBase<TypingContext, @NonN
     private final PolyResolution polyResolution;
     private final JClassType stringType;
     private final JavaAstProcessor processor;
+    private final SemanticErrorReporter err;
     private final Infer infer;
 
 
-    public LazyTypeResolver(JavaAstProcessor processor, TypeInferenceLogger logger) {
+    public LazyTypeResolver(JavaAstProcessor processor,
+                            TypeInferenceLogger logger) {
         this.ts = processor.getTypeSystem();
         this.infer = new Infer(ts, processor.getJdkVersion(), logger);
         this.polyResolution = new PolyResolution(infer);
         this.stringType = (JClassType) TypesFromReflection.fromReflect(String.class, ts);
         this.processor = processor;
+        this.err = processor.getLogger();
     }
 
     public ExprContext getConversionContextForExternalUse(ASTExpression e) {
@@ -566,6 +570,7 @@ public final class LazyTypeResolver extends JavaVisitorBase<TypingContext, @NonN
         JMethodSig m = lambda.getFunctionalMethod(); // this forces resolution of the lambda
         if (!isUnresolved(m)) {
             if (m.getArity() != node.getOwner().getArity()) {
+                err.error(node.getOwner(), "Lambda shape does not conform to the functional method {0}", m);
                 return ts.ERROR;
             }
             return m.getFormalParameters().get(node.getIndexInParent());

From abad80634477599b4b631c1745945d9cb6152b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Thu, 14 Apr 2022 21:38:52 +0200
Subject: [PATCH 060/180] Fix tree dump tests

---
 .../pmd/lang/java/ast/LambdaBug1333.txt       |  2 +-
 .../pmd/lang/java/ast/LambdaBug1470.txt       |  8 +--
 .../pmd/lang/java/ast/ParserCornerCases18.txt | 66 +++++++++----------
 .../java14/YieldStatements.txt                |  2 +-
 .../jdkversiontests/java16/LocalRecords.txt   |  4 +-
 5 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
index 9611a35d64..2ba5fa1773 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1333.txt
@@ -20,7 +20,7 @@
          |     +- ExpressionStatement[]
          |        +- MethodCall[@CompileTimeConstant = "false", @Image = "delete", @MethodName = "delete", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           +- ArgumentList[@Empty = "false", @Size = "1"]
-         |              +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+         |              +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |                 +- LambdaParameterList[@Empty = "false", @Size = "1"]
          |                 |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
          |                 |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
index a22e4f7c3b..eff4b29069 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/LambdaBug1470.txt
@@ -24,7 +24,7 @@
          |           |  +- TypeExpression[@CompileTimeConstant = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Observable"]
          |           |  +- ArgumentList[@Empty = "false", @Size = "1"]
-         |           |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+         |           |     +- LambdaExpression[@Arity = "1", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
          |           |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "false", @Visibility = "package"]
          |           |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -39,7 +39,7 @@
          |           |                 +- VariableAccess[@AccessType = "WRITE", @CompileTimeConstant = "false", @Image = "stuff", @Name = "stuff", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |                 +- BooleanLiteral[@CompileTimeConstant = "true", @ParenthesisDepth = "0", @Parenthesized = "false", @True = "true"]
          |           +- ArgumentList[@Empty = "false", @Size = "1"]
-         |              +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+         |              +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |                 +- LambdaParameterList[@Empty = "false", @Size = "1"]
          |                 |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
          |                 |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -58,7 +58,7 @@
                      |  +- TypeExpression[@CompileTimeConstant = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
                      |  |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Observable"]
                      |  +- ArgumentList[@Empty = "false", @Size = "1"]
-                     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+                     |     +- LambdaExpression[@Arity = "1", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
                      |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
                      |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
                      |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -69,7 +69,7 @@
                      |                 +- VariableAccess[@AccessType = "WRITE", @CompileTimeConstant = "false", @Image = "stuff", @Name = "stuff", @ParenthesisDepth = "0", @Parenthesized = "false"]
                      |                 +- BooleanLiteral[@CompileTimeConstant = "true", @ParenthesisDepth = "0", @Parenthesized = "false", @True = "true"]
                      +- ArgumentList[@Empty = "false", @Size = "1"]
-                        +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+                        +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
                            +- LambdaParameterList[@Empty = "false", @Size = "1"]
                            |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
                            |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
index 8db59987e3..5b8a8aadc2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/ParserCornerCases18.txt
@@ -22,7 +22,7 @@
    |     |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "java"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "java", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "false", @Visibility = "package"]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -39,7 +39,7 @@
    |     |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "java2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "java2", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -55,7 +55,7 @@
    |     |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "java3"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "java3", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -71,7 +71,7 @@
    |     |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "FileFilter"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "java4"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "java4", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
+   |     |     |     +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -93,7 +93,7 @@
    |     |     |     |  |        +- AmbiguousName[@CompileTimeConstant = "false", @Image = "array", @Name = "array", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |     |  +- ArgumentList[@Empty = "true", @Size = "0"]
    |     |     |     +- ArgumentList[@Empty = "false", @Size = "1"]
-   |     |     |        +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |        +- LambdaExpression[@Arity = "1", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |           |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -122,7 +122,7 @@
    |     |     |        |  +- ArrayDimensions[@Empty = "false", @Size = "1"]
    |     |     |        |     +- ArrayTypeDim[@Varargs = "false"]
    |     |     |        +- ArrayInitializer[@CompileTimeConstant = "false", @Length = "3", @ParenthesisDepth = "0", @Parenthesized = "false"]
-   |     |     |           +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |  +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |           |  |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -130,7 +130,7 @@
    |     |     |           |  +- MethodCall[@CompileTimeConstant = "false", @Image = "exists", @MethodName = "exists", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |     +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "f", @Name = "f", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |     +- ArgumentList[@Empty = "true", @Size = "0"]
-   |     |     |           +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |  +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |           |  |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |           |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -138,7 +138,7 @@
    |     |     |           |  +- MethodCall[@CompileTimeConstant = "false", @Image = "canRead", @MethodName = "canRead", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |     +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "f", @Name = "f", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |     +- ArgumentList[@Empty = "true", @Size = "0"]
-   |     |     |           +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |              |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |              |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -158,7 +158,7 @@
    |     |     |           |  +- ArrayDimensions[@Empty = "false", @Size = "1"]
    |     |     |           |     +- ArrayTypeDim[@Varargs = "false"]
    |     |     |           +- ArrayInitializer[@CompileTimeConstant = "false", @Length = "3", @ParenthesisDepth = "0", @Parenthesized = "false"]
-   |     |     |              +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |              +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |  +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |              |  |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |              |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -166,7 +166,7 @@
    |     |     |              |  +- MethodCall[@CompileTimeConstant = "false", @Image = "exists", @MethodName = "exists", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |     +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "f", @Name = "f", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |     +- ArgumentList[@Empty = "true", @Size = "0"]
-   |     |     |              +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |              +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |  +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |              |  |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |              |  |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -174,7 +174,7 @@
    |     |     |              |  +- MethodCall[@CompileTimeConstant = "false", @Image = "canRead", @MethodName = "canRead", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |     +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "f", @Name = "f", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              |     +- ArgumentList[@Empty = "true", @Size = "0"]
-   |     |     |              +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |              +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |                 +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |                 |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |                 |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -192,7 +192,7 @@
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "user", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
    |     |     |     +- MethodCall[@CompileTimeConstant = "false", @Image = "doPrivileged", @MethodName = "doPrivileged", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- ArgumentList[@Empty = "false", @Size = "1"]
-   |     |     |           +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |              +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |              +- MethodCall[@CompileTimeConstant = "false", @Image = "getProperty", @MethodName = "getProperty", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |                 +- TypeExpression[@CompileTimeConstant = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
@@ -206,7 +206,7 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "c"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "c", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |        +- StringLiteral[@CompileTimeConstant = "true", @ConstValue = "done", @Empty = "false", @Image = "\"done\"", @Length = "4", @ParenthesisDepth = "0", @Parenthesized = "false", @TextBlock = "false"]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = "local", @Final = "false", @TypeInferred = "false", @Visibility = "local"]
@@ -214,7 +214,7 @@
    |     |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "r"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "r", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |        +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |     |           +- ExpressionStatement[]
@@ -231,9 +231,9 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Runnable"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "sup"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "sup", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "true", @Size = "0"]
-   |     |     |        +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |           +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |     |              +- ExpressionStatement[]
@@ -260,10 +260,10 @@
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "c2", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
    |     |     |     +- ConditionalExpression[@CompileTimeConstant = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "flag", @Name = "flag", @ParenthesisDepth = "0", @Parenthesized = "false"]
-   |     |     |        +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
+   |     |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
    |     |     |        |  +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |        |  +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "23", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "23.0", @ValueAsFloat = "23.0", @ValueAsInt = "23", @ValueAsLong = "23"]
-   |     |     |        +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
+   |     |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "1", @Parenthesized = "true"]
    |     |     |           +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |           +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "42", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "42.0", @ValueAsFloat = "42.0", @ValueAsInt = "42", @ValueAsLong = "42"]
    |     |     +- LocalVariableDeclaration[@EffectiveVisibility = "local", @Final = "false", @TypeInferred = "false", @Visibility = "local"]
@@ -273,7 +273,7 @@
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "o", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
    |     |     |     +- CastExpression[@CompileTimeConstant = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Runnable"]
-   |     |     |        +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |     |           +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |     |              +- ExpressionStatement[]
@@ -297,7 +297,7 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "String"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "comparer"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "comparer", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "2", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -312,7 +312,7 @@
    |     |     +- ExpressionStatement[]
    |     |     |  +- AssignmentExpression[@CompileTimeConstant = "false", @Compound = "false", @Operator = "=", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |     +- VariableAccess[@AccessType = "WRITE", @CompileTimeConstant = "false", @Image = "comparer", @Name = "comparer", @ParenthesisDepth = "0", @Parenthesized = "false"]
-   |     |     |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "2", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -336,7 +336,7 @@
    |     |     |  +- MethodCall[@CompileTimeConstant = "false", @Image = "addActionListener", @MethodName = "addActionListener", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |     +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "button", @Name = "button", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |     +- ArgumentList[@Empty = "false", @Size = "1"]
-   |     |     |        +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |        +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           +- LambdaParameterList[@Empty = "false", @Size = "1"]
    |     |     |           |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |           |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -371,7 +371,7 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "lambda2"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "lambda2", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "2", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "false", @Visibility = "package"]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -393,7 +393,7 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Integer"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "lambda2a"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "lambda2a", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "2", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -414,7 +414,7 @@
    |     |     |  |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Double"]
    |     |     |  +- VariableDeclarator[@Initializer = "true", @Name = "lambda3"]
    |     |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "lambda3", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |     +- LambdaExpression[@Arity = "3", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |        +- LambdaParameterList[@Empty = "false", @Size = "3"]
    |     |     |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "false", @Visibility = "package"]
    |     |     |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -442,7 +442,7 @@
    |     |        |     +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Double"]
    |     |        +- VariableDeclarator[@Initializer = "true", @Name = "lambda3a"]
    |     |           +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "local", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "false", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "true", @Name = "lambda3a", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "local"]
-   |     |           +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |           +- LambdaExpression[@Arity = "3", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |              +- LambdaParameterList[@Empty = "false", @Size = "3"]
    |     |              |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |              |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -488,7 +488,7 @@
    |     |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Runnable"]
    |     |  +- VariableDeclarator[@Initializer = "true", @Name = "r1"]
    |     |     +- VariableDeclaratorId[@ArrayType = "false", @EffectiveVisibility = "package", @EnumConstant = "false", @ExceptionBlockParameter = "false", @Field = "true", @Final = "false", @ForLoopVariable = "false", @ForeachVariable = "false", @FormalParameter = "false", @LambdaParameter = "false", @LocalVariable = "false", @Name = "r1", @PatternBinding = "false", @RecordComponent = "false", @ResourceDeclaration = "false", @TypeInferred = "false", @Visibility = "package"]
-   |     |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |        +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |        +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |           +- ExpressionStatement[]
@@ -504,7 +504,7 @@
    |     |  +- FormalParameters[@Empty = "true", @Size = "0"]
    |     |  +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |     +- ReturnStatement[]
-   |     |        +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |           +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |           +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |              +- ExpressionStatement[]
@@ -568,7 +568,7 @@
    |     |           |  |           +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "K"]
    |     |           |  |           +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "V"]
    |     |           |  +- ClassOrInterfaceType[@FullyQualified = "false", @SimpleName = "Serializable"]
-   |     |           +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |           +- LambdaExpression[@Arity = "2", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |              +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |              |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |              |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -702,7 +702,7 @@
    |     |  +- FormalParameters[@Empty = "true", @Size = "0"]
    |     |  +- Block[@Empty = "false", @Size = "1", @containsComment = "false"]
    |     |     +- ReturnStatement[]
-   |     |        +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |        +- LambdaExpression[@Arity = "0", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |           +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |           +- MethodCall[@CompileTimeConstant = "false", @Image = "println", @MethodName = "println", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |              +- FieldAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "out", @Name = "out", @ParenthesisDepth = "0", @Parenthesized = "false"]
@@ -776,7 +776,7 @@
    |     |     |           |  |     +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "2", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "2.0", @ValueAsFloat = "2.0", @ValueAsInt = "2", @ValueAsLong = "2"]
    |     |     |           |  |     +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "3", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "3.0", @ValueAsFloat = "3.0", @ValueAsInt = "3", @ValueAsLong = "3"]
    |     |     |           |  +- ArgumentList[@Empty = "false", @Size = "1"]
-   |     |     |           |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           |     +- LambdaExpression[@Arity = "2", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |           |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
    |     |     |           |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -827,7 +827,7 @@
    |     |     |           |  |     +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "2", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "2.0", @ValueAsFloat = "2.0", @ValueAsInt = "2", @ValueAsLong = "2"]
    |     |     |           |  |     +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "3", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "0", @Parenthesized = "false", @ValueAsDouble = "3.0", @ValueAsFloat = "3.0", @ValueAsInt = "3", @ValueAsLong = "3"]
    |     |     |           |  +- ArgumentList[@Empty = "false", @Size = "1"]
-   |     |     |           |     +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |     |           |     +- LambdaExpression[@Arity = "2", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |     |           |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
    |     |     |           |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "false", @Visibility = "package"]
    |     |     |           |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -873,7 +873,7 @@
    |     |              +- AssignmentExpression[@CompileTimeConstant = "false", @Compound = "false", @Operator = "=", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |                 +- FieldAccess[@AccessType = "WRITE", @CompileTimeConstant = "false", @Image = "event", @Name = "event", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |                 |  +- AmbiguousName[@CompileTimeConstant = "false", @Image = "object", @Name = "object", @ParenthesisDepth = "0", @Parenthesized = "false"]
-   |     |                 +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+   |     |                 +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
    |     |                    +- LambdaParameterList[@Empty = "true", @Size = "0"]
    |     |                    +- Block[@Empty = "false", @Size = "2", @containsComment = "true"]
    |     |                       +- LocalVariableDeclaration[@EffectiveVisibility = "local", @Final = "false", @TypeInferred = "false", @Visibility = "local"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/YieldStatements.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/YieldStatements.txt
index 16419dfa5a..94c8ba1742 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/YieldStatements.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/YieldStatements.txt
@@ -73,7 +73,7 @@
                               |              +- YieldStatement[]
                               |                 +- NumericLiteral[@Base = "10", @CompileTimeConstant = "true", @DoubleLiteral = "false", @FloatLiteral = "false", @Image = "5", @IntLiteral = "true", @Integral = "true", @LongLiteral = "false", @ParenthesisDepth = "1", @Parenthesized = "true", @ValueAsDouble = "5.0", @ValueAsFloat = "5.0", @ValueAsInt = "5", @ValueAsLong = "5"]
                               +- YieldStatement[]
-                              |  +- LambdaExpression[@BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
+                              |  +- LambdaExpression[@Arity = "0", @BlockBody = "true", @CompileTimeConstant = "false", @ExpressionBody = "false", @ParenthesisDepth = "0", @Parenthesized = "false"]
                               |     +- LambdaParameterList[@Empty = "true", @Size = "0"]
                               |     +- Block[@Empty = "true", @Size = "0", @containsComment = "false"]
                               +- ExpressionStatement[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
index 64969a13d3..fbadb01853 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/LocalRecords.txt
@@ -61,7 +61,7 @@
          |           |  |  |  |  +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "merchants", @Name = "merchants", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |  |  |  +- ArgumentList[@Empty = "true", @Size = "0"]
          |           |  |  |  +- ArgumentList[@Empty = "false", @Size = "1"]
-         |           |  |  |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+         |           |  |  |     +- LambdaExpression[@Arity = "1", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |  |        +- LambdaParameterList[@Empty = "false", @Size = "1"]
          |           |  |  |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
          |           |  |  |        |     +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]
@@ -75,7 +75,7 @@
          |           |  |  |                    +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "merchant", @Name = "merchant", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |  |                    +- VariableAccess[@AccessType = "READ", @CompileTimeConstant = "false", @Image = "month", @Name = "month", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |  +- ArgumentList[@Empty = "false", @Size = "1"]
-         |           |  |     +- LambdaExpression[@BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
+         |           |  |     +- LambdaExpression[@Arity = "2", @BlockBody = "false", @CompileTimeConstant = "false", @ExpressionBody = "true", @ParenthesisDepth = "0", @Parenthesized = "false"]
          |           |  |        +- LambdaParameterList[@Empty = "false", @Size = "2"]
          |           |  |        |  +- LambdaParameter[@EffectiveVisibility = "package", @Final = "false", @TypeInferred = "true", @Visibility = "package"]
          |           |  |        |  |  +- ModifierList[@EffectiveModifiers = "{}", @ExplicitModifiers = "{}"]

From 5cb27503293f816422ac1b422ec2245ee685d22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 15:05:34 +0200
Subject: [PATCH 061/180] Change task name to 'Processing files'

---
 .../net/sourceforge/pmd/cli/internal/ProgressBarListener.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
index 8c27669e79..efdabc3816 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
@@ -29,7 +29,7 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
     
     public ProgressBarListener(int totalFiles, Consumer<String> loggingFunction) {
         progressBar = new ProgressBarBuilder()
-                .setTaskName("Processing")
+                .setTaskName("Processing files")
                 .setInitialMax(totalFiles)
                 .setStyle(ProgressBarStyle.ASCII)
                 .continuousUpdate()

From 70238044414cd846f6be19a568dc20eaeb793933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 15:06:53 +0200
Subject: [PATCH 062/180] Inline method

to see more clearly what's going on
---
 .../sourceforge/pmd/cli/internal/ProgressBarListener.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
index efdabc3816..dfb46f197f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cli/internal/ProgressBarListener.java
@@ -38,10 +38,6 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
         progressBar.setExtraMessage(extraMessage() + "\r");
     }
 
-    private void incrementProgress() {
-        progressBar.step();
-        refreshProgressBar();
-    }
 
     /**
      * Updates progress bar string and forces it to be output regardless of its update interval.
@@ -85,7 +81,8 @@ public final class ProgressBarListener implements GlobalAnalysisListener {
             @Override
             public void close() {
                 // Refresh progress bar on file analysis end (or file was in cache)
-                ProgressBarListener.this.incrementProgress();
+                progressBar.step();
+                refreshProgressBar();
             }
         };
     }

From 2fee670407db2e27eaca99b737ce805516922838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 15:08:32 +0200
Subject: [PATCH 063/180] Document default value

---
 .../src/main/java/net/sourceforge/pmd/PMDConfiguration.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
index aac28d62c7..0bf7b1b1e9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
@@ -122,7 +122,7 @@ public class PMDConfiguration extends AbstractConfiguration {
     private boolean benchmark;
     private AnalysisCache analysisCache = new NoopAnalysisCache();
     private boolean ignoreIncrementalAnalysis;
-    private boolean progressBar;
+    private boolean progressBar = false;
 
     /**
      * Get the suppress marker. This is the source level marker used to indicate
@@ -793,7 +793,8 @@ public class PMDConfiguration extends AbstractConfiguration {
 
 
     /**
-     * Returns whether progress bar indicator should be used.
+     * Returns whether progress bar indicator should be used. The default
+     * is false.
      *
      * @return {@code true} if progress bar indicator is enabled
      */

From 9620dfc91afb17aa579a5f6cfa257f21a8b8df3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 15:22:40 +0200
Subject: [PATCH 064/180] Update release notes, ref #3866

---
 docs/pages/7_0_0_release_notes.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/pages/7_0_0_release_notes.md b/docs/pages/7_0_0_release_notes.md
index 51bd0939c6..cc3d9a0dc9 100644
--- a/docs/pages/7_0_0_release_notes.md
+++ b/docs/pages/7_0_0_release_notes.md
@@ -19,6 +19,15 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
+#### CLI improvements
+
+The PMD CLI has been enhanced with a progress bar, which interactively displays the
+current progress of the analysis.
+
+TODO screenshot (take it right before releasing, because other changes to the CLI will occur until then)
+
+This can be disabled with the `--no-progress` flag.
+
 #### Full Antlr support
 
 Languages backed by an Antlr grammar are now fully supported. This means, it's now possible not only to use Antlr grammars for CPD,
@@ -155,7 +164,8 @@ The following previously deprecated rules have been finally removed:
 *   miscellaneous
     *   [#896](https://github.com/pmd/pmd/issues/896): \[all] Use slf4j
     *   [#1451](https://github.com/pmd/pmd/issues/1451): \[core] RulesetFactoryCompatibility stores the whole ruleset file in memory as a string
-
+*   cli
+    *   [#3828](https://github.com/pmd/pmd/issues/3828): \[core] Progress reporting
 *   apex-design
     *   [#2667](https://github.com/pmd/pmd/issues/2667): \[apex] Integrate nawforce/ApexLink to build robust Unused rule
 *   java-bestpractices
@@ -279,6 +289,7 @@ The metrics framework has been made simpler and more general.
 *   [#1881](https://github.com/pmd/pmd/pull/1881): \[doc] Add ANTLR documentation - [Matías Fraga](https://github.com/matifraga)
 *   [#1882](https://github.com/pmd/pmd/pull/1882): \[swift] UnavailableFunction Swift rule - [Tomás de Lucca](https://github.com/tomidelucca)
 *   [#2830](https://github.com/pmd/pmd/pull/2830): \[apex] Apexlink POC - [Kevin Jones](https://github.com/nawforce)
+*   [#3866](https://github.com/pmd/pmd/pull/3866): \[core] Add CLI Progress Bar - [@JerritEic](https://github.com/JerritEic)
 
 {% endtocmaker %}
 

From 715442b66b97865782ac31786bcbf73f2a61c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:31:56 +0200
Subject: [PATCH 065/180] Update java/PMDTaskTest to use mocked rules

---
 .../net/sourceforge/pmd/ant/PMDTaskTest.java  | 35 ++++++-------
 .../pmd/lang/java/rule/DummyJavaRule.java     | 51 +++++++++++++++++++
 .../sourceforge/pmd/ant/xml/pmdtasktest.xml   | 34 ++++++-------
 .../rulesets/testing/test-rset-1.xml          | 40 +++++++++++++++
 .../rulesets/testing/test-rset-2.xml          | 25 +++++++++
 .../rulesets/testing/test-rset-3.xml          | 25 +++++++++
 .../pmd/ant/AbstractAntTestHelper.java        | 17 ++++---
 7 files changed, 185 insertions(+), 42 deletions(-)
 create mode 100644 pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
 create mode 100644 pmd-java/src/test/resources/rulesets/testing/test-rset-1.xml
 create mode 100644 pmd-java/src/test/resources/rulesets/testing/test-rset-2.xml
 create mode 100644 pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index 3cc5d614ce..2ae2b31129 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -27,21 +27,20 @@ public class PMDTaskTest extends AbstractAntTestHelper {
     @Test
     public void testNoFormattersValidation() {
         executeTarget("testNoFormattersValidation");
-        assertOutputContaining("Fields should be declared at the top of the class");
+        assertOutputContaining("Violation from test-rset-1.xml");
     }
 
     @Test
     public void testNestedRuleset() {
         executeTarget("testNestedRuleset");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
+        assertOutputContaining("Violation from test-rset-2.xml");
     }
 
     @Test
     public void testFormatterWithProperties() {
         executeTarget("testFormatterWithProperties");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
         assertOutputContaining("link_prefix");
         assertOutputContaining("line_prefix");
     }
@@ -49,42 +48,40 @@ public class PMDTaskTest extends AbstractAntTestHelper {
     @Test
     public void testAbstractNames() {
         executeTarget("testAbstractNames");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
+        assertOutputContaining("Violation from test-rset-2.xml");
     }
 
     @Test
     public void testAbstractNamesInNestedRuleset() {
         executeTarget("testAbstractNamesInNestedRuleset");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
+        assertOutputContaining("Violation from test-rset-2.xml");
     }
 
     @Test
     public void testCommaInRulesetfiles() {
         executeTarget("testCommaInRulesetfiles");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
+        assertOutputContaining("Violation from test-rset-2.xml");
     }
 
     @Test
     public void testRelativeRulesets() {
         executeTarget("testRelativeRulesets");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at the");
+        assertOutputContaining("Violation from test-rset-1.xml");
     }
 
     @Test
     public void testRelativeRulesetsInRulesetfiles() {
         executeTarget("testRelativeRulesetsInRulesetfiles");
-        assertOutputContaining("Avoid really long methods");
-        assertOutputContaining("Fields should be declared at");
+        assertOutputContaining("Violation from test-rset-1.xml");
     }
 
     @Test
     public void testExplicitRuleInRuleSet() {
         executeTarget("testExplicitRuleInRuleSet");
-        assertOutputContaining("Avoid really long methods");
+        assertOutputContaining("Violation from test-rset-1.xml");
     }
 
     @Test
@@ -166,14 +163,14 @@ public class PMDTaskTest extends AbstractAntTestHelper {
     @Test
     public void testMissingCacheLocation() {
         executeTarget("testMissingCacheLocation");
-        assertOutputContaining("Avoid really long methods");
+        assertOutputContaining("Violation from test-rset-1.xml");
         assertContains(buildRule.getLog(), "This analysis could be faster");
     }
 
     @Test
     public void testAnalysisCache() {
         executeTarget("testAnalysisCache");
-        assertOutputContaining("Avoid really long methods");
+        assertOutputContaining("Violation from test-rset-1.xml");
         assertDoesntContain(buildRule.getLog(), "This analysis could be faster");
 
         assertTrue(currentTempFile().exists());
@@ -183,7 +180,7 @@ public class PMDTaskTest extends AbstractAntTestHelper {
     @Test
     public void testDisableIncrementalAnalysis() {
         executeTarget("testDisableIncrementalAnalysis");
-        assertOutputContaining("Avoid really long methods");
+        assertOutputContaining("Violation from test-rset-1.xml");
         assertDoesntContain(buildRule.getLog(), "This analysis could be faster");
 
         assertFalse(currentTempFile().exists());
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
new file mode 100644
index 0000000000..a6771bf142
--- /dev/null
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
@@ -0,0 +1,51 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.rule;
+
+import java.util.List;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
+import net.sourceforge.pmd.lang.java.ast.JavaNode;
+
+/**
+ * @author Clément Fournier
+ */
+public class DummyJavaRule extends AbstractJavaRule {
+
+    @Override
+    public void apply(List<? extends Node> nodes, RuleContext ctx) {
+        for (Node node : nodes) {
+            apply(node, ctx);
+        }
+    }
+
+    public void apply(Node node, RuleContext ctx) {
+
+    }
+
+    public static class DummyRuleOneViolationPerFile extends DummyJavaRule {
+
+        @Override
+        public void apply(Node node, RuleContext ctx) {
+            ctx.addViolation(node);
+        }
+    }
+
+    public static class DummyRulePrintsVars extends DummyJavaRule {
+
+        @Override
+        public void apply(Node node, RuleContext ctx) {
+            ((JavaNode) node).jjtAccept(this, ctx);
+        }
+
+        @Override
+        public Object visit(ASTVariableDeclaratorId node, Object data) {
+            asCtx(data).addViolation(node, node.getName());
+            return super.visit(node, data);
+        }
+    }
+}
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
index 3eedc1b1b2..a1abe53864 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
@@ -6,8 +6,8 @@
 
 	<target name="testNestedRuleset">
 		<pmd>
-			<ruleset>${pmd.home}/src/main/resources/category/java/codestyle.xml</ruleset>
-			<ruleset>${pmd.home}/src/main/resources/category/java/design.xml</ruleset>
+			<ruleset>${pmd.home}/src/test/resources/rulesets/testing/test-rset-1.xml</ruleset>
+			<ruleset>${pmd.home}/src/test/resources/rulesets/testing/test-rset-2.xml</ruleset>
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -17,8 +17,8 @@
 
 	<target name="testFormatterWithProperties">
 		<pmd>
-			<ruleset>${pmd.home}/src/main/resources/category/java/codestyle.xml</ruleset>
-			<ruleset>${pmd.home}/src/main/resources/category/java/design.xml</ruleset>
+			<ruleset>${pmd.home}/src/test/resources/rulesets/testing/test-rset-1.xml</ruleset>
+			<ruleset>${pmd.home}/src/test/resources/rulesets/testing/test-rset-2.xml</ruleset>
 			<formatter type="summaryhtml" toConsole="true">
 				<param name="linkPrefix" value="link_prefix"/>
 				<param name="linePrefix" value="line_prefix"/>
@@ -30,7 +30,7 @@
 	</target>
 
 	<target name="testAbstractNames">
-		<pmd rulesetfiles="category/java/codestyle.xml,category/java/design.xml">
+		<pmd rulesetfiles="rulesets/testing/test-rset-1.xml,rulesets/testing/test-rset-2.xml">
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -40,8 +40,8 @@
 
 	<target name="testAbstractNamesInNestedRuleset">
 		<pmd>
-			<ruleset>category/java/codestyle.xml</ruleset>
-			<ruleset>category/java/design.xml</ruleset>
+			<ruleset>rulesets/testing/test-rset-1.xml</ruleset>
+			<ruleset>rulesets/testing/test-rset-2.xml</ruleset>
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -50,7 +50,7 @@
 	</target>
 
 	<target name="testCommaInRulesetfiles">
-		<pmd rulesetfiles="${pmd.home}/src/main/resources/category/java/codestyle.xml,${pmd.home}/src/main/resources/category/java/design.xml">
+		<pmd rulesetfiles="${pmd.home}/src/test/resources/rulesets/testing/test-rset-1.xml,${pmd.home}/src/test/resources/rulesets/testing/test-rset-2.xml">
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -61,7 +61,7 @@
 	<target name="testRelativeRulesets">
 		<pmd>
 			<ruleset>custom_ruleset.xml</ruleset>
-			<ruleset>category/java/codestyle.xml</ruleset>
+			<ruleset>rulesets/testing/test-rset-1.xml</ruleset>
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -70,7 +70,7 @@
 	</target>
 
 	<target name="testRelativeRulesetsInRulesetfiles">
-		<pmd rulesetfiles="custom_ruleset.xml,src/main/resources/category/java/codestyle.xml">
+		<pmd rulesetfiles="custom_ruleset.xml,src/test/resources/rulesets/testing/test-rset-1.xml">
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -79,7 +79,7 @@
 	</target>
 
 	<target name="testNoFormattersValidation">
-		<pmd rulesetfiles="${pmd.home}/src/main/resources/category/java/codestyle.xml">
+		<pmd rulesetfiles="${pmd.home}/src/test/resources/rulesets/testing/test-rset-1.xml">
             <fileset dir="${pmd.home}/src/test/resources/ant/java">
                 <include name="*.java"/>
             </fileset>
@@ -87,7 +87,7 @@
 	</target>
 
 	<target name="testExplicitRuleInRuleSet">
-		<pmd rulesetfiles="src/main/resources/category/java/design.xml/ExcessiveMethodLength">
+		<pmd rulesetfiles="src/test/resources/rulesets/testing/test-rset-1.xml/DummyRuleWithAViolationPerFile">
 			<formatter type="text" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -111,7 +111,7 @@
     <target name="testFormatterEncodingWithXML">
         <!-- source encoding is cp1252 -->
         <pmd encoding="cp1252">
-            <ruleset>category/java/bestpractices.xml</ruleset>
+            <ruleset>rulesets/testing/test-rset-3.xml</ruleset>
             <!--
             <formatter type="xml" toConsole="true"/>
             -->
@@ -128,7 +128,7 @@
     <target name="testFormatterEncodingWithXMLConsole">
         <!-- source encoding is cp1252 -->
         <pmd encoding="cp1252">
-            <ruleset>category/java/bestpractices.xml</ruleset>
+					<ruleset>rulesets/testing/test-rset-3.xml</ruleset>
             <formatter type="xml" toConsole="true">
                 <!-- specifying a encoding here will override the console encoding.
                      The output might have junk characters in it.
@@ -145,7 +145,7 @@
     </target>
 
 	<target name="testAnalysisCache">
-		<pmd rulesetfiles="src/main/resources/category/java/design.xml/ExcessiveMethodLength" cacheLocation="${tmpfile}">
+		<pmd rulesetfiles="src/test/resources/rulesets/testing/test-rset-1.xml/DummyRuleWithAViolationPerFile" cacheLocation="${tmpfile}">
 			<formatter type="xml" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -154,7 +154,7 @@
 	</target>
 
 	<target name="testMissingCacheLocation">
-		<pmd rulesetfiles="src/main/resources/category/java/design.xml/ExcessiveMethodLength">
+		<pmd rulesetfiles="src/test/resources/rulesets/testing/test-rset-1.xml/DummyRuleWithAViolationPerFile">
 			<formatter type="xml" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
@@ -163,7 +163,7 @@
 	</target>
 
 	<target name="testDisableIncrementalAnalysis">
-		<pmd rulesetfiles="src/main/resources/category/java/design.xml/ExcessiveMethodLength" noCache="true" cacheLocation="${tmpfile}">
+		<pmd rulesetfiles="src/test/resources/rulesets/testing/test-rset-1.xml/DummyRuleWithAViolationPerFile" noCache="true" cacheLocation="${tmpfile}">
 			<formatter type="xml" toConsole="true"/>
 			<fileset dir="${pmd.home}/src/test/resources/ant/java">
 				<include name="*.java"/>
diff --git a/pmd-java/src/test/resources/rulesets/testing/test-rset-1.xml b/pmd-java/src/test/resources/rulesets/testing/test-rset-1.xml
new file mode 100644
index 0000000000..1d4aa234d7
--- /dev/null
+++ b/pmd-java/src/test/resources/rulesets/testing/test-rset-1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<ruleset name="Test Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Ruleset used by test RuleSetReferenceIdTest
+    </description>
+
+    <rule name="DummyRuleNoViolation"
+          language="java"
+          since="1.0"
+          message="Test Rule 1"
+          class="net.sourceforge.pmd.lang.java.rule.DummyJavaRule">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+
+    <rule name="DummyRuleWithAViolationPerFile"
+          language="java"
+          since="1.0"
+          message="Violation from test-rset-1.xml"
+          class="net.sourceforge.pmd.lang.java.rule.DummyJavaRule$DummyRuleOneViolationPerFile">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+
+</ruleset>
diff --git a/pmd-java/src/test/resources/rulesets/testing/test-rset-2.xml b/pmd-java/src/test/resources/rulesets/testing/test-rset-2.xml
new file mode 100644
index 0000000000..5302192808
--- /dev/null
+++ b/pmd-java/src/test/resources/rulesets/testing/test-rset-2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<ruleset name="Test Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Ruleset used by test RuleSetReferenceIdTest
+    </description>
+
+    <rule name="DummyRuleWithAViolationPerFile"
+          language="java"
+          since="1.0"
+          message="Violation from test-rset-2.xml"
+          class="net.sourceforge.pmd.lang.java.rule.DummyJavaRule$DummyRuleOneViolationPerFile">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+
+</ruleset>
diff --git a/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml b/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml
new file mode 100644
index 0000000000..faf99689e1
--- /dev/null
+++ b/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<ruleset name="Test Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Ruleset used by test RuleSetReferenceIdTest
+    </description>
+
+    <rule name="DummyRuleWithAViolationPerFile"
+          language="java"
+          since="1.0"
+          message="Violation from test-rset-3.xml: name {0}"
+          class="net.sourceforge.pmd.lang.java.rule.DummyJavaRule$DummyRulePrintsVars">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+
+</ruleset>
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java b/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java
index 196aa2b07b..9e333bdd0c 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java
@@ -5,15 +5,18 @@
 package net.sourceforge.pmd.ant;
 
 import static java.io.File.separator;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.Project;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
+import org.junit.contrib.java.lang.system.SystemErrRule;
 import org.junit.rules.TemporaryFolder;
 
 
@@ -33,6 +36,9 @@ public abstract class AbstractAntTestHelper {
     @Rule
     public final BuildFileRule buildRule = new BuildFileRule();
 
+    @Rule
+    public final SystemErrRule systemErrRule = new SystemErrRule().muteForSuccessfulTests();
+
     protected String pathToTestScript;
     protected String antTestScriptFilename;
     public String mvnWorkaround;
@@ -85,21 +91,20 @@ public abstract class AbstractAntTestHelper {
 
     public void executeTarget(String target) {
         buildRule.executeTarget(target);
+        System.err.println(buildRule.getLog());
     }
 
     public void assertOutputContaining(String text) {
-        assertContains(buildRule.getOutput(), text);
+        assertThat(buildRule.getOutput(), containsString(text));
     }
 
 
     public void assertContains(String text, String toFind) {
-        Assert.assertTrue("Expected to find \"" + toFind + "\", but it's missing",
-                          text.contains(toFind));
+        assertThat(text, containsString(toFind));
     }
 
 
     public void assertDoesntContain(String text, String toFind) {
-        Assert.assertTrue("Expected no occurrence of \"" + toFind + "\", but found at least one",
-                          !text.contains(toFind));
+        assertThat(text, not(containsString(toFind)));
     }
 }

From 359225ca3777ae39d82c19d1a5c08eefe3be16b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:34:55 +0200
Subject: [PATCH 066/180] Update ExcludeLinesTest

---
 .../net/sourceforge/pmd/ExcludeLinesTest.java | 23 +++++++++++++------
 .../rulesets/testing/test-rset-3.xml          |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
index a1f3e4bd9f..9c5b79665c 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
@@ -23,7 +23,7 @@ public class ExcludeLinesTest extends RuleTst {
 
     @Before
     public void setUp() {
-        rule = findRule("java-unusedcode", "UnusedLocalVariable");
+        rule = findRule("rulesets/testing/test-rset-3.xml", "PrintsVariableNames");
     }
 
     @Test
@@ -49,12 +49,21 @@ public class ExcludeLinesTest extends RuleTst {
         assertEquals(r.getSuppressedRuleViolations().size(), 1);
     }
 
-    private static final String TEST1 = "public class Foo {" + PMD.EOL + " void foo() {" + PMD.EOL + "  int x; //NOPMD "
-            + PMD.EOL + " } " + PMD.EOL + "}";
+    private static final String TEST1 = "public class Foo {\n" +
+                                        " void foo() {\n" +
+                                        "  int x; //NOPMD \n" +
+                                        " } \n" +
+                                        "}";
 
-    private static final String TEST2 = "public class Foo {" + PMD.EOL + " void foo() {" + PMD.EOL + "  int x;"
-            + PMD.EOL + " } " + PMD.EOL + "}";
+    private static final String TEST2 = "public class Foo {\n" +
+                                        " void foo() {\n" +
+                                        "  int x;\n" +
+                                        " } \n" +
+                                        "}";
 
-    private static final String TEST3 = "public class Foo {" + PMD.EOL + " void foo() {" + PMD.EOL
-            + "  int x; // FOOBAR" + PMD.EOL + " } " + PMD.EOL + "}";
+    private static final String TEST3 = "public class Foo {\n" +
+                                        " void foo() {\n" +
+                                        "  int x; // FOOBAR\n" +
+                                        " } \n" +
+                                        "}";
 }
diff --git a/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml b/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml
index faf99689e1..3d68bea41f 100644
--- a/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml
+++ b/pmd-java/src/test/resources/rulesets/testing/test-rset-3.xml
@@ -7,7 +7,7 @@
         Ruleset used by test RuleSetReferenceIdTest
     </description>
 
-    <rule name="DummyRuleWithAViolationPerFile"
+    <rule name="PrintsVariableNames"
           language="java"
           since="1.0"
           message="Violation from test-rset-3.xml: name {0}"

From c77826629416c1e80ad3ecf5411b43f776c691e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:41:39 +0200
Subject: [PATCH 067/180] Update java/CLITest

---
 .../java/net/sourceforge/pmd/cli/CLITest.java | 34 ++++++++++---------
 .../testing/rset-without-violations.xml       | 25 ++++++++++++++
 2 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 pmd-java/src/test/resources/rulesets/testing/rset-without-violations.xml

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java b/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
index 3ddaa56643..22bcfca35e 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/cli/CLITest.java
@@ -13,62 +13,64 @@ import net.sourceforge.pmd.PMD.StatusCode;
 
 /**
  * @author Romain Pelisse &lt;belaran@gmail.com&gt;
- *
  */
 public class CLITest extends BaseCLITest {
+
+    private static final String RSET_NO_VIOLATION = "rulesets/testing/rset-without-violations.xml";
+    private static final String RSET_WITH_VIOLATION = "rulesets/testing/test-rset-1.xml";
+
     @Test
     public void minimalArgs() {
-        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/bestpractices.xml,category/java/design.xml");
+        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_NO_VIOLATION);
     }
 
     @Test
     public void minimumPriority() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml", "-min", "1", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_WITH_VIOLATION, "-min", "1", };
         runTest(args);
     }
 
     @Test
     public void usingDebug() {
-        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml", "-debug");
+        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_NO_VIOLATION, "-debug");
     }
 
     @Test
     public void usingDebugLongOption() {
-        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml", "--debug");
+        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_NO_VIOLATION, "--debug");
     }
 
     @Test
     public void changeJavaVersion() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml", "-version", "1.5", "-language",
-                          "java", "--debug", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_NO_VIOLATION, "-version", "1.5", "-language", "java", "--debug" };
         String log = runTest(args);
         assertThat(log, containsPattern("Adding file .*\\.java \\(lang: java 1\\.5\\)"));
     }
 
     @Test
     public void exitStatusNoViolations() {
-        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml");
+        runTest("-d", SOURCE_FOLDER, "-f", "text", "-R", "rulesets/testing/rset-without-violations.xml");
     }
 
     @Test
     public void exitStatusWithViolations() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/errorprone.xml", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_WITH_VIOLATION, };
         String log = runTest(StatusCode.VIOLATIONS_FOUND, args);
-        assertThat(log, containsString("Avoid empty if"));
+        assertThat(log, containsString("Violation from test-rset-1.xml"));
     }
 
     @Test
     public void exitStatusWithViolationsAndWithoutFailOnViolations() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/errorprone.xml", "-failOnViolation", "false", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_WITH_VIOLATION, "-failOnViolation", "false", };
         String log = runTest(StatusCode.OK, args);
-        assertThat(log, containsString("Avoid empty if"));
+        assertThat(log, containsString("Violation from test-rset-1.xml"));
     }
 
     @Test
     public void exitStatusWithViolationsAndWithoutFailOnViolationsLongOption() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/errorprone.xml", "--fail-on-violation", "false", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_WITH_VIOLATION, "--fail-on-violation", "false", };
         String log = runTest(StatusCode.OK, args);
-        assertThat(log, containsString("Avoid empty if"));
+        assertThat(log, containsString("Violation from test-rset-1.xml"));
     }
 
     /**
@@ -98,9 +100,9 @@ public class CLITest extends BaseCLITest {
      */
     @Test
     public void testWrongRulename() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", "category/java/design.xml/ThisRuleDoesNotExist", };
+        String[] args = { "-d", SOURCE_FOLDER, "-f", "text", "-R", RSET_WITH_VIOLATION + "/ThisRuleDoesNotExist", };
         String log = runTest(StatusCode.OK, args);
         assertThat(log, containsString("No rules found. Maybe you misspelled a rule name?"
-                                           + " (category/java/design.xml/ThisRuleDoesNotExist)"));
+                                       + " (" + RSET_WITH_VIOLATION + "/ThisRuleDoesNotExist)"));
     }
 }
diff --git a/pmd-java/src/test/resources/rulesets/testing/rset-without-violations.xml b/pmd-java/src/test/resources/rulesets/testing/rset-without-violations.xml
new file mode 100644
index 0000000000..12ba1ca5a3
--- /dev/null
+++ b/pmd-java/src/test/resources/rulesets/testing/rset-without-violations.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<ruleset name="Test Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Ruleset used by test RuleSetReferenceIdTest
+    </description>
+
+
+    <rule name="DummyRuleNoViolation"
+          language="java"
+          since="1.0"
+          message="Test Rule 1"
+          class="net.sourceforge.pmd.lang.java.rule.DummyJavaRule">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+</ruleset>

From 367c6cf54a94474d41f65055e0f674d1d94958c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:48:53 +0200
Subject: [PATCH 068/180] Update JS module

---
 .../java/net/sourceforge/pmd/cli/CLITest.java | 17 +++++++--
 .../pmd/lang/ecmascript/DummyJsRule.java      | 37 +++++++++++++++++++
 .../resources/rulesets/testing/js-rset1.xml   | 25 +++++++++++++
 .../net/sourceforge/pmd/cli/BaseCLITest.java  | 33 ++++++-----------
 4 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
 create mode 100644 pmd-javascript/src/test/resources/rulesets/testing/js-rset1.xml

diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/cli/CLITest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/cli/CLITest.java
index 3b83aaa055..ba086299f0 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/cli/CLITest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/cli/CLITest.java
@@ -8,6 +8,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 
+import net.sourceforge.pmd.PMD.StatusCode;
+
 /**
  * @author Romain Pelisse &lt;belaran@gmail.com&gt;
  *
@@ -15,9 +17,18 @@ import org.junit.Test;
 public class CLITest extends BaseCLITest {
     @Test
     public void useEcmaScript() {
-        String[] args = { "-d", SOURCE_FOLDER, "-f", "xml", "-R", "ecmascript-basic", "-version", "3", "-l",
-            "ecmascript", "-debug", };
-        String log = runTest(args);
+        String log = runTest(StatusCode.VIOLATIONS_FOUND,
+                             "-d",
+                             SOURCE_FOLDER,
+                             "-f",
+                             "xml",
+                             "-R",
+                             "rulesets/testing/js-rset1.xml",
+                             "-version",
+                             "3",
+                             "-l",
+                             "ecmascript",
+                             "--debug");
         assertThat(log, containsPattern("Adding file .*\\.js \\(lang: ecmascript 3\\)"));
     }
 }
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
new file mode 100644
index 0000000000..50a5690238
--- /dev/null
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
@@ -0,0 +1,37 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ecmascript;
+
+import java.util.List;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
+
+/**
+ * @author Clément Fournier
+ */
+public class DummyJsRule extends AbstractEcmascriptRule {
+
+    @Override
+    public void apply(List<? extends Node> nodes, RuleContext ctx) {
+        for (Node node : nodes) {
+            apply(node, ctx);
+        }
+    }
+
+    public void apply(Node node, RuleContext ctx) {
+
+    }
+
+    public static class DummyRuleOneViolationPerFile extends DummyJsRule {
+
+        @Override
+        public void apply(Node node, RuleContext ctx) {
+            ctx.addViolation(node);
+        }
+    }
+
+}
diff --git a/pmd-javascript/src/test/resources/rulesets/testing/js-rset1.xml b/pmd-javascript/src/test/resources/rulesets/testing/js-rset1.xml
new file mode 100644
index 0000000000..b934c00b24
--- /dev/null
+++ b/pmd-javascript/src/test/resources/rulesets/testing/js-rset1.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<ruleset name="Test Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+
+    <description>
+        Ruleset used by test RuleSetReferenceIdTest
+    </description>
+
+    <rule name="DummyRuleWithAViolationPerFile"
+          language="ecmascript"
+          since="1.0"
+          message="Violation from test-rset-1.xml"
+          class="net.sourceforge.pmd.lang.ecmascript.DummyJsRule$DummyRuleOneViolationPerFile">
+        <description>
+            Just for test
+        </description>
+        <priority>3</priority>
+        <example>
+ <![CDATA[
+            ]]>
+     </example>
+    </rule>
+
+</ruleset>
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/cli/BaseCLITest.java b/pmd-test/src/main/java/net/sourceforge/pmd/cli/BaseCLITest.java
index 54e9739159..8756256260 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/cli/BaseCLITest.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/cli/BaseCLITest.java
@@ -15,13 +15,14 @@ import java.io.PrintStream;
 import java.nio.file.Files;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.IOUtils;
+import org.apache.tools.ant.util.TeeOutputStream;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.contrib.java.lang.system.SystemErrRule;
+import org.junit.contrib.java.lang.system.SystemOutRule;
 
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMD.StatusCode;
@@ -39,8 +40,10 @@ public abstract class BaseCLITest {
     // and slowing down tests
     protected static final String SOURCE_FOLDER = "src/test/resources/net/sourceforge/pmd/cli";
 
-    protected PrintStream originalOut;
-    protected PrintStream originalErr;
+    @Rule
+    public SystemErrRule systemErrRule = new SystemErrRule().muteForSuccessfulTests();
+    @Rule
+    public SystemOutRule systemOutRule = new SystemOutRule().muteForSuccessfulTests();
 
     /**
      * @throws java.lang.Exception
@@ -55,20 +58,6 @@ public abstract class BaseCLITest {
         }
     }
 
-    @Before
-    public void setup() {
-        originalOut = System.out;
-        originalErr = System.err;
-    }
-
-    @After
-    public void tearDown() {
-        IOUtils.closeQuietly(System.out);
-
-        System.setOut(originalOut);
-        System.setErr(originalErr);
-    }
-
     protected void createTestOutputFile(String filename) {
         try {
             @SuppressWarnings("PMD.CloseResource")
@@ -133,9 +122,11 @@ public abstract class BaseCLITest {
 
     protected String runTest(StatusCode expectedExitCode, String... args) {
         ByteArrayOutputStream console = new ByteArrayOutputStream();
-        PrintStream out = new PrintStream(console);
+
+        PrintStream out = new PrintStream(new TeeOutputStream(console, System.out));
+        PrintStream err = new PrintStream(new TeeOutputStream(console, System.err));
         System.setOut(out);
-        System.setErr(out);
+        System.setErr(err);
         StatusCode statusCode = PMD.runPmd(args);
         assertEquals(expectedExitCode, statusCode);
         return console.toString();

From afc43191dc85cc19e2c1b59446949ef08fd388e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:55:35 +0200
Subject: [PATCH 069/180] update release notes

---
 docs/pages/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 728b65281c..428f2a7071 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,6 +22,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
+  * [#3068](https://github.com/pmd/pmd/pull/3068): \[java] Some tests should not depend on real rules
 
 *   core
     *   [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice

From cdf49448651481526c231c725f667fe68d60fb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 20:05:04 +0200
Subject: [PATCH 070/180] Checkstyle

---
 .../net/sourceforge/pmd/ExcludeLinesTest.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
index 9c5b79665c..ab65a3f129 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
@@ -42,28 +42,28 @@ public class ExcludeLinesTest extends RuleTst {
         ctx.setSourceCodeFile(new File("n/a"));
         ctx.setLanguageVersion(LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getDefaultVersion());
         RuleSet rules = RuleSet.forSingleRule(rule);
-        
+
         SourceCodeProcessor sourceCodeProcessor = new SourceCodeProcessor(configuration);
         sourceCodeProcessor.processSourceCode(new StringReader(TEST3), new RuleSets(rules), ctx);
         assertTrue(r.isEmpty());
         assertEquals(r.getSuppressedRuleViolations().size(), 1);
     }
 
-    private static final String TEST1 = "public class Foo {\n" +
-                                        " void foo() {\n" +
-                                        "  int x; //NOPMD \n" +
-                                        " } \n" +
-                                        "}";
+    private static final String TEST1 = "public class Foo {\n"
+                                        + " void foo() {\n"
+                                        + "  int x; //NOPMD \n"
+                                        + " } \n"
+                                        + "}";
 
-    private static final String TEST2 = "public class Foo {\n" +
-                                        " void foo() {\n" +
-                                        "  int x;\n" +
-                                        " } \n" +
-                                        "}";
+    private static final String TEST2 = "public class Foo {\n"
+                                        + " void foo() {\n"
+                                        + "  int x;\n"
+                                        + " } \n"
+                                        + "}";
 
-    private static final String TEST3 = "public class Foo {\n" +
-                                        " void foo() {\n" +
-                                        "  int x; // FOOBAR\n" +
-                                        " } \n" +
-                                        "}";
+    private static final String TEST3 = "public class Foo {\n"
+                                        + " void foo() {\n"
+                                        + "  int x; // FOOBAR\n"
+                                        + " } \n"
+                                        + "}";
 }

From 91d019343c7a772512053b19ea042095fc0ba1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 16 Apr 2022 20:09:41 +0200
Subject: [PATCH 071/180] Move things around

---
 .../sourceforge/pmd/lang/html/HtmlCpdLanguage.java   |  1 +
 .../net/sourceforge/pmd/lang/html/HtmlHandler.java   |  1 +
 .../pmd/lang/html/{ => ast}/HtmlParser.java          |  5 ++---
 .../pmd/lang/html/{ => ast}/HtmlTokenizer.java       | 12 +++---------
 .../pmd/lang/html/ast/HtmlTreeBuilder.java           | 11 ++++-------
 .../sourceforge/pmd/lang/html/HtmlTokenizerTest.java |  1 +
 6 files changed, 12 insertions(+), 19 deletions(-)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/{ => ast}/HtmlParser.java (89%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/{ => ast}/HtmlTokenizer.java (77%)

diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
index 3aa54289c8..3c6c0fdbde 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlCpdLanguage.java
@@ -6,6 +6,7 @@
 package net.sourceforge.pmd.lang.html;
 
 import net.sourceforge.pmd.cpd.AbstractLanguage;
+import net.sourceforge.pmd.lang.html.ast.HtmlTokenizer;
 
 public final class HtmlCpdLanguage extends AbstractLanguage {
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
index 6988089323..b6c3ad9659 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
@@ -12,6 +12,7 @@ import net.sourceforge.pmd.lang.AbstractLanguageVersionHandler;
 import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.ParserOptions;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.html.ast.HtmlParser;
 import net.sourceforge.pmd.lang.rule.AbstractRuleViolationFactory;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
similarity index 89%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
index 4b89e099aa..c61cb4f5a4 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlParser.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
@@ -3,7 +3,7 @@
  */
 
 
-package net.sourceforge.pmd.lang.html;
+package net.sourceforge.pmd.lang.html.ast;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -18,9 +18,8 @@ import net.sourceforge.pmd.lang.ParserOptions;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.ParseException;
-import net.sourceforge.pmd.lang.html.ast.HtmlTreeBuilder;
 
-class HtmlParser implements net.sourceforge.pmd.lang.Parser {
+public final class HtmlParser implements net.sourceforge.pmd.lang.Parser {
 
     @Override
     public boolean canParse() {
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
similarity index 77%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
index ad803faade..9a94cf77c3 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
@@ -3,9 +3,7 @@
  */
 
 
-package net.sourceforge.pmd.lang.html;
-
-import java.io.IOException;
+package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.Document;
 import org.jsoup.parser.Parser;
@@ -14,15 +12,11 @@ import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.cpd.TokenEntry;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.Tokens;
-import net.sourceforge.pmd.lang.html.ast.HtmlDocument;
-import net.sourceforge.pmd.lang.html.ast.HtmlNode;
-import net.sourceforge.pmd.lang.html.ast.HtmlTextNode;
-import net.sourceforge.pmd.lang.html.ast.HtmlTreeBuilder;
 
-class HtmlTokenizer implements Tokenizer {
+public class HtmlTokenizer implements Tokenizer {
 
     @Override
-    public void tokenize(SourceCode sourceCode, Tokens tokenEntries) throws IOException {
+    public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         String data = sourceCode.getCodeBuffer().toString();
 
         Document doc = Parser.xmlParser().parseInput(data, "");
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
index f9f72eb8cf..831edf0d6b 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
@@ -14,14 +14,11 @@ import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
 import org.jsoup.nodes.XmlDeclaration;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
-@InternalApi
-public final class HtmlTreeBuilder {
+final class HtmlTreeBuilder {
 
     public HtmlDocument build(Document doc, String htmlString) {
         HtmlDocument root = new HtmlDocument(doc);
-        addChilds(root, doc);
+        addChildren(root, doc);
 
         LineNumbers lineNumbers = new LineNumbers(root, htmlString);
         lineNumbers.determine();
@@ -29,11 +26,11 @@ public final class HtmlTreeBuilder {
         return root;
     }
     
-    private void addChilds(HtmlNode parent, Node node) {
+    private void addChildren(HtmlNode parent, Node node) {
         for (Node child : node.childNodes()) {
             HtmlNode converted = convertJsoupNode(child);
             parent.jjtAddChild(converted, parent.getNumChildren());
-            addChilds(converted, child);
+            addChildren(converted, child);
         }
     }
 
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
index b5cf3ab200..046e092a38 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java
@@ -11,6 +11,7 @@ import org.junit.Test;
 
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.html.ast.HtmlTokenizer;
 
 public class HtmlTokenizerTest extends CpdTextComparisonTest {
 

From 5958b928dc05bed5ba19705f799ada057dab19dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AE=B6=E5=A5=A5?=
 <lijiaao@lijiaaodeMacBook-Pro.local>
Date: Tue, 19 Apr 2022 11:03:29 +0800
Subject: [PATCH 072/180] [plsql] Fix parsing exception

---
 pmd-plsql/etc/grammar/PldocAST.jjt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 14e42bacdd..bacd49d722 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2124,7 +2124,11 @@ void QueryTableExpression() #void :
   |
     TableCollectionExpression()
   |
-    [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
+    LOOKAHEAD(5) "(" [ LOOKAHEAD(2) SchemaName() "." ] TableName() [TableAlias()] ")"  
+  |  
+    LOOKAHEAD(3) [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
+  | 
+    LOOKAHEAD(3) "(" JoinClause() ")"
   )
 }
 

From aab240bc2d27884135668e529824ea745c0dd3d7 Mon Sep 17 00:00:00 2001
From: Seth Wilcox <swilcox@icat.com>
Date: Wed, 13 Apr 2022 14:20:32 -0600
Subject: [PATCH 073/180] Allow the ignored fieldnames in the Unused Private
 Field check to be configurable.  The current hardcoded defaults handle the
 fields needed for java serialization, but this isn't documented, and having
 this be configurable, as well as explicitly documented can be helpful.  For
 example, our default new file template always creates a logger for every
 file, and I would prefer to have the logger there unused for future use,
 rather than having to pull it when not used

---
 .../bestpractices/UnusedPrivateFieldRule.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
index c60e6ca6a9..14019dce67 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.lang.java.rule.bestpractices;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -27,9 +28,21 @@ import net.sourceforge.pmd.lang.java.symboltable.JavaNameOccurrence;
 import net.sourceforge.pmd.lang.java.symboltable.VariableNameDeclaration;
 import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
 import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
+import net.sourceforge.pmd.properties.PropertyDescriptor;
+import net.sourceforge.pmd.properties.PropertyFactory;
 
 public class UnusedPrivateFieldRule extends AbstractLombokAwareRule {
 
+    private static final PropertyDescriptor<List<String>> IGNORED_FIELD_NAMES =
+                PropertyFactory.stringListProperty("ignoredFieldNames")
+                    .defaultValue(Arrays.asList("serialVersionUID", "serialPersistentFields", "IDENT"))
+                    .desc("Field Names that are ignored from the unused check")
+                    .build();
+
+    public UnusedPrivateFieldRule() {
+        definePropertyDescriptor(IGNORED_FIELD_NAMES);
+    }
+
     @Override
     protected Collection<String> defaultSuppressionAnnotations() {
         Collection<String> defaultValues = new ArrayList<>(super.defaultSuppressionAnnotations());
@@ -133,6 +146,6 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule {
     }
 
     private boolean isOK(String image) {
-        return "serialVersionUID".equals(image) || "serialPersistentFields".equals(image) || "IDENT".equals(image);
+        return getProperty(IGNORED_FIELD_NAMES).contains(image);
     }
 }

From 6f12ed132277a990dbb25f8845f5dc190bc6fd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 14:55:52 +0200
Subject: [PATCH 074/180] Stop ignoring name "IDENT"

---
 .../lang/java/rule/bestpractices/UnusedPrivateFieldRule.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
index 14019dce67..5dbb3b15a9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
@@ -35,7 +35,7 @@ public class UnusedPrivateFieldRule extends AbstractLombokAwareRule {
 
     private static final PropertyDescriptor<List<String>> IGNORED_FIELD_NAMES =
                 PropertyFactory.stringListProperty("ignoredFieldNames")
-                    .defaultValue(Arrays.asList("serialVersionUID", "serialPersistentFields", "IDENT"))
+                    .defaultValues("serialVersionUID", "serialPersistentFields")
                     .desc("Field Names that are ignored from the unused check")
                     .build();
 

From 8277fd206401d0994948fb4d07506ece2b9c6952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 15:01:22 +0200
Subject: [PATCH 075/180] Update release notes, refs #3910

---
 docs/pages/release_notes.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 728b65281c..531f07a3f1 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -14,6 +14,13 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
+#### Modified rules
+
+*   The Java rule {% rule java/bestpractices/UnusedPrivateField %} has a new property `ignoredFieldNames`.
+    The default ignores serialization-specific fields (eg `serialVersionUID`).
+    The property can be used to ignore more fields based on their name.
+    Note that the rule used to ignore fields named `IDENT`, but doesn't anymore (add this value to the property to restore the old behaviour).
+
 ### Fixed Issues
 * core
   * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
@@ -30,6 +37,7 @@ This is a {{ site.pmd.release_type }} release.
 
 ### External Contributions
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
+* [#3910](https://github.com/pmd/pmd/pull/3910): \[java] Allow the ignored fieldnames in the Unused Private Field check to be configurable - [Seth Wilcox](https://github.com/laoseth)
 
 {% endtocmaker %}
 

From 9513c505fb4e5f975de61686b33ccaf6b56a9c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 15 Apr 2022 19:02:04 +0200
Subject: [PATCH 076/180] checkstyle

---
 .../pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
index 5dbb3b15a9..6eb43383d0 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldRule.java
@@ -5,7 +5,6 @@
 package net.sourceforge.pmd.lang.java.rule.bestpractices;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

From 2667b421c157b3688c07bce8e98520be8ce591fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AE=B6=E5=A5=A5?=
 <lijiaao@lijiaaodeMacBook-Pro.local>
Date: Wed, 20 Apr 2022 14:37:11 +0800
Subject: [PATCH 077/180] add junit test cases

---
 pmd-plsql/etc/grammar/PldocAST.jjt            |  4 +--
 .../lang/plsql/ast/ParenthesisGroupTest.java  | 32 +++++++++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup0.pls  | 21 ++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup1.pls  | 21 ++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup2.pls  | 15 +++++++++
 5 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index bacd49d722..0641868f00 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2126,9 +2126,9 @@ void QueryTableExpression() #void :
   |
     LOOKAHEAD(5) "(" [ LOOKAHEAD(2) SchemaName() "." ] TableName() [TableAlias()] ")"  
   |  
-    LOOKAHEAD(3) [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
+    LOOKAHEAD(5) [ <LATERAL> ] "(" Subquery() [ SubqueryRestrictionClause() ] ")"
   | 
-    LOOKAHEAD(3) "(" JoinClause() ")"
+    "(" JoinClause() ")"
   )
 }
 
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
new file mode 100644
index 0000000000..edfefb1614
--- /dev/null
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
@@ -0,0 +1,32 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql.ast;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
+
+public class ParenthesisGroupTest extends AbstractPLSQLParserTst {
+
+    @Test
+    public void parseParenthesisGroup0() {
+        ASTInput input = plsql.parseResource("ParenthesisGroup0.pls");
+        Assert.assertNotNull(input);
+    }
+    
+    @Test
+    public void parseParenthesisGroup1() {
+        ASTInput input = plsql.parseResource("ParenthesisGroup1.pls");
+        Assert.assertNotNull(input);
+    }
+    
+    @Test
+    public void parseParenthesisGroup2() {
+        ASTInput input = plsql.parseResource("ParenthesisGroup2.pls");
+        Assert.assertNotNull(input);
+    }
+    
+}
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
new file mode 100644
index 0000000000..af1c3e246b
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
@@ -0,0 +1,21 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
new file mode 100644
index 0000000000..c5fd5d411d
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
@@ -0,0 +1,21 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls
new file mode 100644
index 0000000000..cfd982322c
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls
@@ -0,0 +1,15 @@
+CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
+    --
+    CURSOR c_test IS
+        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent
+        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)
+            INNER JOIN
+            (STUDENT_SCORE ss) on si.sid = sp.sid)
+            INNER JOIN
+            (STUDENT_PARENT sp) on si.sid = sp.sid)
+        WHERE si.sid = '114514';
+    --
+BEGIN
+    --
+    --
+END EXAMPLE_PROCEDURE;

From 17ff1b7ffb1b6b34d10b208d7568916000539c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AE=B6=E5=A5=A5?=
 <lijiaao@lijiaaodeMacBook-Pro.local>
Date: Thu, 21 Apr 2022 14:47:08 +0800
Subject: [PATCH 078/180] fix one error in ParenthesisGroup0.pls

---
 .../net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
index af1c3e246b..0026e24d5d 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
@@ -3,7 +3,7 @@ CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    CURSOR c_example IS
       SELECT a.owner, u.object_name, p.aggregate
         FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
-               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id
                INNER JOIN (ALL_PROCEDURES p) ON
                p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
        WHERE a.owner = USER;

From f5be685068e0ee32ba1abaa7a0c05196b18ec640 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 11:26:30 +0200
Subject: [PATCH 079/180] [plsql] Convert ParenthesisGroupTest to be a tree
 dump test

---
 .../lang/plsql/ast/ParenthesisGroupTest.java  |  32 ++-
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  | 250 ++++++++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  | 250 ++++++++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  | 150 +++++++++++
 4 files changed, 670 insertions(+), 12 deletions(-)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt

diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
index edfefb1614..b93bc5f7ec 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
@@ -4,29 +4,37 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
-import org.junit.Assert;
 import org.junit.Test;
 
-import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
 
-public class ParenthesisGroupTest extends AbstractPLSQLParserTst {
+public class ParenthesisGroupTest extends BaseTreeDumpTest {
+
+    public ParenthesisGroupTest() {
+        super(new RelevantAttributePrinter(), ".pls");
+    }
+
+    @Override
+    public BaseParsingHelper<?, ?> getParser() {
+        return PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+    }
 
     @Test
     public void parseParenthesisGroup0() {
-        ASTInput input = plsql.parseResource("ParenthesisGroup0.pls");
-        Assert.assertNotNull(input);
+        doTest("ParenthesisGroup0");
     }
-    
+
     @Test
     public void parseParenthesisGroup1() {
-        ASTInput input = plsql.parseResource("ParenthesisGroup1.pls");
-        Assert.assertNotNull(input);
+        doTest("ParenthesisGroup1");
     }
-    
+
     @Test
     public void parseParenthesisGroup2() {
-        ASTInput input = plsql.parseResource("ParenthesisGroup2.pls");
-        Assert.assertNotNull(input);
+        doTest("ParenthesisGroup2");
     }
-    
+
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
new file mode 100644
index 0000000000..0602c49949
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -0,0 +1,250 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = false]
+         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- JoinClause[@CanonicalImage = null]
+         |              |     +- TableReference[@CanonicalImage = null]
+         |              |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
+         |              |     |  |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |  +- TableAlias[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     |     +- ID[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     |        +- KEYWORD_UNRESERVED[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |     |  +- TableReference[@CanonicalImage = null]
+         |              |     |  |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |     |  |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |     |  |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  |     +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
+         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
+         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = false]
+         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
+         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
+         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
+         |              |     |        +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = false]
+         |              |     |        |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
+         |              |     |        |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |        |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |        |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |        |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |        +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = false]
+         |              |     |           +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
+         |              |     |              +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |                 +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |        |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |        |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
+         |              |        |     +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |        +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = false]
+         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
+         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = false]
+         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
+         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
+         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = false]
+         |              |              |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
+         |              |              |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |              |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
+         |              |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |                    +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                       +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = false]
+         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
+         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
+         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- ForStatement[@CanonicalImage = null]
+         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = false]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = false]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        +- Statement[@CanonicalImage = null]
+         |           +- UnlabelledStatement[@CanonicalImage = null]
+         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |                       +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                          +- ArgumentList[@CanonicalImage = null]
+         |                             +- Argument[@CanonicalImage = null]
+         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = false]
+         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
new file mode 100644
index 0000000000..1d77da1f68
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -0,0 +1,250 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   CURSOR c_example IS
+      SELECT a.owner, u.object_name, p.aggregate
+        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
+               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
+               INNER JOIN (ALL_PROCEDURES p) ON
+               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)
+       WHERE a.owner = USER;
+   --
+BEGIN
+   --
+   FOR l_object IN c_example LOOP
+      --
+      DBMS_OUTPUT.Put_Line(l_object.owner);
+      DBMS_OUTPUT.Put_Line(l_object.object_name);
+      DBMS_OUTPUT.Put_Line(l_object.aggregate);
+      --
+   END LOOP;
+   --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = false]
+         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- TableReference[@CanonicalImage = null]
+         |              |     +- JoinClause[@CanonicalImage = null]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |        |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |        |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
+         |              |        |     |     +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |        |        +- TableReference[@CanonicalImage = null]
+         |              |        |        |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |        |        |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |        |        |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        |     +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
+         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
+         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = false]
+         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
+         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
+         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
+         |              |        |              +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = false]
+         |              |        |              |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
+         |              |        |              |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |              |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |              |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |              |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = false]
+         |              |        |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
+         |              |        |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |                       +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |           +- TableReference[@CanonicalImage = null]
+         |              |           |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |           |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |           |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
+         |              |           |     +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = false]
+         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
+         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = false]
+         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
+         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
+         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
+         |              |                 +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = false]
+         |              |                 |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
+         |              |                 |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |                 |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |                 |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                 |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                 +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
+         |              |                    +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |                       +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |                       |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |                       |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |                       +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                          +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
+         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = false]
+         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
+         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
+         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- ForStatement[@CanonicalImage = null]
+         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = false]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = false]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        +- Statement[@CanonicalImage = null]
+         |           +- UnlabelledStatement[@CanonicalImage = null]
+         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
+         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |                       +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                          +- ArgumentList[@CanonicalImage = null]
+         |                             +- Argument[@CanonicalImage = null]
+         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = false]
+         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
new file mode 100644
index 0000000000..329d2f56ae
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -0,0 +1,150 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
+    --
+    CURSOR c_test IS
+        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent
+        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)
+            INNER JOIN
+            (STUDENT_SCORE ss) on si.sid = sp.sid)
+            INNER JOIN
+            (STUDENT_PARENT sp) on si.sid = sp.sid)
+        WHERE si.sid = '114514';
+    --
+BEGIN
+    --
+    --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_TEST", @Image = "c_test"]
+         |           +- ID[@CanonicalImage = "C_TEST", @Image = "c_test"]
+         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |  |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |  |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |  |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |  |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |  +- SqlExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SN.NAME", @Image = "sn.name", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
+         |              |  |        +- TableName[@CanonicalImage = "SN", @Image = "sn"]
+         |              |  |        |  +- ID[@CanonicalImage = "SN", @Image = "sn"]
+         |              |  |        +- Column[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  |           +- ID[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  |              +- KEYWORD_UNRESERVED[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  +- SqlExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SA.AGE", @Image = "sa.age", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
+         |              |  |        +- TableName[@CanonicalImage = "SA", @Image = "sa"]
+         |              |  |        |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |  |        +- Column[@CanonicalImage = "AGE", @Image = "age"]
+         |              |  |           +- ID[@CanonicalImage = "AGE", @Image = "age"]
+         |              |  +- SqlExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SS.SCORE", @Image = "ss.score", @SelfModifier = false]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
+         |              |  |        +- TableName[@CanonicalImage = "SS", @Image = "ss"]
+         |              |  |        |  +- ID[@CanonicalImage = "SS", @Image = "ss"]
+         |              |  |        +- Column[@CanonicalImage = "SCORE", @Image = "score"]
+         |              |  |           +- ID[@CanonicalImage = "SCORE", @Image = "score"]
+         |              |  +- SqlExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "SP.PARENT", @Image = "sp.parent", @SelfModifier = false]
+         |              |        +- SimpleExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
+         |              |           +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           +- Column[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              |              +- ID[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- TableReference[@CanonicalImage = null]
+         |              |     +- JoinClause[@CanonicalImage = null]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |     |  +- TableName[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
+         |              |        |     |     |  |  +- ID[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
+         |              |        |     |     |  +- TableAlias[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |     |     +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |        |     |        +- TableReference[@CanonicalImage = null]
+         |              |        |     |        |  +- TableName[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
+         |              |        |     |        |  |  +- ID[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
+         |              |        |     |        |  +- TableAlias[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |        |     +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |        +- EqualityExpression[@CanonicalImage = "SI.SID = SA.SID", @Image = "si.sid = sa.sid"]
+         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
+         |              |        |     |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |        |     |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SA.SID", @Image = "sa.sid", @SelfModifier = false]
+         |              |        |     |              +- SimpleExpression[@CanonicalImage = "SA.SID", @Image = "sa.sid"]
+         |              |        |     |                 +- TableName[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |                 |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |        |        +- TableReference[@CanonicalImage = null]
+         |              |        |        |  +- TableName[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
+         |              |        |        |  |  +- ID[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
+         |              |        |        |  +- TableAlias[@CanonicalImage = "SS", @Image = "ss"]
+         |              |        |        |     +- ID[@CanonicalImage = "SS", @Image = "ss"]
+         |              |        |        +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
+         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
+         |              |        |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |        |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = false]
+         |              |        |              +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
+         |              |        |                 +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |        |                 |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |        |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
+         |              |           +- TableReference[@CanonicalImage = null]
+         |              |           |  +- TableName[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
+         |              |           |  |  +- ID[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
+         |              |           |  +- TableAlias[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           |     +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
+         |              |              |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |              |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |              |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |              |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |              |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = false]
+         |              |                 +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
+         |              |                    +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |                    |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |                    +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |                       +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
+         |                          |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |                          |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |                          |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |                          |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |                          |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |                          +- SqlExpression[@CanonicalImage = "'114514'", @Image = "'114514'"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "'114514'", @Image = "'114514'", @SelfModifier = false]
+         |                                +- Literal[@CanonicalImage = "'114514'", @Image = "'114514'"]
+         |                                   +- StringLiteral[@CanonicalImage = "'114514'", @Image = "'114514'", @String = "114514"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]

From ebbc01736392e35f8627e9ea5634c8feb8fec8a0 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 11:29:26 +0200
Subject: [PATCH 080/180] [doc] Update release notes (#3706, #3928)

---
 docs/pages/release_notes.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 728b65281c..4aff208745 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -18,18 +18,19 @@ This is a {{ site.pmd.release_type }} release.
 * core
   * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
+  * [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
-
-*   core
-    *   [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
+* plsql
+  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
 ### API Changes
 
 ### External Contributions
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
+* [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
 
 {% endtocmaker %}
 

From cb4b981fdd43e4d35e70390cd0b4d3073c7ef096 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 11:29:53 +0200
Subject: [PATCH 081/180]  Add @LiGaOg as a contributor

---
 .all-contributorsrc                   |   9 ++
 docs/pages/pmd/projectdocs/credits.md | 121 +++++++++++++-------------
 2 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 530ae5a2be..b753fb25ad 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6594,6 +6594,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "LiGaOg",
+      "name": "LiGaOg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72175888?v=4",
+      "profile": "https://github.com/LiGaOg",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index 10b84a28bf..2e849c2105 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -398,540 +398,541 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://www.linkedin.com/in/larry-diamond-3964042/"><img src="https://avatars.githubusercontent.com/u/1066589?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Larry Diamond</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=larrydiamond" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alarrydiamond" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lars-sh.de/"><img src="https://avatars.githubusercontent.com/u/880198?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lars Knickrehm</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alars-sh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgabrielgr"><img src="https://avatars.githubusercontent.com/u/760959?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Gutierrez</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algabrielgr" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Lintsi"><img src="https://avatars.githubusercontent.com/u/6848650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lintsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALintsi" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/LiGaOg"><img src="https://avatars.githubusercontent.com/u/72175888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LiGaOg</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=LiGaOg" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Lintsi"><img src="https://avatars.githubusercontent.com/u/6848650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lintsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALintsi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://linusfernandes.com/"><img src="https://avatars.githubusercontent.com/u/24714685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Linus Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AFernal73" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/LixonLookose"><img src="https://avatars.githubusercontent.com/u/66419481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lixon Lookose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALixonLookose" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/logesh14"><img src="https://avatars.githubusercontent.com/u/30902439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Logesh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alogesh14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lolgab"><img src="https://avatars.githubusercontent.com/u/5793054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lorenzo Gabriele</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alolgab" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ledoyen"><img src="https://avatars.githubusercontent.com/u/6298315?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Loïc Ledoyen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aledoyen" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lssilva"><img src="https://avatars.githubusercontent.com/u/7464888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Silva</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alssilva" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lsoncini"><img src="https://avatars.githubusercontent.com/u/12226579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Soncini</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lsoncini" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alsoncini" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lsoncini"><img src="https://avatars.githubusercontent.com/u/12226579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Soncini</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lsoncini" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alsoncini" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lslonina"><img src="https://avatars.githubusercontent.com/u/12303865?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukasz Slonina</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alslonina" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lukebray"><img src="https://avatars.githubusercontent.com/u/39488446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukebray</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALukebray" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgoldstein"><img src="https://avatars.githubusercontent.com/u/1436205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lyor Goldstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algoldstein" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mcmics.jnet24.de/"><img src="https://avatars.githubusercontent.com/u/4604206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MCMicS</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMCMicS" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Macarse"><img src="https://avatars.githubusercontent.com/u/24915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Macarse</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMacarse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pmd.github.io/"><img src="https://avatars.githubusercontent.com/u/26070915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Machine account for PMD</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pmd-bot" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/msiemczyk"><img src="https://avatars.githubusercontent.com/u/5693250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciek Siemczyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsiemczyk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/msiemczyk"><img src="https://avatars.githubusercontent.com/u/5693250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciek Siemczyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsiemczyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maikelsteneker"><img src="https://avatars.githubusercontent.com/u/2788927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maikel Steneker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=maikelsteneker" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amaikelsteneker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maksim-m"><img src="https://avatars.githubusercontent.com/u/1863269?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maksim Moiseikin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaksim-m" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/koma0277"><img src="https://avatars.githubusercontent.com/u/35556790?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manfred Koch</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akoma0277" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/manuel-moya-ferrer-11163168/"><img src="https://avatars.githubusercontent.com/u/15876612?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Moya Ferrer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=mmoyaferrer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ammoyaferrer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mryan43"><img src="https://avatars.githubusercontent.com/u/223869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Ryan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amryan43" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/touzoku"><img src="https://avatars.githubusercontent.com/u/1285662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marat Vyshegorodtsev</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atouzoku" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/marcelhaerle"><img src="https://avatars.githubusercontent.com/u/5338817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcel Härle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelhaerle" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/marcelhaerle"><img src="https://avatars.githubusercontent.com/u/5338817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcel Härle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelhaerle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcello-fialho"><img src="https://avatars.githubusercontent.com/u/28719666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcello Fialho</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcello-fialho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lidel.org/"><img src="https://avatars.githubusercontent.com/u/157609?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcin Rataj</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alidel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/adamcin"><img src="https://avatars.githubusercontent.com/u/524972?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Adamcin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aadamcin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/markhall82"><img src="https://avatars.githubusercontent.com/u/22261511?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=markhall82" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarkhall82" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mark.koli.ch/"><img src="https://avatars.githubusercontent.com/u/1202420?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Kolich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkkolich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/markpritchard"><img src="https://avatars.githubusercontent.com/u/8234070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Pritchard</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkpritchard" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/maggu2810"><img src="https://avatars.githubusercontent.com/u/204670?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Markus Rathgeb</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaggu2810" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/maggu2810"><img src="https://avatars.githubusercontent.com/u/204670?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Markus Rathgeb</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaggu2810" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://marquiswang.com/"><img src="https://avatars.githubusercontent.com/u/358220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marquis Wang</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarquiswang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martofeld"><img src="https://avatars.githubusercontent.com/u/5756343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Feldsztejn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartofeld" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://twitter.com/theneva"><img src="https://avatars.githubusercontent.com/u/1404650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Lehmann</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheneva" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.spamer.me.uk/"><img src="https://avatars.githubusercontent.com/u/2852862?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Spamer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMartin-Spamer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martin-tarjanyi"><img src="https://avatars.githubusercontent.com/u/17810336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Tarjányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartin-tarjanyi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MatFl"><img src="https://avatars.githubusercontent.com/u/8408624?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatFl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMatFl" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mateusz-stefanski"><img src="https://avatars.githubusercontent.com/u/28163508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Stefanski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amateusz-stefanski" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mateusz-stefanski"><img src="https://avatars.githubusercontent.com/u/28163508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Stefanski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amateusz-stefanski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mathieugouin"><img src="https://avatars.githubusercontent.com/u/11562302?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathieu Gouin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amathieugouin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MatiasComercio"><img src="https://avatars.githubusercontent.com/u/9677633?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatiasComercio</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=MatiasComercio" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AMatiasComercio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mbenson"><img src="https://avatars.githubusercontent.com/u/487462?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Benson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ambenson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MPoorter"><img src="https://avatars.githubusercontent.com/u/25356097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt De Poorter</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMPoorter" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frizbog"><img src="https://avatars.githubusercontent.com/u/2901857?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Harrah</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrizbog" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mattnelson"><img src="https://avatars.githubusercontent.com/u/1894657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Nelson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amattnelson" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/blackmamo"><img src="https://avatars.githubusercontent.com/u/35695811?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Amos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ablackmamo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/blackmamo"><img src="https://avatars.githubusercontent.com/u/35695811?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Amos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ablackmamo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mduggan"><img src="https://avatars.githubusercontent.com/u/3765590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Duggan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amduggan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/qualidafial"><img src="https://avatars.githubusercontent.com/u/38629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aqualidafial" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matifraga"><img src="https://avatars.githubusercontent.com/u/7543268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matías Fraga</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=matifraga" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amatifraga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marob"><img src="https://avatars.githubusercontent.com/u/3486231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maxime Robert</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=marob" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MetaBF"><img src="https://avatars.githubusercontent.com/u/101029254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MetaBF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMetaBF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://boyl.es/"><img src="https://avatars.githubusercontent.com/u/17732072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelboyles" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mikebell90"><img src="https://avatars.githubusercontent.com/u/780301?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikebell90" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mikebell90"><img src="https://avatars.githubusercontent.com/u/780301?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikebell90" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://reifyworks.com/"><img src="https://avatars.githubusercontent.com/u/2878?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bernstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mclay"><img src="https://avatars.githubusercontent.com/u/393727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Clay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amclay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mikedombrowski.com/"><img src="https://avatars.githubusercontent.com/u/3926405?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Dombrowski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMikeDombo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TheRealHaui"><img src="https://avatars.githubusercontent.com/u/6312834?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hausegger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheRealHaui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/michaelhoefer"><img src="https://avatars.githubusercontent.com/u/479449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hoefer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelhoefer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.rrsoftware.de/"><img src="https://avatars.githubusercontent.com/u/1881640?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Möbius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARocketRider" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://mnlipp.github.io/"><img src="https://avatars.githubusercontent.com/u/1446020?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael N. Lipp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnlipp" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://mnlipp.github.io/"><img src="https://avatars.githubusercontent.com/u/1446020?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael N. Lipp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnlipp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mpellegrini"><img src="https://avatars.githubusercontent.com/u/466696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Pellegrini</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ampellegrini" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pl.linkedin.com/in/mkordas/"><img src="https://avatars.githubusercontent.com/u/5467276?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michal Kordas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkordas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.greenpath.pl/"><img src="https://avatars.githubusercontent.com/u/986194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Borek</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichalborek" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coola"><img src="https://avatars.githubusercontent.com/u/83182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Kuliński</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoola" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mnunezdm.com/"><img src="https://avatars.githubusercontent.com/u/10410852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Miguel Núñez Díaz-Montes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnunezdm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/impmihai"><img src="https://avatars.githubusercontent.com/u/22995337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihai Ionut</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aimpmihai" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mhankus"><img src="https://avatars.githubusercontent.com/u/6095361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mirek Hankus</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amhankus" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mhankus"><img src="https://avatars.githubusercontent.com/u/6095361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mirek Hankus</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amhankus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ImmortalPawn"><img src="https://avatars.githubusercontent.com/u/30688679?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mladjan Gadzic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AImmortalPawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MrAngry52"><img src="https://avatars.githubusercontent.com/u/30026386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MrAngry52</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMrAngry52" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/muminc"><img src="https://avatars.githubusercontent.com/u/934067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muminur Choudhury</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amuminc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Drofff"><img src="https://avatars.githubusercontent.com/u/45700628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mykhailo Palahuta</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Drofff" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADrofff" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nagendra080389"><img src="https://avatars.githubusercontent.com/u/6088582?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nagendra Kumar Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANagendra080389" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://bit.ly/nahuelbarrios"><img src="https://avatars.githubusercontent.com/u/196234?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nahuel Barrios</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abarriosnahuel" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/nbraun-Google"><img src="https://avatars.githubusercontent.com/u/52723353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Braun</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anbraun-Google" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nbraun-Google"><img src="https://avatars.githubusercontent.com/u/52723353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Braun</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anbraun-Google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nathanspectacular"><img src="https://avatars.githubusercontent.com/u/88563519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anathanspectacular" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/numeralnathan"><img src="https://avatars.githubusercontent.com/u/1236594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anumeralnathan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mastodon.tetaneutral.net/@roipoussiere"><img src="https://avatars.githubusercontent.com/u/1665542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathanaël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aroipoussiere" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nazdravi"><img src="https://avatars.githubusercontent.com/u/273093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nazdravi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANazdravi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Neha-Dhonde"><img src="https://avatars.githubusercontent.com/u/31505059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neha-Dhonde</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANeha-Dhonde" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/njdoyle"><img src="https://avatars.githubusercontent.com/u/316852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Doyle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anjdoyle" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/NickButcher1"><img src="https://avatars.githubusercontent.com/u/8671565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Butcher</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANickButcher1" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/NickButcher1"><img src="https://avatars.githubusercontent.com/u/8671565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Butcher</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANickButcher1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicoabie"><img src="https://avatars.githubusercontent.com/u/2797992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Gallinal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicoabie" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niktekusho"><img src="https://avatars.githubusercontent.com/u/18280135?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicola Dal Maso</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniktekusho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/1997376/nicolas-filotto"><img src="https://avatars.githubusercontent.com/u/1618116?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Filotto</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=essobedo" title="Code">💻</a></td>
     <td align="center"><a href="https://www.salesforcecraft.dev/"><img src="https://avatars.githubusercontent.com/u/8916229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Chursin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anchursin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://vanniktech.com/"><img src="https://avatars.githubusercontent.com/u/5759366?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niklas Baudy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanniktech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/havrikov"><img src="https://avatars.githubusercontent.com/u/29175267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolas Havrikov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahavrikov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://nileshvirkar.github.io/"><img src="https://avatars.githubusercontent.com/u/24671786?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nilesh Virkar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANileshVirkar" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://nileshvirkar.github.io/"><img src="https://avatars.githubusercontent.com/u/24671786?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nilesh Virkar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANileshVirkar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nimit-patel"><img src="https://avatars.githubusercontent.com/u/13987001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nimit Patel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Animit-patel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niranjanh"><img src="https://avatars.githubusercontent.com/u/23009945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Harpale</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniranjanh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noahsussman"><img src="https://avatars.githubusercontent.com/u/31490710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sussman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoahsussman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Noah0120"><img src="https://avatars.githubusercontent.com/u/86766856?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah0120</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANoah0120" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://noamtamim.com/"><img src="https://avatars.githubusercontent.com/u/10047237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noam Tamim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoamtamim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/grandinj"><img src="https://avatars.githubusercontent.com/u/796121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noel Grandin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agrandinj" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/OlafHaalstra"><img src="https://avatars.githubusercontent.com/u/6420723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olaf Haalstra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOlafHaalstra" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/OlafHaalstra"><img src="https://avatars.githubusercontent.com/u/6420723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olaf Haalstra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOlafHaalstra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Oleg-Pavlenko-EPAM"><img src="https://avatars.githubusercontent.com/u/82513963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleg Pavlenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOleg-Pavlenko-EPAM" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dykov"><img src="https://avatars.githubusercontent.com/u/36415196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleksii Dykov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dykov" title="Code">💻</a></td>
     <td align="center"><a href="http://www.eikemeier.com/"><img src="https://avatars.githubusercontent.com/u/604196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Eikemeier</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeikemeier" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pyxide"><img src="https://avatars.githubusercontent.com/u/9992381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olivier Parent</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pyxide" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apyxide" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ollieabbey"><img src="https://avatars.githubusercontent.com/u/52665918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ollie Abbey</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ollieabbey" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aollieabbey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OverDrone"><img src="https://avatars.githubusercontent.com/u/8506029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OverDrone</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOverDrone" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ozangulle"><img src="https://avatars.githubusercontent.com/u/1334150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ozan Gulle</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ozangulle" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aozangulle" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ozangulle"><img src="https://avatars.githubusercontent.com/u/1334150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ozan Gulle</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ozangulle" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aozangulle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/PJ17101"><img src="https://avatars.githubusercontent.com/u/31703044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PUNEET JAIN</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APJ17101" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parbatiSF"><img src="https://avatars.githubusercontent.com/u/37078591?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Parbati Bose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AparbatiSF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/paulberg"><img src="https://avatars.githubusercontent.com/u/3239883?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Berg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apaulberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbludov"><img src="https://avatars.githubusercontent.com/u/900805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Bludov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbludov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/malejpavouk"><img src="https://avatars.githubusercontent.com/u/4127023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Mička</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amalejpavouk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pnsantos"><img src="https://avatars.githubusercontent.com/u/630567?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Nuno Santos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apnsantos" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://pedrorijo.com/"><img src="https://avatars.githubusercontent.com/u/1999050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Rijo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apedrorijo91" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://pedrorijo.com/"><img src="https://avatars.githubusercontent.com/u/1999050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Rijo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apedrorijo91" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://belaran.eu/wordpress/"><img src="https://avatars.githubusercontent.com/u/117836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pelisse Romain</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arpelisse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MisterSquishy"><img src="https://avatars.githubusercontent.com/u/5599894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pete Davids</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMisterSquishy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://blog.bruin.sg/"><img src="https://avatars.githubusercontent.com/u/4156901?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Bruin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auncletall" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pchittum"><img src="https://avatars.githubusercontent.com/u/1127876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Chittum</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pchittum" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apchittum" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/petercudmore"><img src="https://avatars.githubusercontent.com/u/12710815?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Cudmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apetercudmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pkasson"><img src="https://avatars.githubusercontent.com/u/3072247?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kasson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apkasson" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.code-cop.org/"><img src="https://avatars.githubusercontent.com/u/830028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kofler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acodecop" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.code-cop.org/"><img src="https://avatars.githubusercontent.com/u/830028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kofler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acodecop" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gpbp"><img src="https://avatars.githubusercontent.com/u/18648177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pham Hai Trung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agpbp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/acanda"><img src="https://avatars.githubusercontent.com/u/174978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Graf</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=acanda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aacanda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krallus"><img src="https://avatars.githubusercontent.com/u/29927450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Hachey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrallus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pozil.github.io/"><img src="https://avatars.githubusercontent.com/u/5071767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philippe Ozil</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apozil" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phinehasz"><img src="https://avatars.githubusercontent.com/u/36982629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phinehas Artemix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphinehasz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fluxroot"><img src="https://avatars.githubusercontent.com/u/247365?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phokham Nonava</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afluxroot" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/szyman23"><img src="https://avatars.githubusercontent.com/u/4140681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Szymański</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszyman23" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/szyman23"><img src="https://avatars.githubusercontent.com/u/4140681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Szymański</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszyman23" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pzygielo"><img src="https://avatars.githubusercontent.com/u/11896137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotrek Żygieło</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pzygielo" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apzygielo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/pranayjaiswal"><img src="https://avatars.githubusercontent.com/u/1728493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pranay Jaiswal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apranayjswl007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kamath-prasad"><img src="https://avatars.githubusercontent.com/u/28445395?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasad Kamath</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akamath-prasad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Prasanna-Loga"><img src="https://avatars.githubusercontent.com/u/36530081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasanna</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APrasanna-Loga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Presh-AR"><img src="https://avatars.githubusercontent.com/u/20354066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Presh-AR</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APresh-AR" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Puneet1726"><img src="https://avatars.githubusercontent.com/u/26565880?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet1726</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APuneet1726" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mrfyda"><img src="https://avatars.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael Cortês</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrfyda" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mrfyda"><img src="https://avatars.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael Cortês</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrfyda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RaheemShaik999"><img src="https://avatars.githubusercontent.com/u/43146735?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RaheemShaik999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARaheemShaik999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshggwp"><img src="https://avatars.githubusercontent.com/u/8025160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RajeshR</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rajeshggwp" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshggwp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ramachandra-mohan"><img src="https://avatars.githubusercontent.com/u/22360770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ramachandra Mohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aramachandra-mohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.walkmod.com/"><img src="https://avatars.githubusercontent.com/u/1483433?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raquel Pau</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arpau" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://ravikiranj.net/"><img src="https://avatars.githubusercontent.com/u/389491?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ravikiran Janardhana</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aravikiranj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/reda_benh"><img src="https://avatars.githubusercontent.com/u/1609466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reda Benhemmouche</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARedaBenh" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://dogeforce.com/"><img src="https://avatars.githubusercontent.com/u/6956403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Oliveira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=renatoliveira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arenatoliveira" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://dogeforce.com/"><img src="https://avatars.githubusercontent.com/u/6956403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Oliveira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=renatoliveira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arenatoliveira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rdicroce"><img src="https://avatars.githubusercontent.com/u/1458922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rich DiCroce</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ardicroce" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://developer.riotgames.com/"><img src="https://avatars.githubusercontent.com/u/33143437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Riot R1cket</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARiotR1cket" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rishjain.me/"><img src="https://avatars.githubusercontent.com/u/25207823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabh Jain</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajainrish" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rishabhdeepsingh"><img src="https://avatars.githubusercontent.com/u/28526643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RishabhDeep Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arishabhdeepsingh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmartinus"><img src="https://avatars.githubusercontent.com/u/12573669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robbie Martinus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmartinus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armartinus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RobertHenry6bev"><img src="https://avatars.githubusercontent.com/u/4371939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Henry</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobertHenry6bev" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/robertpainsi"><img src="https://avatars.githubusercontent.com/u/1794599?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Painsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertpainsi" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/robertpainsi"><img src="https://avatars.githubusercontent.com/u/1794599?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Painsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertpainsi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Sebanisu"><img src="https://avatars.githubusercontent.com/u/1035905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Russell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASebanisu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsoesemann"><img src="https://avatars.githubusercontent.com/u/8180281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Sösemann</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Documentation">📖</a> <a href="#talk-rsoesemann" title="Talks">📢</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsoesemann" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertwhitebit"><img src="https://avatars.githubusercontent.com/u/11049034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Whitebit</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertwhitebit" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://androbin.de/"><img src="https://avatars.githubusercontent.com/u/16437156?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Richtsfeld</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AAndrobin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.whatsthistimestamp.com/"><img src="https://avatars.githubusercontent.com/u/16778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Stocker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=robinst" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arobinst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.robinwils.com/"><img src="https://avatars.githubusercontent.com/u/5617025?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Wils</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobin-Wils" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/RochusOest"><img src="https://avatars.githubusercontent.com/u/65393072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RochusOest</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARochusOest" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/RochusOest"><img src="https://avatars.githubusercontent.com/u/65393072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RochusOest</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARochusOest" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rodolfonoviski"><img src="https://avatars.githubusercontent.com/u/7316374?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodolfo Noviski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arodolfonoviski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Casara"><img src="https://avatars.githubusercontent.com/u/2224686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Casara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ACasara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rtfpessoa.xyz/"><img src="https://avatars.githubusercontent.com/u/902384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Artfpessoa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsalvador"><img src="https://avatars.githubusercontent.com/u/1301827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roman Salvador</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsalvador" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsalvador" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.rblasch.org/"><img src="https://avatars.githubusercontent.com/u/52590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ronald Blaschke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arblasch" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TWiStErRob"><img src="https://avatars.githubusercontent.com/u/2906988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Róbert Papp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATWiStErRob" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://saikat.hashnode.dev/"><img src="https://avatars.githubusercontent.com/u/41847480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saikat Sengupta</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3As4ik4t" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://saikat.hashnode.dev/"><img src="https://avatars.githubusercontent.com/u/41847480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saikat Sengupta</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3As4ik4t" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miplodder.github.io/"><img src="https://avatars.githubusercontent.com/u/22195621?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saksham Handu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AmiPlodder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Saladoc"><img src="https://avatars.githubusercontent.com/u/36816545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saladoc</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASaladoc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SalesforceBobLightning"><img src="https://avatars.githubusercontent.com/u/39457343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Salesforce Bob Lightning</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASalesforceBobLightning" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SamCarlberg"><img src="https://avatars.githubusercontent.com/u/6320992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Carlberg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASamCarlberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://d.hatena.ne.jp/megascus/"><img src="https://avatars.githubusercontent.com/u/976085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Kubo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amegascus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scottkennedy"><img src="https://avatars.githubusercontent.com/u/881690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Kennedy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascottkennedy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sschuberth"><img src="https://avatars.githubusercontent.com/u/349154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schuberth</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asschuberth" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itsmebasti"><img src="https://avatars.githubusercontent.com/u/12232063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schwarz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitsmebasti" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
     <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>

From 8d5c2e5683f95ff36c6dd6f0b872ebe4616bbfdb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 14:12:47 +0200
Subject: [PATCH 082/180] [java] ArrayIsStoredDirectly - fix tree traversal

Fixes #3879
---
 docs/pages/release_notes.md                    |  1 +
 .../ArrayIsStoredDirectlyRule.java             |  8 ++++++--
 .../xml/ArrayIsStoredDirectly.xml              | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 4aff208745..0e6ecfd7ff 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,6 +22,7 @@ This is a {{ site.pmd.release_type }} release.
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
+  * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
 * plsql
   * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
index 739c28cf71..db7cd5498a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
@@ -19,6 +19,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTPrimaryExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTPrimaryPrefix;
 import net.sourceforge.pmd.lang.java.ast.ASTPrimarySuffix;
+import net.sourceforge.pmd.lang.java.ast.ASTStatement;
 import net.sourceforge.pmd.lang.java.ast.ASTStatementExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
@@ -105,9 +106,12 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
         final ASTVariableDeclaratorId vid = parameter.getFirstDescendantOfType(ASTVariableDeclaratorId.class);
         final String varName = vid.getImage();
         for (ASTBlockStatement b : bs) {
-            if (b.hasDescendantOfType(ASTAssignmentOperator.class)) {
+            if (b.getChild(0) instanceof ASTStatement && b.getChild(0).getChild(0) instanceof ASTStatementExpression) {
                 final ASTStatementExpression se = b.getFirstDescendantOfType(ASTStatementExpression.class);
-                if (se == null || !(se.getChild(0) instanceof ASTPrimaryExpression)) {
+                if (se == null
+                        || se.getNumChildren() < 2
+                        || !(se.getChild(0) instanceof ASTPrimaryExpression)
+                        || !(se.getChild(1) instanceof ASTAssignmentOperator)) {
                     continue;
                 }
                 String assignedVar = getExpressionVarName(se);
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
index cec9365196..39188405c2 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
@@ -269,4 +269,22 @@ public class Foo {
 }
         ]]></code>
     </test-code>
+
+    <test-code>
+        <description>[java] ArrayIsStoredDirectly reports duplicated violation #3879</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>5</expected-linenumbers>
+        <code><![CDATA[
+public class ExampleAISD {
+
+    public String[] strs;
+
+    public void func(String[] strs, boolean flag) { // line 5
+        if (flag) {
+            this.strs = strs; // line 7
+        }
+    }
+}
+]]></code>
+    </test-code>
 </test-data>

From 55662908214f4cc2419058a1d59ab777d2a5fc99 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 14:31:20 +0200
Subject: [PATCH 083/180] [java] ArrayIsStoredDirectly - ignore method calls

Fixes #1474
---
 docs/pages/release_notes.md                   |  1 +
 .../ArrayIsStoredDirectlyRule.java            | 14 ++++++++++++++
 .../xml/ArrayIsStoredDirectly.xml             | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 0e6ecfd7ff..9314b76290 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,6 +22,7 @@ This is a {{ site.pmd.release_type }} release.
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
+  * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
   * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
 * plsql
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
index db7cd5498a..cd8248eb86 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
@@ -80,6 +80,9 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
 
     private String getExpressionVarName(Node e) {
         String assignedVar = getFirstNameImage(e);
+        if (isMethodCall(e)) {
+            return null;
+        }
         if (assignedVar == null) {
             ASTPrimarySuffix suffix = e.getFirstDescendantOfType(ASTPrimarySuffix.class);
             if (suffix != null) {
@@ -97,6 +100,17 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
         return assignedVar;
     }
 
+    private boolean isMethodCall(Node e) {
+        if (e.getNumChildren() == 1 && e.getChild(0) instanceof ASTPrimaryExpression) {
+            ASTPrimaryExpression primaryExpression = (ASTPrimaryExpression) e.getChild(0);
+            if (primaryExpression.getNumChildren() > 1) {
+                ASTPrimarySuffix suffix = (ASTPrimarySuffix) primaryExpression.getChild(1);
+                return suffix.isArguments();
+            }
+        }
+        return false;
+    }
+
     /**
      * Checks if the variable designed in parameter is written to a field (not
      * local variable) in the statements.
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
index 39188405c2..e3bf9deaf4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
@@ -287,4 +287,23 @@ public class ExampleAISD {
 }
 ]]></code>
     </test-code>
+
+    <test-code>
+        <description>[java] ArrayIsStoredDirectly false positive with method call #1474</description>
+        <rule-property name="allowPrivate">false</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class TestArrayIsStoredDirectly {
+    public double energy(int x) {
+        return 0.0;
+    }
+
+    // if energy[] is replace by energy2[], then no ArrayIsStoredDirectly warning
+    private void f(double[] energy) {
+        energy[0] = energy(1);
+    }
+}
+]]></code>
+    </test-code>
+
 </test-data>

From 0d8373d2902fb88a2d2c46a723b2ba2b1921c39c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 14:48:23 +0200
Subject: [PATCH 084/180] [java] ArrayIsStoredDirectly - fix field access with
 this

Fixes #1185
---
 docs/pages/release_notes.md                   |  1 +
 .../ArrayIsStoredDirectlyRule.java            |  9 +++++++--
 .../xml/ArrayIsStoredDirectly.xml             | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 9314b76290..3dbbcfb482 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,6 +22,7 @@ This is a {{ site.pmd.release_type }} release.
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
+  * [#1185](https://github.com/pmd/pmd/issues/1185): \[java] ArrayIsStoredDirectly false positive with field access 
   * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
   * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
index cd8248eb86..4eeccde81d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
@@ -84,10 +84,15 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
             return null;
         }
         if (assignedVar == null) {
-            ASTPrimarySuffix suffix = e.getFirstDescendantOfType(ASTPrimarySuffix.class);
+            ASTPrimaryPrefix prefix = null;
+            ASTPrimarySuffix suffix = null;
+            if (e.getNumChildren() > 0 && e.getChild(0) instanceof ASTPrimaryExpression) {
+                ASTPrimaryExpression primaryExpression = (ASTPrimaryExpression) e.getChild(0);
+                prefix = (ASTPrimaryPrefix) primaryExpression.getChild(0);
+                suffix = primaryExpression.getFirstChildOfType(ASTPrimarySuffix.class);
+            }
             if (suffix != null) {
                 assignedVar = suffix.getImage();
-                ASTPrimaryPrefix prefix = e.getFirstDescendantOfType(ASTPrimaryPrefix.class);
                 if (prefix != null) {
                     if (prefix.usesThisModifier()) {
                         assignedVar = "this." + assignedVar;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
index e3bf9deaf4..3c58220e61 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
@@ -303,6 +303,25 @@ public class TestArrayIsStoredDirectly {
         energy[0] = energy(1);
     }
 }
+]]></code>
+    </test-code>
+
+    <test-code>
+        <description>[java] ArrayIsStoredDirectly false positive with field access #1185</description>
+        <rule-property name="allowPrivate">false</rule-property>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+class TestArrayIsStoredDirectly {
+    private final boolean[] a;
+    private final foo b;
+
+    private TestArrayIsStoredDirectly(boolean[] a) {
+        this.a = null;
+        this.a = a.clone(); // no violation, it doesn't matter what the state of this.a is
+        this.b = new TestArrayIsStoredDirectly(a); // no violation
+        this.b = new TestArrayIsStoredDirectly(this.a); // false positive violation here
+    }
+}
 ]]></code>
     </test-code>
 

From f27c6453cafd4d9a30e24a928b336a10c99f5a4d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 15:15:11 +0200
Subject: [PATCH 085/180] [java] ArrayIsStoredDirectly - report assignment
 rather than formal param

Fixes #3929
---
 docs/pages/release_notes.md                           |  1 +
 .../rule/bestpractices/ArrayIsStoredDirectlyRule.java | 11 ++++++-----
 .../rule/bestpractices/xml/ArrayIsStoredDirectly.xml  |  9 +++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 3dbbcfb482..68874d3aa0 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -26,6 +26,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
   * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
+  * [#3929](https://github.com/pmd/pmd/issues/3929): \[java] ArrayIsStoredDirectly should report the assignment rather than formal parameter
 * plsql
   * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
index 4eeccde81d..d2525fc995 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyRule.java
@@ -7,6 +7,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.java.ast.ASTAssignmentOperator;
 import net.sourceforge.pmd.lang.java.ast.ASTBlockStatement;
@@ -120,10 +121,10 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
      * Checks if the variable designed in parameter is written to a field (not
      * local variable) in the statements.
      */
-    private boolean checkForDirectAssignment(Object ctx, final ASTFormalParameter parameter,
+    private void checkForDirectAssignment(Object ctx, final ASTFormalParameter parameter,
             final List<ASTBlockStatement> bs) {
         final ASTVariableDeclaratorId vid = parameter.getFirstDescendantOfType(ASTVariableDeclaratorId.class);
-        final String varName = vid.getImage();
+        final String varName = vid.getName();
         for (ASTBlockStatement b : bs) {
             if (b.getChild(0) instanceof ASTStatement && b.getChild(0).getChild(0) instanceof ASTStatementExpression) {
                 final ASTStatementExpression se = b.getFirstDescendantOfType(ASTStatementExpression.class);
@@ -173,13 +174,13 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
                             md = pe.getFirstParentOfType(ASTConstructorDeclaration.class);
                         }
                         if (!isLocalVariable(varName, md)) {
-                            addViolation(ctx, parameter, varName);
+                            RuleContext ruleContext = (RuleContext) ctx;
+                            ruleContext.addViolation(e, varName);
                         }
                     }
                 }
             }
         }
-        return false;
     }
 
     private ASTFormalParameter[] getArrays(ASTFormalParameters params) {
@@ -187,7 +188,7 @@ public class ArrayIsStoredDirectlyRule extends AbstractSunSecureRule {
         if (l != null && !l.isEmpty()) {
             List<ASTFormalParameter> l2 = new ArrayList<>();
             for (ASTFormalParameter fp : l) {
-                if (fp.isArray() || fp.isVarargs()) {
+                if (fp.getVariableDeclaratorId().hasArrayType() || fp.isVarargs()) {
                     l2.add(fp);
                 }
             }
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
index 3c58220e61..6b4ffce11c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ArrayIsStoredDirectly.xml
@@ -7,6 +7,7 @@
     <test-code>
         <description>Clear violation</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     String [] arr;
@@ -18,6 +19,7 @@ public class Foo {
     <test-code>
         <description>Clear violation with this.</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     String [] arr;
@@ -29,6 +31,7 @@ public class Foo {
     <test-code>
         <description>assignment to an internal array</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     String [] arr;
@@ -96,6 +99,7 @@ public class Foo {
     <test-code>
         <description>Constructor clear violation</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     String [] arr;
@@ -129,6 +133,7 @@ public class Foo {
     <test-code>
         <description>Trigger on Varargs</description>
         <expected-problems>1</expected-problems>
+        <expected-linenumbers>3</expected-linenumbers>
         <code><![CDATA[
 public class Foo {
     String [] arr;
@@ -222,7 +227,7 @@ public class AISD {
         <description>do not allow private methods</description>
         <rule-property name="allowPrivate">false</rule-property>
         <expected-problems>2</expected-problems>
-        <expected-linenumbers>3,6</expected-linenumbers>
+        <expected-linenumbers>4,7</expected-linenumbers>
         <code><![CDATA[
 public class AISD {
     private final byte[] buf;
@@ -273,7 +278,7 @@ public class Foo {
     <test-code>
         <description>[java] ArrayIsStoredDirectly reports duplicated violation #3879</description>
         <expected-problems>1</expected-problems>
-        <expected-linenumbers>5</expected-linenumbers>
+        <expected-linenumbers>7</expected-linenumbers>
         <code><![CDATA[
 public class ExampleAISD {
 

From a098ab17acd291e62fa79222cfe924fec840292e Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Thu, 21 Apr 2022 15:41:37 +0200
Subject: [PATCH 086/180] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 .../main/java/net/sourceforge/pmd/Report.java    | 16 ++++------------
 .../java/net/sourceforge/pmd/ReportTest.java     |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index fc097d2ae9..edf7980484 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -42,7 +42,7 @@ import net.sourceforge.pmd.util.Predicate;
  *     <li>{@link #filterViolations(Predicate)}</li>
  *     <li>{@link #union(Report)}</li>
  * </ul>
- * These methods create a new {@link Report} rather than modifying it.
+ * These methods create a new {@link Report} rather than modifying their receiver.
  * </p>
  */
 public class Report implements Iterable<RuleViolation> {
@@ -722,7 +722,7 @@ public class Report implements Iterable<RuleViolation> {
     /**
      * Creates a new report by combining this report with another report.
      * This is similar to {@link #merge(Report)}, but instead a new report
-     * is created.
+     * is created. The lowest start time and greatest end time are kept in the copy.
      *
      * @param other the other report to combine
      * @return
@@ -730,16 +730,8 @@ public class Report implements Iterable<RuleViolation> {
     public Report union(Report other) {
         Report copy = new Report();
 
-        if (other.start < start) {
-            copy.start = other.start;
-        } else {
-            copy.start = start;
-        }
-        if (other.end > end) {
-            copy.end = other.end;
-        } else {
-            copy.end = end;
-        }
+        copy.start = Math.min(other.start, this.start);
+        copy.end = Math.max(other.end, this.end);
 
         for (RuleViolation violation : violations) {
             copy.addRuleViolation(violation);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
index ad4af56ad0..6c4012549b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
@@ -182,7 +182,7 @@ public class ReportTest implements ThreadSafeReportListener {
         Report filtered = r.filterViolations(new Predicate<RuleViolation>() {
             @Override
             public boolean test(RuleViolation ruleViolation) {
-                return !("to be filtered".equals(ruleViolation.getDescription()));
+                return !"to be filtered".equals(ruleViolation.getDescription());
             }
         });
 

From d6b736f676b4a5a06c2466a1272e33cc5a0fc439 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 15:53:59 +0200
Subject: [PATCH 087/180] [core] Report - Mark new methods as @Experimental

---
 docs/pages/release_notes.md                               | 8 ++++++++
 pmd-core/src/main/java/net/sourceforge/pmd/Report.java    | 3 +++
 .../src/main/java/net/sourceforge/pmd/util/Predicate.java | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 2067995f83..7f7776c6b7 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -21,6 +21,14 @@ This is a {{ site.pmd.release_type }} release.
 
 ### API Changes
 
+#### Experimental APIs
+
+* Report has two new methods which allow limited mutations of a given report:
+  * {% jdoc !!core::Report#filterViolations(net.sourceforge.pmd.util.Predicate) %} creates a new report with
+    some violations removed with a given predicate based filter.
+  * {% jdoc !!core::Report#union(net.sourceforge.pmd.Report) %} can combine two reports into a single new Report.
+* {% jdoc !!core::util.Predicate %} will be replaced in PMD7 with the standard Predicate interface from java8.
+
 ### External Contributions
 
 {% endtocmaker %}
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index edf7980484..40dd28177c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -19,6 +19,7 @@ import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 
+import net.sourceforge.pmd.annotation.Experimental;
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.dfa.report.ReportTree;
 import net.sourceforge.pmd.lang.rule.stat.StatisticalRule;
@@ -700,6 +701,7 @@ public class Report implements Iterable<RuleViolation> {
      * @param filter when true, the violation will be kept.
      * @return copy of this report
      */
+    @Experimental
     public Report filterViolations(Predicate<RuleViolation> filter) {
         Report copy = new Report();
         copy.start = start;
@@ -727,6 +729,7 @@ public class Report implements Iterable<RuleViolation> {
      * @param other the other report to combine
      * @return
      */
+    @Experimental
     public Report union(Report other) {
         Report copy = new Report();
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java
index 524958f415..36fb94f507 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/Predicate.java
@@ -4,12 +4,15 @@
 
 package net.sourceforge.pmd.util;
 
+import net.sourceforge.pmd.annotation.Experimental;
+
 /**
  * Simple predicate of one argument.
  *
  * @param <T> the type of the input to the predicate
  */
 // TODO java8 - replace with java.util.function.Predicate
+@Experimental
 public interface Predicate<T> {
 
     boolean test(T t);

From bb564be0b12d1447a6cbcf7c80e748280388996e Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 16:21:48 +0200
Subject: [PATCH 088/180] [core] AbstractParser.setFileName is InternalApi

---
 .../src/main/java/net/sourceforge/pmd/lang/AbstractParser.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
index c5c0f5bfff..38fe168db6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/AbstractParser.java
@@ -7,6 +7,7 @@ package net.sourceforge.pmd.lang;
 import java.io.Reader;
 import java.nio.file.Paths;
 
+import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.xpath.internal.FileNameXPathFunction;
 
@@ -46,6 +47,7 @@ public abstract class AbstractParser implements Parser {
         return rootNode;
     }
 
+    @InternalApi
     public static void setFileName(String fileName, Node rootNode) {
         // remove prefixed path segments.
         String simpleFileName = Paths.get(fileName).getFileName().toString();

From cfc981fc8ea7f09264f6968eccd15317b270657a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 16:22:18 +0200
Subject: [PATCH 089/180] [doc] Update release notes (#3896)

---
 docs/pages/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 4aff208745..35417987ed 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -19,6 +19,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
   * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
   * [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
+  * [#3896](https://github.com/pmd/pmd/pull/3896): \[core] Fix ast-dump CLI when reading from stdin
 * doc
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java

From 8e0eac97bcf568bc659b52310649f1c291633887 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 16:30:13 +0200
Subject: [PATCH 090/180] Fix unit test

---
 .../net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
index baf8db963b..72516c68d4 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pmd xmlns="http://pmd.sourceforge.net/report/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/report/2.0.0 http://pmd.sourceforge.net/report_2_0_0.xsd" version="6.45.0-SNAPSHOT" timestamp="2022-03-31T17:55:43.046">
 <file name="sample.dummy">
-<violation beginline="0" endline="0" begincolumn="1" endcolumn="0" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
+<violation beginline="0" endline="0" begincolumn="1" endcolumn="109" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
 Test Rule 2
 </violation>
 </file>

From 455cd962ebc06d9c673a51154003dd43ef1a919b Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Thu, 21 Apr 2022 16:43:29 +0200
Subject: [PATCH 091/180] Update docs/pages/release_notes.md

---
 docs/pages/release_notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 428f2a7071..c98a287fb3 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -22,7 +22,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
-  * [#3068](https://github.com/pmd/pmd/pull/3068): \[java] Some tests should not depend on real rules
+  * [#3068](https://github.com/pmd/pmd/issues/3068): \[java] Some tests should not depend on real rules
 
 *   core
     *   [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice

From dc4894d0f5dfcdc8ba1262b7b116c2be468511fa Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 16:45:30 +0200
Subject: [PATCH 092/180]  Add @laoseth as a contributor

---
 .all-contributorsrc                   |  9 ++++
 docs/pages/pmd/projectdocs/credits.md | 73 ++++++++++++++-------------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 530ae5a2be..3687609c65 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6594,6 +6594,15 @@
         "code",
         "doc"
       ]
+    },
+    {
+      "login": "laoseth",
+      "name": "Seth Wilcox",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16923065?v=4",
+      "profile": "https://github.com/laoseth",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index 10b84a28bf..c2622aa74d 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -614,324 +614,325 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/laoseth"><img src="https://avatars.githubusercontent.com/u/16923065?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Seth Wilcox</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=laoseth" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
     <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>

From 29175e0c909f8c9949d9ac831b96212377258b3c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 16:51:58 +0200
Subject: [PATCH 093/180] [doc] Update release notes (#3910)

---
 docs/pages/release_notes.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index f3537675c9..f8bb525fc9 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -31,6 +31,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
+  * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
 * plsql
   * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
@@ -38,7 +39,7 @@ This is a {{ site.pmd.release_type }} release.
 
 ### External Contributions
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
-* [#3910](https://github.com/pmd/pmd/pull/3910): \[java] Allow the ignored fieldnames in the Unused Private Field check to be configurable - [Seth Wilcox](https://github.com/laoseth)
+* [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
 * [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
 
 {% endtocmaker %}

From 764920f61fdb1741d74884cc1de05ffdb07f3bf2 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 17:14:11 +0200
Subject: [PATCH 094/180] Fix unit test under Windows

---
 .../src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index e3664ed464..48acda9ba2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -95,6 +95,12 @@ public class PMDTaskTest {
             expected = expected.replaceFirst("timestamp=\"[^\"]+\"", "timestamp=\"\"");
             expected = expected.replaceFirst("\\.xsd\" version=\"[^\"]+\"", ".xsd\" version=\"\"");
 
+            // under windows, the file source sample.dummy has different line endings
+            // and therefore the endcolumn of the nodes also change
+            if (System.lineSeparator().equals("\r\n")) {
+                expected = expected.replaceFirst("endcolumn=\"109\"", "endcolumn=\"110\"");
+            }
+
             Assert.assertEquals(expected, actual);
         }
     }

From 4c61883a9296db7d40c98bb19d2cafc22c07f7cc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 18:45:51 +0200
Subject: [PATCH 095/180] Fix compilation errors

---
 .../sourceforge/pmd/lang/java/rule/DummyJavaRule.java    | 9 ---------
 .../net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java | 9 ---------
 .../pmd/lang/plsql/ast/ParenthesisGroupTest.java         | 2 +-
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
index a6771bf142..d8a7bea8d6 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/DummyJavaRule.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.java.rule;
 
-import java.util.List;
-
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
@@ -16,13 +14,6 @@ import net.sourceforge.pmd.lang.java.ast.JavaNode;
  */
 public class DummyJavaRule extends AbstractJavaRule {
 
-    @Override
-    public void apply(List<? extends Node> nodes, RuleContext ctx) {
-        for (Node node : nodes) {
-            apply(node, ctx);
-        }
-    }
-
     public void apply(Node node, RuleContext ctx) {
 
     }
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
index 50a5690238..97ddeaa608 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/DummyJsRule.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.ecmascript;
 
-import java.util.List;
-
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
@@ -15,13 +13,6 @@ import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
  */
 public class DummyJsRule extends AbstractEcmascriptRule {
 
-    @Override
-    public void apply(List<? extends Node> nodes, RuleContext ctx) {
-        for (Node node : nodes) {
-            apply(node, ctx);
-        }
-    }
-
     public void apply(Node node, RuleContext ctx) {
 
     }
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
index b93bc5f7ec..49cc555e4d 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java
@@ -19,7 +19,7 @@ public class ParenthesisGroupTest extends BaseTreeDumpTest {
 
     @Override
     public BaseParsingHelper<?, ?> getParser() {
-        return PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+        return PlsqlParsingHelper.DEFAULT.withResourceContext(getClass());
     }
 
     @Test

From 73aee5f2a6a021286af8b394c4e81fea7a7cd3cb Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 18:53:47 +0200
Subject: [PATCH 096/180] Fix tests

---
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  | 250 ------------------
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  | 250 ------------------
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  | 150 -----------
 3 files changed, 650 deletions(-)
 delete mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
 delete mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
 delete mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt

diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
deleted file mode 100644
index 0602c49949..0000000000
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
+++ /dev/null
@@ -1,250 +0,0 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   CURSOR c_example IS
-      SELECT a.owner, u.object_name, p.aggregate
-        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
-               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id
-               INNER JOIN (ALL_PROCEDURES p) ON
-               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
-       WHERE a.owner = USER;
-   --
-BEGIN
-   --
-   FOR l_object IN c_example LOOP
-      --
-      DBMS_OUTPUT.Put_Line(l_object.owner);
-      DBMS_OUTPUT.Put_Line(l_object.object_name);
-      DBMS_OUTPUT.Put_Line(l_object.aggregate);
-      --
-   END LOOP;
-   --
-END EXAMPLE_PROCEDURE;
-"]
-   +- Global[@CanonicalImage = null]
-      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
-         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
-         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
-         +- DeclarativeSection[@CanonicalImage = null]
-         |  +- DeclarativeUnit[@CanonicalImage = null]
-         |     +- CursorSpecification[@CanonicalImage = null]
-         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
-         |              +- SelectList[@CanonicalImage = null]
-         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
-         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = false]
-         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
-         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              +- FromClause[@CanonicalImage = null]
-         |              |  +- JoinClause[@CanonicalImage = null]
-         |              |     +- TableReference[@CanonicalImage = null]
-         |              |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
-         |              |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
-         |              |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
-         |              |     |  |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |     |  +- TableAlias[@CanonicalImage = "INNER", @Image = "INNER"]
-         |              |     |     +- ID[@CanonicalImage = "INNER", @Image = "INNER"]
-         |              |     |        +- KEYWORD_UNRESERVED[@CanonicalImage = "INNER", @Image = "INNER"]
-         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |     |  +- TableReference[@CanonicalImage = null]
-         |              |     |  |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
-         |              |     |  |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
-         |              |     |  |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
-         |              |     |  |     +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |     |  |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |     |  +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
-         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
-         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
-         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
-         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
-         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
-         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = false]
-         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
-         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
-         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
-         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
-         |              |     |        +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = false]
-         |              |     |        |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
-         |              |     |        |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |     |        |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |     |        |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |     |        |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |     |        +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = false]
-         |              |     |           +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
-         |              |     |              +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |     |              |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |     |              |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |     |              +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |     |                 +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |        +- TableReference[@CanonicalImage = null]
-         |              |        |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
-         |              |        |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
-         |              |        |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
-         |              |        |     +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |        +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
-         |              |           +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
-         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = false]
-         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
-         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |           |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |           |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
-         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = false]
-         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
-         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
-         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
-         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
-         |              |              +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = false]
-         |              |              |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
-         |              |              |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |              |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |              |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |              |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
-         |              |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
-         |              |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |                    +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |                       +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              +- WhereClause[@CanonicalImage = null]
-         |                 +- Condition[@CanonicalImage = null]
-         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
-         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
-         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
-         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = false]
-         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
-         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
-         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
-         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
-         +- Statement[@CanonicalImage = null]
-         |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- ForStatement[@CanonicalImage = null]
-         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = false]
-         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        +- Statement[@CanonicalImage = null]
-         |        |  +- UnlabelledStatement[@CanonicalImage = null]
-         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |        |                 +- ArgumentList[@CanonicalImage = null]
-         |        |                    +- Argument[@CanonicalImage = null]
-         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
-         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = false]
-         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
-         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |        +- Statement[@CanonicalImage = null]
-         |        |  +- UnlabelledStatement[@CanonicalImage = null]
-         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |        |                 +- ArgumentList[@CanonicalImage = null]
-         |        |                    +- Argument[@CanonicalImage = null]
-         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
-         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = false]
-         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
-         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |        +- Statement[@CanonicalImage = null]
-         |           +- UnlabelledStatement[@CanonicalImage = null]
-         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |                       +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |                          +- ArgumentList[@CanonicalImage = null]
-         |                             +- Argument[@CanonicalImage = null]
-         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
-         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = false]
-         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
-         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
deleted file mode 100644
index 1d77da1f68..0000000000
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
+++ /dev/null
@@ -1,250 +0,0 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   CURSOR c_example IS
-      SELECT a.owner, u.object_name, p.aggregate
-        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
-               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
-               INNER JOIN (ALL_PROCEDURES p) ON
-               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)
-       WHERE a.owner = USER;
-   --
-BEGIN
-   --
-   FOR l_object IN c_example LOOP
-      --
-      DBMS_OUTPUT.Put_Line(l_object.owner);
-      DBMS_OUTPUT.Put_Line(l_object.object_name);
-      DBMS_OUTPUT.Put_Line(l_object.aggregate);
-      --
-   END LOOP;
-   --
-END EXAMPLE_PROCEDURE;
-"]
-   +- Global[@CanonicalImage = null]
-      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
-         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
-         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
-         +- DeclarativeSection[@CanonicalImage = null]
-         |  +- DeclarativeUnit[@CanonicalImage = null]
-         |     +- CursorSpecification[@CanonicalImage = null]
-         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
-         |              +- SelectList[@CanonicalImage = null]
-         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
-         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = false]
-         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
-         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |              +- FromClause[@CanonicalImage = null]
-         |              |  +- TableReference[@CanonicalImage = null]
-         |              |     +- JoinClause[@CanonicalImage = null]
-         |              |        +- TableReference[@CanonicalImage = null]
-         |              |        |  +- JoinClause[@CanonicalImage = null]
-         |              |        |     +- TableReference[@CanonicalImage = null]
-         |              |        |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
-         |              |        |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
-         |              |        |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
-         |              |        |     |     +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |        |        +- TableReference[@CanonicalImage = null]
-         |              |        |        |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
-         |              |        |        |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
-         |              |        |        |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
-         |              |        |        |     +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |        |        |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |        |        +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
-         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
-         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = false]
-         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
-         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
-         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
-         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
-         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = false]
-         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
-         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
-         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
-         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
-         |              |        |              +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = false]
-         |              |        |              |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
-         |              |        |              |     +- TableName[@CanonicalImage = "U", @Image = "u"]
-         |              |        |              |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
-         |              |        |              |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |        |              |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |        |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = false]
-         |              |        |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
-         |              |        |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |        |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |        |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |        |                    +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |        |                       +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
-         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |           +- TableReference[@CanonicalImage = null]
-         |              |           |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
-         |              |           |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
-         |              |           |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
-         |              |           |     +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |           +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
-         |              |              +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
-         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = false]
-         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
-         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |              |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |              |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |              |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
-         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = false]
-         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
-         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |              |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |              |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = false]
-         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
-         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |              |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |              |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
-         |              |                 +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = false]
-         |              |                 |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
-         |              |                 |     +- TableName[@CanonicalImage = "P", @Image = "p"]
-         |              |                 |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
-         |              |                 |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |                 |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |                 +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = false]
-         |              |                    +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
-         |              |                       +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |              |                       |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |              |                       |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |              |                       +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              |                          +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
-         |              +- WhereClause[@CanonicalImage = null]
-         |                 +- Condition[@CanonicalImage = null]
-         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
-         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
-         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = false]
-         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
-         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
-         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
-         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
-         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
-         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = false]
-         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
-         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
-         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
-         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
-         +- Statement[@CanonicalImage = null]
-         |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- ForStatement[@CanonicalImage = null]
-         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = false]
-         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
-         |        +- Statement[@CanonicalImage = null]
-         |        |  +- UnlabelledStatement[@CanonicalImage = null]
-         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |        |                 +- ArgumentList[@CanonicalImage = null]
-         |        |                    +- Argument[@CanonicalImage = null]
-         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
-         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = false]
-         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
-         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
-         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
-         |        +- Statement[@CanonicalImage = null]
-         |        |  +- UnlabelledStatement[@CanonicalImage = null]
-         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |        |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |        |                 +- ArgumentList[@CanonicalImage = null]
-         |        |                    +- Argument[@CanonicalImage = null]
-         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
-         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = false]
-         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
-         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
-         |        +- Statement[@CanonicalImage = null]
-         |           +- UnlabelledStatement[@CanonicalImage = null]
-         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = false]
-         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
-         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
-         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
-         |                       +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
-         |                          +- ArgumentList[@CanonicalImage = null]
-         |                             +- Argument[@CanonicalImage = null]
-         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
-         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = false]
-         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
-         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
-         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
-         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
deleted file mode 100644
index 329d2f56ae..0000000000
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
-    --
-    CURSOR c_test IS
-        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent
-        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)
-            INNER JOIN
-            (STUDENT_SCORE ss) on si.sid = sp.sid)
-            INNER JOIN
-            (STUDENT_PARENT sp) on si.sid = sp.sid)
-        WHERE si.sid = '114514';
-    --
-BEGIN
-    --
-    --
-END EXAMPLE_PROCEDURE;
-"]
-   +- Global[@CanonicalImage = null]
-      +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = 1]
-         |  +- ObjectNameDeclaration[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
-         |     +- ID[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
-         +- DeclarativeSection[@CanonicalImage = null]
-         |  +- DeclarativeUnit[@CanonicalImage = null]
-         |     +- CursorSpecification[@CanonicalImage = null]
-         |        +- CursorUnit[@CanonicalImage = "C_TEST", @Image = "c_test"]
-         |           +- ID[@CanonicalImage = "C_TEST", @Image = "c_test"]
-         |           +- SelectStatement[@All = false, @CanonicalImage = null, @Distinct = false, @Unique = false]
-         |              +- SelectList[@CanonicalImage = null]
-         |              |  +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |              |  |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
-         |              |  |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |              |  |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |  |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |  +- SqlExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SN.NAME", @Image = "sn.name", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
-         |              |  |        +- TableName[@CanonicalImage = "SN", @Image = "sn"]
-         |              |  |        |  +- ID[@CanonicalImage = "SN", @Image = "sn"]
-         |              |  |        +- Column[@CanonicalImage = "NAME", @Image = "name"]
-         |              |  |           +- ID[@CanonicalImage = "NAME", @Image = "name"]
-         |              |  |              +- KEYWORD_UNRESERVED[@CanonicalImage = "NAME", @Image = "name"]
-         |              |  +- SqlExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SA.AGE", @Image = "sa.age", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
-         |              |  |        +- TableName[@CanonicalImage = "SA", @Image = "sa"]
-         |              |  |        |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
-         |              |  |        +- Column[@CanonicalImage = "AGE", @Image = "age"]
-         |              |  |           +- ID[@CanonicalImage = "AGE", @Image = "age"]
-         |              |  +- SqlExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
-         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SS.SCORE", @Image = "ss.score", @SelfModifier = false]
-         |              |  |     +- SimpleExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
-         |              |  |        +- TableName[@CanonicalImage = "SS", @Image = "ss"]
-         |              |  |        |  +- ID[@CanonicalImage = "SS", @Image = "ss"]
-         |              |  |        +- Column[@CanonicalImage = "SCORE", @Image = "score"]
-         |              |  |           +- ID[@CanonicalImage = "SCORE", @Image = "score"]
-         |              |  +- SqlExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
-         |              |     +- PrimaryPrefix[@CanonicalImage = "SP.PARENT", @Image = "sp.parent", @SelfModifier = false]
-         |              |        +- SimpleExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
-         |              |           +- TableName[@CanonicalImage = "SP", @Image = "sp"]
-         |              |           |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
-         |              |           +- Column[@CanonicalImage = "PARENT", @Image = "parent"]
-         |              |              +- ID[@CanonicalImage = "PARENT", @Image = "parent"]
-         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "PARENT", @Image = "parent"]
-         |              +- FromClause[@CanonicalImage = null]
-         |              |  +- TableReference[@CanonicalImage = null]
-         |              |     +- JoinClause[@CanonicalImage = null]
-         |              |        +- TableReference[@CanonicalImage = null]
-         |              |        |  +- JoinClause[@CanonicalImage = null]
-         |              |        |     +- TableReference[@CanonicalImage = null]
-         |              |        |     |  +- JoinClause[@CanonicalImage = null]
-         |              |        |     |     +- TableReference[@CanonicalImage = null]
-         |              |        |     |     |  +- TableName[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
-         |              |        |     |     |  |  +- ID[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
-         |              |        |     |     |  +- TableAlias[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |     |     |     +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |     |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |        |     |        +- TableReference[@CanonicalImage = null]
-         |              |        |     |        |  +- TableName[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
-         |              |        |     |        |  |  +- ID[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
-         |              |        |     |        |  +- TableAlias[@CanonicalImage = "SA", @Image = "sa"]
-         |              |        |     |        |     +- ID[@CanonicalImage = "SA", @Image = "sa"]
-         |              |        |     |        +- EqualityExpression[@CanonicalImage = "SI.SID = SA.SID", @Image = "si.sid = sa.sid"]
-         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
-         |              |        |     |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |              |        |     |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |     |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |     |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |     |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SA.SID", @Image = "sa.sid", @SelfModifier = false]
-         |              |        |     |              +- SimpleExpression[@CanonicalImage = "SA.SID", @Image = "sa.sid"]
-         |              |        |     |                 +- TableName[@CanonicalImage = "SA", @Image = "sa"]
-         |              |        |     |                 |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
-         |              |        |     |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |     |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |        |        +- TableReference[@CanonicalImage = null]
-         |              |        |        |  +- TableName[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
-         |              |        |        |  |  +- ID[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
-         |              |        |        |  +- TableAlias[@CanonicalImage = "SS", @Image = "ss"]
-         |              |        |        |     +- ID[@CanonicalImage = "SS", @Image = "ss"]
-         |              |        |        +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
-         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
-         |              |        |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |              |        |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |              |        |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = false]
-         |              |        |              +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
-         |              |        |                 +- TableName[@CanonicalImage = "SP", @Image = "sp"]
-         |              |        |                 |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
-         |              |        |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = false, @Natural = false]
-         |              |           +- TableReference[@CanonicalImage = null]
-         |              |           |  +- TableName[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
-         |              |           |  |  +- ID[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
-         |              |           |  +- TableAlias[@CanonicalImage = "SP", @Image = "sp"]
-         |              |           |     +- ID[@CanonicalImage = "SP", @Image = "sp"]
-         |              |           +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
-         |              |              +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
-         |              |              |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |              |              |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
-         |              |              |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |              |              |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |              |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              |              +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = false]
-         |              |                 +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
-         |              |                    +- TableName[@CanonicalImage = "SP", @Image = "sp"]
-         |              |                    |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
-         |              |                    +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |              |                       +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |              +- WhereClause[@CanonicalImage = null]
-         |                 +- Condition[@CanonicalImage = null]
-         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
-         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
-         |                          +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |                          |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = false]
-         |                          |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
-         |                          |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
-         |                          |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
-         |                          |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
-         |                          |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |                          +- SqlExpression[@CanonicalImage = "'114514'", @Image = "'114514'"]
-         |                             +- PrimaryPrefix[@CanonicalImage = "'114514'", @Image = "'114514'", @SelfModifier = false]
-         |                                +- Literal[@CanonicalImage = "'114514'", @Image = "'114514'"]
-         |                                   +- StringLiteral[@CanonicalImage = "'114514'", @Image = "'114514'", @String = "114514"]
-         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]

From 6b7f976728562111b243a8ec6ab1fc4d04ad555a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 19:07:29 +0200
Subject: [PATCH 097/180] [core] (tests) Remove DummyRoot and use
 DummyNode.DummyRootNode

Refs #3896
---
 .../net/sourceforge/pmd/AbstractRuleTest.java | 10 +--
 .../java/net/sourceforge/pmd/RuleSetTest.java |  4 +-
 .../pmd/RuleViolationComparatorTest.java      |  4 +-
 .../lang/ast/DummyNodeWithListAndEnum.java    |  2 +-
 .../sourceforge/pmd/lang/ast/DummyRoot.java   | 61 -------------------
 .../pmd/lang/ast/impl/AbstractNodeTest.java   |  8 +--
 .../pmd/lang/ast/impl/DummyTreeUtil.java      | 10 +--
 .../pmd/lang/rule/XPathRuleTest.java          | 10 +--
 .../rule/xpath/internal/ElementNodeTest.java  |  4 +-
 .../internal/SaxonXPathRuleQueryTest.java     | 16 ++---
 .../pmd/renderers/AbstractRendererTest.java   |  4 +-
 .../renderers/SummaryHTMLRendererTest.java    |  4 +-
 .../pmd/renderers/XMLRendererTest.java        |  4 +-
 .../pmd/renderers/XSLTRendererTest.java       |  4 +-
 14 files changed, 42 insertions(+), 103 deletions(-)
 delete mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
index edf68f1086..5a9a47b0fe 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java
@@ -15,7 +15,7 @@ import org.junit.Test;
 
 import net.sourceforge.pmd.Report.SuppressedViolation;
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
@@ -70,7 +70,7 @@ public class AbstractRuleTest {
     public void testCreateRV() {
         MyRule r = new MyRule();
         r.setRuleSetName("foo");
-        DummyNode s = new DummyRoot().withFileName("filename");
+        DummyNode s = new DummyRootNode().withFileName("filename");
         s.setCoords(5, 5, 5, 10);
         RuleViolation rv = new ParametricRuleViolation<>(r, s, r.getMessage());
         assertEquals("Line number mismatch!", 5, rv.getBeginLine());
@@ -83,7 +83,7 @@ public class AbstractRuleTest {
     @Test
     public void testCreateRV2() {
         MyRule r = new MyRule();
-        DummyNode s = new DummyRoot().withFileName("filename");
+        DummyNode s = new DummyRootNode().withFileName("filename");
         s.setCoords(5, 5, 5, 10);
         RuleViolation rv = new ParametricRuleViolation<>(r, s, "specificdescription");
         assertEquals("Line number mismatch!", 5, rv.getBeginLine());
@@ -103,7 +103,7 @@ public class AbstractRuleTest {
         r.definePropertyDescriptor(PropertyFactory.intProperty("testInt").desc("description").require(inRange(0, 100)).defaultValue(10).build());
         r.setMessage("Message ${packageName} ${className} ${methodName} ${variableName} ${testInt} ${noSuchProperty}");
 
-        DummyNode s = new DummyRoot().withFileName("filename");
+        DummyNode s = new DummyRootNode().withFileName("filename");
         s.setCoords(5, 1, 6, 1);
         s.setImage("TestImage");
 
@@ -113,7 +113,7 @@ public class AbstractRuleTest {
 
     @Test
     public void testRuleSuppress() {
-        DummyRoot n = new DummyRoot().withNoPmdComments(Collections.singletonMap(5, ""));
+        DummyRootNode n = new DummyRootNode().withNoPmdComments(Collections.singletonMap(5, ""));
         n.setCoords(5, 1, 6, 1);
         RuleViolation violation = DefaultRuleViolationFactory.defaultInstance().createViolation(new MyRule(), n, "specificdescription");
         SuppressedViolation suppressed = DefaultRuleViolationFactory.defaultInstance().suppressOrNull(n, violation);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
index b9e4f1fa14..503b8d0c98 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleSetTest.java
@@ -40,7 +40,7 @@ import net.sourceforge.pmd.lang.Dummy2LanguageModule;
 import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.rule.RuleReference;
@@ -472,7 +472,7 @@ public class RuleSetTest {
     }
 
     private RootNode makeCompilationUnits(String filename) {
-        DummyRoot node = new DummyRoot();
+        DummyRootNode node = new DummyRootNode();
         node.setCoords(1, 1, 10, 1);
         node.setImage("Foo");
         node.withFileName(filename);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
index 1474d3dfe6..c3ab2751a3 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
@@ -16,7 +16,7 @@ import java.util.Random;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.MockRule;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
@@ -71,7 +71,7 @@ public class RuleViolationComparatorTest {
 
     private RuleViolation createJavaRuleViolation(Rule rule, String fileName, int beginLine, String description,
             int beginColumn, int endLine, int endColumn) {
-        DummyNode simpleNode = new DummyRoot().withFileName(fileName);
+        DummyNode simpleNode = new DummyRootNode().withFileName(fileName);
         simpleNode.setCoords(beginLine, beginColumn, endLine, endColumn);
         return new ParametricRuleViolation<Node>(rule, simpleNode, description);
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
index 2f5e18450c..7948d5963d 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
@@ -8,7 +8,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class DummyNodeWithListAndEnum extends DummyRoot {
+public class DummyNodeWithListAndEnum extends DummyNode.DummyRootNode {
     public DummyNodeWithListAndEnum() {
         super();
         beginLine = 1;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java
deleted file mode 100644
index 71aa6b6996..0000000000
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyRoot.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.ast;
-
-import java.util.Collections;
-import java.util.Map;
-
-import net.sourceforge.pmd.lang.DummyLanguageModule;
-import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.ast.impl.GenericNode;
-
-public class DummyRoot extends DummyNode implements GenericNode<DummyNode>, RootNode {
-
-    private Map<Integer, String> suppressMap = Collections.emptyMap();
-    private String filename = "sample.dummy";
-    private LanguageVersion languageVersion = LanguageRegistry.findLanguageByTerseName(DummyLanguageModule.TERSE_NAME).getDefaultVersion();
-    private String sourceText = "dummy text";
-
-
-    public DummyRoot withLanguage(LanguageVersion languageVersion) {
-        this.languageVersion = languageVersion;
-        return this;
-    }
-
-    public DummyRoot withSourceText(String sourceText) {
-        this.sourceText = sourceText;
-        return this;
-    }
-
-    public DummyRoot withNoPmdComments(Map<Integer, String> suppressMap) {
-        this.suppressMap = suppressMap;
-        return this;
-    }
-
-
-    public DummyRoot withFileName(String filename) {
-        this.filename = filename;
-        return this;
-    }
-
-
-    @Override
-    public AstInfo<DummyRoot> getAstInfo() {
-        return new AstInfo<>(
-            filename,
-            languageVersion,
-            sourceText,
-            this,
-            suppressMap
-        );
-    }
-
-    @Override
-    public String getXPathNodeName() {
-        return "dummyRootNode";
-    }
-
-}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/AbstractNodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/AbstractNodeTest.java
index b6a81f2bbc..5ef7195965 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/AbstractNodeTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/AbstractNodeTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 
 import junitparams.JUnitParamsRunner;
@@ -65,13 +65,13 @@ public class AbstractNodeTest {
         return indexes;
     }
 
-    private DummyRoot rootNode;
+    private DummyRootNode rootNode;
 
     @Before
     public void setUpSampleNodeTree() {
         rootNode = tree(
             () -> {
-                DummyRoot root = root();
+                DummyRootNode root = root();
 
                 for (int i = 0; i < NUM_CHILDREN; i++) {
                     final DummyNode child = node();
@@ -110,7 +110,7 @@ public class AbstractNodeTest {
 
     @Test
     public void testPrevNextSiblings() {
-        DummyRoot root = tree(() -> root(node(), node()));
+        DummyRootNode root = tree(() -> root(node(), node()));
 
         assertNull(root.getNextSibling());
         assertNull(root.getPreviousSibling());
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/DummyTreeUtil.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/DummyTreeUtil.java
index 1623aa7a17..3ae0d7f601 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/DummyTreeUtil.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/DummyTreeUtil.java
@@ -9,7 +9,7 @@ import java.util.function.Supplier;
 
 import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyNode.DummyNodeTypeB;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.NodeStream;
 import net.sourceforge.pmd.util.CollectionUtil;
@@ -26,8 +26,8 @@ public final class DummyTreeUtil {
     }
 
 
-    public static DummyRoot root(DummyNode... children) {
-        return nodeImpl(new DummyRoot(), children);
+    public static DummyRootNode root(DummyNode... children) {
+        return nodeImpl(new DummyRootNode(), children);
     }
 
     /** Creates a dummy node with the given children. */
@@ -74,8 +74,8 @@ public final class DummyTreeUtil {
      * )
      * </pre>
      */
-    public static DummyRoot tree(Supplier<DummyRoot> supplier) {
-        DummyRoot dummyNode = supplier.get();
+    public static DummyRootNode tree(Supplier<DummyRootNode> supplier) {
+        DummyRootNode dummyNode = supplier.get();
         assignPathImage(dummyNode, "");
         return dummyNode;
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
index 584b12f9ee..2bb4bd1d27 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
@@ -18,8 +18,8 @@ import net.sourceforge.pmd.RuleContextTest;
 import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.DummyNode;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.DummyNodeWithDeprecatedAttribute;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
 public class XPathRuleTest {
@@ -147,16 +147,16 @@ public class XPathRuleTest {
     }
 
 
-    public DummyRoot newNode() {
-        DummyRoot root = new DummyRoot();
+    public DummyRootNode newNode() {
+        DummyRootNode root = new DummyRootNode();
         DummyNode dummy = new DummyNodeWithDeprecatedAttribute(2);
         dummy.setCoords(1, 1, 1, 2);
         root.addChild(dummy, 0);
         return root;
     }
 
-    public DummyRoot newRoot(String fileName) {
-        DummyRoot dummy = new DummyRoot().withFileName(fileName);
+    public DummyRootNode newRoot(String fileName) {
+        DummyRootNode dummy = new DummyRootNode().withFileName(fileName);
         dummy.setCoords(1, 1, 1, 2);
         return dummy;
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
index 37d7f2d0dd..30283b683b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
@@ -9,7 +9,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 
 import net.sf.saxon.Configuration;
 import net.sf.saxon.type.Type;
@@ -19,7 +19,7 @@ public class ElementNodeTest {
 
     @Test
     public void testCompareOrder() {
-        DummyRoot root = new DummyRoot();
+        DummyRootNode root = new DummyRootNode();
 
         DummyNode c0 = new DummyNode(false, "foo");
         c0.setCoords(1, 1, 2, 2);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/SaxonXPathRuleQueryTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/SaxonXPathRuleQueryTest.java
index 2a1a70aa43..7ea30935b7 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/SaxonXPathRuleQueryTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/SaxonXPathRuleQueryTest.java
@@ -22,8 +22,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.DummyNodeWithListAndEnum;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException;
@@ -64,7 +64,7 @@ public class SaxonXPathRuleQueryTest {
 
     @Test
     public void testHigherOrderFuns() { // XPath 3.1
-        DummyRoot tree = tree(() -> root(
+        DummyRootNode tree = tree(() -> root(
             node()
         ));
 
@@ -116,7 +116,7 @@ public class SaxonXPathRuleQueryTest {
 
     @Test
     public void testRootExpression() {
-        DummyRoot dummy = new DummyRoot();
+        DummyRootNode dummy = new DummyRootNode();
 
         List<Node> result = assertQuery(1, "/", dummy);
         Assert.assertEquals(dummy, result.get(0));
@@ -124,7 +124,7 @@ public class SaxonXPathRuleQueryTest {
 
     @Test
     public void testRootExpressionIsADocumentNode() {
-        DummyRoot dummy = new DummyRoot();
+        DummyRootNode dummy = new DummyRootNode();
 
         List<Node> result = assertQuery(1, "(/)[self::document-node()]", dummy);
         Assert.assertEquals(dummy, result.get(0));
@@ -132,7 +132,7 @@ public class SaxonXPathRuleQueryTest {
 
     @Test
     public void testRootExpressionWithName() {
-        DummyRoot dummy = new DummyRoot();
+        DummyRootNode dummy = new DummyRootNode();
         String xpathName = dummy.getXPathNodeName();
 
         List<Node> result = assertQuery(1, "(/)[self::document-node(element(" + xpathName + "))]", dummy);
@@ -232,7 +232,7 @@ public class SaxonXPathRuleQueryTest {
     public void unionBeforeSlash() {
         SaxonXPathRuleQuery query = createQuery("(//dummyNode | //dummyNodeB)/dummyNode[@Image = '10']");
 
-        DummyRoot tree = tree(() -> root(
+        DummyRootNode tree = tree(() -> root(
             node(
                 node()
             ),
@@ -254,7 +254,7 @@ public class SaxonXPathRuleQueryTest {
     public void unionBeforeSlashWithFilter() {
         SaxonXPathRuleQuery query = createQuery("(//dummyNode[@Image='0'] | //dummyNodeB[@Image='1'])/dummyNode[@Image = '10']");
 
-        DummyRoot tree = tree(() -> root(
+        DummyRootNode tree = tree(() -> root(
             node(
                 node()
             ),
@@ -277,7 +277,7 @@ public class SaxonXPathRuleQueryTest {
     public void unionBeforeSlashDeeper() {
         SaxonXPathRuleQuery query = createQuery("(//dummyNode | //dummyNodeB)/dummyNode/dummyNode");
 
-        DummyRoot tree = tree(() -> root(
+        DummyRootNode tree = tree(() -> root(
             node(
                 node(
                     node()
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
index c6dc96a4a1..884e82ce99 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
@@ -27,7 +27,7 @@ import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.RuleWithProperties;
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 import net.sourceforge.pmd.reporting.FileAnalysisListener;
@@ -90,7 +90,7 @@ public abstract class AbstractRendererTest {
     }
 
     protected DummyNode createNode(int beginLine, int beginColumn, int endLine, int endColumn) {
-        DummyNode node = new DummyRoot().withFileName(getSourceCodeFilename());
+        DummyNode node = new DummyRootNode().withFileName(getSourceCodeFilename());
         node.setCoords(beginLine, beginColumn, endLine, endColumn);
         return node;
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
index 4f1ff68b77..c70f880428 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java
@@ -16,7 +16,7 @@ import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
 import net.sourceforge.pmd.RuleContext;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.reporting.FileAnalysisListener;
 
 public class SummaryHTMLRendererTest extends AbstractRendererTest {
@@ -145,7 +145,7 @@ public class SummaryHTMLRendererTest extends AbstractRendererTest {
 
     private Consumer<FileAnalysisListener> createEmptyReportWithSuppression() throws Exception {
         return listener -> {
-            DummyRoot root = new DummyRoot().withNoPmdComments(Collections.singletonMap(1, "test")).withFileName(getSourceCodeFilename());
+            DummyRootNode root = new DummyRootNode().withNoPmdComments(Collections.singletonMap(1, "test")).withFileName(getSourceCodeFilename());
             root.setCoords(1, 10, 4, 5);
 
             RuleContext ruleContext = RuleContext.create(listener, new FooRule());
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
index 7e843ed3e0..aa6a10f28f 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
@@ -30,7 +30,7 @@ import net.sourceforge.pmd.Report.ConfigurationError;
 import net.sourceforge.pmd.Report.ProcessingError;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 
@@ -91,7 +91,7 @@ public class XMLRendererTest extends AbstractRendererTest {
     }
 
     private RuleViolation createRuleViolation(String description) {
-        DummyNode node = new DummyRoot().withFileName(getSourceCodeFilename());
+        DummyNode node = new DummyRootNode().withFileName(getSourceCodeFilename());
         node.setCoords(1, 1, 1, 1);
         return new ParametricRuleViolation<Node>(new FooRule(), node, description);
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
index 556dda43a7..3c2e88fbad 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
@@ -11,7 +11,7 @@ import net.sourceforge.pmd.FooRule;
 import net.sourceforge.pmd.ReportTest;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.ast.DummyNode;
-import net.sourceforge.pmd.lang.ast.DummyRoot;
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 
@@ -20,7 +20,7 @@ public class XSLTRendererTest {
     @Test
     public void testDefaultStylesheet() throws Exception {
         XSLTRenderer renderer = new XSLTRenderer();
-        DummyNode node = new DummyRoot().withFileName("file");
+        DummyNode node = new DummyRootNode().withFileName("file");
         node.setCoords(1, 1, 1, 2);
         RuleViolation rv = new ParametricRuleViolation<Node>(new FooRule(), node, "violation message");
         String result = ReportTest.render(renderer, it -> it.onRuleViolation(rv));

From 38765e1ce1b10815d01a96c905ec4e8770cb37be Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 19:38:12 +0200
Subject: [PATCH 098/180] Add missing files

---
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  | 229 ++++++++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  | 229 ++++++++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  | 135 +++++++++++
 3 files changed, 593 insertions(+)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt

diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
new file mode 100644
index 0000000000..cabf4a0f6a
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -0,0 +1,229 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- SelectStatement[@All = "false", @CanonicalImage = null, @Distinct = "false", @Unique = "false"]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = "false"]
+         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- JoinClause[@CanonicalImage = null]
+         |              |     +- TableReference[@CanonicalImage = null]
+         |              |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
+         |              |     |  |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |  +- TableAlias[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     |     +- ID[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     |        +- KEYWORD_UNRESERVED[@CanonicalImage = "INNER", @Image = "INNER"]
+         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |     |  +- TableReference[@CanonicalImage = null]
+         |              |     |  |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |     |  |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |     |  |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  |     +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |  +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = "false"]
+         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = "false"]
+         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = "false"]
+         |              |     |     |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
+         |              |     |     |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |     |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = "false"]
+         |              |     |     |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |     |     |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |     |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |     |     +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
+         |              |     |        +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = "false"]
+         |              |     |        |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
+         |              |     |        |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |     |        |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |     |        |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |        |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |        +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = "false"]
+         |              |     |           +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
+         |              |     |              +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |     |              +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     |                 +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |        |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |        |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
+         |              |        |     +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |        +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = "false"]
+         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
+         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = "false"]
+         |              |           |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
+         |              |           |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = "false"]
+         |              |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |           +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = "false"]
+         |              |              |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
+         |              |              |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |              |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = "false"]
+         |              |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |                    +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                       +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = "false"]
+         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
+         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
+         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- ForStatement[@CanonicalImage = null]
+         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = "false"]
+         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = "false"]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = "false"]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        +- Statement[@CanonicalImage = null]
+         |           +- UnlabelledStatement[@CanonicalImage = null]
+         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |                       +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |                          +- ArgumentList[@CanonicalImage = null]
+         |                             +- Argument[@CanonicalImage = null]
+         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = "false"]
+         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
new file mode 100644
index 0000000000..adc310a7b1
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -0,0 +1,229 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |           +- SelectStatement[@All = "false", @CanonicalImage = null, @Distinct = "false", @Unique = "false"]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |  |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |  |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |  +- SqlExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |  |        +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |  |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |  +- SqlExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate", @SelfModifier = "false"]
+         |              |        +- SimpleExpression[@CanonicalImage = "P.AGGREGATE", @Image = "p.aggregate"]
+         |              |           +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |           |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |              +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- TableReference[@CanonicalImage = null]
+         |              |     +- JoinClause[@CanonicalImage = null]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |  +- TableName[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |        |     |  |  +- ID[@CanonicalImage = "USER_OBJECTS", @Image = "USER_OBJECTS"]
+         |              |        |     |  +- TableAlias[@CanonicalImage = "U", @Image = "u"]
+         |              |        |     |     +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |        |        +- TableReference[@CanonicalImage = null]
+         |              |        |        |  +- TableName[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |        |        |  |  +- ID[@CanonicalImage = "ALL_OBJECTS", @Image = "ALL_OBJECTS"]
+         |              |        |        |  +- TableAlias[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        |     +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        |        +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |        +- ConditionalAndExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME AND U.OBJECT_TYPE = A.OBJECT_TYPE AND U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_NAME = A.OBJECT_NAME", @Image = "u.object_name = a.object_name"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name", @SelfModifier = "false"]
+         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_NAME", @Image = "u.object_name"]
+         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = "false"]
+         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "u.object_type = a.object_type"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type", @SelfModifier = "false"]
+         |              |        |           |  |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_TYPE", @Image = "u.object_type"]
+         |              |        |           |  |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |           |  |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |  |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = "false"]
+         |              |        |           |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |        |           |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |           |        +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           |           +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |        |           +- EqualityExpression[@CanonicalImage = "U.OBJECT_ID = A.OBJECT_ID", @Image = "u.object_id = a.object_id"]
+         |              |        |              +- PrimaryPrefix[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id", @SelfModifier = "false"]
+         |              |        |              |  +- SimpleExpression[@CanonicalImage = "U.OBJECT_ID", @Image = "u.object_id"]
+         |              |        |              |     +- TableName[@CanonicalImage = "U", @Image = "u"]
+         |              |        |              |     |  +- ID[@CanonicalImage = "U", @Image = "u"]
+         |              |        |              |     +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |              |        +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |              +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id", @SelfModifier = "false"]
+         |              |        |                 +- SimpleExpression[@CanonicalImage = "A.OBJECT_ID", @Image = "a.object_id"]
+         |              |        |                    +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |        |                    +- Column[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        |                       +- ID[@CanonicalImage = "OBJECT_ID", @Image = "object_id"]
+         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |           +- TableReference[@CanonicalImage = null]
+         |              |           |  +- TableName[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |           |  |  +- ID[@CanonicalImage = "ALL_PROCEDURES", @Image = "ALL_PROCEDURES"]
+         |              |           |  +- TableAlias[@CanonicalImage = "P", @Image = "p"]
+         |              |           |     +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |           +- ConditionalAndExpression[@CanonicalImage = "P.OWNER = A.OWNER AND P.OBJECT_NAME = A.OBJECT_NAME AND P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OWNER = A.OWNER", @Image = "p.owner = a.owner"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OWNER", @Image = "p.owner", @SelfModifier = "false"]
+         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OWNER", @Image = "p.owner"]
+         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |  |        +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_NAME = A.OBJECT_NAME", @Image = "p.object_name = a.object_name"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name", @SelfModifier = "false"]
+         |              |              |  |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_NAME", @Image = "p.object_name"]
+         |              |              |  |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |              |  |     +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |  |        +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |  +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name", @SelfModifier = "false"]
+         |              |              |     +- SimpleExpression[@CanonicalImage = "A.OBJECT_NAME", @Image = "a.object_name"]
+         |              |              |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |              |        +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              |           +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |              |              +- EqualityExpression[@CanonicalImage = "P.OBJECT_TYPE = A.OBJECT_TYPE", @Image = "p.object_type = a.object_type"]
+         |              |                 +- PrimaryPrefix[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type", @SelfModifier = "false"]
+         |              |                 |  +- SimpleExpression[@CanonicalImage = "P.OBJECT_TYPE", @Image = "p.object_type"]
+         |              |                 |     +- TableName[@CanonicalImage = "P", @Image = "p"]
+         |              |                 |     |  +- ID[@CanonicalImage = "P", @Image = "p"]
+         |              |                 |     +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                 |        +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                 +- PrimaryPrefix[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type", @SelfModifier = "false"]
+         |              |                    +- SimpleExpression[@CanonicalImage = "A.OBJECT_TYPE", @Image = "a.object_type"]
+         |              |                       +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |              |                       |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |              |                       |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |              |                       +- Column[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              |                          +- ID[@CanonicalImage = "OBJECT_TYPE", @Image = "object_type"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "A.OWNER", @Image = "a.owner", @SelfModifier = "false"]
+         |                          |     +- SimpleExpression[@CanonicalImage = "A.OWNER", @Image = "a.owner"]
+         |                          |        +- TableName[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |  +- ID[@CanonicalImage = "A", @Image = "a"]
+         |                          |        |     +- KEYWORD_UNRESERVED[@CanonicalImage = "A", @Image = "a"]
+         |                          |        +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          |           +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |                          +- SqlExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "USER", @Image = "USER", @SelfModifier = "false"]
+         |                                +- SimpleExpression[@CanonicalImage = "USER", @Image = "USER"]
+         |                                   +- Column[@CanonicalImage = "USER", @Image = "USER"]
+         |                                      +- ID[@CanonicalImage = "USER", @Image = "USER"]
+         |                                         +- KEYWORD_UNRESERVED[@CanonicalImage = "USER", @Image = "USER"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- ForStatement[@CanonicalImage = null]
+         |        +- ForIndex[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        +- Expression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "C_EXAMPLE", @Image = "c_example", @SelfModifier = "false"]
+         |        |     +- SimpleExpression[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |        +- Column[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        |           +- ID[@CanonicalImage = "C_EXAMPLE", @Image = "c_example"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner", @SelfModifier = "false"]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OWNER", @Image = "l_object.owner"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        |                                   +- ID[@CanonicalImage = "OWNER", @Image = "owner"]
+         |        +- Statement[@CanonicalImage = null]
+         |        |  +- UnlabelledStatement[@CanonicalImage = null]
+         |        |     +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |        +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |        |           +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |        |              |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |        |              |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |        |              +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |        |                 +- ArgumentList[@CanonicalImage = null]
+         |        |                    +- Argument[@CanonicalImage = null]
+         |        |                       +- Expression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                          +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name", @SelfModifier = "false"]
+         |        |                             +- SimpleExpression[@CanonicalImage = "L_OBJECT.OBJECT_NAME", @Image = "l_object.object_name"]
+         |        |                                +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |        |                                +- Column[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        |                                   +- ID[@CanonicalImage = "OBJECT_NAME", @Image = "object_name"]
+         |        +- Statement[@CanonicalImage = null]
+         |           +- UnlabelledStatement[@CanonicalImage = null]
+         |              +- Expression[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line", @SelfModifier = "false"]
+         |                    +- FunctionCall[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       +- FunctionName[@CanonicalImage = "DBMS_OUTPUT.PUT_LINE", @Image = "DBMS_OUTPUT.Put_Line"]
+         |                       |  +- ID[@CanonicalImage = "DBMS_OUTPUT", @Image = "DBMS_OUTPUT"]
+         |                       |  +- ID[@CanonicalImage = "PUT_LINE", @Image = "Put_Line"]
+         |                       +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
+         |                          +- ArgumentList[@CanonicalImage = null]
+         |                             +- Argument[@CanonicalImage = null]
+         |                                +- Expression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                   +- PrimaryPrefix[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate", @SelfModifier = "false"]
+         |                                      +- SimpleExpression[@CanonicalImage = "L_OBJECT.AGGREGATE", @Image = "l_object.aggregate"]
+         |                                         +- TableName[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         |  +- ID[@CanonicalImage = "L_OBJECT", @Image = "l_object"]
+         |                                         +- Column[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                            +- ID[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         |                                               +- KEYWORD_UNRESERVED[@CanonicalImage = "AGGREGATE", @Image = "aggregate"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
new file mode 100644
index 0000000000..c7e6d1afb5
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -0,0 +1,135 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS\n    --\n    CURSOR c_test IS\n        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent\n        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)\n            INNER JOIN\n            (STUDENT_SCORE ss) on si.sid = sp.sid)\n            INNER JOIN\n            (STUDENT_PARENT sp) on si.sid = sp.sid)\n        WHERE si.sid = \'114514\';\n    --\nBEGIN\n    --\n    --\nEND EXAMPLE_PROCEDURE;\n"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = "1"]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- CursorSpecification[@CanonicalImage = null]
+         |        +- CursorUnit[@CanonicalImage = "C_TEST", @Image = "c_test"]
+         |           +- ID[@CanonicalImage = "C_TEST", @Image = "c_test"]
+         |           +- SelectStatement[@All = "false", @CanonicalImage = null, @Distinct = "false", @Unique = "false"]
+         |              +- SelectList[@CanonicalImage = null]
+         |              |  +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |  |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |  |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |  |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |  |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |  +- SqlExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SN.NAME", @Image = "sn.name", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SN.NAME", @Image = "sn.name"]
+         |              |  |        +- TableName[@CanonicalImage = "SN", @Image = "sn"]
+         |              |  |        |  +- ID[@CanonicalImage = "SN", @Image = "sn"]
+         |              |  |        +- Column[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  |           +- ID[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  |              +- KEYWORD_UNRESERVED[@CanonicalImage = "NAME", @Image = "name"]
+         |              |  +- SqlExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SA.AGE", @Image = "sa.age", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SA.AGE", @Image = "sa.age"]
+         |              |  |        +- TableName[@CanonicalImage = "SA", @Image = "sa"]
+         |              |  |        |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |  |        +- Column[@CanonicalImage = "AGE", @Image = "age"]
+         |              |  |           +- ID[@CanonicalImage = "AGE", @Image = "age"]
+         |              |  +- SqlExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
+         |              |  |  +- PrimaryPrefix[@CanonicalImage = "SS.SCORE", @Image = "ss.score", @SelfModifier = "false"]
+         |              |  |     +- SimpleExpression[@CanonicalImage = "SS.SCORE", @Image = "ss.score"]
+         |              |  |        +- TableName[@CanonicalImage = "SS", @Image = "ss"]
+         |              |  |        |  +- ID[@CanonicalImage = "SS", @Image = "ss"]
+         |              |  |        +- Column[@CanonicalImage = "SCORE", @Image = "score"]
+         |              |  |           +- ID[@CanonicalImage = "SCORE", @Image = "score"]
+         |              |  +- SqlExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
+         |              |     +- PrimaryPrefix[@CanonicalImage = "SP.PARENT", @Image = "sp.parent", @SelfModifier = "false"]
+         |              |        +- SimpleExpression[@CanonicalImage = "SP.PARENT", @Image = "sp.parent"]
+         |              |           +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           +- Column[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              |              +- ID[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              |                 +- KEYWORD_UNRESERVED[@CanonicalImage = "PARENT", @Image = "parent"]
+         |              +- FromClause[@CanonicalImage = null]
+         |              |  +- TableReference[@CanonicalImage = null]
+         |              |     +- JoinClause[@CanonicalImage = null]
+         |              |        +- TableReference[@CanonicalImage = null]
+         |              |        |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |  +- JoinClause[@CanonicalImage = null]
+         |              |        |     |     +- TableReference[@CanonicalImage = null]
+         |              |        |     |     |  +- TableName[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
+         |              |        |     |     |  |  +- ID[@CanonicalImage = "STUDENT_INFO", @Image = "STUDENT_INFO"]
+         |              |        |     |     |  +- TableAlias[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |     |     +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |        |     |        +- TableReference[@CanonicalImage = null]
+         |              |        |     |        |  +- TableName[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
+         |              |        |     |        |  |  +- ID[@CanonicalImage = "STUDENT_AGE", @Image = "STUDENT_AGE"]
+         |              |        |     |        |  +- TableAlias[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |        |     +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |        +- EqualityExpression[@CanonicalImage = "SI.SID = SA.SID", @Image = "si.sid = sa.sid"]
+         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = "false"]
+         |              |        |     |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |        |     |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |     |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |           +- PrimaryPrefix[@CanonicalImage = "SA.SID", @Image = "sa.sid", @SelfModifier = "false"]
+         |              |        |     |              +- SimpleExpression[@CanonicalImage = "SA.SID", @Image = "sa.sid"]
+         |              |        |     |                 +- TableName[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |                 |  +- ID[@CanonicalImage = "SA", @Image = "sa"]
+         |              |        |     |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |     +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |        |        +- TableReference[@CanonicalImage = null]
+         |              |        |        |  +- TableName[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
+         |              |        |        |  |  +- ID[@CanonicalImage = "STUDENT_SCORE", @Image = "STUDENT_SCORE"]
+         |              |        |        |  +- TableAlias[@CanonicalImage = "SS", @Image = "ss"]
+         |              |        |        |     +- ID[@CanonicalImage = "SS", @Image = "ss"]
+         |              |        |        +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
+         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = "false"]
+         |              |        |           |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |        |           |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |           |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |        |           |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |           |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |           +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = "false"]
+         |              |        |              +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
+         |              |        |                 +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |        |                 |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |        |                 +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        |                    +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |        +- InnerCrossJoinClause[@CanonicalImage = null, @Cross = "false", @Natural = "false"]
+         |              |           +- TableReference[@CanonicalImage = null]
+         |              |           |  +- TableName[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
+         |              |           |  |  +- ID[@CanonicalImage = "STUDENT_PARENT", @Image = "STUDENT_PARENT"]
+         |              |           |  +- TableAlias[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           |     +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |           +- EqualityExpression[@CanonicalImage = "SI.SID = SP.SID", @Image = "si.sid = sp.sid"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = "false"]
+         |              |              |  +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |              |              |     +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |              |              |     |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |              |              |     +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |              |        +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              |              +- PrimaryPrefix[@CanonicalImage = "SP.SID", @Image = "sp.sid", @SelfModifier = "false"]
+         |              |                 +- SimpleExpression[@CanonicalImage = "SP.SID", @Image = "sp.sid"]
+         |              |                    +- TableName[@CanonicalImage = "SP", @Image = "sp"]
+         |              |                    |  +- ID[@CanonicalImage = "SP", @Image = "sp"]
+         |              |                    +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |              |                       +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |              +- WhereClause[@CanonicalImage = null]
+         |                 +- Condition[@CanonicalImage = null]
+         |                    +- CompoundCondition[@CanonicalImage = null, @Type = null]
+         |                       +- ComparisonCondition[@CanonicalImage = null, @Operator = "="]
+         |                          +- SqlExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |                          |  +- PrimaryPrefix[@CanonicalImage = "SI.SID", @Image = "si.sid", @SelfModifier = "false"]
+         |                          |     +- SimpleExpression[@CanonicalImage = "SI.SID", @Image = "si.sid"]
+         |                          |        +- TableName[@CanonicalImage = "SI", @Image = "si"]
+         |                          |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
+         |                          |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
+         |                          |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
+         |                          +- SqlExpression[@CanonicalImage = "\'114514\'", @Image = "\'114514\'"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "\'114514\'", @Image = "\'114514\'", @SelfModifier = "false"]
+         |                                +- Literal[@CanonicalImage = "\'114514\'", @Image = "\'114514\'"]
+         |                                   +- StringLiteral[@CanonicalImage = "\'114514\'", @Image = "\'114514\'", @String = "114514"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]

From 23997a15d734b9d47234929d417715ac17e6823c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 21 Apr 2022 21:06:31 +0200
Subject: [PATCH 099/180] Fix pmd dogfood -
 ClassWithOnlyPrivateConstructorsShouldBeFinal

---
 .../java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
index 2916bde9e0..cd7c7c7e99 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
@@ -227,7 +227,7 @@ public class TreeExportCli {
         return new AbortedError();
     }
 
-    private static class AbortedError extends Error {
+    private static final class AbortedError extends Error {
 
     }
 }

From 24f4b2ecb6b80d9b9e0c68715f285d014196e6d1 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 08:20:46 +0200
Subject: [PATCH 100/180] [ci] Fix maven-pmd-plugin configuration

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 94ed6846fd..725d4997b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,6 +413,16 @@
                             <artifactId>pmd-java</artifactId>
                             <version>6.44.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-jsp</artifactId>
+                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                        </dependency>
+                        <dependency>
+                            <groupId>net.sourceforge.pmd</groupId>
+                            <artifactId>pmd-javascript</artifactId>
+                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                        </dependency>
                         <!-- This contains the dogfood ruleset -->
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>

From 004a59ab04049a08088ba55d74c7b0cf745cb461 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 10:49:13 +0200
Subject: [PATCH 101/180] [html] Add visitor, add tests for xpath and java
 rules

---
 .../pmd/lang/html/ast/AbstractHtmlNode.java   |  2 +-
 .../pmd/lang/html/ast/HtmlCDataNode.java      |  5 ++
 .../pmd/lang/html/ast/HtmlComment.java        |  5 ++
 .../pmd/lang/html/ast/HtmlDocument.java       |  5 ++
 .../pmd/lang/html/ast/HtmlDocumentType.java   |  5 ++
 .../pmd/lang/html/ast/HtmlElement.java        |  9 ++
 .../pmd/lang/html/ast/HtmlNode.java           |  1 +
 .../pmd/lang/html/ast/HtmlTextNode.java       |  5 ++
 .../pmd/lang/html/ast/HtmlVisitor.java        | 24 +++++
 .../pmd/lang/html/ast/HtmlVisitorAdapter.java | 51 +++++++++++
 .../pmd/lang/html/ast/HtmlXmlDeclaration.java |  5 ++
 .../pmd/lang/html/rule/AbstractHtmlRule.java  | 90 +++++++++++++++++++
 .../pmd/lang/html/HtmlJavaRuleTest.java       | 74 +++++++++++++++
 .../pmd/lang/html/HtmlXPathRuleTest.java      | 70 +++++++++++++++
 14 files changed, 350 insertions(+), 1 deletion(-)
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java

diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
index 43741a63ea..53ae8b011c 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
@@ -9,7 +9,7 @@ import org.jsoup.nodes.Node;
 
 import net.sourceforge.pmd.lang.ast.AbstractNode;
 
-class AbstractHtmlNode<T extends Node> extends AbstractNode implements HtmlNode {
+abstract class AbstractHtmlNode<T extends Node> extends AbstractNode implements HtmlNode {
 
     protected final T node;
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
index f86402f475..354f99630b 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
@@ -16,4 +16,9 @@ public final class HtmlCDataNode extends AbstractHtmlNode<CDataNode> {
     public String getText() {
         return node.text();
     }
+
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
index 48ffe347e9..671a3dcabd 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
@@ -16,4 +16,9 @@ public final class HtmlComment extends AbstractHtmlNode<Comment> {
     public String getData() {
         return node.getData();
     }
+
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
index 840166b3d9..05256244ad 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
@@ -14,4 +14,9 @@ public class HtmlDocument extends HtmlElement implements RootNode {
     HtmlDocument(Document document) {
         super(document);
     }
+
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
index 3511db323d..6a7e036b29 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
@@ -13,6 +13,11 @@ public final class HtmlDocumentType extends AbstractHtmlNode<DocumentType> {
         super(node);
     }
 
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
+
     public String getName() {
         return node.name();
     }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
index 6a6c018fa5..505562449e 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
@@ -26,6 +26,15 @@ public class HtmlElement extends AbstractHtmlNode<Element> {
         }
     }
 
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
+
+    public List<Attribute> getAttributes() {
+        return attributes;
+    }
+
     @Override
     public Iterator<Attribute> getXPathAttributesIterator() {
         Iterator<Attribute> defaultAttributes = super.getXPathAttributesIterator();
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
index 2cda1e5b38..820229c82b 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
@@ -12,4 +12,5 @@ public interface HtmlNode extends Node {
     @Override
     Iterable<? extends HtmlNode> children();
 
+    Object acceptVisitor(HtmlVisitor visitor, Object data);
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
index 16ecb530f1..33430a491e 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
@@ -13,6 +13,11 @@ public class HtmlTextNode extends AbstractHtmlNode<TextNode> {
         super(node);
     }
 
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
+
     public String getNormalizedText() {
         return node.text();
     }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
new file mode 100644
index 0000000000..67570a3617
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
@@ -0,0 +1,24 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.ast;
+
+public interface HtmlVisitor {
+
+    Object visit(HtmlNode node, Object data);
+
+    Object visit(HtmlCDataNode node, Object data);
+
+    Object visit(HtmlComment node, Object data);
+
+    Object visit(HtmlDocument node, Object data);
+
+    Object visit(HtmlDocumentType node, Object data);
+
+    Object visit(HtmlElement node, Object data);
+
+    Object visit(HtmlTextNode node, Object data);
+
+    Object visit(HtmlXmlDeclaration node, Object data);
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
new file mode 100644
index 0000000000..09afbec0b4
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
@@ -0,0 +1,51 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.ast;
+
+public class HtmlVisitorAdapter implements HtmlVisitor {
+
+    @Override
+    public Object visit(HtmlNode node, Object data) {
+        for (HtmlNode child : node.children()) {
+            child.acceptVisitor(this, data);
+        }
+        return null;
+    }
+
+    @Override
+    public Object visit(HtmlCDataNode node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlComment node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlDocument node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlDocumentType node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlElement node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlTextNode node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlXmlDeclaration node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
index 3c80f5cbf2..001751edb3 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
@@ -13,6 +13,11 @@ public final class HtmlXmlDeclaration extends AbstractHtmlNode<XmlDeclaration> {
         super(node);
     }
 
+    @Override
+    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+        return visitor.visit(this, data);
+    }
+
     public String getName() {
         return node.name();
     }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
new file mode 100644
index 0000000000..2dcade1e60
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
@@ -0,0 +1,90 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule;
+
+import java.util.List;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
+import net.sourceforge.pmd.lang.html.ast.HtmlCDataNode;
+import net.sourceforge.pmd.lang.html.ast.HtmlComment;
+import net.sourceforge.pmd.lang.html.ast.HtmlDocument;
+import net.sourceforge.pmd.lang.html.ast.HtmlDocumentType;
+import net.sourceforge.pmd.lang.html.ast.HtmlElement;
+import net.sourceforge.pmd.lang.html.ast.HtmlNode;
+import net.sourceforge.pmd.lang.html.ast.HtmlTextNode;
+import net.sourceforge.pmd.lang.html.ast.HtmlVisitor;
+import net.sourceforge.pmd.lang.html.ast.HtmlXmlDeclaration;
+import net.sourceforge.pmd.lang.rule.AbstractRule;
+
+public abstract class AbstractHtmlRule extends AbstractRule implements HtmlVisitor {
+
+    public AbstractHtmlRule() {
+        super.setLanguage(LanguageRegistry.getLanguage(HtmlLanguageModule.NAME));
+    }
+
+    @Override
+    public void apply(List<? extends Node> nodes, RuleContext ctx) {
+        for (Node node : nodes) {
+            if (node instanceof HtmlNode) {
+                ((HtmlNode) node).acceptVisitor(this, ctx);
+            }
+        }
+    }
+
+    //
+    // The following APIs are identical to those in HtmlVisitorAdapter.
+    // Due to Java single inheritance, it is preferred to extend from the more
+    // complex Rule base class instead of from relatively simple Visitor.
+    //
+    // CPD-OFF
+
+    @Override
+    public Object visit(HtmlNode node, Object data) {
+        for (HtmlNode child : node.children()) {
+            child.acceptVisitor(this, data);
+        }
+        return null;
+    }
+
+    @Override
+    public Object visit(HtmlCDataNode node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlComment node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlDocument node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlDocumentType node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlElement node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlTextNode node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    @Override
+    public Object visit(HtmlXmlDeclaration node, Object data) {
+        return visit((HtmlNode) node, data);
+    }
+
+    // CPD-ON
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
new file mode 100644
index 0000000000..72af83bfa2
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
@@ -0,0 +1,74 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html;
+
+import java.io.StringReader;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.lang.html.ast.HtmlElement;
+import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
+
+public class HtmlJavaRuleTest {
+    // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
+    private static final String LIGHTNING_WEB_COMPONENT = "<!-- helloExpressions.html -->\n"
+            + "<template>\n"
+            + "    <p>Hello, { greeting}!</p>\n"
+            + "    <lightning-input label=\"Name\" value={ greeting} onchange=\"{ handleChange }\"></lightning-input>\n"
+            + "    <div class=\"slds-m-around_medium\">\n"
+            + "        <lightning-input name='firstName' label=\"First Name\" onchange={ handleChange }></lightning-input>\n"
+            + "        <lightning-input name='lastName' label=\"Last Name\" onchange={handleChange}></lightning-input>\n"
+            + "        <p class=\"slds-m-top_medium\">Uppercased Full Name: {uppercasedFullName}</p>\n"
+            + "    </div>\n"
+            + "</template>";
+
+    @Test
+    public void findAllAttributesWithInvalidExpression() {
+        // "Don’t add spaces around the property, for example, { data } is not valid HTML."
+        Rule rule = new AbstractHtmlRule() {
+            @Override
+            public String getMessage() {
+                return "Invalid expression";
+            }
+
+            @Override
+            public Object visit(HtmlElement node, Object data) {
+                for (Attribute attribute : node.getAttributes()) {
+                    if ("{".equals(attribute.getValue())) {
+                        RuleContext ctx = (RuleContext) data;
+                        ctx.addViolation(node);
+                    }
+                }
+                return super.visit(node, data);
+            }
+        };
+        Report report = runRule(LIGHTNING_WEB_COMPONENT, rule);
+        Assert.assertEquals(2, report.getViolations().size());
+        Assert.assertEquals(4, report.getViolations().get(0).getBeginLine());
+        Assert.assertEquals(6, report.getViolations().get(1).getBeginLine());
+    }
+
+    private Report runRule(String html, Rule rule) {
+        LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
+        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser(htmlLanguage.getLanguageVersionHandler().getDefaultParserOptions());
+
+        Node node = parser.parse("n/a", new StringReader(html));
+        RuleContext context = new RuleContext();
+        context.setLanguageVersion(htmlLanguage);
+        context.setCurrentRule(rule);
+        rule.apply(Arrays.asList(node), context);
+        return context.getReport();
+    }
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
new file mode 100644
index 0000000000..6c2c53e2f9
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
@@ -0,0 +1,70 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html;
+
+import java.io.StringReader;
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.Parser;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.rule.XPathRule;
+import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
+
+public class HtmlXPathRuleTest {
+    // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
+    private static final String LIGHTNING_WEB_COMPONENT = "<!-- helloExpressions.html -->\n"
+            + "<template>\n"
+            + "    <p>Hello, { greeting}!</p>\n"
+            + "    <lightning-input label=\"Name\" value={ greeting} onchange={handleChange}></lightning-input>"
+            + "    <div class=\"slds-m-around_medium\">\n"
+            + "        <lightning-input name='firstName' label=\"First Name\" onchange={handleChange}></lightning-input>\n"
+            + "        <lightning-input name='lastName' label=\"Last Name\" onchange={handleChange}></lightning-input>\n"
+            + "        <p class=\"slds-m-top_medium\">Uppercased Full Name: {uppercasedFullName}</p>\n"
+            + "    </div>\n"
+            + "</template>";
+
+    @Test
+    public void selectTextNode() {
+        // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
+        // "Don’t add spaces around the property, for example, { data } is not valid HTML."
+        String xpath = "//*[local-name() = '#text'][contains(@Text, '{ ')]";
+
+        Report report = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
+        Assert.assertEquals(1, report.getViolations().size());
+        Assert.assertEquals(3, report.getViolations().get(0).getBeginLine());
+    }
+
+    @Test
+    public void selectAttributes() {
+        // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
+        // "Don’t add spaces around the property, for example, { data } is not valid HTML."
+        String xpath = "//*[@value = '{']";
+
+        Report report = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
+        Assert.assertEquals(1, report.getViolations().size());
+        Assert.assertEquals(4, report.getViolations().get(0).getBeginLine());
+    }
+
+    private Report runXPath(String html, String xpath) {
+        LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
+        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser(htmlLanguage.getLanguageVersionHandler().getDefaultParserOptions());
+
+        XPathRule rule = new XPathRule(XPathVersion.XPATH_2_0, xpath);
+        rule.setMessage("test");
+        Node node = parser.parse("n/a", new StringReader(html));
+        RuleContext context = new RuleContext();
+        context.setLanguageVersion(htmlLanguage);
+        context.setCurrentRule(rule);
+        rule.apply(Arrays.asList(node), context);
+        return context.getReport();
+    }
+}

From 3e8274fd0d8bef76c34fbd4c943de5d4e8c48a94 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 11:32:50 +0200
Subject: [PATCH 102/180] [html] Rename AST nodes

---
 .../pmd/lang/html/HtmlTokenizer.java          | 10 ++---
 ...mlCDataNode.java => ASTHtmlCDataNode.java} |  4 +-
 .../{HtmlComment.java => ASTHtmlComment.java} |  4 +-
 ...HtmlDocument.java => ASTHtmlDocument.java} |  4 +-
 ...mentType.java => ASTHtmlDocumentType.java} |  4 +-
 .../{HtmlElement.java => ASTHtmlElement.java} |  4 +-
 ...HtmlTextNode.java => ASTHtmlTextNode.java} |  4 +-
 ...ration.java => ASTHtmlXmlDeclaration.java} |  4 +-
 .../pmd/lang/html/ast/HtmlTreeBuilder.java    | 16 ++++----
 .../pmd/lang/html/ast/HtmlVisitor.java        | 14 +++----
 .../pmd/lang/html/ast/HtmlVisitorAdapter.java | 14 +++----
 .../pmd/lang/html/ast/LineNumbers.java        | 40 +++++++++----------
 .../pmd/lang/html/rule/AbstractHtmlRule.java  | 28 ++++++-------
 .../pmd/lang/html/HtmlJavaRuleTest.java       |  4 +-
 .../pmd/lang/html/ast/HtmlParsingHelper.java  |  4 +-
 .../pmd/lang/html/ast/HtmlTreeDumpTest.java   |  2 +-
 .../pmd/lang/html/ast/PositionTest.java       |  2 +-
 17 files changed, 81 insertions(+), 81 deletions(-)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlCDataNode.java => ASTHtmlCDataNode.java} (77%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlComment.java => ASTHtmlComment.java} (79%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlDocument.java => ASTHtmlDocument.java} (76%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlDocumentType.java => ASTHtmlDocumentType.java} (81%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlElement.java => ASTHtmlElement.java} (93%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlTextNode.java => ASTHtmlTextNode.java} (84%)
 rename pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/{HtmlXmlDeclaration.java => ASTHtmlXmlDeclaration.java} (75%)

diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
index ad803faade..2804a39a62 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlTokenizer.java
@@ -14,9 +14,9 @@ import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.cpd.TokenEntry;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.Tokens;
-import net.sourceforge.pmd.lang.html.ast.HtmlDocument;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocument;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlTextNode;
 import net.sourceforge.pmd.lang.html.ast.HtmlNode;
-import net.sourceforge.pmd.lang.html.ast.HtmlTextNode;
 import net.sourceforge.pmd.lang.html.ast.HtmlTreeBuilder;
 
 class HtmlTokenizer implements Tokenizer {
@@ -27,7 +27,7 @@ class HtmlTokenizer implements Tokenizer {
 
         Document doc = Parser.xmlParser().parseInput(data, "");
         HtmlTreeBuilder builder = new HtmlTreeBuilder();
-        HtmlDocument root = builder.build(doc, data);
+        ASTHtmlDocument root = builder.build(doc, data);
         
         traverse(root, tokenEntries);
         tokenEntries.add(TokenEntry.EOF);
@@ -36,8 +36,8 @@ class HtmlTokenizer implements Tokenizer {
     private void traverse(HtmlNode node, Tokens tokenEntries) {
         String image = node.getXPathNodeName();
 
-        if (node instanceof HtmlTextNode) {
-            image = ((HtmlTextNode) node).getText();
+        if (node instanceof ASTHtmlTextNode) {
+            image = ((ASTHtmlTextNode) node).getText();
         }
 
         TokenEntry token = new TokenEntry(image, node.getXPathNodeName(), node.getBeginLine(),
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
similarity index 77%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
index 354f99630b..1074e740e8 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlCDataNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.CDataNode;
 
-public final class HtmlCDataNode extends AbstractHtmlNode<CDataNode> {
+public final class ASTHtmlCDataNode extends AbstractHtmlNode<CDataNode> {
 
-    HtmlCDataNode(CDataNode node) {
+    ASTHtmlCDataNode(CDataNode node) {
         super(node);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
similarity index 79%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
index 671a3dcabd..b00053fc90 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlComment.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.Comment;
 
-public final class HtmlComment extends AbstractHtmlNode<Comment> {
+public final class ASTHtmlComment extends AbstractHtmlNode<Comment> {
 
-    HtmlComment(Comment node) {
+    ASTHtmlComment(Comment node) {
         super(node);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
similarity index 76%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
index 05256244ad..b429e463c6 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocument.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
@@ -9,9 +9,9 @@ import org.jsoup.nodes.Document;
 
 import net.sourceforge.pmd.lang.ast.RootNode;
 
-public class HtmlDocument extends HtmlElement implements RootNode {
+public class ASTHtmlDocument extends ASTHtmlElement implements RootNode {
 
-    HtmlDocument(Document document) {
+    ASTHtmlDocument(Document document) {
         super(document);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
similarity index 81%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
index 6a7e036b29..0345fa1fc1 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlDocumentType.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.DocumentType;
 
-public final class HtmlDocumentType extends AbstractHtmlNode<DocumentType> {
+public final class ASTHtmlDocumentType extends AbstractHtmlNode<DocumentType> {
 
-    HtmlDocumentType(DocumentType node) {
+    ASTHtmlDocumentType(DocumentType node) {
         super(node);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
similarity index 93%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
index 505562449e..fe01917db9 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlElement.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
@@ -13,11 +13,11 @@ import org.jsoup.nodes.Element;
 
 import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 
-public class HtmlElement extends AbstractHtmlNode<Element> {
+public class ASTHtmlElement extends AbstractHtmlNode<Element> {
 
     private final List<Attribute> attributes;
 
-    HtmlElement(Element element) {
+    ASTHtmlElement(Element element) {
         super(element);
 
         attributes = new ArrayList<>();
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
similarity index 84%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
index 33430a491e..1f7d7ef07d 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTextNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.TextNode;
 
-public class HtmlTextNode extends AbstractHtmlNode<TextNode> {
+public class ASTHtmlTextNode extends AbstractHtmlNode<TextNode> {
 
-    HtmlTextNode(TextNode node) {
+    ASTHtmlTextNode(TextNode node) {
         super(node);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
similarity index 75%
rename from pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
rename to pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
index 001751edb3..87a1ef17ea 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlXmlDeclaration.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.XmlDeclaration;
 
-public final class HtmlXmlDeclaration extends AbstractHtmlNode<XmlDeclaration> {
+public final class ASTHtmlXmlDeclaration extends AbstractHtmlNode<XmlDeclaration> {
 
-    HtmlXmlDeclaration(XmlDeclaration node) {
+    ASTHtmlXmlDeclaration(XmlDeclaration node) {
         super(node);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
index f9f72eb8cf..795dcda1a7 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
@@ -19,8 +19,8 @@ import net.sourceforge.pmd.annotation.InternalApi;
 @InternalApi
 public final class HtmlTreeBuilder {
 
-    public HtmlDocument build(Document doc, String htmlString) {
-        HtmlDocument root = new HtmlDocument(doc);
+    public ASTHtmlDocument build(Document doc, String htmlString) {
+        ASTHtmlDocument root = new ASTHtmlDocument(doc);
         addChilds(root, doc);
 
         LineNumbers lineNumbers = new LineNumbers(root, htmlString);
@@ -39,17 +39,17 @@ public final class HtmlTreeBuilder {
 
     private HtmlNode convertJsoupNode(Node node) {
         if (node instanceof Element) {
-            return new HtmlElement((Element) node);
+            return new ASTHtmlElement((Element) node);
         } else if (node instanceof CDataNode) {
-            return new HtmlCDataNode((CDataNode) node);
+            return new ASTHtmlCDataNode((CDataNode) node);
         } else if (node instanceof TextNode) {
-            return new HtmlTextNode((TextNode) node);
+            return new ASTHtmlTextNode((TextNode) node);
         } else if (node instanceof Comment) {
-            return new HtmlComment((Comment) node);
+            return new ASTHtmlComment((Comment) node);
         } else if (node instanceof XmlDeclaration) {
-            return new HtmlXmlDeclaration((XmlDeclaration) node);
+            return new ASTHtmlXmlDeclaration((XmlDeclaration) node);
         } else if (node instanceof DocumentType) {
-            return new HtmlDocumentType((DocumentType) node);
+            return new ASTHtmlDocumentType((DocumentType) node);
         } else {
             throw new RuntimeException("Unsupported node type: " + node.getClass());
         }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
index 67570a3617..143488ccfc 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
@@ -8,17 +8,17 @@ public interface HtmlVisitor {
 
     Object visit(HtmlNode node, Object data);
 
-    Object visit(HtmlCDataNode node, Object data);
+    Object visit(ASTHtmlCDataNode node, Object data);
 
-    Object visit(HtmlComment node, Object data);
+    Object visit(ASTHtmlComment node, Object data);
 
-    Object visit(HtmlDocument node, Object data);
+    Object visit(ASTHtmlDocument node, Object data);
 
-    Object visit(HtmlDocumentType node, Object data);
+    Object visit(ASTHtmlDocumentType node, Object data);
 
-    Object visit(HtmlElement node, Object data);
+    Object visit(ASTHtmlElement node, Object data);
 
-    Object visit(HtmlTextNode node, Object data);
+    Object visit(ASTHtmlTextNode node, Object data);
 
-    Object visit(HtmlXmlDeclaration node, Object data);
+    Object visit(ASTHtmlXmlDeclaration node, Object data);
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
index 09afbec0b4..8907439e48 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
@@ -15,37 +15,37 @@ public class HtmlVisitorAdapter implements HtmlVisitor {
     }
 
     @Override
-    public Object visit(HtmlCDataNode node, Object data) {
+    public Object visit(ASTHtmlCDataNode node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlComment node, Object data) {
+    public Object visit(ASTHtmlComment node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlDocument node, Object data) {
+    public Object visit(ASTHtmlDocument node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlDocumentType node, Object data) {
+    public Object visit(ASTHtmlDocumentType node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlElement node, Object data) {
+    public Object visit(ASTHtmlElement node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlTextNode node, Object data) {
+    public Object visit(ASTHtmlTextNode node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlXmlDeclaration node, Object data) {
+    public Object visit(ASTHtmlXmlDeclaration node, Object data) {
         return visit((HtmlNode) node, data);
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
index 52b9a2904d..11d3517353 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
@@ -7,11 +7,11 @@ package net.sourceforge.pmd.lang.html.ast;
 import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
 
 class LineNumbers {
-    private final HtmlDocument document;
+    private final ASTHtmlDocument document;
     private String htmlString;
     private SourceCodePositioner sourceCodePositioner;
 
-    LineNumbers(HtmlDocument document, String htmlString) {
+    LineNumbers(ASTHtmlDocument document, String htmlString) {
         this.document = document;
         this.htmlString = htmlString;
         this.sourceCodePositioner = new SourceCodePositioner(htmlString);
@@ -26,20 +26,20 @@ class LineNumbers {
         int nodeLength = 0;
         int textLength = 0;
 
-        if (n instanceof HtmlDocument) {
+        if (n instanceof ASTHtmlDocument) {
             nextIndex = index;
-        } else if (n instanceof HtmlComment) {
+        } else if (n instanceof ASTHtmlComment) {
             nextIndex = htmlString.indexOf("<!--", nextIndex);
-        } else if (n instanceof HtmlElement) {
+        } else if (n instanceof ASTHtmlElement) {
             nextIndex = htmlString.indexOf("<" + n.getXPathNodeName(), nextIndex);
             nodeLength = htmlString.indexOf(">", nextIndex) - nextIndex + 1;
-        } else if (n instanceof HtmlCDataNode) {
+        } else if (n instanceof ASTHtmlCDataNode) {
             nextIndex = htmlString.indexOf("<![CDATA[", nextIndex);
-        } else if (n instanceof HtmlXmlDeclaration) {
+        } else if (n instanceof ASTHtmlXmlDeclaration) {
             nextIndex = htmlString.indexOf("<?", nextIndex);
-        } else if (n instanceof HtmlTextNode) {
-            textLength = ((HtmlTextNode) n).getText().length();
-        } else if (n instanceof HtmlDocumentType) {
+        } else if (n instanceof ASTHtmlTextNode) {
+            textLength = ((ASTHtmlTextNode) n).getText().length();
+        } else if (n instanceof ASTHtmlDocumentType) {
             nextIndex = index;
         }
 
@@ -53,24 +53,24 @@ class LineNumbers {
 
         // autoclosing element, eg <a />
         boolean isAutoClose = n.getNumChildren() == 0
-                && n instanceof HtmlElement
+                && n instanceof ASTHtmlElement
                 // nextIndex is up to the closing > at this point
                 && htmlString.startsWith("/>", nextIndex - 2);
 
-        if (n instanceof HtmlDocument) {
+        if (n instanceof ASTHtmlDocument) {
             nextIndex = htmlString.length();
-        } else if (n instanceof HtmlElement && !isAutoClose) {
+        } else if (n instanceof ASTHtmlElement && !isAutoClose) {
             nextIndex += 2 + n.getXPathNodeName().length() + 1; // </nodename>
-        } else if (n instanceof HtmlComment) {
+        } else if (n instanceof ASTHtmlComment) {
             nextIndex += 4 + 3; // <!-- and -->
-            nextIndex += ((HtmlComment) n).getData().length();
-        } else if (n instanceof HtmlTextNode) {
+            nextIndex += ((ASTHtmlComment) n).getData().length();
+        } else if (n instanceof ASTHtmlTextNode) {
             nextIndex += textLength;
-        } else if (n instanceof HtmlCDataNode) {
-            nextIndex += "<![CDATA[".length() + ((HtmlCDataNode) n).getText().length() + "]]>".length();
-        } else if (n instanceof HtmlXmlDeclaration) {
+        } else if (n instanceof ASTHtmlCDataNode) {
+            nextIndex += "<![CDATA[".length() + ((ASTHtmlCDataNode) n).getText().length() + "]]>".length();
+        } else if (n instanceof ASTHtmlXmlDeclaration) {
             nextIndex = htmlString.indexOf("?>", nextIndex) + 2;
-        } else if (n instanceof HtmlDocumentType) {
+        } else if (n instanceof ASTHtmlDocumentType) {
             nextIndex = htmlString.indexOf(">", nextIndex) + 1;
         }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
index 2dcade1e60..c65e21d7e8 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
@@ -10,15 +10,15 @@ import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
-import net.sourceforge.pmd.lang.html.ast.HtmlCDataNode;
-import net.sourceforge.pmd.lang.html.ast.HtmlComment;
-import net.sourceforge.pmd.lang.html.ast.HtmlDocument;
-import net.sourceforge.pmd.lang.html.ast.HtmlDocumentType;
-import net.sourceforge.pmd.lang.html.ast.HtmlElement;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlCDataNode;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlComment;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocument;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocumentType;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlTextNode;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlXmlDeclaration;
 import net.sourceforge.pmd.lang.html.ast.HtmlNode;
-import net.sourceforge.pmd.lang.html.ast.HtmlTextNode;
 import net.sourceforge.pmd.lang.html.ast.HtmlVisitor;
-import net.sourceforge.pmd.lang.html.ast.HtmlXmlDeclaration;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 
 public abstract class AbstractHtmlRule extends AbstractRule implements HtmlVisitor {
@@ -52,37 +52,37 @@ public abstract class AbstractHtmlRule extends AbstractRule implements HtmlVisit
     }
 
     @Override
-    public Object visit(HtmlCDataNode node, Object data) {
+    public Object visit(ASTHtmlCDataNode node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlComment node, Object data) {
+    public Object visit(ASTHtmlComment node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlDocument node, Object data) {
+    public Object visit(ASTHtmlDocument node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlDocumentType node, Object data) {
+    public Object visit(ASTHtmlDocumentType node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlElement node, Object data) {
+    public Object visit(ASTHtmlElement node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlTextNode node, Object data) {
+    public Object visit(ASTHtmlTextNode node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
     @Override
-    public Object visit(HtmlXmlDeclaration node, Object data) {
+    public Object visit(ASTHtmlXmlDeclaration node, Object data) {
         return visit((HtmlNode) node, data);
     }
 
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
index 72af83bfa2..307a7aef74 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
@@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-import net.sourceforge.pmd.lang.html.ast.HtmlElement;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
 import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
 
 public class HtmlJavaRuleTest {
@@ -44,7 +44,7 @@ public class HtmlJavaRuleTest {
             }
 
             @Override
-            public Object visit(HtmlElement node, Object data) {
+            public Object visit(ASTHtmlElement node, Object data) {
                 for (Attribute attribute : node.getAttributes()) {
                     if ("{".equals(attribute.getValue())) {
                         RuleContext ctx = (RuleContext) data;
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
index 7cdcc057f9..37812e7f1c 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
@@ -7,12 +7,12 @@ package net.sourceforge.pmd.lang.html.ast;
 import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
 import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
 
-public final class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, HtmlDocument> {
+public final class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> {
 
     public static final HtmlParsingHelper DEFAULT = new HtmlParsingHelper(Params.getDefaultProcess());
 
     private HtmlParsingHelper(Params params) {
-        super(HtmlLanguageModule.NAME, HtmlDocument.class, params);
+        super(HtmlLanguageModule.NAME, ASTHtmlDocument.class, params);
     }
 
     @Override
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
index 8ffe75d03a..05f83eb600 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java
@@ -17,7 +17,7 @@ public class HtmlTreeDumpTest extends BaseTreeDumpTest {
     }
 
     @Override
-    public BaseParsingHelper<HtmlParsingHelper, HtmlDocument> getParser() {
+    public BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> getParser() {
         return HtmlParsingHelper.DEFAULT.withResourceContext(HtmlTreeDumpTest.class, "testdata");
     }
 
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
index aa7db3ddb0..37b7d21322 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
@@ -22,7 +22,7 @@ public class PositionTest extends BaseTreeDumpTest {
     }
 
     @Override
-    public BaseParsingHelper<HtmlParsingHelper, HtmlDocument> getParser() {
+    public BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> getParser() {
         return HtmlParsingHelper.DEFAULT.withResourceContext(HtmlTreeDumpTest.class, "testdata");
     }
 

From b3871a14761237a7755129bbe0609d446d7e2388 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 11:39:38 +0200
Subject: [PATCH 103/180] [html] New rule UnnecessaryTypeAttributeRule

---
 .../pmd/lang/html/ast/AbstractHtmlNode.java   |   4 +
 .../UnnecessaryTypeAttributeRule.java         |  50 ++++++
 .../resources/category/html/bestpractices.xml |  24 +++
 .../UnnecessaryTypeAttributeTest.java         |  11 ++
 .../lang/html/ast/testdata/SimpleHtmlFile.txt |  30 ++--
 .../lang/html/ast/testdata/SimpleXmlFile.txt  |  18 +-
 .../html/ast/testdata/TemplateFragment.txt    | 166 +++++++++---------
 .../xml/UnnecessaryTypeAttribute.xml          |  37 ++++
 8 files changed, 233 insertions(+), 107 deletions(-)
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UnnecessaryTypeAttribute.xml

diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
index 53ae8b011c..6517233002 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
@@ -18,6 +18,10 @@ abstract class AbstractHtmlNode<T extends Node> extends AbstractNode implements
         this.node = node;
     }
 
+    public String getNodeName() {
+        return node.nodeName();
+    }
+
     @Override
     public String getXPathNodeName() {
         return node.nodeName();
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
new file mode 100644
index 0000000000..49f230e92a
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
@@ -0,0 +1,50 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule.bestpractices;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
+import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
+
+public class UnnecessaryTypeAttributeRule extends AbstractHtmlRule {
+
+    @Override
+    public Object visit(ASTHtmlElement node, Object data) {
+        if ("link".equalsIgnoreCase(node.getNodeName())) {
+            checkLink(node, data);
+        } else if ("script".equalsIgnoreCase(node.getNodeName())) {
+            checkScript(node, data);
+        }
+        return super.visit(node, data);
+    }
+
+    private void checkScript(ASTHtmlElement node, Object data) {
+        if (getAttribute(node, "type") != null) {
+            addViolation(node, data);
+        }
+    }
+
+    private void checkLink(ASTHtmlElement node, Object data) {
+        String rel = getAttribute(node, "rel");
+        if (getAttribute(node, "type") != null && "stylesheet".equalsIgnoreCase(rel)) {
+            addViolation(node, data);
+        }
+    }
+
+    private String getAttribute(ASTHtmlElement node, String rel) {
+        return node.getAttributes().stream()
+                .filter(attribute -> rel.equalsIgnoreCase(attribute.getName()))
+                .findFirst()
+                .map(Attribute::getValue)
+                .map(String::valueOf)
+                .orElse(null);
+    }
+
+    private void addViolation(ASTHtmlElement node, Object data) {
+        RuleContext ctx = (RuleContext) data;
+        ctx.addViolation(node);
+    }
+}
diff --git a/pmd-html/src/main/resources/category/html/bestpractices.xml b/pmd-html/src/main/resources/category/html/bestpractices.xml
index d64ee57961..565fe30da2 100644
--- a/pmd-html/src/main/resources/category/html/bestpractices.xml
+++ b/pmd-html/src/main/resources/category/html/bestpractices.xml
@@ -33,6 +33,30 @@ This helps to reuse common styles.
         <example>
 <![CDATA[
 <div style="font-size: 12pt;"></div>
+]]>
+        </example>
+    </rule>
+
+    <rule name="UnnecessaryTypeAttribute"
+          language="html"
+          since="6.45.0"
+          message="Type attribute for link and script elements is not needed."
+          class="net.sourceforge.pmd.lang.html.rule.bestpractices.UnnecessaryTypeAttributeRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_html_bestpractices.html#unnecessarytypeattribute">
+        <description>
+            In HTML5 the explicit type attribute for link and script elements is not needed. Modern browsers expect
+            stylesheets to be in CSS and scripts to use JavaScript.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+<!-- Instead of -->
+<link type="text/css" rel="stylesheet" href="css/styles.css" />
+<script type="text/javascript" src="js/scripts.js"></script>
+
+<!-- Just use -->
+<link rel="stylesheet" href="css/styles.css" />
+<script src="js/scripts.js"></script>
 ]]>
         </example>
     </rule>
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java
new file mode 100644
index 0000000000..b955463364
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java
@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule.bestpractices;
+
+import net.sourceforge.pmd.testframework.PmdRuleTst;
+
+public class UnnecessaryTypeAttributeTest extends PmdRuleTst {
+    // no additional unit tests
+}
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
index 3dbe45de94..058a83898d 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
@@ -1,22 +1,22 @@
-+- #document[]
-   +- #doctype[@Name = "html", @PublicId = "", @SystemId = ""]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
++- #document[@NodeName = "#document"]
+   +- #doctype[@Name = "html", @NodeName = "#doctype", @PublicId = "", @SystemId = ""]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- html[]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- html[@NodeName = "html"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
     "]
-   |  +- head[]
-   |  |  +- #text[@Image = "hello", @NormalizedText = "hello", @Text = "hello"]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- head[@NodeName = "head"]
+   |  |  +- #text[@Image = "hello", @NodeName = "#text", @NormalizedText = "hello", @Text = "hello"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
     "]
-   |  +- body[]
-   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- body[@NodeName = "body"]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
         "]
-   |  |  +- h1[]
-   |  |  |  +- #text[@Image = "world", @NormalizedText = "world", @Text = "world"]
-   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  +- h1[@NodeName = "h1"]
+   |  |  |  +- #text[@Image = "world", @NodeName = "#text", @NormalizedText = "world", @Text = "world"]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
     "]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
index 29a2088979..a5c715bfb0 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
@@ -1,13 +1,13 @@
-+- #document[]
-   +- #declaration[@Name = "xml"]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
++- #document[@NodeName = "#document"]
+   +- #declaration[@Name = "xml", @NodeName = "#declaration"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- root[]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- root[@NodeName = "root"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
   "]
-   |  +- child[@attr1 = "value1"]
-   |  |  +- #text[@Image = "text & entities", @NormalizedText = "text & entities", @Text = "text & entities"]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- child[@NodeName = "child", @attr1 = "value1"]
+   |  |  +- #text[@Image = "text & entities", @NodeName = "#text", @NormalizedText = "text & entities", @Text = "text & entities"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
index db08ecb82d..c9e048e3be 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
@@ -1,130 +1,130 @@
-+- #document[]
-   +- #comment[@Data = " from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html "]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
++- #document[@NodeName = "#document"]
+   +- #comment[@Data = " from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html ", @NodeName = "#comment"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- template[]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- template[@NodeName = "template"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
     "]
-   |  +- section[@class = "content container page-background"]
-   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- section[@NodeName = "section", @class = "content container page-background"]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
         "]
-   |  |  +- ui-navbar[@nav-items = "{navigationItems}", @oncategorychange = "{handleCategoryChange}", @selected-item = "{currentNavigationItem}"]
-   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  +- ui-navbar[@NodeName = "ui-navbar", @nav-items = "{navigationItems}", @oncategorychange = "{handleCategoryChange}", @selected-item = "{currentNavigationItem}"]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
         "]
-   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 
         "]
-   |  |  +- article[@class = "container"]
-   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  +- article[@NodeName = "article", @class = "container"]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
             "]
-   |  |  |  +- div[]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  +- div[@NodeName = "div"]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.hello.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.hello.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello[@NodeName = "recipe-hello"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello-binding[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello-binding[@NodeName = "recipe-hello-binding"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello-expressions[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello-expressions[@NodeName = "recipe-hello-expressions"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello-expressions-track[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello-expressions-track[@NodeName = "recipe-hello-expressions-track"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello-conditional-rendering[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello-conditional-rendering[@NodeName = "recipe-hello-conditional-rendering"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-hello-for-each[]
-   |  |  |  |  |  +- recipe-hello-iterator[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-hello-for-each[@NodeName = "recipe-hello-for-each"]
+   |  |  |  |  |  +- recipe-hello-iterator[@NodeName = "recipe-hello-iterator"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.composition.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.composition.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-composition-basics[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-composition-basics[@NodeName = "recipe-composition-basics"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-composition-iteration[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-composition-iteration[@NodeName = "recipe-composition-iteration"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-composition-contact-search[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-composition-contact-search[@NodeName = "recipe-composition-contact-search"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-composition-dynamic[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-composition-dynamic[@NodeName = "recipe-composition-dynamic"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.child.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.child.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-event-simple[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-event-simple[@NodeName = "recipe-event-simple"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-event-with-data[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-event-with-data[@NodeName = "recipe-event-with-data"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-event-bubbling[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-event-bubbling[@NodeName = "recipe-event-bubbling"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.parent.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.parent.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-api-property[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-api-property[@NodeName = "recipe-api-property"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-api-function[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-api-function[@NodeName = "recipe-api-function"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-api-setter-getter[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-api-setter-getter[@NodeName = "recipe-api-setter-getter"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.misc.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.misc.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-misc-shared-java-script[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-misc-shared-java-script[@NodeName = "recipe-misc-shared-java-script"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-misc-rest-api-call[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-misc-rest-api-call[@NodeName = "recipe-misc-rest-api-call"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-misc-dom-query[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-misc-dom-query[@NodeName = "recipe-misc-dom-query"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-misc-multiple-templates[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-misc-multiple-templates[@NodeName = "recipe-misc-multiple-templates"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- template[@if:true = "{navigationItems.party.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.party.visible}"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-libs-d3[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-libs-d3[@NodeName = "recipe-libs-d3"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                     "]
-   |  |  |  |  |  +- recipe-libs-chartjs[]
-   |  |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  |  +- recipe-libs-chartjs[@NodeName = "recipe-libs-chartjs"]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
                 "]
-   |  |  |  |  +- ui-navfooter[@label-next = "{nextNavigationItem}", @label-previous = "{previousNavigationItem}", @onnextclicked = "{handleNavigateNext}", @onpreviousclicked = "{handleNavigatePrevious}"]
-   |  |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  |  +- ui-navfooter[@NodeName = "ui-navfooter", @label-next = "{nextNavigationItem}", @label-previous = "{previousNavigationItem}", @onnextclicked = "{handleNavigateNext}", @onpreviousclicked = "{handleNavigatePrevious}"]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
             "]
-   |  |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
         "]
-   |  |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
     "]
-   |  +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
-   +- #text[@Image = " ", @NormalizedText = " ", @Text = "
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
 "]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UnnecessaryTypeAttribute.xml b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UnnecessaryTypeAttribute.xml
new file mode 100644
index 0000000000..a5664b9803
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UnnecessaryTypeAttribute.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+
+    <test-code>
+        <description>Example</description>
+        <expected-problems>2</expected-problems>
+        <expected-linenumbers>4,5</expected-linenumbers>
+        <code><![CDATA[
+<html>
+  <head>
+    <!-- Instead of -->
+    <link type="text/css" rel="stylesheet" href="css/styles.css" />
+    <script type="text/javascript" src="js/scripts.js"></script>
+
+    <!-- Just use -->
+    <link rel="stylesheet" href="css/styles.css" />
+    <script src="js/scripts.js"></script>
+  </head>
+</html>
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>Link refers not a stylesheet</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+<html>
+  <head>
+    <link type="text/markdown" rel="author" href="the-author.md" />
+  </head>
+</html>
+]]></code>
+    </test-code>
+</test-data>

From 83c07a540ba93971ea4f2f934d10ac5f290f15cd Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 12:01:55 +0200
Subject: [PATCH 104/180] [html] New rule UseAltAttributeForImages which uses
 rule chain

---
 .../pmd/lang/html/ast/ASTHtmlElement.java     | 13 +++++++++
 .../UnnecessaryTypeAttributeRule.java         | 15 +++--------
 .../UseAltAttributeForImagesRule.java         | 27 +++++++++++++++++++
 .../resources/category/html/bestpractices.xml | 22 +++++++++++++++
 .../UseAltAttributeForImagesTest.java         | 11 ++++++++
 .../xml/UseAltAttributeForImages.xml          | 23 ++++++++++++++++
 6 files changed, 99 insertions(+), 12 deletions(-)
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java
 create mode 100644 pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UseAltAttributeForImages.xml

diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
index fe01917db9..5ddca95cae 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
@@ -35,6 +35,19 @@ public class ASTHtmlElement extends AbstractHtmlNode<Element> {
         return attributes;
     }
 
+    public boolean hasAttribute(String name) {
+        return attributes.stream().anyMatch(attribute -> name.equalsIgnoreCase(attribute.getName()));
+    }
+
+    public String getAttribute(String rel) {
+        return attributes.stream()
+                .filter(attribute -> rel.equalsIgnoreCase(attribute.getName()))
+                .findFirst()
+                .map(Attribute::getValue)
+                .map(String::valueOf)
+                .orElse(null);
+    }
+
     @Override
     public Iterator<Attribute> getXPathAttributesIterator() {
         Iterator<Attribute> defaultAttributes = super.getXPathAttributesIterator();
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
index 49f230e92a..b24cadff59 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeRule.java
@@ -5,7 +5,6 @@
 package net.sourceforge.pmd.lang.html.rule.bestpractices;
 
 import net.sourceforge.pmd.RuleContext;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
 import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
 
@@ -22,26 +21,18 @@ public class UnnecessaryTypeAttributeRule extends AbstractHtmlRule {
     }
 
     private void checkScript(ASTHtmlElement node, Object data) {
-        if (getAttribute(node, "type") != null) {
+        if (node.hasAttribute("type")) {
             addViolation(node, data);
         }
     }
 
     private void checkLink(ASTHtmlElement node, Object data) {
-        String rel = getAttribute(node, "rel");
-        if (getAttribute(node, "type") != null && "stylesheet".equalsIgnoreCase(rel)) {
+        String rel = node.getAttribute("rel");
+        if (node.hasAttribute("type") && "stylesheet".equalsIgnoreCase(rel)) {
             addViolation(node, data);
         }
     }
 
-    private String getAttribute(ASTHtmlElement node, String rel) {
-        return node.getAttributes().stream()
-                .filter(attribute -> rel.equalsIgnoreCase(attribute.getName()))
-                .findFirst()
-                .map(Attribute::getValue)
-                .map(String::valueOf)
-                .orElse(null);
-    }
 
     private void addViolation(ASTHtmlElement node, Object data) {
         RuleContext ctx = (RuleContext) data;
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
new file mode 100644
index 0000000000..cd3895d595
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
@@ -0,0 +1,27 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule.bestpractices;
+
+import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
+import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
+
+public class UseAltAttributeForImagesRule extends AbstractHtmlRule {
+
+    public UseAltAttributeForImagesRule() {
+        addRuleChainVisit("img");
+    }
+
+    @Override
+    public Object visit(ASTHtmlElement node, Object data) {
+        if (!node.hasAttribute("alt")) {
+            RuleContext ctx = (RuleContext) data;
+            ctx.addViolation(node);
+            return data;
+        }
+
+        return data;
+    }
+}
diff --git a/pmd-html/src/main/resources/category/html/bestpractices.xml b/pmd-html/src/main/resources/category/html/bestpractices.xml
index 565fe30da2..19c07662e9 100644
--- a/pmd-html/src/main/resources/category/html/bestpractices.xml
+++ b/pmd-html/src/main/resources/category/html/bestpractices.xml
@@ -57,6 +57,28 @@ This helps to reuse common styles.
 <!-- Just use -->
 <link rel="stylesheet" href="css/styles.css" />
 <script src="js/scripts.js"></script>
+]]>
+        </example>
+    </rule>
+
+    <rule name="UseAltAttributeForImages"
+          language="html"
+          since="6.45.0"
+          message="The image is missing an alternate text."
+          class="net.sourceforge.pmd.lang.html.rule.bestpractices.UseAltAttributeForImagesRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_html_bestpractices.html#usealtattributeforimages">
+        <description>
+            Always use an "alt" attribute for images. This provides an alternative text and is extensively used
+            by screen readers.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+<!-- instead of -->
+<img src="house.jpeg">
+
+<!-- use this -->
+<img src="house.jpeg" alt="A house from the 18th century">
 ]]>
         </example>
     </rule>
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java
new file mode 100644
index 0000000000..9bca187b2e
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java
@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html.rule.bestpractices;
+
+import net.sourceforge.pmd.testframework.PmdRuleTst;
+
+public class UseAltAttributeForImagesTest extends PmdRuleTst {
+    // no additional unit tests
+}
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UseAltAttributeForImages.xml b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UseAltAttributeForImages.xml
new file mode 100644
index 0000000000..2090405e20
--- /dev/null
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/rule/bestpractices/xml/UseAltAttributeForImages.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+
+    <test-code>
+        <description>Example</description>
+        <expected-problems>1</expected-problems>
+        <expected-linenumbers>4</expected-linenumbers>
+        <code><![CDATA[
+<html>
+  <body>
+    <!-- instead of -->
+    <img src="house.jpeg">
+
+    <!-- use this -->
+    <img src="house.jpeg" alt="A house from the 18th century">
+  </body>
+</html>
+        ]]></code>
+    </test-code>
+</test-data>

From 0e6ad2dc635c1fc0549c101ce8c5f9c4f43e2c30 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 12:20:02 +0200
Subject: [PATCH 105/180] [html] Add documentation (#3885)

---
 docs/_data/sidebars/pmd_sidebar.yml           |  3 ++
 docs/pages/pmd/languages/html.md              | 18 +++++++++++
 docs/pages/release_notes.md                   | 30 +++++++++++++++++++
 .../main/resources/rulesets/releases/6450.xml | 15 ++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 docs/pages/pmd/languages/html.md
 create mode 100644 pmd-core/src/main/resources/rulesets/releases/6450.xml

diff --git a/docs/_data/sidebars/pmd_sidebar.yml b/docs/_data/sidebars/pmd_sidebar.yml
index a8a420916f..81d095e398 100644
--- a/docs/_data/sidebars/pmd_sidebar.yml
+++ b/docs/_data/sidebars/pmd_sidebar.yml
@@ -379,6 +379,9 @@ entries:
     - title: XML and XML dialects
       url: /pmd_languages_xml.html
       output: web, pdf
+    - title: HTML
+      url: /pmd_languages_html.html
+      output: web, pdf
   - title: Developer Documentation
     output: web, pdf
     folderitems:
diff --git a/docs/pages/pmd/languages/html.md b/docs/pages/pmd/languages/html.md
new file mode 100644
index 0000000000..acb96fc416
--- /dev/null
+++ b/docs/pages/pmd/languages/html.md
@@ -0,0 +1,18 @@
+---
+title: Processing HTML files
+permalink: pmd_languages_html.html
+last_updated: April 2022 (6.45.0)
+---
+
+## The HTML language module
+
+**Since:** 6.45.0
+
+**Minimum Java Runtime:** Java 8
+
+{% include warning.html content="This language module is experimental and may change any time." %}
+
+The HTML language module uses [jsoup](https://jsoup.org/) for parsing.
+
+XPath rules are supported, but the DOM is not a typical XML/XPath DOM. E.g.
+text nodes are normal nodes. This might change in the future.
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 962f226a13..e637b652d1 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -14,6 +14,36 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
+#### Support for HTML
+
+This version of PMD ships a new language module to support analyzing of HTML.
+Support for HTML is experimental and might change without notice.
+
+#### New rules
+
+* The HTML rule {% rule html/bestpractices/AvoidInlineStyles %} finds elements which use a style attribute.
+  In order to help maintaining a webpage it is considered good practice to separate content and styles. Instead
+  of inline styles one should use CSS files and classes.
+
+```xml
+    <rule ref="category/html/bestpractices.xml/AvoidInlineStyles" />
+```
+
+* The HTML rule {% rule html/bestpractices/UnnecessaryTypeAttribute %} finds "link" and "script" elements which
+  still have a "type" attribute. This is not necessary anymore since modern browsers automatically use CSS and
+  JavaScript.
+
+```xml
+      <rule ref="category/html/bestpractices.xml/UnnecessaryTypeAttribute" />
+```
+
+* The HTML rule {% rule html/bestpractices/UseAltAttributeForImages %} finds "img" elements without an "alt"
+  attribute. An alternate text should always be provided in order to help screen readers.
+
+```xml
+      <rule ref="category/html/bestpractices.xml/UseAltAttributeForImages" />
+```
+
 #### Modified rules
 
 *   The Java rule {% rule java/bestpractices/UnusedPrivateField %} has a new property `ignoredFieldNames`.
diff --git a/pmd-core/src/main/resources/rulesets/releases/6450.xml b/pmd-core/src/main/resources/rulesets/releases/6450.xml
new file mode 100644
index 0000000000..25ab462ed4
--- /dev/null
+++ b/pmd-core/src/main/resources/rulesets/releases/6450.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<ruleset name="6450"
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+  <description>
+This ruleset contains links to rules that are new in PMD v6.45.0
+  </description>
+
+    <rule ref="category/html/bestpractices.xml/AvoidInlineStyles" />
+    <rule ref="category/html/bestpractices.xml/UnnecessaryTypeAttribute" />
+    <rule ref="category/html/bestpractices.xml/UseAltAttributeForImages" />
+
+</ruleset>

From c9a1b3fb78f97d82b8bb5158838e8f782d6e10d6 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 22 Apr 2022 16:01:51 +0200
Subject: [PATCH 106/180] [html] Migrate to PMD 7

---
 pmd-html/pom.xml                              |   2 +-
 .../pmd/lang/html/HtmlHandler.java            |  36 +----
 .../pmd/lang/html/ast/ASTHtmlCDataNode.java   |   2 +-
 .../pmd/lang/html/ast/ASTHtmlComment.java     |   2 +-
 .../pmd/lang/html/ast/ASTHtmlDocument.java    |  18 ++-
 .../lang/html/ast/ASTHtmlDocumentType.java    |   2 +-
 .../pmd/lang/html/ast/ASTHtmlElement.java     |   5 +-
 .../pmd/lang/html/ast/ASTHtmlTextNode.java    |   2 +-
 .../lang/html/ast/ASTHtmlXmlDeclaration.java  |   2 +-
 .../pmd/lang/html/ast/AbstractHtmlNode.java   |  35 ++---
 .../pmd/lang/html/ast/HtmlNode.java           |   9 +-
 .../pmd/lang/html/ast/HtmlParser.java         |  45 +-----
 .../pmd/lang/html/ast/HtmlTokenizer.java      |  25 ++--
 .../pmd/lang/html/ast/HtmlTreeBuilder.java    |  16 +-
 .../pmd/lang/html/ast/HtmlVisitor.java        |  39 +++--
 .../pmd/lang/html/ast/HtmlVisitorAdapter.java |  51 -------
 .../pmd/lang/html/ast/LineNumbers.java        |   6 +-
 .../pmd/lang/html/rule/AbstractHtmlRule.java  |  70 +--------
 .../UseAltAttributeForImagesRule.java         |  10 +-
 .../pmd/lang/html/HtmlJavaRuleTest.java       |  36 ++---
 .../pmd/lang/html/HtmlXPathRuleTest.java      |  41 +++---
 .../pmd/lang/html/ast/HtmlParsingHelper.java  |   2 +-
 .../pmd/lang/html/ast/PositionTest.java       |   4 +-
 .../lang/html/ast/testdata/SimpleHtmlFile.txt |  21 +--
 .../html/ast/testdata/SimpleHtmlFile2.txt     |  30 ++--
 .../lang/html/ast/testdata/SimpleXmlFile.txt  |  12 +-
 .../html/ast/testdata/TemplateFragment.txt    | 139 ++++++------------
 27 files changed, 242 insertions(+), 420 deletions(-)
 delete mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java

diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
index 8e35a9cf2b..9a51a81887 100644
--- a/pmd-html/pom.xml
+++ b/pmd-html/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
index b6c3ad9659..c5dd4e436b 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/HtmlHandler.java
@@ -5,42 +5,14 @@
 
 package net.sourceforge.pmd.lang.html;
 
-import net.sourceforge.pmd.Rule;
-import net.sourceforge.pmd.RuleContext;
-import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.lang.AbstractLanguageVersionHandler;
-import net.sourceforge.pmd.lang.Parser;
-import net.sourceforge.pmd.lang.ParserOptions;
-import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
+import net.sourceforge.pmd.lang.ast.Parser;
 import net.sourceforge.pmd.lang.html.ast.HtmlParser;
-import net.sourceforge.pmd.lang.rule.AbstractRuleViolationFactory;
-import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
-import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
 
-class HtmlHandler extends AbstractLanguageVersionHandler {
+class HtmlHandler extends AbstractPmdLanguageVersionHandler {
 
     @Override
-    public RuleViolationFactory getRuleViolationFactory() {
-        return new AbstractRuleViolationFactory() {
-
-            @Override
-            protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message) {
-                return new ParametricRuleViolation<Node>(rule, ruleContext, node, message);
-            }
-
-            @Override
-            protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
-                    int beginLine, int endLine) {
-                ParametricRuleViolation<Node> ruleViolation = new ParametricRuleViolation<>(rule, ruleContext, node, message);
-                ruleViolation.setLines(beginLine, endLine);
-                return ruleViolation;
-            }
-            
-        };
-    }
-
-    @Override
-    public Parser getParser(ParserOptions parserOptions) {
+    public Parser getParser() {
         return new HtmlParser();
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
index 1074e740e8..833be67698 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlCDataNode.java
@@ -18,7 +18,7 @@ public final class ASTHtmlCDataNode extends AbstractHtmlNode<CDataNode> {
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
index b00053fc90..ae78e81606 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlComment.java
@@ -18,7 +18,7 @@ public final class ASTHtmlComment extends AbstractHtmlNode<Comment> {
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
index b429e463c6..16527686b8 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
@@ -5,18 +5,32 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
+import java.util.Map;
+
 import org.jsoup.nodes.Document;
 
+import net.sourceforge.pmd.lang.ast.AstInfo;
+import net.sourceforge.pmd.lang.ast.Parser;
 import net.sourceforge.pmd.lang.ast.RootNode;
 
 public class ASTHtmlDocument extends ASTHtmlElement implements RootNode {
 
-    ASTHtmlDocument(Document document) {
+    private final AstInfo<ASTHtmlDocument> astInfo;
+
+    ASTHtmlDocument(Document document,
+                    Parser.ParserTask task,
+                    Map<Integer, String> suppressMap) {
         super(document);
+        this.astInfo = new AstInfo<>(task, this, suppressMap);
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
+
+    @Override
+    public AstInfo<ASTHtmlDocument> getAstInfo() {
+        return astInfo;
+    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
index 0345fa1fc1..8279608c67 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocumentType.java
@@ -14,7 +14,7 @@ public final class ASTHtmlDocumentType extends AbstractHtmlNode<DocumentType> {
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
index 5ddca95cae..9efd840ff1 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlElement.java
@@ -11,7 +11,8 @@ import java.util.List;
 
 import org.jsoup.nodes.Element;
 
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.lang.rule.xpath.Attribute;
+
 
 public class ASTHtmlElement extends AbstractHtmlNode<Element> {
 
@@ -27,7 +28,7 @@ public class ASTHtmlElement extends AbstractHtmlNode<Element> {
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
index 1f7d7ef07d..524a8a931e 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlTextNode.java
@@ -14,7 +14,7 @@ public class ASTHtmlTextNode extends AbstractHtmlNode<TextNode> {
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
index 87a1ef17ea..da1f98d88d 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlXmlDeclaration.java
@@ -14,7 +14,7 @@ public final class ASTHtmlXmlDeclaration extends AbstractHtmlNode<XmlDeclaration
     }
 
     @Override
-    public Object acceptVisitor(HtmlVisitor visitor, Object data) {
+    protected <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
     }
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
index 6517233002..288c80c2cd 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
@@ -7,14 +7,14 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.jsoup.nodes.Node;
 
-import net.sourceforge.pmd.lang.ast.AbstractNode;
+import net.sourceforge.pmd.lang.ast.AstVisitor;
+import net.sourceforge.pmd.lang.ast.impl.AbstractNodeWithTextCoordinates;
 
-abstract class AbstractHtmlNode<T extends Node> extends AbstractNode implements HtmlNode {
+abstract class AbstractHtmlNode<T extends Node> extends AbstractNodeWithTextCoordinates<AbstractHtmlNode<?>, HtmlNode> implements HtmlNode {
 
     protected final T node;
 
     AbstractHtmlNode(T node) {
-        super(0);
         this.node = node;
     }
 
@@ -28,23 +28,24 @@ abstract class AbstractHtmlNode<T extends Node> extends AbstractNode implements
     }
 
     @Override
-    public Iterable<? extends HtmlNode> children() {
-        return (Iterable<? extends HtmlNode>) super.children();
+    @SuppressWarnings("unchecked")
+    public final <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
+        if (visitor instanceof HtmlVisitor) {
+            return this.acceptHtmlVisitor((HtmlVisitor<? super P, ? extends R>) visitor, data);
+        }
+        return visitor.cannotVisit(this, data);
     }
 
-    void setBeginLine(int beginLine) {
-        this.beginLine = beginLine;
+    protected abstract <P, R> R acceptHtmlVisitor(HtmlVisitor<? super P, ? extends R> visitor, P data);
+
+    // overridden to make them visible
+    @Override
+    protected void addChild(AbstractHtmlNode<?> child, int index) {
+        super.addChild(child, index);
     }
 
-    void setBeginColumn(int beginColumn) {
-        this.beginColumn = beginColumn;
-    }
-
-    void setEndLine(int endLine) {
-        this.endLine = endLine;
-    }
-
-    void setEndColumn(int endColumn) {
-        this.endColumn = endColumn;
+    @Override
+    protected void setCoords(int bline, int bcol, int eline, int ecol) {
+        super.setCoords(bline, bcol, eline, ecol);
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
index 820229c82b..4bf784a0f8 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlNode.java
@@ -5,12 +5,7 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.impl.GenericNode;
 
-public interface HtmlNode extends Node {
-
-    @Override
-    Iterable<? extends HtmlNode> children();
-
-    Object acceptVisitor(HtmlVisitor visitor, Object data);
+public interface HtmlNode extends GenericNode<HtmlNode> {
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
index c61cb4f5a4..a2ce2533b0 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
@@ -5,51 +5,18 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import java.io.IOException;
-import java.io.Reader;
 import java.util.HashMap;
-import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
 import org.jsoup.nodes.Document;
 import org.jsoup.parser.Parser;
 
-import net.sourceforge.pmd.lang.ParserOptions;
-import net.sourceforge.pmd.lang.TokenManager;
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.ParseException;
-
-public final class HtmlParser implements net.sourceforge.pmd.lang.Parser {
+public final class HtmlParser implements net.sourceforge.pmd.lang.ast.Parser {
 
     @Override
-    public boolean canParse() {
-        return true;
-    }
-
-    @Override
-    public Node parse(String fileName, Reader source) throws ParseException {
-        try {
-            String data = IOUtils.toString(source);
-            Document doc = Parser.xmlParser().parseInput(data, "");
-            HtmlTreeBuilder builder = new HtmlTreeBuilder();
-            return builder.build(doc, data);
-        } catch (IOException e) {
-            throw new ParseException(e);
-        }
-    }
-
-    @Override
-    public Map<Integer, String> getSuppressMap() {
-        return new HashMap<>(); // FIXME
-    }
-
-    @Override
-    public ParserOptions getParserOptions() {
-        return new ParserOptions();
-    }
-
-    @Override
-    public TokenManager getTokenManager(String fileName, Reader source) {
-        return null;
+    public ASTHtmlDocument parse(ParserTask task) {
+        String data = task.getSourceText();
+        Document doc = Parser.xmlParser().parseInput(data, "");
+        HtmlTreeBuilder builder = new HtmlTreeBuilder();
+        return builder.build(doc, data, task, new HashMap<>());
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
index a66c53d0ca..f99793cb55 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
@@ -2,27 +2,35 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-
 package net.sourceforge.pmd.lang.html.ast;
 
-import org.jsoup.nodes.Document;
-import org.jsoup.parser.Parser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.cpd.TokenEntry;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.Tokens;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
+import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
+import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
 
 public class HtmlTokenizer implements Tokenizer {
+    private static final Logger LOG = LoggerFactory.getLogger(HtmlTokenizer.class);
 
     @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-        String data = sourceCode.getCodeBuffer().toString();
+        ParserTask task = new ParserTask(
+                LanguageRegistry.getLanguage(HtmlLanguageModule.NAME).getDefaultVersion(),
+                sourceCode.getFileName(),
+                sourceCode.getCodeBuffer().toString(),
+                SemanticErrorReporter.reportToLogger(LOG)
+        );
+
+        HtmlParser parser = new HtmlParser();
+        ASTHtmlDocument root = parser.parse(task);
 
-        Document doc = Parser.xmlParser().parseInput(data, "");
-        HtmlTreeBuilder builder = new HtmlTreeBuilder();
-        ASTHtmlDocument root = builder.build(doc, data);
-        
         traverse(root, tokenEntries);
         tokenEntries.add(TokenEntry.EOF);
     }
@@ -42,5 +50,4 @@ public class HtmlTokenizer implements Tokenizer {
             traverse(child, tokenEntries);
         }
     }
-
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
index 4c57243bcf..44d0996fdc 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
@@ -5,6 +5,8 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
+import java.util.Map;
+
 import org.jsoup.nodes.CDataNode;
 import org.jsoup.nodes.Comment;
 import org.jsoup.nodes.Document;
@@ -14,10 +16,12 @@ import org.jsoup.nodes.Node;
 import org.jsoup.nodes.TextNode;
 import org.jsoup.nodes.XmlDeclaration;
 
+import net.sourceforge.pmd.lang.ast.Parser;
+
 final class HtmlTreeBuilder {
 
-    public ASTHtmlDocument build(Document doc, String htmlString) {
-        ASTHtmlDocument root = new ASTHtmlDocument(doc);
+    public ASTHtmlDocument build(Document doc, String htmlString, Parser.ParserTask task, Map<Integer, String> suppressMap) {
+        ASTHtmlDocument root = new ASTHtmlDocument(doc, task, suppressMap);
         addChildren(root, doc);
 
         LineNumbers lineNumbers = new LineNumbers(root, htmlString);
@@ -26,15 +30,15 @@ final class HtmlTreeBuilder {
         return root;
     }
     
-    private void addChildren(HtmlNode parent, Node node) {
+    private void addChildren(AbstractHtmlNode<?> parent, Node node) {
         for (Node child : node.childNodes()) {
-            HtmlNode converted = convertJsoupNode(child);
-            parent.jjtAddChild(converted, parent.getNumChildren());
+            AbstractHtmlNode<?> converted = convertJsoupNode(child);
+            parent.addChild(converted, parent.getNumChildren());
             addChildren(converted, child);
         }
     }
 
-    private HtmlNode convertJsoupNode(Node node) {
+    private AbstractHtmlNode<? extends Node> convertJsoupNode(Node node) {
         if (node instanceof Element) {
             return new ASTHtmlElement((Element) node);
         } else if (node instanceof CDataNode) {
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
index 143488ccfc..45f25dc69e 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitor.java
@@ -4,21 +4,42 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-public interface HtmlVisitor {
+import net.sourceforge.pmd.lang.ast.AstVisitor;
 
-    Object visit(HtmlNode node, Object data);
+public interface HtmlVisitor<P, R> extends AstVisitor<P, R> {
 
-    Object visit(ASTHtmlCDataNode node, Object data);
+    /**
+     * The default visit method, to which other methods delegate.
+     */
+    default R visitHtmlNode(HtmlNode node, P data) {
+        return visitNode(node, data);
+    }
 
-    Object visit(ASTHtmlComment node, Object data);
+    default R visit(ASTHtmlCDataNode node, P data) {
+        return visitHtmlNode(node, data);
+    }
 
-    Object visit(ASTHtmlDocument node, Object data);
+    default R visit(ASTHtmlComment node, P data) {
+        return visitHtmlNode(node, data);
+    }
 
-    Object visit(ASTHtmlDocumentType node, Object data);
+    default R visit(ASTHtmlDocument node, P data) {
+        return visitHtmlNode(node, data);
+    }
 
-    Object visit(ASTHtmlElement node, Object data);
+    default R visit(ASTHtmlDocumentType node, P data) {
+        return visitHtmlNode(node, data);
+    }
 
-    Object visit(ASTHtmlTextNode node, Object data);
+    default R visit(ASTHtmlElement node, P data) {
+        return visitHtmlNode(node, data);
+    }
 
-    Object visit(ASTHtmlXmlDeclaration node, Object data);
+    default R visit(ASTHtmlTextNode node, P data) {
+        return visitHtmlNode(node, data);
+    }
+
+    default R visit(ASTHtmlXmlDeclaration node, P data) {
+        return visitHtmlNode(node, data);
+    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
deleted file mode 100644
index 8907439e48..0000000000
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlVisitorAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.html.ast;
-
-public class HtmlVisitorAdapter implements HtmlVisitor {
-
-    @Override
-    public Object visit(HtmlNode node, Object data) {
-        for (HtmlNode child : node.children()) {
-            child.acceptVisitor(this, data);
-        }
-        return null;
-    }
-
-    @Override
-    public Object visit(ASTHtmlCDataNode node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlComment node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlDocument node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlDocumentType node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlElement node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlTextNode node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlXmlDeclaration node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-}
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
index 11d3517353..6ee33e7c8e 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
@@ -82,8 +82,7 @@ class LineNumbers {
         if (n != null) {
             int line = sourceCodePositioner.lineNumberFromOffset(index);
             int column = sourceCodePositioner.columnFromOffset(line, index);
-            n.setBeginLine(line);
-            n.setBeginColumn(column);
+            n.setCoords(line, column, line, column);
         }
     }
 
@@ -91,8 +90,7 @@ class LineNumbers {
         if (n != null) {
             int line = sourceCodePositioner.lineNumberFromOffset(index);
             int column = sourceCodePositioner.columnFromOffset(line, index);
-            n.setEndLine(line);
-            n.setEndColumn(column);
+            n.setCoords(n.getBeginLine(), n.getBeginColumn(), line, column);
         }
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
index c65e21d7e8..246b3dc0eb 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/AbstractHtmlRule.java
@@ -4,20 +4,10 @@
 
 package net.sourceforge.pmd.lang.html.rule;
 
-import java.util.List;
-
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlCDataNode;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlComment;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocument;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocumentType;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlTextNode;
-import net.sourceforge.pmd.lang.html.ast.ASTHtmlXmlDeclaration;
-import net.sourceforge.pmd.lang.html.ast.HtmlNode;
 import net.sourceforge.pmd.lang.html.ast.HtmlVisitor;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 
@@ -28,63 +18,13 @@ public abstract class AbstractHtmlRule extends AbstractRule implements HtmlVisit
     }
 
     @Override
-    public void apply(List<? extends Node> nodes, RuleContext ctx) {
-        for (Node node : nodes) {
-            if (node instanceof HtmlNode) {
-                ((HtmlNode) node).acceptVisitor(this, ctx);
-            }
-        }
-    }
-
-    //
-    // The following APIs are identical to those in HtmlVisitorAdapter.
-    // Due to Java single inheritance, it is preferred to extend from the more
-    // complex Rule base class instead of from relatively simple Visitor.
-    //
-    // CPD-OFF
-
-    @Override
-    public Object visit(HtmlNode node, Object data) {
-        for (HtmlNode child : node.children()) {
-            child.acceptVisitor(this, data);
-        }
-        return null;
+    public Object visitNode(Node node, Object param) {
+        node.children().forEach(c -> c.acceptVisitor(this, param));
+        return param;
     }
 
     @Override
-    public Object visit(ASTHtmlCDataNode node, Object data) {
-        return visit((HtmlNode) node, data);
+    public void apply(Node target, RuleContext ctx) {
+        target.acceptVisitor(this, ctx);
     }
-
-    @Override
-    public Object visit(ASTHtmlComment node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlDocument node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlDocumentType node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlElement node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlTextNode node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    @Override
-    public Object visit(ASTHtmlXmlDeclaration node, Object data) {
-        return visit((HtmlNode) node, data);
-    }
-
-    // CPD-ON
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
index cd3895d595..3cab721591 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesRule.java
@@ -4,14 +4,20 @@
 
 package net.sourceforge.pmd.lang.html.rule.bestpractices;
 
+import java.util.Arrays;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
 import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
+import net.sourceforge.pmd.lang.rule.RuleTargetSelector;
 
 public class UseAltAttributeForImagesRule extends AbstractHtmlRule {
 
-    public UseAltAttributeForImagesRule() {
-        addRuleChainVisit("img");
+    @Override
+    protected @NonNull RuleTargetSelector buildTargetSelector() {
+        return RuleTargetSelector.forXPathNames(Arrays.asList("img"));
     }
 
     @Override
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
index 307a7aef74..6f0acc19b9 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
@@ -4,22 +4,24 @@
 
 package net.sourceforge.pmd.lang.html;
 
-import java.io.StringReader;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.lang.ast.Parser;
+import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
+import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
 import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
+import net.sourceforge.pmd.lang.rule.xpath.Attribute;
 
 public class HtmlJavaRuleTest {
     // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
@@ -54,21 +56,21 @@ public class HtmlJavaRuleTest {
                 return super.visit(node, data);
             }
         };
-        Report report = runRule(LIGHTNING_WEB_COMPONENT, rule);
-        Assert.assertEquals(2, report.getViolations().size());
-        Assert.assertEquals(4, report.getViolations().get(0).getBeginLine());
-        Assert.assertEquals(6, report.getViolations().get(1).getBeginLine());
+        List<RuleViolation> violations = runRule(LIGHTNING_WEB_COMPONENT, rule);
+        Assert.assertEquals(2, violations.size());
+        Assert.assertEquals(4, violations.get(0).getBeginLine());
+        Assert.assertEquals(6, violations.get(1).getBeginLine());
     }
 
-    private Report runRule(String html, Rule rule) {
+    private List<RuleViolation> runRule(String html, Rule rule) {
         LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
-        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser(htmlLanguage.getLanguageVersionHandler().getDefaultParserOptions());
+        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser();
+        ParserTask parserTask = new ParserTask(htmlLanguage, "n/a", html, SemanticErrorReporter.noop());
+        Node node = parser.parse(parserTask);
 
-        Node node = parser.parse("n/a", new StringReader(html));
-        RuleContext context = new RuleContext();
-        context.setLanguageVersion(htmlLanguage);
-        context.setCurrentRule(rule);
-        rule.apply(Arrays.asList(node), context);
-        return context.getReport();
+        List<RuleViolation> violations = new ArrayList<>();
+        RuleContext context = RuleContext.create(violations::add, rule);
+        rule.apply(node, context);
+        return violations;
     }
 }
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
index 6c2c53e2f9..f6dca7ab97 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
@@ -4,18 +4,20 @@
 
 package net.sourceforge.pmd.lang.html;
 
-import java.io.StringReader;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.Parser;
+import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
+import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
@@ -38,9 +40,9 @@ public class HtmlXPathRuleTest {
         // "Don’t add spaces around the property, for example, { data } is not valid HTML."
         String xpath = "//*[local-name() = '#text'][contains(@Text, '{ ')]";
 
-        Report report = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
-        Assert.assertEquals(1, report.getViolations().size());
-        Assert.assertEquals(3, report.getViolations().get(0).getBeginLine());
+        List<RuleViolation> violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
+        Assert.assertEquals(1, violations.size());
+        Assert.assertEquals(3, violations.get(0).getBeginLine());
     }
 
     @Test
@@ -49,22 +51,23 @@ public class HtmlXPathRuleTest {
         // "Don’t add spaces around the property, for example, { data } is not valid HTML."
         String xpath = "//*[@value = '{']";
 
-        Report report = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
-        Assert.assertEquals(1, report.getViolations().size());
-        Assert.assertEquals(4, report.getViolations().get(0).getBeginLine());
+        List<RuleViolation> violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath);
+        Assert.assertEquals(1, violations.size());
+        Assert.assertEquals(4, violations.get(0).getBeginLine());
     }
 
-    private Report runXPath(String html, String xpath) {
+    private List<RuleViolation> runXPath(String html, String xpath) {
         LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
-        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser(htmlLanguage.getLanguageVersionHandler().getDefaultParserOptions());
+        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser();
+        ParserTask parserTask = new ParserTask(htmlLanguage, "n/a", html, SemanticErrorReporter.noop());
+        Node node = parser.parse(parserTask);
 
-        XPathRule rule = new XPathRule(XPathVersion.XPATH_2_0, xpath);
+        List<RuleViolation> violations = new ArrayList<>();
+        XPathRule rule = new XPathRule(XPathVersion.DEFAULT, xpath);
         rule.setMessage("test");
-        Node node = parser.parse("n/a", new StringReader(html));
-        RuleContext context = new RuleContext();
-        context.setLanguageVersion(htmlLanguage);
-        context.setCurrentRule(rule);
-        rule.apply(Arrays.asList(node), context);
-        return context.getReport();
+        rule.setLanguage(htmlLanguage.getLanguage());
+        RuleContext context = RuleContext.create(violations::add, rule);
+        rule.apply(node, context);
+        return violations;
     }
 }
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
index 37812e7f1c..ded77d2816 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java
@@ -9,7 +9,7 @@ import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
 
 public final class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> {
 
-    public static final HtmlParsingHelper DEFAULT = new HtmlParsingHelper(Params.getDefaultProcess());
+    public static final HtmlParsingHelper DEFAULT = new HtmlParsingHelper(Params.getDefault());
 
     private HtmlParsingHelper(Params params) {
         super(HtmlLanguageModule.NAME, ASTHtmlDocument.class, params);
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
index 37b7d21322..342bbc957f 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
@@ -13,7 +13,7 @@ import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.test.BaseNodeAttributePrinter;
 import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
 import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
+import net.sourceforge.pmd.lang.rule.xpath.Attribute;
 import net.sourceforge.pmd.util.CollectionUtil;
 
 public class PositionTest extends BaseTreeDumpTest {
@@ -32,7 +32,7 @@ public class PositionTest extends BaseTreeDumpTest {
     }
 
     private static class PositionRenderer extends BaseNodeAttributePrinter {
-        private final Set<String> pos = CollectionUtil.asSet(new String[] {"BeginLine", "BeginColumn", "EndLine", "EndColumn"});
+        private final Set<String> pos = CollectionUtil.setOf("BeginLine", "BeginColumn", "EndLine", "EndColumn");
 
         @Override
         protected boolean ignoreAttribute(Node node, Attribute attribute) {
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
index 058a83898d..6d8af325b6 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
@@ -1,22 +1,15 @@
 +- #document[@NodeName = "#document"]
    +- #doctype[@Name = "html", @NodeName = "#doctype", @PublicId = "", @SystemId = ""]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- html[@NodeName = "html"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- head[@NodeName = "head"]
    |  |  +- #text[@Image = "hello", @NodeName = "#text", @NormalizedText = "hello", @Text = "hello"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- body[@NodeName = "body"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
    |  |  +- h1[@NodeName = "h1"]
    |  |  |  +- #text[@Image = "world", @NodeName = "#text", @NormalizedText = "world", @Text = "world"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
index 6e90423dff..8bc595502f 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile2.txt
@@ -1,15 +1,15 @@
-+- #document[@BeginColumn = 1, @BeginLine = 1, @EndColumn = 8, @EndLine = 7]
-   +- #doctype[@BeginColumn = 1, @BeginLine = 1, @EndColumn = 15, @EndLine = 1]
-   +- #text[@BeginColumn = 16, @BeginLine = 1, @EndColumn = 16, @EndLine = 1]
-   +- html[@BeginColumn = 1, @BeginLine = 2, @EndColumn = 7, @EndLine = 7]
-   |  +- #text[@BeginColumn = 7, @BeginLine = 2, @EndColumn = 4, @EndLine = 3]
-   |  +- head[@BeginColumn = 5, @BeginLine = 3, @EndColumn = 22, @EndLine = 3]
-   |  |  +- #text[@BeginColumn = 11, @BeginLine = 3, @EndColumn = 15, @EndLine = 3]
-   |  +- #text[@BeginColumn = 23, @BeginLine = 3, @EndColumn = 4, @EndLine = 4]
-   |  +- body[@BeginColumn = 5, @BeginLine = 4, @EndColumn = 11, @EndLine = 6]
-   |  |  +- #text[@BeginColumn = 11, @BeginLine = 4, @EndColumn = 8, @EndLine = 5]
-   |  |  +- h1[@BeginColumn = 9, @BeginLine = 5, @EndColumn = 22, @EndLine = 5]
-   |  |  |  +- #text[@BeginColumn = 13, @BeginLine = 5, @EndColumn = 17, @EndLine = 5]
-   |  |  +- #text[@BeginColumn = 23, @BeginLine = 5, @EndColumn = 4, @EndLine = 6]
-   |  +- #text[@BeginColumn = 12, @BeginLine = 6, @EndColumn = 12, @EndLine = 6]
-   +- #text[@BeginColumn = 8, @BeginLine = 7, @EndColumn = 8, @EndLine = 7]
++- #document[@BeginColumn = "1", @BeginLine = "1", @EndColumn = "8", @EndLine = "7"]
+   +- #doctype[@BeginColumn = "1", @BeginLine = "1", @EndColumn = "15", @EndLine = "1"]
+   +- #text[@BeginColumn = "16", @BeginLine = "1", @EndColumn = "16", @EndLine = "1"]
+   +- html[@BeginColumn = "1", @BeginLine = "2", @EndColumn = "7", @EndLine = "7"]
+   |  +- #text[@BeginColumn = "7", @BeginLine = "2", @EndColumn = "4", @EndLine = "3"]
+   |  +- head[@BeginColumn = "5", @BeginLine = "3", @EndColumn = "22", @EndLine = "3"]
+   |  |  +- #text[@BeginColumn = "11", @BeginLine = "3", @EndColumn = "15", @EndLine = "3"]
+   |  +- #text[@BeginColumn = "23", @BeginLine = "3", @EndColumn = "4", @EndLine = "4"]
+   |  +- body[@BeginColumn = "5", @BeginLine = "4", @EndColumn = "11", @EndLine = "6"]
+   |  |  +- #text[@BeginColumn = "11", @BeginLine = "4", @EndColumn = "8", @EndLine = "5"]
+   |  |  +- h1[@BeginColumn = "9", @BeginLine = "5", @EndColumn = "22", @EndLine = "5"]
+   |  |  |  +- #text[@BeginColumn = "13", @BeginLine = "5", @EndColumn = "17", @EndLine = "5"]
+   |  |  +- #text[@BeginColumn = "23", @BeginLine = "5", @EndColumn = "4", @EndLine = "6"]
+   |  +- #text[@BeginColumn = "12", @BeginLine = "6", @EndColumn = "12", @EndLine = "6"]
+   +- #text[@BeginColumn = "8", @BeginLine = "7", @EndColumn = "8", @EndLine = "7"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
index a5c715bfb0..9c25c1a1fc 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
@@ -1,13 +1,9 @@
 +- #document[@NodeName = "#document"]
    +- #declaration[@Name = "xml", @NodeName = "#declaration"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- root[@NodeName = "root"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-  "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n  "]
    |  +- child[@NodeName = "child", @attr1 = "value1"]
    |  |  +- #text[@Image = "text & entities", @NodeName = "#text", @NormalizedText = "text & entities", @Text = "text & entities"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
index c9e048e3be..6b4d6a4f40 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
@@ -1,130 +1,83 @@
 +- #document[@NodeName = "#document"]
    +- #comment[@Data = " from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html ", @NodeName = "#comment"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- template[@NodeName = "template"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- section[@NodeName = "section", @class = "content container page-background"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
    |  |  +- ui-navbar[@NodeName = "ui-navbar", @nav-items = "{navigationItems}", @oncategorychange = "{handleCategoryChange}", @selected-item = "{currentNavigationItem}"]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-
-        "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n\n        "]
    |  |  +- article[@NodeName = "article", @class = "container"]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-            "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n            "]
    |  |  |  +- div[@NodeName = "div"]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.hello.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello[@NodeName = "recipe-hello"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-binding[@NodeName = "recipe-hello-binding"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-expressions[@NodeName = "recipe-hello-expressions"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-expressions-track[@NodeName = "recipe-hello-expressions-track"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-conditional-rendering[@NodeName = "recipe-hello-conditional-rendering"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-for-each[@NodeName = "recipe-hello-for-each"]
    |  |  |  |  |  +- recipe-hello-iterator[@NodeName = "recipe-hello-iterator"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.composition.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-basics[@NodeName = "recipe-composition-basics"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-iteration[@NodeName = "recipe-composition-iteration"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-contact-search[@NodeName = "recipe-composition-contact-search"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-dynamic[@NodeName = "recipe-composition-dynamic"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.child.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-simple[@NodeName = "recipe-event-simple"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-with-data[@NodeName = "recipe-event-with-data"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-bubbling[@NodeName = "recipe-event-bubbling"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.parent.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-property[@NodeName = "recipe-api-property"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-function[@NodeName = "recipe-api-function"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-setter-getter[@NodeName = "recipe-api-setter-getter"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.misc.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-shared-java-script[@NodeName = "recipe-misc-shared-java-script"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-rest-api-call[@NodeName = "recipe-misc-rest-api-call"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-dom-query[@NodeName = "recipe-misc-dom-query"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-multiple-templates[@NodeName = "recipe-misc-multiple-templates"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.party.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-libs-d3[@NodeName = "recipe-libs-d3"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-libs-chartjs[@NodeName = "recipe-libs-chartjs"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- ui-navfooter[@NodeName = "ui-navfooter", @label-next = "{nextNavigationItem}", @label-previous = "{previousNavigationItem}", @onnextclicked = "{handleNavigateNext}", @onpreviousclicked = "{handleNavigatePrevious}"]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-            "]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n            "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]

From 2a0ce95a992d25ed96a592dbfaaad4febe11c0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 22 Apr 2022 20:41:25 +0200
Subject: [PATCH 107/180] Change a Chars method

---
 .../sourceforge/pmd/lang/document/Chars.java  | 17 +++++-----
 .../net/sourceforge/pmd/RuleContextTest.java  |  6 +++-
 .../net/sourceforge/pmd/ant/PMDTaskTest.java  |  6 ----
 .../sourceforge/pmd/lang/ast/DummyNode.java   | 30 +++++++++++------
 .../pmd/lang/document/CharsTest.java          | 32 ++++++++++++++++++-
 .../pmd/ant/xml/expected-pmd-ant-xml.xml      |  2 +-
 6 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index d55562b822..664a58330c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -346,21 +346,20 @@ public final class Chars implements CharSequence {
     }
 
     /**
-     * Returns the substring starting at the given offset and with the
-     * given length. This differs from {@link String#substring(int, int)}
-     * in that it uses offset + length instead of start + end.
+     * Returns the substring between the given offsets.
+     * given length.
      *
-     * @param off Start offset ({@code 0 <= off < this.length()})
-     * @param len Length of the substring ({@code 0 <= len <= this.length() - off})
+     * @param start Start offset ({@code 0 <= start < this.length()})
+     * @param end   End offset ({@code start <= end <= this.length()})
      *
      * @return A substring
      *
      * @throws IndexOutOfBoundsException If the parameters are not a valid range
+     * @see String#substring(int, int)
      */
-    public String substring(int off, int len) {
-        validateRange(off, len, this.len);
-        int start = idx(off);
-        return str.substring(start, start + len);
+    public String substring(int start, int end) {
+        validateRange(start, end - start, this.len);
+        return str.substring(idx(start), idx(end));
     }
 
     private static void validateRangeWithAssert(int off, int len, int bound) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java
index 835d227dbb..a24170661a 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleContextTest.java
@@ -9,6 +9,7 @@ import java.util.function.BiConsumer;
 import org.junit.Assert;
 import org.junit.Test;
 
+import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.ast.impl.DummyTreeUtil;
@@ -49,7 +50,10 @@ public class RuleContextTest {
     }
 
     private RuleViolation makeViolation(String unescapedMessage, Object... args) throws Exception {
-        Report report = getReport(new FooRule(), (r, ctx) -> ctx.addViolationWithMessage(DummyTreeUtil.tree(DummyTreeUtil::root), unescapedMessage, args));
+        Report report = getReport(new FooRule(), (r, ctx) -> {
+            DummyRootNode node = DummyTreeUtil.tree(DummyTreeUtil::root);
+            ctx.addViolationWithMessage(node, unescapedMessage, args);
+        });
         return report.getViolations().get(0);
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index 6e2ae33f8f..ba7970fca1 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -110,12 +110,6 @@ public class PMDTaskTest {
             expected = expected.replaceFirst("timestamp=\"[^\"]+\"", "timestamp=\"\"");
             expected = expected.replaceFirst("\\.xsd\" version=\"[^\"]+\"", ".xsd\" version=\"\"");
 
-            // under windows, the file source sample.dummy has different line endings
-            // and therefore the endcolumn of the nodes also change
-            if (System.lineSeparator().equals("\r\n")) {
-                expected = expected.replaceFirst("endcolumn=\"109\"", "endcolumn=\"110\"");
-            }
-
             Assert.assertEquals(expected, actual);
         }
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index 92d3aa8740..ed94e8ccc2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -5,7 +5,6 @@
 package net.sourceforge.pmd.lang.ast;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -154,28 +153,39 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements Gen
 
     public static class DummyRootNode extends DummyNode implements RootNode {
 
-        private Map<Integer, String> suppressMap = Collections.emptyMap();
-        private TextDocument sourceText = TextDocument.readOnlyString(
-            "dummy text",
-            TextFile.UNKNOWN_FILENAME,
-            DummyLanguageModule.getInstance().getDefaultVersion()
-        );
-
         private AstInfo<DummyRootNode> astInfo;
 
+        public DummyRootNode() {
+            TextDocument document = TextDocument.readOnlyString(
+                "dummy text",
+                TextFile.UNKNOWN_FILENAME,
+                DummyLanguageModule.getInstance().getDefaultVersion()
+            );
+            astInfo = new AstInfo<>(
+                new ParserTask(
+                    document,
+                    SemanticErrorReporter.noop()
+                ),
+                this);
+        }
+
         public DummyRootNode withTaskInfo(ParserTask task) {
             this.astInfo = new AstInfo<>(task, this);
             return this;
         }
 
         public DummyRootNode withNoPmdComments(Map<Integer, String> suppressMap) {
-            this.suppressMap = suppressMap;
+            this.astInfo = new AstInfo<>(
+                astInfo.getTextDocument(),
+                this,
+                suppressMap
+            );
             return this;
         }
 
         @Override
         public AstInfo<DummyRootNode> getAstInfo() {
-            return Objects.requireNonNull(astInfo, "no ast info, don't use DummyRootNode's ctor directly");
+            return Objects.requireNonNull(astInfo, "no ast info");
         }
 
         @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index 762bf68b2a..e872f0e288 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -77,7 +77,7 @@ public class CharsTest {
         Chars bc = Chars.wrap("abcd").slice(1, 2);
 
         bc.getChars(0, arr, 1, 2);
-        assertArrayEquals(arr, new char[] {0, 'b', 'c', 0});
+        assertArrayEquals(arr, new char[] { 0, 'b', 'c', 0 });
 
         assertThrows(IndexOutOfBoundsException.class, () -> bc.getChars(2, arr, 0, 1));
         assertThrows(IndexOutOfBoundsException.class, () -> bc.getChars(-1, arr, 0, 1));
@@ -232,4 +232,34 @@ public class CharsTest {
         assertTrue(chars.contentEquals(Chars.wrap("A_B_C"), true));
     }
 
+    @Test
+    public void testSlice() {
+        // slice is offset + length
+        Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5);
+        //                          -----
+        assertEquals(Chars.wrap("_b_"), chars.slice(1, 3));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.slice(0, -1));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.slice(0, 6));
+    }
+
+    @Test
+    public void testSubsequence() {
+        // subsequence is start + end
+        Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5);
+        //                          -----
+        assertEquals(Chars.wrap("_b"), chars.subSequence(1, 3));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.slice(0, -1));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.slice(0, 6));
+    }
+
+    @Test
+    public void testSubstring() {
+        // substring is start + end
+        Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5);
+        //                          -----
+        assertEquals("_b", chars.substring(1, 3));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.substring(0, -1));
+        assertThrows(IndexOutOfBoundsException.class, () -> chars.substring(0, 6));
+    }
+
 }
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
index 0bfe352391..081d871709 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pmd xmlns="http://pmd.sourceforge.net/report/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/report/2.0.0 http://pmd.sourceforge.net/report_2_0_0.xsd" version="6.45.0-SNAPSHOT" timestamp="2022-03-31T17:55:43.046">
 <file name="sample.dummy">
-<violation beginline="1" endline="1" begincolumn="1" endcolumn="109" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
+<violation beginline="1" endline="2" begincolumn="1" endcolumn="1" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
 Test Rule 2
 </violation>
 </file>

From 1a2682d5f84a820d9551276c47748fd356b4f1e7 Mon Sep 17 00:00:00 2001
From: wsf <1912125562@qq.com>
Date: Sat, 23 Apr 2022 17:31:16 +0800
Subject: [PATCH 108/180] fix ExecuteImmediateBulkCollect bug and add some test
 cases

---
 pmd-plsql/etc/grammar/PldocAST.jjt            |  1 +
 .../ast/ExecuteImmediateBulkCollectTest.java  | 30 +++++++++++++++++++
 .../ast/ExecuteImmediateBulkCollect1.pls      | 15 ++++++++++
 .../ast/ExecuteImmediateBulkCollect2.pls      | 26 ++++++++++++++++
 .../ast/ExecuteImmediateBulkCollect3.pls      | 21 +++++++++++++
 5 files changed, 93 insertions(+)
 create mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 0641868f00..1ec8e28725 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2818,6 +2818,7 @@ ASTEmbeddedSqlStatement EmbeddedSqlStatement()  :
 {}
 {
    <EXECUTE> <IMMEDIATE> StringExpression()
+    [ LOOKAHEAD(<BULK>) BulkCollectIntoClause() ] //#3687 Invoke this method to parse BULK COLLECT
 	[ <INTO> Name() ("," Name())* ]
 	[ UsingClause() ]
 	[ ( <RETURN> | <RETURNING> )  <INTO> Expression() ("," Expression())*] ";"
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
new file mode 100644
index 0000000000..8def0bb7af
--- /dev/null
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
@@ -0,0 +1,30 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql.ast;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
+
+public class ExecuteImmediateBulkCollectTest extends AbstractPLSQLParserTst {
+    @Test
+    public void testExecuteImmediateBulkCollect1() {
+        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect1.pls");
+        Assert.assertNotNull(input);
+    }
+
+    @Test
+    public void testExecuteImmediateBulkCollect2() {
+        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect2.pls");
+        Assert.assertNotNull(input);
+    }
+
+    @Test
+    public void testExecuteImmediateBulkCollect3() {
+        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect3.pls");
+        Assert.assertNotNull(input);
+    }
+}
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
new file mode 100644
index 0000000000..f4951287e3
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
@@ -0,0 +1,15 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;
+   --
+   l_data t_data;
+   l_sql  VARCHAR2(500);
+   --
+BEGIN
+   --
+   l_sql := 'SELECT * FROM DUAL';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data;
+   --
+END EXAMPLE_PROCEDURE;
\ No newline at end of file
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
new file mode 100644
index 0000000000..bde3fe091e
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
@@ -0,0 +1,26 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
+   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
+   --
+   l_data_key t_data_key;
+   l_data_description t_data_description;
+   l_sql  VARCHAR2(500);
+   p_rownum1 NUMBER(20);
+   p_rownum2 NUMBER(20);
+   --
+BEGIN
+   --
+   p_rownum1 := 10;
+   p_rownum2 := 30;
+   --
+   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
+             ' FROM DUAL '||' WHERE ROWNUM <= :p_rownum1 ' ||
+            'UNION ALL '||
+            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
+             ' FROM DUAL'||' WHERE ROWNUM <= :p_rownum2 ';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;
+   --
+END EXAMPLE_PROCEDURE;
\ No newline at end of file
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls
new file mode 100644
index 0000000000..74270792e3
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls
@@ -0,0 +1,21 @@
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
+   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
+   --
+   l_data_key t_data_key;
+   l_data_description t_data_description;
+   l_sql  VARCHAR2(500);
+   --
+BEGIN
+   --
+   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
+             ' FROM DUAL '||
+            'UNION ALL '||
+            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
+             ' FROM DUAL';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data_key, l_data_description;
+   --
+END EXAMPLE_PROCEDURE;
\ No newline at end of file

From 246436ac7fbc2935807a6778c2a29513119d45ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 23 Apr 2022 15:56:38 +0200
Subject: [PATCH 109/180] Fix tests on windows

Bug in toLocation(Range2d)
Use RulePriority.LOW as default in PMDTask, so as not to create IndexOutOfBoundsException every time
---
 pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java   | 3 ++-
 .../java/net/sourceforge/pmd/lang/document/TextDocument.java  | 2 +-
 .../src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java    | 4 +++-
 .../net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml      | 3 +++
 pmd-core/src/test/resources/rulesets/dummy/basic.xml          | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java b/pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
index ba9367ad15..192a714f6e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
@@ -15,6 +15,7 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
+import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.ant.internal.PMDTaskImpl;
 
 public class PMDTask extends Task {
@@ -31,7 +32,7 @@ public class PMDTask extends Task {
     private boolean noRuleSetCompatibility;
     private String encoding;
     private int threads = 1; // same default as in PMDParameters (CLI)
-    private int minimumPriority;
+    private int minimumPriority = RulePriority.LOW.getPriority(); // inclusive
     private int maxRuleViolations = 0;
     private String failuresPropertyName;
     private SourceLanguage sourceLanguage;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index f26e4abfc8..6c6f95b48c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -157,7 +157,7 @@ public interface TextDocument extends Closeable {
      * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
      */
     default FileLocation toLocation(TextRange2d range) {
-        int startOffset = offsetAtLineColumn(range.getEndPos());
+        int startOffset = offsetAtLineColumn(range.getStartPos());
         if (startOffset < 0) {
             throw new IndexOutOfBoundsException("Region out of bounds: " + range.displayString());
         }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index ba7970fca1..0e4666817c 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.ant;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.fail;
 
 import java.io.FileInputStream;
@@ -92,7 +94,7 @@ public class PMDTaskTest {
             String actual = IOUtils.toString(in, StandardCharsets.UTF_8);
             // remove any trailing newline
             actual = actual.trim();
-            Assert.assertEquals("sample.dummy:1:\tSampleXPathRule:\tTest Rule 2", actual);
+            assertThat(actual, containsString("sample.dummy:1:\tSampleXPathRule:\tTest Rule 2"));
         }
     }
 
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
index 081d871709..705fc08dfa 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
@@ -4,5 +4,8 @@
 <violation beginline="1" endline="2" begincolumn="1" endcolumn="1" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
 Test Rule 2
 </violation>
+<violation beginline="1" endline="2" begincolumn="1" endcolumn="1" rule="DeprecatedRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#deprecatedrule" priority="3">
+Test Rule 3
+</violation>
 </file>
 </pmd>
diff --git a/pmd-core/src/test/resources/rulesets/dummy/basic.xml b/pmd-core/src/test/resources/rulesets/dummy/basic.xml
index e4874941cc..bc9c94cc4a 100644
--- a/pmd-core/src/test/resources/rulesets/dummy/basic.xml
+++ b/pmd-core/src/test/resources/rulesets/dummy/basic.xml
@@ -47,7 +47,7 @@ Just for test
             <property name="version" value="2.0"/>
             <property name="xpath">
                 <value><![CDATA[
-//DummyRootNode
+//dummyRootNode
                 ]]></value>
             </property>
         </properties>

From f567b8caee40580db0005e1669fd4ee090d1e9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 00:01:51 +0200
Subject: [PATCH 110/180] plsql: Update reference files

The SourceCode attribute has disappeared
---
 .../net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt    | 2 +-
 .../net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt    | 2 +-
 .../net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
index cabf4a0f6a..bdb2c702fa 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
index adc310a7b1..48fe75d278 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
index c7e6d1afb5..5dff6521ae 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS\n    --\n    CURSOR c_test IS\n        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent\n        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)\n            INNER JOIN\n            (STUDENT_SCORE ss) on si.sid = sp.sid)\n            INNER JOIN\n            (STUDENT_PARENT sp) on si.sid = sp.sid)\n        WHERE si.sid = \'114514\';\n    --\nBEGIN\n    --\n    --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = "1"]

From 1da096b126fc4cc1a29e282bf84ce70aafa71d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 11:50:33 +0200
Subject: [PATCH 111/180] Merge, wip

---
 .../net/sourceforge/pmd/lang/ast/Node.java    |  6 +--
 .../pmd/lang/document/BaseMappedDocument.java | 20 +++++++
 .../lang/document/FragmentedTextDocument.java | 53 ++++++++++++++-----
 .../pmd/lang/document/TextDocument.java       | 48 ++++++++++++++---
 .../pmd/lang/document/TextPos2d.java          |  5 ++
 .../pmd/lang/document/TextRegion.java         | 15 ++----
 .../java/net/sourceforge/pmd/ReportTest.java  |  5 +-
 .../pmd/RuleViolationComparatorTest.java      |  2 +-
 .../pmd/renderers/AbstractRendererTest.java   |  2 +-
 .../pmd/renderers/XMLRendererTest.java        |  3 +-
 .../pmd/renderers/XSLTRendererTest.java       |  2 +-
 11 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 7d71a83c62..58860b614e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -130,12 +130,8 @@ public interface Node extends Reportable {
      *     to create a region.
      */
     default TextRegion getTextRegion() {
-        @SuppressWarnings("PMD.CloseResource")
-        TextDocument document = getAstInfo().getTextDocument();
         FileLocation loc = getReportLocation();
-        int startOffset = document.offsetAtLineColumn(loc.getStartPos());
-        int endOffset = document.offsetAtLineColumn(loc.getStartPos());
-        return TextRegion.fromBothOffsets(startOffset, endOffset);
+        return getAstInfo().getTextDocument().toRegion(loc.toRange2d());
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
index b25d6aaf33..cbea8633d8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
@@ -59,6 +59,21 @@ abstract class BaseMappedDocument implements TextDocument {
         return base.createLineRange(startLineInclusive, endLineInclusive);
     }
 
+    @Override
+    public int offsetAtLineColumn(int line, int column) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isInRange(TextPos2d textPos2d) {
+        return false;
+    }
+
     @Override
     public int inputOffset(int outOffset, boolean inclusive) {
         if (outOffset < 0 || outOffset > getLength()) {
@@ -67,8 +82,13 @@ abstract class BaseMappedDocument implements TextDocument {
         return base.inputOffset(localOffsetTransform(outOffset, inclusive), inclusive);
     }
 
+    /**
+     * Output offset to input offset.
+     */
     protected abstract int localOffsetTransform(int outOffset, boolean inclusive);
 
+    protected abstract int inverseLocalOffsetTransform(int inOffset, boolean inclusive);
+
 
     @Override
     public void close() throws IOException {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
index 735c7aa2a3..99be79f6df 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.document;
 
+import java.util.function.ToIntFunction;
+
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.LanguageVersion;
@@ -48,44 +50,71 @@ final class FragmentedTextDocument extends BaseMappedDocument implements TextDoc
 
     @Override
     protected int localOffsetTransform(int outOffset, boolean inclusive) {
-        return inputOffsetAt(outOffset, inclusive);
+        return offsetTransform(outOffset, inclusive,
+                               Fragment::outToIn,
+                               Fragment::outEnd,
+                               Fragment::outStart
+        );
     }
 
-    private int inputOffsetAt(int outputOffset, boolean inclusive) {
+    @Override
+    protected int inverseLocalOffsetTransform(int inOffset, boolean inclusive) {
+        return offsetTransform(inOffset, inclusive,
+                               Fragment::inToOut,
+                               Fragment::inEnd,
+                               Fragment::inStart
+        );
+    }
+
+    interface OffsetMapper {
+
+        int mapOffset(Fragment fragment, int offset);
+    }
+
+    private int offsetTransform(int offset,
+                                boolean inclusive,
+                                OffsetMapper mapOffsetWhenContains,
+                                ToIntFunction<Fragment> end,
+                                ToIntFunction<Fragment> start) {
         // caching the last accessed fragment instead of doing
         // a linear search is critical for performance.
         Fragment f = this.lastAccessedFragment;
         if (f == null) {
-            return outputOffset;
+            return offset;
         }
 
-        if (!f.contains(outputOffset)) {
+        // Whether the fragment contains the offset we're looking for.
+        // Will be true most of the time.
+        boolean containsOffset =
+            start.applyAsInt(f) >= offset && offset < end.applyAsInt(f);
+
+        if (!containsOffset) {
             // Slow path, we must search for the fragment
             // This optimisation is important, otherwise we have
             // to search for very long times in some files
 
-            if (f.outEnd() < outputOffset) { // search forward
-                while (f.next != null && f.outEnd() < outputOffset) {
+            if (end.applyAsInt(f) < offset) { // search forward
+                while (f.next != null && end.applyAsInt(f) < offset) {
                     f = f.next;
                 }
             } else { // search backwards
-                while (f.prev != null && outputOffset <= f.outStart()) {
+                while (f.prev != null && offset <= start.applyAsInt(f)) {
                     f = f.prev;
                 }
             }
             lastAccessedFragment = f;
         }
 
-        if (!inclusive && f.outEnd() == outputOffset) {
+        if (!inclusive && end.applyAsInt(f) == offset) {
             if (f.next != null) {
                 f = f.next;
                 lastAccessedFragment = f;
                 // fallthrough
             } else {
-                return f.outToIn(outputOffset) + 1;
+                return mapOffsetWhenContains.mapOffset(f, offset) + 1;
             }
         }
-        return f.outToIn(outputOffset);
+        return mapOffsetWhenContains.mapOffset(f, offset);
     }
 
 
@@ -150,8 +179,8 @@ final class FragmentedTextDocument extends BaseMappedDocument implements TextDoc
             return inStart() + outOffset - outStart();
         }
 
-        boolean contains(int outOffset) {
-            return outStart() <= outOffset && outEnd() > outOffset;
+        int inToOut(int inOffset) {
+            return inOffset - inStart() + outStart();
         }
 
         @Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index e7fe94c960..10d5209fde 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -148,7 +148,7 @@ public interface TextDocument extends Closeable {
     int inputOffset(int outOffset, boolean inclusive);
 
     /**
-     * Translate a region given in the the coordinate system of this
+     * Translate a region given in the coordinate system of this
      * document, to the coordinate system of the original document.
      * This works as if creating a new region with both start and end
      * offsets translated through {@link #inputOffset(int, boolean)}. The
@@ -160,6 +160,21 @@ public interface TextDocument extends Closeable {
      */
     TextRegion inputRegion(TextRegion outputRegion);
 
+    /**
+     * Translate a 2D range given in the coordinate system of this
+     * document, to the coordinate system of the original document.
+     * This works as if creating a new region with both start and end
+     * offsets translated through {@link #inputOffset(int, boolean)}. The
+     * returned region may have a different length.
+     *
+     * @param outputRange Output region
+     *
+     * @return Input region
+     */
+    default TextRange2d inputRange(TextRange2d outputRange) {
+        return toRange2d(inputRegion(toRegion(outputRange)));
+    }
+
 
     /**
      * Returns a reader over the text of this document.
@@ -176,16 +191,20 @@ public interface TextDocument extends Closeable {
     }
 
     /**
-     * Returns a text region that corresponds to the entire document.
+     * Returns a text region that corresponds to the entire document,
+     * in the coordinate system of this document.
      */
     default TextRegion getEntireRegion() {
         return TextRegion.fromOffsetLength(0, getLength());
     }
 
     /**
-     * Returns a 2D text range that corresponds to the entire document.
+     * Returns a 2D text range that corresponds to the entire document,
+     * in the coordinate system of this document.
      */
-    TextRange2d getEntireRegion2d();
+    default TextRange2d getEntireRegion2d() {
+        return toRange2d(getEntireRegion());
+    }
 
     /**
      * Returns a region that spans the text of all the given lines.
@@ -210,7 +229,9 @@ public interface TextDocument extends Closeable {
      * the line/column information for both start and end offset of
      * the region.
      *
-     * @return A new file position
+     * @param region A region, in the coordinate system of this document
+     *
+     * @return A new file position, with absolute coordinates
      *
      * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
      */
@@ -231,7 +252,7 @@ public interface TextDocument extends Closeable {
         }
         TextRegion region = TextRegion.caretAt(startOffset);
         checkInRange(region, this.getLength());
-        return FileLocation.location(getDisplayName(), range);
+        return FileLocation.range(getDisplayName(), range);
     }
 
     /**
@@ -289,6 +310,8 @@ public interface TextDocument extends Closeable {
 
     /**
      * Returns the line and column at the given offset (inclusive).
+     * Both the input offset and the output range are in the coordinates
+     * of this document.
      *
      * @param offset    A source offset (0-based), can range in {@code [0, length]}.
      * @param inclusive If the offset falls right after a line terminator,
@@ -296,6 +319,8 @@ public interface TextDocument extends Closeable {
      *                  choose the position at the start of the next line.
      *                  Otherwise choose the offset at the end of the line.
      *
+     * @return A position, in the coordinate system of this document
+     *
      * @throws IndexOutOfBoundsException if the offset is out of bounds
      */
     TextPos2d lineColumnAtOffset(int offset, boolean inclusive);
@@ -315,6 +340,17 @@ public interface TextDocument extends Closeable {
     @Override
     void close() throws IOException;
 
+    /**
+     * Create a new text document for the given text file. The document's
+     * coordinate system is the same as the original text file.
+     *
+     * @param textFile A text file
+     *
+     * @return A new text document
+     *
+     * @throws IOException          If the file cannot be read ({@link TextFile#readContents()})
+     * @throws NullPointerException If the parameter is null
+     */
     static TextDocument create(TextFile textFile) throws IOException {
         return new RootTextDocument(textFile);
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
index bdf767af3b..4f561fb238 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
@@ -11,6 +11,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  */
 public final class TextPos2d implements Comparable<TextPos2d> {
 
+    /**
+     * The position at the start of the document (line 1, column 1).
+     */
+    public static TextPos2d DOCUMENT_START = new TextPos2d(1, 1);
+
     private final int line;
     private final int column;
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
index 5d14a965a2..a8fd7d6956 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
@@ -122,8 +122,8 @@ public final class TextRegion implements Comparable<TextRegion> {
      * @throws AssertionError If the parameter cannot produce a valid region
      */
     public TextRegion growLeft(int delta) {
-        assert (delta + length) >= 0 : "Left delta " + delta + " would produce a negative length region" + parThis();
-        assert (startOffset - delta) >= 0 : "Left delta " + delta + " would produce a region that starts before zero" + parThis();
+        assert delta + length >= 0 : "Left delta " + delta + " would produce a negative length region" + parThis();
+        assert startOffset - delta >= 0 : "Left delta " + delta + " would produce a region that starts before zero" + parThis();
         return new TextRegion(startOffset - delta, delta + length);
     }
 
@@ -135,7 +135,7 @@ public final class TextRegion implements Comparable<TextRegion> {
      * @throws AssertionError If the delta is negative and less than the length of this region
      */
     public TextRegion growRight(int delta) {
-        assert (delta + length) >= 0 : "Right delta " + delta + " would produce a negative length region" + parThis();
+        assert delta + length >= 0 : "Right delta " + delta + " would produce a negative length region" + parThis();
         return new TextRegion(startOffset, delta + length);
     }
 
@@ -181,15 +181,6 @@ public final class TextRegion implements Comparable<TextRegion> {
         return new TextRegion(startOffset, length);
     }
 
-    /**
-     * Builds a new region from offset and length.
-     *
-     * @throws AssertionError If either parameter is negative
-     */
-    public static TextRegion caretAt(int offset) {
-        return fromOffsetLength(offset, 0);
-    }
-
     /**
      * Builds a new region from start and end offset.
      *
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
index 3bf7ea5247..f987287f8f 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
@@ -75,10 +75,7 @@ public class ReportTest {
     }
 
     private static FileLocation getNode(int line, int column, String filename) {
-        return FileLocation.location(
-            filename,
-            TextRange2d.range2d(line, column, line, column)
-        );
+        return FileLocation.range(filename, TextRange2d.range2d(line, column, line, column));
     }
 
     public static String render(Renderer renderer, Consumer<? super FileAnalysisListener> listenerEffects) throws IOException {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
index 84c00c96a3..cbfa83b685 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
@@ -70,7 +70,7 @@ public class RuleViolationComparatorTest {
 
     private RuleViolation createJavaRuleViolation(Rule rule, String fileName, int beginLine, String description,
             int beginColumn, int endLine, int endColumn) {
-        FileLocation loc = FileLocation.location(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
+        FileLocation loc = FileLocation.range(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
         return new ParametricRuleViolation(rule, loc, description);
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
index 98b2b5a017..a61b2c0066 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
@@ -92,7 +92,7 @@ public abstract class AbstractRendererTest {
 
     protected FileLocation createLocation(int beginLine, int beginColumn, int endLine, int endColumn) {
         TextRange2d range2d = TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn);
-        return FileLocation.location(getSourceCodeFilename(), range2d);
+        return FileLocation.range(getSourceCodeFilename(), range2d);
     }
 
     protected RuleViolation newRuleViolation(int beginLine, int beginColumn, int endLine, int endColumn, Rule rule) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
index 8cbe58a269..2ea3e05434 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
@@ -91,8 +91,7 @@ public class XMLRendererTest extends AbstractRendererTest {
     }
 
     private RuleViolation createRuleViolation(String description) {
-        FileLocation loc = FileLocation.location(getSourceCodeFilename(),
-                                                 TextRange2d.range2d(1, 1, 1, 1));
+        FileLocation loc = FileLocation.range(getSourceCodeFilename(), TextRange2d.range2d(1, 1, 1, 1));
         return new ParametricRuleViolation(new FooRule(), loc, description);
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
index a376586054..48ac7089b9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
@@ -19,7 +19,7 @@ public class XSLTRendererTest {
     @Test
     public void testDefaultStylesheet() throws Exception {
         XSLTRenderer renderer = new XSLTRenderer();
-        FileLocation loc = FileLocation.location("file", TextRange2d.range2d(1, 1, 1, 2));
+        FileLocation loc = FileLocation.range("file", TextRange2d.range2d(1, 1, 1, 2));
         RuleViolation rv = new ParametricRuleViolation(new FooRule(), loc, "violation message");
         String result = ReportTest.render(renderer, it -> it.onRuleViolation(rv));
         Assert.assertTrue(result.contains("violation message"));

From fa60ad93177b77177219d5bcd4561b3dbe1b006f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 11:53:16 +0200
Subject: [PATCH 112/180] Cleanup tests

Make DummyNode use offset/length coordinates
---
 .../java/net/sourceforge/pmd/RuleContext.java |  2 +-
 .../pmd/cache/CachedRuleViolation.java        |  2 +-
 .../pmd/lang/document/FileLocation.java       |  2 +-
 .../pmd/lang/document/TextDocument.java       |  2 +-
 .../pmd/lang/document/TextRange2d.java        | 10 ++++
 .../java/net/sourceforge/pmd/ReportTest.java  |  2 +-
 .../pmd/RuleViolationComparatorTest.java      |  2 +-
 .../sourceforge/pmd/RuleViolationTest.java    | 22 ++++-----
 .../pmd/cache/FileAnalysisCacheTest.java      |  2 +-
 .../token/internal/BaseTokenFilterTest.java   |  3 +-
 .../pmd/lang/DummyLanguageModule.java         | 15 ++----
 .../sourceforge/pmd/lang/ast/DummyNode.java   | 46 +++++++------------
 .../lang/ast/DummyNodeWithListAndEnum.java    |  4 +-
 .../pmd/lang/rule/XPathRuleTest.java          |  3 +-
 .../xpath/impl/AttributeAxisIteratorTest.java |  1 -
 .../rule/xpath/internal/ElementNodeTest.java  | 16 +++----
 .../pmd/renderers/AbstractRendererTest.java   |  2 +-
 .../pmd/renderers/XMLRendererTest.java        |  4 +-
 .../pmd/renderers/XSLTRendererTest.java       |  2 +-
 .../pmd/ant/xml/expected-pmd-ant-xml.xml      |  6 +--
 .../pmd/lang/java/ast/JavadocElement.java     |  2 +-
 .../pmd/test/lang/ast/DummyNode.java          |  2 +-
 22 files changed, 69 insertions(+), 83 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
index c8a700d2a1..a9875bde60 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleContext.java
@@ -132,7 +132,7 @@ public final class RuleContext {
 
         FileLocation location = node.getReportLocation();
         if (beginLine != -1 && endLine != -1) {
-            location = FileLocation.location(location.getFileName(), TextRange2d.range2d(beginLine, 1, endLine, 1));
+            location = FileLocation.range(location.getFileName(), TextRange2d.range2d(beginLine, 1, endLine, 1));
         }
 
         RuleViolation violation = fact.createViolation(rule, node, location, makeMessage(message, formatArgs));
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
index de24b675c4..d5abbe3047 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/CachedRuleViolation.java
@@ -42,7 +42,7 @@ public final class CachedRuleViolation implements RuleViolation {
             final String className, final String methodName, final String variableName) {
         this.mapper = mapper;
         this.description = description;
-        this.location = FileLocation.location(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
+        this.location = FileLocation.range(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
         this.ruleClassName = ruleClassName;
         this.ruleName = ruleName;
         this.ruleTargetLanguage = ruleTargetLanguage;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
index 498a9e15a4..31b0482b5a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileLocation.java
@@ -145,7 +145,7 @@ public final class FileLocation {
      * @throws IllegalArgumentException If the line and column are not correctly ordered
      * @throws IllegalArgumentException If the start offset or length are negative
      */
-    public static FileLocation location(String fileName, TextRange2d range2d) {
+    public static FileLocation range(String fileName, TextRange2d range2d) {
         TextPos2d start = range2d.getStartPos();
         TextPos2d end = range2d.getEndPos();
         return new FileLocation(fileName,
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index 6c6f95b48c..4a7cbed4f4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -163,7 +163,7 @@ public interface TextDocument extends Closeable {
         }
         TextRegion region = TextRegion.caretAt(startOffset);
         checkInRange(region, this.getLength());
-        return FileLocation.location(getDisplayName(), range);
+        return FileLocation.range(getDisplayName(), range);
     }
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
index fb7be6d919..c60eb1a5c5 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
@@ -17,12 +17,22 @@ public final class TextRange2d implements Comparable<TextRange2d> {
     private final int endCol;
 
     public TextRange2d(int startLine, int startCol, int endLine, int endCol) {
+        checkValid(startLine, startCol, endLine, endCol);
         this.startLine = startLine;
         this.startCol = startCol;
         this.endLine = endLine;
         this.endCol = endCol;
     }
 
+    private void checkValid(int startLine, int startCol, int endLine, int endCol) {
+        if (startCol < 1 || startLine < 1 || endLine < 1 || endCol < 1) {
+            throw new IllegalArgumentException(
+                "Not a valid range (l" + startLine + ", c" + startCol + ")-"
+                    + "(l" + endLine + ", c" + endCol + ")"
+            );
+        }
+    }
+
 
     public TextPos2d getStartPos() {
         return TextPos2d.pos2d(startLine, startCol);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
index 3bf7ea5247..7e436ae89f 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/ReportTest.java
@@ -75,7 +75,7 @@ public class ReportTest {
     }
 
     private static FileLocation getNode(int line, int column, String filename) {
-        return FileLocation.location(
+        return FileLocation.range(
             filename,
             TextRange2d.range2d(line, column, line, column)
         );
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
index 84c00c96a3..cbfa83b685 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationComparatorTest.java
@@ -70,7 +70,7 @@ public class RuleViolationComparatorTest {
 
     private RuleViolation createJavaRuleViolation(Rule rule, String fileName, int beginLine, String description,
             int beginColumn, int endLine, int endColumn) {
-        FileLocation loc = FileLocation.location(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
+        FileLocation loc = FileLocation.range(fileName, TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn));
         return new ParametricRuleViolation(rule, loc, description);
     }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
index 468e9537ad..5036f52e3d 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/RuleViolationTest.java
@@ -9,12 +9,14 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Comparator;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
+import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextFile;
+import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.rule.MockRule;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 
@@ -68,25 +70,19 @@ public class RuleViolationTest {
         assertTrue(comp.compare(r2, r1) > 0);
     }
 
-    @Ignore("FIXME enabling this test means we don't respect the contract of Comparator!")
     @Test
     public void testComparatorWithSameFileSameLines() {
         Rule rule = new MockRule("name", "desc", "msg", "rulesetname");
         Comparator<RuleViolation> comp = RuleViolation.DEFAULT_COMPARATOR;
-        DummyRootNode rootNode = new DummyRootNode();
+        String filename = TextFile.UNKNOWN_FILENAME;
 
-        DummyNode s = new DummyNode();
-        s.setCoords(10, 1, 15, 10);
-        rootNode.addChild(s, 0);
-        RuleViolation r1 = new ParametricRuleViolation(rule, s, "description");
 
-        DummyNode s1 = new DummyNode();
-        s1.setCoords(10, 1, 15, 10);
-        rootNode.addChild(s1, 1);
-        RuleViolation r2 = new ParametricRuleViolation(rule, s1, "description");
+        FileLocation loc = FileLocation.range(filename, TextRange2d.range2d(10, 1, 15, 10));
+        RuleViolation r1 = new ParametricRuleViolation(rule, loc, "description");
+        RuleViolation r2 = new ParametricRuleViolation(rule, loc, "description");
 
-        assertEquals(1, comp.compare(r1, r2));
-        assertEquals(1, comp.compare(r2, r1));
+        assertEquals(0, comp.compare(r1, r2));
+        assertEquals(0, comp.compare(r2, r1));
     }
 
     public static junit.framework.Test suite() {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
index a197ba9251..3ca761e9b4 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java
@@ -117,7 +117,7 @@ public class FileAnalysisCacheTest {
 
         final RuleViolation rv = mock(RuleViolation.class);
         when(rv.getFilename()).thenReturn(sourceFile.getDisplayName());
-        when(rv.getLocation()).thenReturn(FileLocation.location(sourceFile.getDisplayName(), TextRange2d.range2d(1, 2, 3, 4)));
+        when(rv.getLocation()).thenReturn(FileLocation.range(sourceFile.getDisplayName(), TextRange2d.range2d(1, 2, 3, 4)));
         final net.sourceforge.pmd.Rule rule = mock(net.sourceforge.pmd.Rule.class, Mockito.RETURNS_SMART_NULLS);
         when(rule.getLanguage()).thenReturn(mock(Language.class));
         when(rv.getRule()).thenReturn(rule);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
index b8d15b7cae..5e4374433c 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilterTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.GenericToken;
 import net.sourceforge.pmd.lang.document.FileLocation;
+import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.document.TextRegion;
 
@@ -59,7 +60,7 @@ public class BaseTokenFilterTest {
 
         @Override
         public FileLocation getReportLocation() {
-            return FileLocation.location("n/a", TextRange2d.range2d(0, 0, 0, 0));
+            return FileLocation.range(TextFile.UNKNOWN_FILENAME, TextRange2d.range2d(1, 1, 1, 1));
         }
 
         @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index 15f94eb42e..67ea0b3513 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -20,8 +20,6 @@ import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextFile;
-import net.sourceforge.pmd.lang.document.TextPos2d;
-import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
 import net.sourceforge.pmd.lang.rule.impl.DefaultRuleViolationFactory;
@@ -115,14 +113,11 @@ public class DummyLanguageModule extends BaseLanguageModule {
     private static DummyRootNode readLispNode(ParserTask task) {
         TextDocument document = task.getTextDocument();
         final DummyRootNode root = new DummyRootNode().withTaskInfo(task);
-        {
-            TextPos2d endPos = document.getEntireRegion2d().getEndPos();
-            root.setCoords(1, 1, endPos.getLine(), endPos.getColumn());
-        }
+        root.setRegion(document.getEntireRegion());
 
         DummyNode top = root;
         int lastNodeStart = 0;
-        Chars text = document.getContent().getNormalizedText();
+        Chars text = document.getText();
         for (int i = 0; i < text.length(); i++) {
             char c = text.charAt(i);
             if (c == '(') {
@@ -130,7 +125,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
                 node.setParent(top);
                 top.addChild(node, top.getNumChildren());
                 // setup coordinates, temporary (will be completed when node closes)
-                node.setCoords(document, TextRegion.caretAt(i));
+                node.setRegion(TextRegion.caretAt(i));
 
                 // cut out image
                 if (top.getImage() == null) {
@@ -148,9 +143,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
                     throw new ParseException("Unbalanced parentheses: " + text);
                 }
 
-                TextPos2d endPos = document.toRange2d(TextRegion.caretAt(i)).getEndPos();
-                TextPos2d startPos = top.getCoords().getStartPos();
-                top.setCoords(TextRange2d.range2d(startPos, endPos));
+                top.setRegion(TextRegion.fromBothOffsets(top.getTextRegion().getStartOffset(), i));
 
                 if (top.getImage() == null) {
                     // cut out image (if node doesn't have children it hasn't been populated yet)
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index ed94e8ccc2..1fc2150dfe 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -5,12 +5,12 @@
 package net.sourceforge.pmd.lang.ast;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import net.sourceforge.pmd.internal.util.AssertionUtil;
 import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
@@ -18,22 +18,17 @@ import net.sourceforge.pmd.lang.ast.impl.GenericNode;
 import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextFile;
-import net.sourceforge.pmd.lang.document.TextRange2d;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.xpath.Attribute;
 
 public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements GenericNode<DummyNode> {
 
     private final boolean findBoundary;
-    private final String xpathName;
-    private final Map<String, String> userData = new HashMap<>();
+    private String xpathName;
     private String image;
     private final List<Attribute> attributes = new ArrayList<>();
 
-    private int bline = 1;
-    private int bcol = 1;
-    private int eline = 1;
-    private int ecol = 1;
+    private TextRegion region = TextRegion.caretAt(0);
 
     public DummyNode(String xpathName) {
         this(false, xpathName);
@@ -83,34 +78,29 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements Gen
         }
     }
 
-    public DummyNode setCoords(int bline, int bcol, int eline, int ecol) {
-        this.bline = bline;
-        this.bcol = bcol;
-        this.eline = eline;
-        this.ecol = ecol;
-        return this;
+    @Override
+    public TextRegion getTextRegion() {
+        return region;
     }
 
-    public DummyNode setCoords(TextDocument document, TextRegion region) {
-        FileLocation loc = document.toLocation(region);
-        return setCoords(loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(), loc.getEndColumn());
-    }
-
-    public DummyNode setCoords(TextRange2d region) {
-        return setCoords(region.getStartLine(), region.getStartColumn(), region.getEndLine(), region.getEndColumn());
-    }
-
-    public TextRange2d getCoords() {
-        return TextRange2d.range2d(bline, bcol, eline, ecol);
+    public void setRegion(TextRegion region) {
+        this.region = region;
     }
 
     @Override
     public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(TextRange2d.range2d(bline, bcol, eline, ecol));
+        return getTextDocument().toLocation(region);
     }
 
+    /**
+     * Nodes with an image that starts with `#` also set the xpath name.
+     */
     public void setImage(String image) {
         this.image = image;
+        if (image.startsWith("#")) {
+            xpathName = image.substring(1);
+            assert AssertionUtil.isJavaIdentifier(xpathName) : "need an ident after '#': " + image;
+        }
     }
 
     @Override
@@ -133,10 +123,6 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements Gen
         return findBoundary;
     }
 
-    public Map<String, String> getUserData() {
-        return userData;
-    }
-
     public void setXPathAttribute(String name, String value) {
         attributes.add(new Attribute(this, name, value));
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
index e5f0ae9ec2..151037aaac 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNodeWithListAndEnum.java
@@ -8,10 +8,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import net.sourceforge.pmd.lang.document.TextRegion;
+
 public class DummyNodeWithListAndEnum extends DummyNode.DummyRootNode {
     public DummyNodeWithListAndEnum() {
         super();
-        setCoords(1, 1, 1, 2);
+        setRegion(TextRegion.fromOffsetLength(0, 1));
     }
 
     public enum MyEnum {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
index cd58a5e244..4344559685 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/XPathRuleTest.java
@@ -20,6 +20,7 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 import net.sourceforge.pmd.lang.ast.DummyNodeWithDeprecatedAttribute;
+import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
 public class XPathRuleTest {
@@ -151,7 +152,7 @@ public class XPathRuleTest {
         DummyRootNode root = new DummyRootNode();
         DummyNode dummy = new DummyNodeWithDeprecatedAttribute();
         root.addChild(dummy, 0);
-        dummy.setCoords(1, 1, 1, 2);
+        dummy.setRegion(TextRegion.fromOffsetLength(0, 1));
         return root;
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/impl/AttributeAxisIteratorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/impl/AttributeAxisIteratorTest.java
index ca9f6d8811..d970f8aeeb 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/impl/AttributeAxisIteratorTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/impl/AttributeAxisIteratorTest.java
@@ -36,7 +36,6 @@ public class AttributeAxisIteratorTest {
     @Test
     public void testAttributeAxisIterator() {
         DummyNode dummyNode = new DummyNode();
-        dummyNode.setCoords(1, 1, 2, 2);
 
         AttributeAxisIterator it = new AttributeAxisIterator(dummyNode);
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
index 30283b683b..1d15739995 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/rule/xpath/internal/ElementNodeTest.java
@@ -8,6 +8,7 @@ package net.sourceforge.pmd.lang.rule.xpath.internal;
 import org.junit.Assert;
 import org.junit.Test;
 
+import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.ast.DummyNode;
 import net.sourceforge.pmd.lang.ast.DummyNode.DummyRootNode;
 
@@ -19,16 +20,13 @@ public class ElementNodeTest {
 
     @Test
     public void testCompareOrder() {
-        DummyRootNode root = new DummyRootNode();
-
-        DummyNode c0 = new DummyNode(false, "foo");
-        c0.setCoords(1, 1, 2, 2);
-        root.addChild(c0, 0);
-
-        DummyNode c1 = new DummyNode(false, "foo");
-        c1.setCoords(2, 1, 2, 2);
-        root.addChild(c1, 1);
+        DummyRootNode root = DummyLanguageModule.parse(
+            "(#foo)"
+                + "(#foo)"
+        );
 
+        DummyNode c0 = root.getChild(0);
+        DummyNode c1 = root.getChild(1);
 
         Configuration configuration = Configuration.newConfiguration();
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
index 98b2b5a017..a61b2c0066 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/AbstractRendererTest.java
@@ -92,7 +92,7 @@ public abstract class AbstractRendererTest {
 
     protected FileLocation createLocation(int beginLine, int beginColumn, int endLine, int endColumn) {
         TextRange2d range2d = TextRange2d.range2d(beginLine, beginColumn, endLine, endColumn);
-        return FileLocation.location(getSourceCodeFilename(), range2d);
+        return FileLocation.range(getSourceCodeFilename(), range2d);
     }
 
     protected RuleViolation newRuleViolation(int beginLine, int beginColumn, int endLine, int endColumn, Rule rule) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
index 8cbe58a269..de887c378b 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XMLRendererTest.java
@@ -91,8 +91,8 @@ public class XMLRendererTest extends AbstractRendererTest {
     }
 
     private RuleViolation createRuleViolation(String description) {
-        FileLocation loc = FileLocation.location(getSourceCodeFilename(),
-                                                 TextRange2d.range2d(1, 1, 1, 1));
+        FileLocation loc = FileLocation.range(getSourceCodeFilename(),
+                                              TextRange2d.range2d(1, 1, 1, 1));
         return new ParametricRuleViolation(new FooRule(), loc, description);
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
index a376586054..48ac7089b9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/XSLTRendererTest.java
@@ -19,7 +19,7 @@ public class XSLTRendererTest {
     @Test
     public void testDefaultStylesheet() throws Exception {
         XSLTRenderer renderer = new XSLTRenderer();
-        FileLocation loc = FileLocation.location("file", TextRange2d.range2d(1, 1, 1, 2));
+        FileLocation loc = FileLocation.range("file", TextRange2d.range2d(1, 1, 1, 2));
         RuleViolation rv = new ParametricRuleViolation(new FooRule(), loc, "violation message");
         String result = ReportTest.render(renderer, it -> it.onRuleViolation(rv));
         Assert.assertTrue(result.contains("violation message"));
diff --git a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
index 705fc08dfa..6e7f517c67 100644
--- a/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
+++ b/pmd-core/src/test/resources/net/sourceforge/pmd/ant/xml/expected-pmd-ant-xml.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<pmd xmlns="http://pmd.sourceforge.net/report/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/report/2.0.0 http://pmd.sourceforge.net/report_2_0_0.xsd" version="6.45.0-SNAPSHOT" timestamp="2022-03-31T17:55:43.046">
+<pmd xmlns="http://pmd.sourceforge.net/report/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/report/2.0.0 http://pmd.sourceforge.net/report_2_0_0.xsd" version="" timestamp="">
 <file name="sample.dummy">
-<violation beginline="1" endline="2" begincolumn="1" endcolumn="1" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
+<violation beginline="1" endline="1" begincolumn="1" endcolumn="110" rule="SampleXPathRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#SampleXPathRule" priority="3">
 Test Rule 2
 </violation>
-<violation beginline="1" endline="2" begincolumn="1" endcolumn="1" rule="DeprecatedRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#deprecatedrule" priority="3">
+<violation beginline="1" endline="1" begincolumn="1" endcolumn="110" rule="DeprecatedRule" ruleset="Test Ruleset" package="foo" externalInfoUrl="${pmd.website.baseurl}/rules/dummy/basic.xml#deprecatedrule" priority="3">
 Test Rule 3
 </violation>
 </file>
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
index 86e9ed268f..e7febf6e5b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
@@ -17,7 +17,7 @@ public class JavadocElement extends Comment {
     public JavadocElement(JavaccToken t, int theBeginLine, int theEndLine, int theBeginColumn, int theEndColumn, JavadocTag theTag) {
         super(t);
         this.tag = theTag;
-        this.reportLoc = FileLocation.location("TODO", TextRange2d.range2d(theBeginLine, theBeginColumn, theEndLine, theEndColumn));
+        this.reportLoc = FileLocation.range("TODO", TextRange2d.range2d(theBeginLine, theBeginColumn, theEndLine, theEndColumn));
     }
 
     public JavadocTag tag() {
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
index 7bac3c7e33..dbd049969d 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
@@ -14,7 +14,7 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> {
     private FileLocation location;
 
     public void setCoords(int bline, int bcol, int eline, int ecol) {
-        this.location = FileLocation.location(":dummyFile:", TextRange2d.range2d(bline, bcol, eline, ecol));
+        this.location = FileLocation.range(":dummyFile:", TextRange2d.range2d(bline, bcol, eline, ecol));
     }
 
     @Override

From 13d0ddad1be69bdda5f04ebe8068b3f5e9e194b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 12:07:18 +0200
Subject: [PATCH 113/180] Sync with designer, remove range2d

---
 .../pmd/lang/document/RootTextDocument.java   | 10 ----
 .../pmd/lang/document/TextDocument.java       | 44 ------------------
 .../pmd/lang/document/TextDocumentTest.java   | 46 -------------------
 3 files changed, 100 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index 162830346c..9e8ecbb3a3 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -123,16 +123,6 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         return TextRegion.fromBothOffsets(first, last);
     }
 
-    @Override
-    public TextRange2d getEntireRegion2d() {
-        SourceCodePositioner positioner = content.getPositioner();
-        return TextRange2d.range2d(
-            1, 1,
-            positioner.getLastLine(),
-            positioner.getLastLineColumn()
-        );
-    }
-
     static void checkInRange(TextRegion region, int length) {
         if (region.getEndOffset() > length) {
             throw regionOutOfBounds(region.getStartOffset(), region.getEndOffset(), length);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index 4a7cbed4f4..d1ded64a4f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.document;
 
-import static net.sourceforge.pmd.lang.document.RootTextDocument.checkInRange;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Reader;
@@ -119,11 +117,6 @@ public interface TextDocument extends Closeable {
         return TextRegion.fromOffsetLength(0, getLength());
     }
 
-    /**
-     * Returns a 2D text range that corresponds to the entire document.
-     */
-    TextRange2d getEntireRegion2d();
-
     /**
      * Returns a region that spans the text of all the given lines.
      * This is intended to provide a replacement for {@link SourceCode#getSlice(int, int)}.
@@ -148,43 +141,6 @@ public interface TextDocument extends Closeable {
      */
     FileLocation toLocation(TextRegion region);
 
-    /**
-     * Turn a text region into a {@link FileLocation}. The file name is
-     * the display name of this document.
-     *
-     * @return A new file position
-     *
-     * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
-     */
-    default FileLocation toLocation(TextRange2d range) {
-        int startOffset = offsetAtLineColumn(range.getStartPos());
-        if (startOffset < 0) {
-            throw new IndexOutOfBoundsException("Region out of bounds: " + range.displayString());
-        }
-        TextRegion region = TextRegion.caretAt(startOffset);
-        checkInRange(region, this.getLength());
-        return FileLocation.range(getDisplayName(), range);
-    }
-
-    /**
-     * Turn a text region to a {@link TextRange2d}.
-     */
-    default TextRange2d toRange2d(TextRegion region) {
-        TextPos2d start = lineColumnAtOffset(region.getStartOffset(), true);
-        TextPos2d end = lineColumnAtOffset(region.getEndOffset(), false);
-        return TextRange2d.range2d(start, end);
-    }
-
-    /**
-     * Turn a {@link TextRange2d} into a {@link TextRegion}.
-     */
-    default TextRegion toRegion(TextRange2d region) {
-        return TextRegion.fromBothOffsets(
-            offsetAtLineColumn(region.getStartPos()),
-            offsetAtLineColumn(region.getEndPos())
-        );
-    }
-
 
     /**
      * Returns the offset at the given line and column number.
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index 888fc8760b..22620da346 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -156,52 +156,6 @@ public class TextDocumentTest {
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
     }
 
-    @Test
-    public void testOffsetFromLineColumn() {
-        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
-
-        assertEquals(0, doc.offsetAtLineColumn(1, 1));
-        assertEquals(1, doc.offsetAtLineColumn(1, 2));
-        assertEquals(2, doc.offsetAtLineColumn(1, 3));
-        assertEquals(3, doc.offsetAtLineColumn(1, 4));
-        assertEquals(4, doc.offsetAtLineColumn(1, 5));
-        assertEquals(5, doc.offsetAtLineColumn(1, 6));
-        assertEquals(6, doc.offsetAtLineColumn(1, 7));
-        assertEquals(7, doc.offsetAtLineColumn(1, 8));
-        assertEquals(8, doc.offsetAtLineColumn(1, 9));
-        assertEquals(8, doc.offsetAtLineColumn(2, 1));
-        assertEquals(9, doc.offsetAtLineColumn(2, 2));
-        assertEquals(10, doc.offsetAtLineColumn(2, 3));
-        assertEquals(11, doc.offsetAtLineColumn(2, 4));
-        assertEquals(11, doc.offsetAtLineColumn(3, 1));
-    }
-
-    @Test
-    public void testCoordinateRoundTripWithEndOfLine() {
-        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
-        TextRange2d inputRange = TextRange2d.fullLine(1, "bonjour\n".length());
-
-        TextRegion lineRange = doc.createLineRange(1, 1);
-        TextRegion region = doc.toRegion(inputRange);
-
-        assertEquals(TextRegion.fromOffsetLength(0, "bonjour\n".length()), region);
-        assertEquals(TextRegion.fromOffsetLength(0, "bonjour\n".length()), lineRange);
-        TextRange2d roundTrip = doc.toRange2d(region);
-        assertEquals(inputRange, roundTrip);
-
-    }
-
-    @Test
-    public void testCoordinateRoundTripSimple() {
-        TextDocument doc = TextDocument.readOnlyString("bonjour\noa\n", dummyVersion);
-        TextRange2d inputRange = TextRange2d.fullLine(1, "bonjour".length());
-
-        TextRegion region = doc.toRegion(inputRange);
-        assertEquals(TextRegion.fromOffsetLength(0, "bonjour".length()), region);
-
-        TextRange2d roundTrip = doc.toRange2d(region);
-        assertEquals(inputRange, roundTrip);
-    }
 
     @Test
     public void testLineRange() {

From f2708f4b4ec891d300b99beb255975d9537d77d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 12:22:03 +0200
Subject: [PATCH 114/180] Make Node#getTextRegion non-default

Now implementors of Node need an implementation.
Implementation of #getReportLocation can be shared
---
 .../apex/ast/ASTMethodCallExpression.java     |  4 +-
 .../pmd/lang/apex/ast/AbstractApexNode.java   |  9 +---
 .../pmd/lang/apex/ast/ApexTreeBuilder.java    |  2 +-
 .../net/sourceforge/pmd/lang/ast/Node.java    | 16 ++-----
 .../lang/ast/impl/antlr4/BaseAntlrNode.java   |  8 ++--
 .../ast/impl/javacc/AbstractJjtreeNode.java   |  5 --
 .../sourceforge/pmd/lang/ast/DummyNode.java   |  5 --
 .../java/ast/ASTLocalVariableDeclaration.java |  1 +
 .../lang/java/ast/ASTMethodDeclaration.java   |  1 +
 .../ast/AbstractEcmascriptNode.java           |  6 ---
 .../pmd/lang/scala/ast/AbstractScalaNode.java |  6 +--
 .../pmd/test/lang/DummyLanguageModule.java    | 47 +++++++++++--------
 .../pmd/test/lang/ast/DummyNode.java          | 23 +++++----
 .../pmd/testframework/RuleTstTest.java        | 14 ++++--
 .../lang/xml/ast/internal/XmlNodeWrapper.java |  6 +--
 15 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
index acc4cd2f3d..a18aa3ebd2 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
@@ -41,10 +41,10 @@ public final class ASTMethodCallExpression extends AbstractApexNode<MethodCallEx
     }
 
     @Override
-    protected @NonNull TextRegion getRegion() {
+    public @NonNull TextRegion getTextRegion() {
         int fullLength = getFullMethodName().length();
         int nameLength = getMethodName().length();
-        TextRegion base = super.getRegion();
+        TextRegion base = super.getTextRegion();
         if (fullLength > nameLength) {
             base = base.growLeft(fullLength - nameLength);
         }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
index 361d857204..48bf3aa906 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
@@ -10,7 +10,6 @@ import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.FileAnalysisException;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextRegion;
 
@@ -57,18 +56,14 @@ abstract class AbstractApexNode<T extends AstNode> extends AbstractNode<Abstract
     }
 
     @Override
-    public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(getRegion());
-    }
-
-    protected @NonNull TextRegion getRegion() {
+    public @NonNull TextRegion getTextRegion() {
         if (region == null) {
             if (!hasRealLoc()) {
                 AbstractApexNode<?> parent = (AbstractApexNode<?>) getParent();
                 if (parent == null) {
                     throw new FileAnalysisException("Unable to determine location of " + this);
                 }
-                region = parent.getRegion();
+                region = parent.getTextRegion();
             } else {
                 Location loc = node.getLoc();
                 region = TextRegion.fromBothOffsets(loc.getStartIndex(), loc.getEndIndex());
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
index e67bd65fb6..c0a8b441c8 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
@@ -390,7 +390,7 @@ final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
             return;
         }
         // find the token, that appears as close as possible before the node
-        TextRegion nodeRegion = node.getRegion();
+        TextRegion nodeRegion = node.getTextRegion();
         for (ApexDocTokenLocation comment : commentInfo.docTokenLocations) {
             if (comment.region.compareTo(nodeRegion) > 0) {
                 // this and all remaining tokens are after the node
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index 276ae14ce9..c90e342a97 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -119,24 +119,16 @@ public interface Node extends Reportable {
      * <p>Use this instead of {@link #getBeginColumn()}/{@link #getBeginLine()}, etc.
      */
     @Override
-    FileLocation getReportLocation();
+    default FileLocation getReportLocation() {
+        return getAstInfo().getTextDocument().toLocation(getTextRegion());
+    }
 
     /**
      * Returns a region of text delimiting the node in the underlying
      * text document. This does not necessarily match the
      * {@link #getReportLocation() report location}.
-     *
-     * @implNote The default implementation uses the {@link #getReportLocation()}
-     *     to create a region.
      */
-    default TextRegion getTextRegion() {
-        @SuppressWarnings("PMD.CloseResource")
-        TextDocument document = getAstInfo().getTextDocument();
-        FileLocation loc = getReportLocation();
-        int startOffset = document.offsetAtLineColumn(loc.getStartPos());
-        int endOffset = document.offsetAtLineColumn(loc.getStartPos());
-        return TextRegion.fromBothOffsets(startOffset, endOffset);
-    }
+    TextRegion getTextRegion();
 
 
     // Those are kept here because they're handled specially as XPath
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
index 64ab4d32a4..3805dbe8e0 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/BaseAntlrNode.java
@@ -12,7 +12,6 @@ import org.antlr.v4.runtime.tree.TerminalNode;
 
 import net.sourceforge.pmd.lang.ast.impl.GenericNode;
 import net.sourceforge.pmd.lang.ast.impl.antlr4.BaseAntlrNode.AntlrToPmdParseTreeAdapter;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.util.DataMap;
 import net.sourceforge.pmd.util.DataMap.DataKey;
@@ -70,11 +69,10 @@ public abstract class BaseAntlrNode<A extends AntlrToPmdParseTreeAdapter<N>, N e
 
     public abstract Token getLastAntlrToken();
 
-
     @Override
-    public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(TextRegion.fromBothOffsets(getFirstAntlrToken().getStartIndex(),
-                                                                       getFirstAntlrToken().getStopIndex()));
+    public TextRegion getTextRegion() {
+        return TextRegion.fromBothOffsets(getFirstAntlrToken().getStartIndex(),
+                                          getFirstAntlrToken().getStopIndex());
     }
 
     void setIndexInParent(int indexInParent) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
index ee3e02fea4..5c7073e4bb 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
@@ -59,11 +59,6 @@ public abstract class AbstractJjtreeNode<B extends AbstractJjtreeNode<B, N>, N e
                                           getLastToken().getEndOffset());
     }
 
-    @Override
-    public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(getTextRegion());
-    }
-
     @Override
     public final int compareLocation(Node other) {
         if (other instanceof JjtreeNode<?>) {
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index 1fc2150dfe..bf1931f9e9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -15,7 +15,6 @@ import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
 import net.sourceforge.pmd.lang.ast.impl.GenericNode;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.lang.document.TextRegion;
@@ -87,10 +86,6 @@ public class DummyNode extends AbstractNode<DummyNode, DummyNode> implements Gen
         this.region = region;
     }
 
-    @Override
-    public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(region);
-    }
 
     /**
      * Nodes with an image that starts with `#` also set the xpath name.
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
index 85877548b4..816b6956ff 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
@@ -37,6 +37,7 @@ public final class ASTLocalVariableDeclaration extends AbstractJavaNode
 
     @Override
     public @Nullable FileLocation getReportLocation() {
+        // the first varId
         return getVarIds().firstOrThrow().getFirstToken().getReportLocation();
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
index 2d779175fd..3a83204420 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
@@ -84,6 +84,7 @@ public final class ASTMethodDeclaration extends AbstractMethodOrConstructorDecla
 
     @Override
     public FileLocation getReportLocation() {
+        // the method identifier
         JavaccToken ident = TokenUtils.nthPrevious(getModifiers().getLastToken(), getFormalParameters().getFirstToken(), 1);
         return ident.getReportLocation();
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
index 05b5f12370..90a0f0a51d 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
@@ -8,7 +8,6 @@ import org.mozilla.javascript.ast.AstNode;
 
 import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextRegion;
 
 abstract class AbstractEcmascriptNode<T extends AstNode> extends AbstractNode<AbstractEcmascriptNode<?>, EcmascriptNode<?>> implements EcmascriptNode<T> {
@@ -34,11 +33,6 @@ abstract class AbstractEcmascriptNode<T extends AstNode> extends AbstractNode<Ab
         this.image = image;
     }
 
-    @Override
-    public FileLocation getReportLocation() {
-        return getTextDocument().toLocation(getTextRegion());
-    }
-
     @Override
     public TextRegion getTextRegion() {
         return TextRegion.fromOffsetLength(node.getAbsolutePosition(), node.getLength());
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index f1cc5bbf58..77c96d5372 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -9,7 +9,6 @@ import java.util.Comparator;
 import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextRegion;
 
 import scala.meta.Tree;
@@ -64,9 +63,8 @@ abstract class AbstractScalaNode<T extends Tree> extends AbstractNode<AbstractSc
     }
 
     @Override
-    public FileLocation getReportLocation() {
-        TextRegion region = TextRegion.fromBothOffsets(pos.start(), pos.end());
-        return getAstInfo().getTextDocument().toLocation(region);
+    public TextRegion getTextRegion() {
+        return TextRegion.fromBothOffsets(pos.start(), pos.end());
     }
 
     @Override
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
index 9e1db22b7c..27661c29e8 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
@@ -4,16 +4,16 @@
 
 package net.sourceforge.pmd.test.lang;
 
-import java.util.Collections;
-
 import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
 import net.sourceforge.pmd.lang.BaseLanguageModule;
 import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.AstInfo;
 import net.sourceforge.pmd.lang.ast.Parser;
+import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ast.RootNode;
+import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.document.TextDocument;
+import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.impl.DefaultRuleViolationFactory;
 import net.sourceforge.pmd.test.lang.ast.DummyNode;
 
@@ -38,7 +38,21 @@ public class DummyLanguageModule extends BaseLanguageModule {
         addVersion("1.8", new Handler(), false);
     }
 
+    public static DummyLanguageModule getInstance() {
+        return (DummyLanguageModule) LanguageRegistry.getLanguage(NAME);
+    }
+
+    public static DummyRootNode parse(String code, String filename) {
+        TextDocument doc = TextDocument.readOnlyString(code, filename, DummyLanguageModule.getInstance().getDefaultVersion());
+        ParserTask task = new ParserTask(
+            doc,
+            SemanticErrorReporter.noop()
+        );
+        return (DummyRootNode) doc.getLanguageVersion().getLanguageVersionHandler().getParser().parse(task);
+    }
+
     public static class Handler extends AbstractPmdLanguageVersionHandler {
+
         @Override
         public RuleViolationFactory getRuleViolationFactory() {
             return new RuleViolationFactory();
@@ -46,38 +60,31 @@ public class DummyLanguageModule extends BaseLanguageModule {
 
         @Override
         public Parser getParser() {
-            return task -> {
-                DummyRootNode node = new DummyRootNode();
-                node.setCoords(1, 1, 1, 2);
-                node.setLanguageVersion(task.getLanguageVersion());
-                node.setImage("Foo");
-                return node;
-            };
+            return DummyRootNode::new;
         }
     }
 
     public static class DummyRootNode extends DummyNode implements RootNode {
 
 
-        private LanguageVersion languageVersion = LanguageRegistry.findLanguageByTerseName(DummyLanguageModule.TERSE_NAME).getDefaultVersion();
+        private final AstInfo<DummyRootNode> astInfo;
 
-        public void setLanguageVersion(LanguageVersion languageVersion) {
-            this.languageVersion = languageVersion;
+        public DummyRootNode(ParserTask task) {
+            this.astInfo = new AstInfo<>(task, this);
+            withCoords(task.getTextDocument().getEntireRegion());
+            setImage("Foo");
         }
 
-        public DummyRootNode withCoords(int bline, int bcol, int eline, int ecol) {
-            super.setCoords(bline, bcol, eline, ecol);
+        @Override
+        public DummyRootNode withCoords(TextRegion region) {
+            super.withCoords(region);
             return this;
         }
 
 
         @Override
         public AstInfo<DummyRootNode> getAstInfo() {
-            return new AstInfo<>(
-                TextDocument.readOnlyString("dummy text", "sample.dummy", languageVersion),
-                this,
-                Collections.emptyMap()
-            );
+            return astInfo;
         }
     }
 
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
index dbd049969d..a7e124e100 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/ast/DummyNode.java
@@ -4,23 +4,30 @@
 
 package net.sourceforge.pmd.test.lang.ast;
 
+import java.util.Objects;
+
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
-import net.sourceforge.pmd.lang.document.FileLocation;
-import net.sourceforge.pmd.lang.document.TextRange2d;
+import net.sourceforge.pmd.lang.document.TextRegion;
 
 public class DummyNode extends AbstractNode<DummyNode, DummyNode> {
 
     private String image;
-    private FileLocation location;
+    private TextRegion region = TextRegion.caretAt(0);
 
-    public void setCoords(int bline, int bcol, int eline, int ecol) {
-        this.location = FileLocation.range(":dummyFile:", TextRange2d.range2d(bline, bcol, eline, ecol));
+    public DummyNode withCoords(TextRegion region) {
+        this.region = Objects.requireNonNull(region);
+        return this;
+    }
+
+    public DummyNode newChild() {
+        DummyNode child = new DummyNode();
+        addChild(child, getNumChildren());
+        return child;
     }
 
     @Override
-    public FileLocation getReportLocation() {
-        assert location != null : "Should have called setCoords";
-        return location;
+    public TextRegion getTextRegion() {
+        return region;
     }
 
     @Deprecated
diff --git a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
index 9f54633ced..21c2b065c5 100644
--- a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
+++ b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
@@ -20,6 +20,7 @@ import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.RuleTargetSelector;
 import net.sourceforge.pmd.test.lang.DummyLanguageModule.DummyRootNode;
 
@@ -59,17 +60,22 @@ public class RuleTstTest {
         when(rule.getTargetSelector()).thenReturn(RuleTargetSelector.forRootOnly());
         when(rule.deepCopy()).thenReturn(rule);
 
+        final String code = "the\ncode";
         Mockito.doAnswer(invocation -> {
             RuleContext context = invocation.getArgument(1, RuleContext.class);
+            DummyRootNode node = invocation.getArgument(0, DummyRootNode.class);
+
             // the violations are reported out of order
-            context.addViolation(new DummyRootNode().withCoords(15, 1, 15, 5));
-            context.addViolation(new DummyRootNode().withCoords(1, 1, 2, 5));
+            // line 2
+            context.addViolation(node.newChild().withCoords(TextRegion.fromOffsetLength("the\n".length(), "code".length())));
+            // line 1
+            context.addViolation(node.newChild().withCoords(TextRegion.fromOffsetLength(0, "the".length())));
             return null;
         }).when(rule).apply(any(Node.class), Mockito.any(RuleContext.class));
 
-        TestDescriptor testDescriptor = new TestDescriptor("the code", "sample test", 2, rule, dummyLanguage);
+        TestDescriptor testDescriptor = new TestDescriptor(code, "sample test", 2, rule, dummyLanguage);
         testDescriptor.setReinitializeRule(false);
-        testDescriptor.setExpectedLineNumbers(Arrays.asList(1, 15));
+        testDescriptor.setExpectedLineNumbers(Arrays.asList(1, 2));
 
         ruleTester.runTest(testDescriptor);
     }
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/internal/XmlNodeWrapper.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/internal/XmlNodeWrapper.java
index c620763d3f..306611f217 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/internal/XmlNodeWrapper.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/internal/XmlNodeWrapper.java
@@ -19,7 +19,6 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import net.sourceforge.pmd.internal.util.IteratorUtil;
-import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.xpath.Attribute;
@@ -58,10 +57,9 @@ class XmlNodeWrapper implements XmlNode {
         return parser.wrapDomNode(domNode);
     }
 
-
     @Override
-    public FileLocation getReportLocation() {
-        return textDoc.toLocation(TextRegion.fromBothOffsets(startOffset, endOffset));
+    public TextRegion getTextRegion() {
+        return TextRegion.fromBothOffsets(startOffset, endOffset);
     }
 
     @Override

From b3818954ac3cbcac66256da46253c8927e75ddcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 12:53:35 +0200
Subject: [PATCH 115/180] Doc

---
 .../pmd/cache/AbstractAnalysisCache.java      |  4 +-
 .../pmd/lang/document/RootTextDocument.java   | 25 ++---
 .../pmd/lang/document/TextDocument.java       | 99 +++++++++++++------
 .../pmd/lang/document/TextRange2d.java        | 12 +--
 .../pmd/lang/DummyLanguageModule.java         |  6 +-
 .../pmd/test/lang/DummyLanguageModule.java    |  7 +-
 6 files changed, 85 insertions(+), 68 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java
index ce0d43a13d..e640d44d58 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java
@@ -67,7 +67,7 @@ public abstract class AbstractAnalysisCache implements AnalysisCache {
     public boolean isUpToDate(final TextDocument document) {
         try (TimedOperation ignored = TimeTracker.startOperation(TimedOperationCategory.ANALYSIS_CACHE, "up-to-date check")) {
             // There is a new file being analyzed, prepare entry in updated cache
-            final AnalysisResult updatedResult = new AnalysisResult(document.getContent().getCheckSum(), new ArrayList<>());
+            final AnalysisResult updatedResult = new AnalysisResult(document.getCheckSum(), new ArrayList<>());
             updatedResultsCache.put(document.getPathId(), updatedResult);
 
             // Now check the old cache
@@ -214,7 +214,7 @@ public abstract class AbstractAnalysisCache implements AnalysisCache {
         String fileName = file.getPathId();
         AnalysisResult analysisResult = updatedResultsCache.get(fileName);
         if (analysisResult == null) {
-            analysisResult = new AnalysisResult(file.getContent().getCheckSum());
+            analysisResult = new AnalysisResult(file.getCheckSum());
         }
         final AnalysisResult nonNullAnalysisResult = analysisResult;
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index 9e8ecbb3a3..dae3fed124 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -62,6 +62,11 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         backend.close();
     }
 
+    @Override
+    public Chars getText() {
+        return content.getNormalizedText();
+    }
+
     @Override
     public FileLocation toLocation(TextRegion region) {
         checkInRange(region, this.getLength());
@@ -83,22 +88,6 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         );
     }
 
-    @Override
-    public int offsetAtLineColumn(int line, int column) {
-        SourceCodePositioner positioner = content.getPositioner();
-        return positioner.offsetFromLineColumn(line, column);
-    }
-
-    @Override
-    public boolean isInRange(TextPos2d textPos2d) {
-        if (textPos2d.getLine() <= content.getPositioner().getNumLines()) {
-            int maxColumn = content.getPositioner().offsetOfEndOfLine(textPos2d.getLine());
-            return textPos2d.getColumn()
-                < content.getPositioner().columnFromOffset(textPos2d.getLine(), maxColumn);
-        }
-        return false;
-    }
-
     @Override
     public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
         long longPos = content.getPositioner().lineColFromOffset(offset, inclusive);
@@ -130,8 +119,8 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
     }
 
     @Override
-    public TextFileContent getContent() {
-        return content;
+    public long getCheckSum() {
+        return content.getCheckSum();
     }
 
     @Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index d1ded64a4f..6bb71432c8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -28,6 +28,47 @@ import net.sourceforge.pmd.util.datasource.DataSource;
  * from a text document. Exposing it here could lead to files being written
  * to from within rules, while we want to eventually build an API that allows
  * file edition based on AST manipulation.
+ *
+ * <h3>Coordinates in TextDocument</h3>
+ *
+ * This interface is an abstraction over a piece of text, which might not
+ * correspond to the backing source file. This allows the document to
+ * be a view on a piece of a larger document (eg, a Javadoc comment, or
+ * a string in which a language is injected). Another use case is to perform
+ * escape translation, while preserving the line breaks of the original source.
+ *
+ * <p>This complicates addressing within a text document. To explain it,
+ * consider that there is always *one* text document that corresponds to
+ * the backing text file, which we call the <i>root</i> text document.
+ * Logical documents built on top of it are called <i>views</i>.
+ *
+ * Text documents use <i>offsets</i> and {@link TextRegion} to address their
+ * contents. These are always relative to the {@linkplain #getText() text} of
+ * the document. Line and column information are provided by {@link FileLocation}
+ * (see {@link #toLocation(TextRegion)}), and are always absolute (ie,
+ * represent actual source lines in the file).
+ *
+ * <p>For instance, say you have the following file (and root text document):
+ * <pre>{@code
+ * l1
+ * l2 (* comment *)
+ * l3
+ * }</pre>
+ * and you create a view for just the section {@code (* comment *)}.
+ * Then, that view's offset 0 (start of the document) will map
+ * to the {@code (} character, while the root document's offset 0 maps
+ * to the start of {@code l1}. When calling {@code toLocation(caretAt(0))},
+ * the view will however return {@code line 2, column 4}, ie, a line/column
+ * that can be found when inspecting the file.
+ *
+ * <p>To reduce the potential for mistakes, views do not provide access
+ * to their underlying text document. That way, nodes only have access
+ * to a single document, and their offsets can be assumed to be in the
+ * coordinate system of that document.
+ *
+ * <p>This interface does not provide a way to obtain line/column
+ * coordinates that are relative to a view's coordinate system. This
+ * would complicate the construction of views significantly.
  */
 public interface TextDocument extends Closeable {
     // todo logical sub-documents, to support embedded languages
@@ -80,9 +121,7 @@ public interface TextDocument extends Closeable {
      *
      * @see TextFileContent#getNormalizedText()
      */
-    default Chars getText() {
-        return getContent().getNormalizedText();
-    }
+    Chars getText();
 
     /**
      * Returns a region of the {@linkplain #getText() text} as a character sequence.
@@ -91,9 +130,11 @@ public interface TextDocument extends Closeable {
 
 
     /**
-     * Returns the current contents of the text file. See also {@link #getText()}.
+     * Returns a checksum for the contents of the file.
+     *
+     * @see TextFileContent#getCheckSum()
      */
-    TextFileContent getContent();
+    long getCheckSum();
 
     /**
      * Returns a reader over the text of this document.
@@ -135,37 +176,19 @@ public interface TextDocument extends Closeable {
      * the line/column information for both start and end offset of
      * the region.
      *
-     * @return A new file position
+     * @param region A region, in the coordinate system of this document
+     *
+     * @return A new file position, with absolute coordinates
      *
      * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
      */
     FileLocation toLocation(TextRegion region);
 
 
-    /**
-     * Returns the offset at the given line and column number.
-     *
-     * @param line   Line number (1-based)
-     * @param column Column number (1-based)
-     *
-     * @return an offset (0-based)
-     */
-    int offsetAtLineColumn(int line, int column);
-
-    /**
-     * Returns true if the position is valid in this document.
-     */
-    boolean isInRange(TextPos2d textPos2d);
-
-    /**
-     * Returns the offset at the line and number.
-     */
-    default int offsetAtLineColumn(TextPos2d pos2d) {
-        return offsetAtLineColumn(pos2d.getLine(), pos2d.getColumn());
-    }
-
     /**
      * Returns the line and column at the given offset (inclusive).
+     * Note that the line/column cannot be converted back. They are
+     * absolute in the coordinate system of the original document.
      *
      * @param offset A source offset (0-based), can range in {@code [0, length]}.
      *
@@ -176,13 +199,15 @@ public interface TextDocument extends Closeable {
     }
 
     /**
-     * Returns the line and column at the given offset (inclusive).
+     * Returns the line and column at the given offset.
      *
      * @param offset    A source offset (0-based), can range in {@code [0, length]}.
      * @param inclusive If the offset falls right after a line terminator,
      *                  two behaviours are possible. If the parameter is true,
-     *                  choose the position at the start of the next line.
-     *                  Otherwise choose the offset at the end of the line.
+     *                  choose the position at the start of the next line,
+     *                  otherwise choose the position at the end of the line.
+     *
+     * @return A position, in the coordinate system of the root document
      *
      * @throws IndexOutOfBoundsException if the offset is out of bounds
      */
@@ -203,7 +228,17 @@ public interface TextDocument extends Closeable {
     @Override
     void close() throws IOException;
 
-
+    /**
+     * Create a new text document for the given text file. The document's
+     * coordinate system is the same as the original text file.
+     *
+     * @param textFile A text file
+     *
+     * @return A new text document
+     *
+     * @throws IOException          If the file cannot be read ({@link TextFile#readContents()})
+     * @throws NullPointerException If the parameter is null
+     */
     static TextDocument create(TextFile textFile) throws IOException {
         return new RootTextDocument(textFile);
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
index c60eb1a5c5..e1a2978a65 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
@@ -17,20 +17,12 @@ public final class TextRange2d implements Comparable<TextRange2d> {
     private final int endCol;
 
     public TextRange2d(int startLine, int startCol, int endLine, int endCol) {
-        checkValid(startLine, startCol, endLine, endCol);
         this.startLine = startLine;
         this.startCol = startCol;
         this.endLine = endLine;
         this.endCol = endCol;
-    }
-
-    private void checkValid(int startLine, int startCol, int endLine, int endCol) {
-        if (startCol < 1 || startLine < 1 || endLine < 1 || endCol < 1) {
-            throw new IllegalArgumentException(
-                "Not a valid range (l" + startLine + ", c" + startCol + ")-"
-                    + "(l" + endLine + ", c" + endCol + ")"
-            );
-        }
+        assert startCol >= 1 && startLine >= 1 && endLine >= 1 && endCol >= 1
+            : "Not a valid range " + displayString();
     }
 
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
index 67ea0b3513..b3cb7cefa2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/DummyLanguageModule.java
@@ -52,12 +52,12 @@ public class DummyLanguageModule extends BaseLanguageModule {
     }
 
     public static DummyRootNode parse(String code, String filename) {
-        TextDocument doc = TextDocument.readOnlyString(code, filename, DummyLanguageModule.getInstance().getDefaultVersion());
+        LanguageVersion version = DummyLanguageModule.getInstance().getDefaultVersion();
         ParserTask task = new ParserTask(
-            doc,
+            TextDocument.readOnlyString(code, filename, version),
             SemanticErrorReporter.noop()
         );
-        return readLispNode(task);
+        return (DummyRootNode) version.getLanguageVersionHandler().getParser().parse(task);
     }
 
 
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
index 27661c29e8..ab5c11f25c 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
@@ -7,6 +7,7 @@ package net.sourceforge.pmd.test.lang;
 import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
 import net.sourceforge.pmd.lang.BaseLanguageModule;
 import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.AstInfo;
 import net.sourceforge.pmd.lang.ast.Parser;
 import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
@@ -43,12 +44,12 @@ public class DummyLanguageModule extends BaseLanguageModule {
     }
 
     public static DummyRootNode parse(String code, String filename) {
-        TextDocument doc = TextDocument.readOnlyString(code, filename, DummyLanguageModule.getInstance().getDefaultVersion());
+        LanguageVersion version = DummyLanguageModule.getInstance().getDefaultVersion();
         ParserTask task = new ParserTask(
-            doc,
+            TextDocument.readOnlyString(code, filename, version),
             SemanticErrorReporter.noop()
         );
-        return (DummyRootNode) doc.getLanguageVersion().getLanguageVersionHandler().getParser().parse(task);
+        return (DummyRootNode) version.getLanguageVersionHandler().getParser().parse(task);
     }
 
     public static class Handler extends AbstractPmdLanguageVersionHandler {

From 0d10425aac5a989482d30f267f4505adab66b2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 14:56:58 +0200
Subject: [PATCH 116/180] Pull some trimming logic into pmd-core

---
 .../sourceforge/pmd/cpd/SimpleRenderer.java   |   7 +-
 .../sourceforge/pmd/lang/document/Chars.java  |  48 ++++++
 .../net/sourceforge/pmd/util/StringUtil.java  | 146 ++++++++++++------
 .../pmd/lang/java/ast/ASTStringLiteral.java   |  99 ++++--------
 .../pmd/testframework/RuleTst.java            |  10 +-
 5 files changed, 188 insertions(+), 122 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
index 9d499def1a..79e8cea468 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
@@ -49,12 +49,7 @@ public class SimpleRenderer implements Renderer, CPDRenderer {
         String source = match.getSourceCodeSlice();
 
         if (trimLeadingWhitespace) {
-            String[] lines = source.split("\n");
-            int trimDepth = StringUtil.maxCommonLeadingWhitespaceForAll(lines);
-            if (trimDepth > 0) {
-                lines = StringUtil.trimStartOn(lines, trimDepth);
-            }
-            for (String line : lines) {
+            for (String line : StringUtil.linesWithTrimIndent(source)) {
                 writer.append(line).append(PMD.EOL);
             }
             return;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 664a58330c..963ed282e4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -13,6 +13,8 @@ import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 
@@ -196,6 +198,27 @@ public final class Chars implements CharSequence {
         return -1;
     }
 
+    /**
+     * See {@link String#lastIndexOf(int, int)}.
+     */
+    public int lastIndexOf(int ch, int fromIndex) {
+        if (fromIndex < 0 || fromIndex >= len) {
+            return -1;
+        }
+        // we want to avoid searching too far in the string
+        // so we don't use String#indexOf, as it would be looking
+        // in the rest of the file too, which in the worst case is
+        // horrible
+
+        for (int i = start + fromIndex; i >= start; i--) {
+            char c = str.charAt(i);
+            if (c == ch) {
+                return i - start;
+            }
+        }
+        return -1;
+    }
+
     /**
      * See {@link String#startsWith(String, int)}.
      */
@@ -221,6 +244,13 @@ public final class Chars implements CharSequence {
         return str.charAt(start + fromIndex) == prefix;
     }
 
+    /**
+     * See {@link String#endsWith(String)}.
+     */
+    public boolean endsWith(String suffix) {
+        return startsWith(suffix, length() - suffix.length());
+    }
+
     /**
      * Returns a subsequence which does not start with control characters ({@code <= 32}).
      * This is consistent with {@link String#trim()}.
@@ -254,6 +284,17 @@ public final class Chars implements CharSequence {
         return trimStart().trimEnd();
     }
 
+    /**
+     * Remove the suffix if it is present, otherwise returns this.
+     */
+    public Chars removeSuffix(String charSeq) {
+        int trimmedLen = length() - charSeq.length();
+        if (startsWith(charSeq, trimmedLen)) {
+            return slice(0, trimmedLen);
+        }
+        return this;
+    }
+
 
     /**
      * Returns true if this char sequence is logically equal to the
@@ -443,6 +484,13 @@ public final class Chars implements CharSequence {
         };
     }
 
+    /**
+     * Returns a stream of lines yielded by {@link #lines()}.
+     */
+    public Stream<Chars> lineStream() {
+        return StreamSupport.stream(lines().spliterator(), false);
+    }
+
 
     /**
      * Returns a new reader for the whole contents of this char sequence.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 79cd5da71f..4c82ffe662 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.util;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -15,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.internal.util.AssertionUtil;
+import net.sourceforge.pmd.lang.document.Chars;
 
 /**
  * A number of String-specific utility methods for use by PMD or its IDE
@@ -278,53 +280,21 @@ public final class StringUtil {
      *
      * @throws NullPointerException If the parameter is null
      */
-    public static int maxCommonLeadingWhitespaceForAll(String[] strings) {
-
-        int shortest = lengthOfShortestIn(strings);
-        if (shortest == 0) {
-            return 0;
-        }
-
-        char[] matches = new char[shortest];
-
-        for (int m = 0; m < matches.length; m++) {
-            matches[m] = strings[0].charAt(m);
-            if (!Character.isWhitespace(matches[m])) {
-                return m;
-            }
-            for (String str : strings) {
-                if (str.charAt(m) != matches[m]) {
-                    return m;
-                }
+    private static int maxCommonLeadingWhitespaceForAll(List<? extends CharSequence> lines) {
+        // the max *common* leading WS length is the min length of all leading WS
+        int maxCommonWs = Integer.MAX_VALUE;
+        for (int i = 0; i < lines.size(); i++) {
+            CharSequence line = lines.get(i);
+            // compute common prefix
+            if (!StringUtils.isAllBlank(line) || i == lines.size() - 1) {
+                maxCommonWs = Math.min(maxCommonWs, StringUtil.countLeadingWhitespace(line));
             }
         }
-
-        return shortest;
-    }
-
-
-    /**
-     * Return the length of the shortest string in the array. If the collection
-     * is empty or any one of them is null then it returns 0.
-     *
-     * @throws NullPointerException If the parameter is null
-     */
-    public static int lengthOfShortestIn(String[] strings) {
-
-        if (strings.length == 0) {
-            return 0;
+        if (maxCommonWs == Integer.MAX_VALUE) {
+            // common prefix not found
+            maxCommonWs = 0;
         }
-
-        int minLength = Integer.MAX_VALUE;
-
-        for (String string : strings) {
-            if (string == null) {
-                return 0;
-            }
-            minLength = Math.min(minLength, string.length());
-        }
-
-        return minLength;
+        return maxCommonWs;
     }
 
 
@@ -334,7 +304,7 @@ public final class StringUtil {
      *
      * @return String[]
      */
-    public static String[] trimStartOn(String[] strings, int trimDepth) {
+    private static String[] trimStartOn(String[] strings, int trimDepth) {
 
         if (trimDepth == 0) {
             return strings;
@@ -347,6 +317,92 @@ public final class StringUtil {
         return results;
     }
 
+    /**
+     * Trim common indentation in the lines of the string.
+     * Does not discard
+     */
+    public static StringBuilder trimIndent(Chars string) {
+        List<Chars> lines = string.lineStream().collect(Collectors.toList());
+        StringBuilder sb = new StringBuilder(string.length());
+        trimIndentIntoStringBuilder(lines, sb);
+        return sb;
+    }
+
+    public static void trimIndentIntoStringBuilder(List<Chars> lines, StringBuilder sb) {
+        int prefixLength = maxCommonLeadingWhitespaceForAll(lines);
+        appendWithoutCommonPrefix(lines, prefixLength, sb);
+    }
+
+    private static void appendWithoutCommonPrefix(List<Chars> lines, int prefixLength, StringBuilder output) {
+        for (int i = 0; i < lines.size(); i++) {
+            Chars line = lines.get(i);
+            // remove common whitespace prefix
+            if (!StringUtils.isAllBlank(line) && line.length() >= prefixLength) {
+                line = line.subSequence(prefixLength, line.length());
+            }
+            line = line.trimEnd();
+            line.appendChars(output);
+
+            boolean isLastLine = i == lines.size() - 1;
+            boolean isFirstLine = i == 0;
+            // todo is this &&?
+            if (!isLastLine || !isFirstLine && !StringUtils.isAllBlank(line)) {
+                output.append('\n'); // normalize line endings to LF
+            }
+        }
+    }
+
+    /**
+     * Remove trailing and leading blank lines.
+     */
+    public static Chars trimBlankLines(Chars string) {
+        int offsetOfFirstNonBlankChar = string.length();
+        for (int i = 0; i < string.length(); i++) {
+            if (!Character.isWhitespace(string.charAt(i))) {
+                offsetOfFirstNonBlankChar = i;
+                break;
+            }
+        }
+        int offsetOfLastNonBlankChar = 0;
+        for (int i = string.length() - 1; i > offsetOfFirstNonBlankChar; i--) {
+            if (!Character.isWhitespace(string.charAt(i))) {
+                offsetOfLastNonBlankChar = i;
+                break;
+            }
+        }
+
+        int lastNonBlankLine = string.indexOf('\n', offsetOfLastNonBlankChar);
+        int firstNonBlankLine = string.lastIndexOf('\n', offsetOfFirstNonBlankChar);
+
+        return string.subSequence(
+            minus1Default(firstNonBlankLine, 0),
+            minus1Default(lastNonBlankLine, string.length())
+        );
+    }
+
+    private static int minus1Default(int i, int defaultValue) {
+        return i == -1 ? defaultValue : i;
+    }
+
+
+    private static int countLeadingWhitespace(CharSequence s) {
+        int count = 0;
+        while (count < s.length() && Character.isWhitespace(s.charAt(count))) {
+            count++;
+        }
+        return count;
+    }
+
+    public static String[] linesWithTrimIndent(String source) {
+        String[] lines = source.split("\n");
+        int trimDepth = maxCommonLeadingWhitespaceForAll(Arrays.asList(lines));
+        if (trimDepth > 0) {
+            lines = trimStartOn(lines, trimDepth);
+        }
+        return lines;
+    }
+
+
 
     /**
      * Are the two String values the same. The Strings can be optionally trimmed
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index 124d972f9b..eb6cf5c377 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -4,14 +4,16 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import net.sourceforge.pmd.lang.document.Chars;
+import net.sourceforge.pmd.util.StringUtil;
+
 /**
  * Represents a string literal. The image of this node is the literal as it appeared
  * in the source ({@link #getText()}). {@link #getConstValue()} allows to recover
@@ -71,7 +73,7 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
     @Override
     protected @Nullable Object buildConstValue() {
         if (isTextBlock()) {
-            return determineTextBlockContent(getImage());
+            return determineTextBlockContent(getText());
         } else {
             CharSequence image = getText();
             CharSequence woDelims = image.subSequence(1, image.length() - 1);
@@ -79,46 +81,36 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
         }
     }
 
-    static String determineTextBlockContent(String image) {
-        // normalize line endings to LF
-        String content = image.replaceAll("\r\n|\r", "\n");
-        int start = determineContentStart(content);
-        content = content.substring(start, content.length() - TEXTBLOCK_DELIMITER.length());
-
-        int prefixLength = Integer.MAX_VALUE;
-        List<String> lines = Arrays.asList(content.split("\\n"));
-        for (int i = 0; i < lines.size(); i++) {
-            String line = lines.get(i);
-            // compute common prefix
-            if (!StringUtils.isAllBlank(line) || i == lines.size() - 1) {
-                prefixLength = Math.min(prefixLength, countLeadingWhitespace(line));
-            }
-        }
-        if (prefixLength == Integer.MAX_VALUE) {
-            // common prefix not found
-            prefixLength = 0;
-        }
-        StringBuilder sb = new StringBuilder(content.length());
-        for (int i = 0; i < lines.size(); i++) {
-            String line = lines.get(i);
-            // remove common whitespace prefix
-            if (!StringUtils.isAllBlank(line) && line.length() >= prefixLength) {
-                line = line.substring(prefixLength);
-            }
-            line = removeTrailingWhitespace(line);
-            sb.append(line);
-
-            boolean isLastLine = i == lines.size() - 1;
-            boolean isFirstLine = i == 0;
-            if (!isLastLine || !isFirstLine && !StringUtils.isAllBlank(line)) {
-                sb.append('\n');
-            }
-        }
-
+    static String determineTextBlockContent(Chars image) {
+        List<Chars> lines = getContentLines(image);
+        StringBuilder sb = new StringBuilder(image.length());
+        StringUtil.trimIndentIntoStringBuilder(lines, sb);
         interpretEscapeSequences(sb);
         return sb.toString();
     }
 
+    static String determineTextBlockContent(String image) {
+        return determineTextBlockContent(Chars.wrap(image));
+    }
+
+    /**
+     * Returns the lines of the parameter minus the delimiters.
+     */
+    private static @NonNull List<Chars> getContentLines(Chars chars) {
+        List<Chars> lines = chars.lineStream().collect(Collectors.toList());
+        assert lines.size() >= 2 : "invalid text block syntax " + chars;
+        // remove first line, it's just """ and some whitespace
+        lines = lines.subList(1, lines.size());
+
+        // trim the """ off the last line.
+        int lastIndex = lines.size() - 1;
+        Chars lastLine = lines.get(lastIndex);
+        assert lastLine.endsWith(TEXTBLOCK_DELIMITER);
+        lines.set(lastIndex, lastLine.removeSuffix(TEXTBLOCK_DELIMITER));
+
+        return lines;
+    }
+
     private static void interpretEscapeSequences(StringBuilder sb) {
         // interpret escape sequences "\<LF>" (line continuation), "n","t","b","r","f", "s", "\"", "\'", "\\"
         // we need to interpret everything in one pass, so regex replacement is inappropriate
@@ -172,33 +164,4 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
             }
         }
     }
-
-    private static int determineContentStart(String s) {
-        int start = TEXTBLOCK_DELIMITER.length(); // this is the opening delimiter
-        // the content begins after at the first character after the line terminator
-        // of the opening delimiter
-        while (start < s.length() && Character.isWhitespace(s.charAt(start))) {
-            if (s.charAt(start) == '\n') {
-                return start + 1;
-            }
-            start++;
-        }
-        return start;
-    }
-
-    private static int countLeadingWhitespace(String s) {
-        int count = 0;
-        while (count < s.length() && Character.isWhitespace(s.charAt(count))) {
-            count++;
-        }
-        return count;
-    }
-
-    private static String removeTrailingWhitespace(String s) {
-        int endIndexIncluding = s.length() - 1;
-        while (endIndexIncluding >= 0 && Character.isWhitespace(s.charAt(endIndexIncluding))) {
-            endIndexIncluding--;
-        }
-        return s.substring(0, endIndexIncluding + 1);
-    }
 }
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
index 5f1bd5bfa3..ff358b038b 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -44,16 +44,19 @@ import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.processor.AbstractPMDProcessor;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.renderers.TextRenderer;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
+import net.sourceforge.pmd.util.StringUtil;
 
 /**
  * Advanced methods for test cases
  */
 public abstract class RuleTst {
+
     private final DocumentBuilder documentBuilder;
 
     /** Use a single classloader for all tests. */
@@ -483,15 +486,16 @@ public abstract class RuleTst {
                     throw new RuntimeException("No matching code fragment found for coderef");
                 }
             }
+            code = StringUtil.trimBlankLines(Chars.wrap(code)).toString();
 
             String description = getNodeValue(testCode, "description", true);
-            int expectedProblems = Integer.parseInt(getNodeValue(testCode, "expected-problems", true));
+            int expectedProblems = Integer.parseInt(getNodeValue(testCode, "expected-problems", true).trim());
 
             String languageVersionString = getNodeValue(testCode, "source-type", false);
             if (languageVersionString == null) {
                 tests[i] = new TestDescriptor(code, description, expectedProblems, rule);
             } else {
-
+                languageVersionString = languageVersionString.trim();
                 LanguageVersion languageVersion = parseSourceType(languageVersionString);
                 if (languageVersion != null) {
                     tests[i] = new TestDescriptor(code, description, expectedProblems, rule, languageVersion);
@@ -553,6 +557,6 @@ public abstract class RuleTst {
                 buffer.append(node.getNodeValue());
             }
         }
-        return buffer.toString().trim();
+        return buffer.toString();
     }
 }

From 3f9fb52a9bb70383ba1f542022bb2096679efb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 15:39:22 +0200
Subject: [PATCH 117/180] Treat \r as line separator as well

---
 .../sourceforge/pmd/lang/document/Chars.java  | 33 +++++----
 .../pmd/lang/document/TextFileContent.java    | 72 ++++++++++++-------
 .../pmd/lang/document/CharsTest.java          |  7 ++
 .../lang/document/TextFileContentTest.java    | 25 ++++---
 4 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 963ed282e4..f9d4b91c1e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.lang.document;
 
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
@@ -452,8 +453,8 @@ public final class Chars implements CharSequence {
 
     /**
      * Returns an iterable over the lines of this char sequence. The lines
-     * are yielded without line separators. For the purposes of this method,
-     * a line delimiter is {@code LF} or {@code CR+LF}.
+     * are yielded without line separators. Like {@link BufferedReader#readLine()},
+     * a line delimiter is {@code CR}, {@code LF} or {@code CR+LF}.
      */
     public Iterable<Chars> lines() {
         return () -> new Iterator<Chars>() {
@@ -467,19 +468,27 @@ public final class Chars implements CharSequence {
 
             @Override
             public Chars next() {
-                int nl = indexOf('\n', pos);
-                Chars next;
-                if (nl < 0) {
-                    next = subSequence(pos, max);
+                int curPos = pos;
+                int cr = indexOf('\r', curPos);
+                int lf = indexOf('\n', curPos);
+
+                if (cr != -1 && lf != -1) {
+                    // found both CR and LF
+                    int min = Math.min(cr, lf);
+                    pos = lf == cr + 1 ? lf + 1 // CRLF
+                                       : min + 1;
+
+                    return subSequence(curPos, min);
+                } else if (cr == -1 && lf == -1) {
+                    // no following line terminator, cut until the end
                     pos = max;
-                    return next;
-                } else if (startsWith('\r', nl - 1)) {
-                    next = subSequence(pos, nl - 1);
+                    return subSequence(curPos, max);
                 } else {
-                    next = subSequence(pos, nl);
+                    // lf or cr (exactly one is != -1 and max returns that one)
+                    int idx = Math.max(cr, lf);
+                    pos = idx + 1;
+                    return subSequence(curPos, idx);
                 }
-                pos = nl + 1;
-                return next;
             }
         };
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
index 84b3a86c2f..0d4234c5ae 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
@@ -41,7 +41,7 @@ public final class TextFileContent {
 
     private static final int DEFAULT_BUFSIZE = 8192;
 
-    private static final Pattern NEWLINE_PATTERN = Pattern.compile("\r\n|\n");
+    private static final Pattern NEWLINE_PATTERN = Pattern.compile("\r\n?|\n");
     private static final String FALLBACK_LINESEP = System.lineSeparator();
 
     private final Chars cdata;
@@ -61,9 +61,10 @@ public final class TextFileContent {
      * The text of the file, with the following normalizations:
      * <ul>
      * <li>Line endings are normalized to {@value NORMALIZED_LINE_TERM}.
-     * For this purpose, a line ending is either {@code \r\n} or {@code \n}
-     * (CRLF or LF), not the full range of unicode line endings. This is
-     * consistent with {@link BufferedReader#readLine()} for example.
+     * For this purpose, a line ending is either {@code \r}, {@code \r\n}
+     * or {@code \n} (CR, CRLF or LF), not the full range of unicode line
+     * endings. This is consistent with {@link BufferedReader#readLine()},
+     * and the JLS, for example.
      * <li>An initial byte-order mark is removed, if any.
      * </ul>
      */
@@ -207,35 +208,52 @@ public final class TextFileContent {
         }
 
         while (n != IOUtils.EOF) {
-            if (updateChecksum) { // if we use a checked input stream we dont need to update the checksum manually
+            if (updateChecksum) {
+                // if we use a checked input stream we dont need to update the checksum manually
+                // note that this checksum operates on non-normalized characters
                 updateChecksum(checksum, CharBuffer.wrap(cbuf, nextCharToCopy, n));
             }
 
+            int offsetDiff = 0;
+
             for (int i = nextCharToCopy; i < n; i++) {
                 char c = cbuf[i];
 
-                if (afterCr && c != NORMALIZED_LINE_TERM_CHAR && i == 0) {
-                    // we saw a \r at the end of the last buffer, but didn't copy it
-                    // it's actually not followed by an \n
-                    result.append('\r');
-                }
-
-                if (c == NORMALIZED_LINE_TERM_CHAR) {
+                if (afterCr || c == NORMALIZED_LINE_TERM_CHAR) {
                     final String newLineTerm;
-                    if (afterCr) {
-                        newLineTerm = "\r\n";
-
+                    final int newLineOffset;
+                    if (afterCr && c != NORMALIZED_LINE_TERM_CHAR) {
+                        // we saw a \r last iteration, but didn't copy it
+                        // it's not followed by an \n
+                        newLineTerm = "\r";
+                        newLineOffset = bufOffset + i + offsetDiff;
                         if (i > 0) {
                             cbuf[i - 1] = '\n'; // replace the \r with a \n
-                            // copy up to and including the \r, which was replaced
-                            result.append(cbuf, nextCharToCopy, i - nextCharToCopy);
-                            nextCharToCopy = i + 1; // set the next char to copy to after the \n
+                        } else {
+                            // The CR was trailing a buffer, so it's not in the current buffer and wasn't copied.
+                            // Append a newline.
+                            result.append(NORMALIZED_LINE_TERM);
                         }
                     } else {
-                        // just \n
-                        newLineTerm = NORMALIZED_LINE_TERM;
+                        if (afterCr) {
+                            newLineTerm = "\r\n";
+
+                            if (i > 0) {
+                                cbuf[i - 1] = '\n'; // replace the \r with a \n
+                                // copy up to and including the \r, which was replaced
+                                result.append(cbuf, nextCharToCopy, i - nextCharToCopy);
+                                nextCharToCopy = i + 1; // set the next char to copy to after the \n
+                            }
+                            // Since we're replacing a 2-char delimiter with a single char,
+                            // the offset of the line needs to be adjusted.
+                            offsetDiff--;
+                        } else {
+                            // just \n
+                            newLineTerm = "\n";
+                        }
+                        newLineOffset = bufOffset + i + offsetDiff + 1;
                     }
-                    positionerBuilder.addLineEndAtOffset(bufOffset + i + 1);
+                    positionerBuilder.addLineEndAtOffset(newLineOffset);
                     detectedLineTerm = detectLineTerm(detectedLineTerm, newLineTerm, fallbackLineSep);
                 }
                 afterCr = c == '\r';
@@ -250,18 +268,21 @@ public final class TextFileContent {
             }
 
             nextCharToCopy = 0;
-            bufOffset += n;
+            bufOffset += n + offsetDiff;
             n = input.read(cbuf);
         } // end while
 
+        if (afterCr) { // we're at EOF, so it's not followed by \n
+            result.append(NORMALIZED_LINE_TERM);
+            positionerBuilder.addLineEndAtOffset(bufOffset);
+            detectedLineTerm = detectLineTerm(detectedLineTerm, "\r", fallbackLineSep);
+        }
+
         if (detectedLineTerm == null) {
             // no line terminator in text
             detectedLineTerm = fallbackLineSep;
         }
 
-        if (afterCr) { // we're at EOF, so it's not followed by \n
-            result.append('\r');
-        }
         return new TextFileContent(Chars.wrap(result), detectedLineTerm, checksum.getValue(), positionerBuilder.build(bufOffset));
     }
 
@@ -272,6 +293,7 @@ public final class TextFileContent {
         if (curLineTerm.equals(newLineTerm)) {
             return curLineTerm;
         } else {
+            // todo maybe we should report a warning
             return fallback; // mixed line terminators, fallback to system default
         }
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index e872f0e288..2e14ffd634 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -199,6 +199,13 @@ public class CharsTest {
         assertEquals(listOf("aa"), lines);
     }
 
+    @Test
+    public void linesTest3WithCr() {
+        Chars bc = Chars.wrap("aa\rb");
+        List<String> lines = CollectionUtil.map(bc.lines(), Chars::toString);
+        assertEquals(listOf("aa", "b"), lines);
+    }
+
     @Test
     public void testEqualsHashCode() {
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
index f21d400b43..05dd38fed9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
@@ -34,7 +34,7 @@ public class TextFileContentTest {
     @Parameters(source = TextContentOrigin.class)
     public void testMixedDelimiters(TextContentOrigin origin) throws IOException {
         TextFileContent content = origin.normalize("a\r\nb\n\rc");
-        Assert.assertEquals(Chars.wrap("a\nb\n\rc"), content.getNormalizedText());
+        Assert.assertEquals(Chars.wrap("a\nb\n\nc"), content.getNormalizedText());
         Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator());
     }
 
@@ -85,6 +85,7 @@ public class TextFileContentTest {
     public void testCrlfSplitOnBuffer() throws IOException {
         StringReader reader = new StringReader("a\r\nb");
         // now the buffer is of size 2, so we read first [a\r] then [\nb]
+        // but there is a single line
         TextFileContent content = TextFileContent.normalizingRead(reader, 2, System.lineSeparator());
         Assert.assertEquals(Chars.wrap("a\nb"), content.getNormalizedText());
         Assert.assertEquals("\r\n", content.getLineTerminator());
@@ -94,18 +95,26 @@ public class TextFileContentTest {
     public void testCrSplitOnBufferFp() throws IOException {
         StringReader reader = new StringReader("a\rb\n");
         // the buffer is of size 2, so we read first [a\r] then [b\n]
-        // the \r is not a line terminator though
+        // the \r is a line terminator on its own
         TextFileContent content = TextFileContent.normalizingRead(reader, 2, LINESEP_SENTINEL);
-        Assert.assertEquals(Chars.wrap("a\rb\n"), content.getNormalizedText());
-        Assert.assertEquals("\n", content.getLineTerminator());
+        Assert.assertEquals(Chars.wrap("a\nb\n"), content.getNormalizedText());
+        Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator());
     }
 
     @Test
     @Parameters(source = TextContentOrigin.class)
     public void testCrCr(TextContentOrigin origin) throws IOException {
         TextFileContent content = origin.normalize("a\r\rb");
-        Assert.assertEquals(Chars.wrap("a\r\rb"), content.getNormalizedText());
-        Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator());
+        Assert.assertEquals(Chars.wrap("a\n\nb"), content.getNormalizedText());
+        Assert.assertEquals("\r", content.getLineTerminator());
+    }
+
+    @Test
+    @Parameters(source = TextContentOrigin.class)
+    public void testCrIsEol(TextContentOrigin origin) throws IOException {
+        TextFileContent content = origin.normalize("a\rb\rdede");
+        Assert.assertEquals(Chars.wrap("a\nb\ndede"), content.getNormalizedText());
+        Assert.assertEquals("\r", content.getLineTerminator());
     }
 
     @Test
@@ -122,8 +131,8 @@ public class TextFileContentTest {
         // the buffer is of size 2, so we read first [a\r] then [\ro]
         // the \r is not a line terminator though
         TextFileContent content = TextFileContent.normalizingRead(reader, 2, LINESEP_SENTINEL);
-        Assert.assertEquals(Chars.wrap("a\r\r"), content.getNormalizedText());
-        Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator());
+        Assert.assertEquals(Chars.wrap("a\n\n"), content.getNormalizedText());
+        Assert.assertEquals("\r", content.getLineTerminator());
     }
 
     enum TextContentOrigin {

From 32c8581f0478fade7d6017c0c15bc8f62e76b17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 15:56:35 +0200
Subject: [PATCH 118/180] Add missing tests

---
 .../lang/document/SourceCodePositioner.java   | 11 ++-
 .../pmd/lang/document/CharsTest.java          | 41 +++++++++
 .../pmd/lang/document/TextDocumentTest.java   | 85 +++++++++++++++----
 3 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
index 56ef19e26f..ed4301b827 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
@@ -44,7 +44,7 @@ final class SourceCodePositioner {
 
         int lineIdx = line - 1; // zero-based
 
-        if (offset == lineOffsets[lineIdx] && !inclusive) {
+        if (lineIdx != 0 && offset == lineOffsets[lineIdx] && !inclusive) {
             // we're precisely on the start of a line
             // if inclusive, prefer the position at the end of the previous line
             // This is a subtlety that the other methods for offset -> line do not
@@ -157,7 +157,8 @@ final class SourceCodePositioner {
      */
     public int offsetOfEndOfLine(final int line) {
         if (!isValidLine(line)) {
-            throw new IndexOutOfBoundsException(line + " is not a valid line number, expected at most " + lineOffsets.length);
+            throw new IndexOutOfBoundsException(
+                line + " is not a valid line number, expected at most " + lineOffsets.length);
         }
 
         return lineOffsets[line];
@@ -187,7 +188,11 @@ final class SourceCodePositioner {
     }
 
     private int getLastColumnOfLine(int line) {
-        return 1 + lineOffsets[line] - lineOffsets[line - 1];
+        if (line == 0) {
+            return 1 + lineOffsets[line];
+        } else {
+            return 1 + lineOffsets[line] - lineOffsets[line - 1];
+        }
     }
 
     /**
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index 2e14ffd634..7b193fcb29 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.Test;
 
@@ -125,6 +126,23 @@ public class CharsTest {
         assertEquals(2, bc.indexOf("bx", 0));
     }
 
+    @Test
+    public void lastIndexOf() {
+        Chars bc = Chars.wrap("aaaaabcdb").slice(5, 2);
+        //                          --
+        assertEquals(0, bc.lastIndexOf('b', 0));
+        assertEquals(0, bc.lastIndexOf('b', 1));
+        assertEquals(1, bc.lastIndexOf('c', 1));
+        assertEquals(-1, bc.lastIndexOf('c', 0));
+
+        assertEquals(-1, bc.lastIndexOf('d', 0));
+
+        assertEquals(-1, bc.lastIndexOf('x', 0));
+        assertEquals(-1, bc.lastIndexOf('a', -1));
+        assertEquals(-1, bc.lastIndexOf('a', 0));
+        assertEquals(-1, bc.lastIndexOf('a', 1));
+    }
+
     @Test
     public void startsWith() {
         Chars bc = Chars.wrap("abcdb").slice(1, 2);
@@ -151,6 +169,22 @@ public class CharsTest {
 
     }
 
+    @Test
+    public void removeSuffix() {
+        Chars bc = Chars.wrap("abcdb").slice(1, 2);
+        //                      --
+
+        assertEquals("bc", bc.toString());
+        assertEquals("b", bc.removeSuffix("c").toString());
+        assertEquals("", bc.removeSuffix("bc").toString());
+
+        bc = Chars.wrap("aaaaaaa").slice(2, 3);
+        //                 ---
+
+        assertEquals("", bc.removeSuffix("aaa").toString());
+        assertEquals("aaa", bc.removeSuffix("aaaa").toString());
+    }
+
     @Test
     public void trimNoop() {
         Chars bc = Chars.wrap("abcdb").slice(1, 2);
@@ -199,6 +233,13 @@ public class CharsTest {
         assertEquals(listOf("aa"), lines);
     }
 
+    @Test
+    public void linesStreamTest() {
+        Chars bc = Chars.wrap("aa\nb\rded\r\nlff");
+        List<String> lines = bc.lineStream().map(Chars::toString).collect(Collectors.toList());
+        assertEquals(listOf("aa", "b", "ded", "lff"), lines);
+    }
+
     @Test
     public void linesTest3WithCr() {
         Chars bc = Chars.wrap("aa\rb");
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index 22620da346..b5e98928e5 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -4,16 +4,26 @@
 
 package net.sourceforge.pmd.lang.document;
 
+import static net.sourceforge.pmd.lang.document.TextPos2d.pos2d;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 
+import java.io.IOException;
+
+import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
 
+import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
+@RunWith(JUnitParamsRunner.class)
 public class TextDocumentTest {
 
     @Rule
@@ -32,13 +42,10 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
-        // todo rename to getStartLine
         assertEquals("bonjour".length(), withLines.getEndColumn() - withLines.getStartColumn());
     }
 
@@ -50,13 +57,10 @@ public class TextDocumentTest {
         assertEquals("bonjour\n", doc.sliceText(region).toString());
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + "bonjour\n".length(), withLines.getEndColumn());
-        // todo rename to getStartLine
         assertEquals("bonjour\n".length(), withLines.getEndColumn() - withLines.getStartColumn());
     }
 
@@ -71,10 +75,8 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(2, withLines.getStartLine());
         assertEquals(2, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartColumn());
         assertEquals(1, withLines.getEndColumn());
     }
@@ -91,10 +93,8 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1 + "bonjour".length(), withLines.getStartColumn());
         assertEquals(1 + "bonjour\n".length(), withLines.getEndColumn());
     }
@@ -108,10 +108,8 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartColumn());
         assertEquals(1 + doc.getLength(), withLines.getEndColumn());
     }
@@ -128,14 +126,36 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(3, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1 + "bonjou".length(), withLines.getStartColumn());
         assertEquals(1 + "tri".length(), withLines.getEndColumn());
     }
 
+
+    @Test
+    public void testLineColumnFromOffset() {
+        TextDocument doc = TextDocument.readOnlyString("ab\ncd\n", dummyVersion);
+
+        assertPos2dEqualsAt(doc, 0, "a", pos2d(1, 1), true);
+        assertPos2dEqualsAt(doc, 0, "a", pos2d(1, 1), false);
+        assertPos2dEqualsAt(doc, 1, "b", pos2d(1, 2), true);
+        assertPos2dEqualsAt(doc, 2, "\n", pos2d(1, 3), true);
+        assertPos2dEqualsAt(doc, 3, "c", pos2d(2, 1), true);
+        assertPos2dEqualsAt(doc, 3, "c", pos2d(1, 4), false);
+        assertPos2dEqualsAt(doc, 4, "d", pos2d(2, 2), true);
+        assertPos2dEqualsAt(doc, 5, "\n", pos2d(2, 3), true);
+        // EOF caret position
+        assertEquals(pos2d(3, 1), doc.lineColumnAtOffset(6));
+        assertThrows(IndexOutOfBoundsException.class, () -> doc.lineColumnAtOffset(7));
+    }
+
+    private void assertPos2dEqualsAt(TextDocument doc, int offset, String c, TextPos2d pos, boolean inclusive) {
+        Chars slicedChar = doc.sliceText(TextRegion.fromOffsetLength(offset, 1));
+        assertEquals(c, slicedChar.toString());
+        assertEquals(pos, doc.lineColumnAtOffset(offset, inclusive));
+    }
+
     @Test
     public void testEmptyRegion() {
         TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion);
@@ -148,10 +168,8 @@ public class TextDocumentTest {
 
         FileLocation withLines = doc.toLocation(region);
 
-        // todo rename to getStartLine
         assertEquals(1, withLines.getStartLine());
         assertEquals(1, withLines.getEndLine());
-        // todo rename to getStartLine
         assertEquals(1 + "bonjour".length(), withLines.getStartColumn());
         assertEquals(1 + "bonjour".length(), withLines.getEndColumn());
     }
@@ -170,6 +188,25 @@ public class TextDocumentTest {
         assertThrows(IndexOutOfBoundsException.class, () -> doc.createLineRange(0, 2));
     }
 
+    @Test
+    @Parameters(source = DocumentsProvider.class)
+    public void testEntireRegion(TextDocument doc) {
+        assertEquals("getEntireRegion should return something based on length",
+                     TextRegion.fromOffsetLength(0, doc.getLength()),
+                     doc.getEntireRegion());
+    }
+
+    @Test
+    @Parameters(source = DocumentsProvider.class)
+    public void testReader(TextDocument doc) throws IOException {
+
+        assertEquals("NewReader should read the text",
+                     doc.getText().toString(),
+                     IOUtils.toString(doc.newReader())
+        );
+
+    }
+
     @Test
     public void testRegionOutOfBounds() {
         TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion);
@@ -179,4 +216,20 @@ public class TextDocumentTest {
         TextRegion.isValidRegion(0, 40, doc);
     }
 
+    // for junit params runner
+    public static final class DocumentsProvider {
+
+
+        @SuppressWarnings("resource")
+        public static Object[] provideParameters() {
+            LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion();
+            return new TextDocument[] {
+                TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion),
+                TextDocument.readOnlyString("bonjour\n", dummyVersion),
+                TextDocument.readOnlyString("\n", dummyVersion),
+                TextDocument.readOnlyString("", dummyVersion),
+            };
+        }
+    }
+
 }

From 2d2a1c5531905f609f1ee15beb4e05e3197e0a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 16:33:00 +0200
Subject: [PATCH 119/180] More tests

---
 .../pmd/lang/document/TextRange2d.java        | 11 ++---
 .../pmd/lang/document/TextRegion.java         |  8 ++--
 .../pmd/lang/document/FileLocationTest.java   | 44 +++++++++++++++++++
 .../pmd/lang/document/TextDocumentTest.java   |  6 +--
 .../pmd/lang/document/TextPos2dTest.java      | 36 +++++++++++++++
 .../pmd/lang/document/TextRange2dTest.java    | 35 +++++++++++++++
 6 files changed, 127 insertions(+), 13 deletions(-)
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
index e1a2978a65..25f6d49dc8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
@@ -22,7 +22,7 @@ public final class TextRange2d implements Comparable<TextRange2d> {
         this.endLine = endLine;
         this.endCol = endCol;
         assert startCol >= 1 && startLine >= 1 && endLine >= 1 && endCol >= 1
-            : "Not a valid range " + displayString();
+            : "Not a valid range " + toDisplayStringWithColon();
     }
 
 
@@ -34,9 +34,9 @@ public final class TextRange2d implements Comparable<TextRange2d> {
         return TextPos2d.pos2d(endLine, endCol);
     }
 
-    public String displayString() {
-        return "(" + startCol + ", " + endCol
-            + ")-(" + endLine + ", " + endCol + ")";
+    public String toDisplayStringWithColon() {
+        return getStartPos().toDisplayStringWithColon() + "-"
+            + getEndPos().toDisplayStringWithColon();
     }
 
     public int getStartLine() {
@@ -104,7 +104,8 @@ public final class TextRange2d implements Comparable<TextRange2d> {
 
     @Override
     public String toString() {
-        return "[" + getStartPos() + " - " + getEndPos() + ']';
+        return "!debug only! [" + getStartPos().toTupleString()
+            + " - " + getEndPos().toTupleString() + ']';
     }
 
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
index 1411997a6a..5b87b05386 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRegion.java
@@ -50,7 +50,7 @@ public final class TextRegion implements Comparable<TextRegion> {
         this.startOffset = startOffset;
         this.length = length;
 
-        assert startOffset >= 0 && length >= 0 : "Invalid region" + parThis();
+        assert startOffset >= 0 && length >= 0 : "Invalid region " + this;
     }
 
     /** 0-based, inclusive index. */
@@ -122,8 +122,8 @@ public final class TextRegion implements Comparable<TextRegion> {
      * @throws AssertionError If the parameter cannot produce a valid region
      */
     public TextRegion growLeft(int delta) {
-        assert (delta + length) >= 0 : "Left delta " + delta + " would produce a negative length region" + parThis();
-        assert (startOffset - delta) >= 0 : "Left delta " + delta + " would produce a region that starts before zero" + parThis();
+        assert delta + length >= 0 : "Left delta " + delta + " would produce a negative length region " + parThis();
+        assert startOffset - delta >= 0 : "Left delta " + delta + " would produce a region that starts before zero " + parThis();
         return new TextRegion(startOffset - delta, delta + length);
     }
 
@@ -135,7 +135,7 @@ public final class TextRegion implements Comparable<TextRegion> {
      * @throws AssertionError If the delta is negative and less than the length of this region
      */
     public TextRegion growRight(int delta) {
-        assert (delta + length) >= 0 : "Right delta " + delta + " would produce a negative length region" + parThis();
+        assert delta + length >= 0 : "Right delta " + delta + " would produce a negative length region " + parThis();
         return new TextRegion(startOffset, delta + length);
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
new file mode 100644
index 0000000000..5e9c353497
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
@@ -0,0 +1,44 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.Test;
+
+/**
+ * @author Clément Fournier
+ */
+public class FileLocationTest {
+
+    @Test
+    public void testSimple() {
+        FileLocation loc = FileLocation.range("fname", TextRange2d.range2d(1, 1, 1, 2));
+        assertEquals("fname", loc.getFileName());
+        assertEquals(1, loc.getStartLine());
+        assertEquals(1, loc.getStartColumn());
+        assertEquals(1, loc.getEndLine());
+        assertEquals(2, loc.getEndColumn());
+    }
+
+    @Test
+    public void testToString() {
+        FileLocation loc = FileLocation.range("fname", TextRange2d.range2d(1, 1, 1, 2));
+
+        assertEquals(
+            "line 1, column 1",
+            loc.startPosToString()
+        );
+        assertEquals(
+            "fname:1:1",
+            loc.startPosToStringWithFile()
+        );
+
+        MatcherAssert.assertThat(loc.toString(), containsString("!debug only!"));
+    }
+
+}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index b5e98928e5..983ba92b6e 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -211,9 +211,7 @@ public class TextDocumentTest {
     public void testRegionOutOfBounds() {
         TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion);
 
-        expect.expect(AssertionError.class);
-
-        TextRegion.isValidRegion(0, 40, doc);
+        assertThrows(AssertionError.class, () -> TextRegion.isValidRegion(0, 40, doc));
     }
 
     // for junit params runner
@@ -228,7 +226,7 @@ public class TextDocumentTest {
                 TextDocument.readOnlyString("bonjour\n", dummyVersion),
                 TextDocument.readOnlyString("\n", dummyVersion),
                 TextDocument.readOnlyString("", dummyVersion),
-            };
+                };
         }
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
new file mode 100644
index 0000000000..4546fede17
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
@@ -0,0 +1,36 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.Test;
+
+/**
+ * @author Clément Fournier
+ */
+public class TextPos2dTest {
+
+    @Test
+    public void testToString() {
+        TextPos2d pos = TextPos2d.pos2d(1, 2);
+        assertEquals(
+            "line 1, column 2",
+            pos.toDisplayStringInEnglish()
+        );
+        assertEquals(
+            "1:2",
+            pos.toDisplayStringWithColon()
+        );
+        assertEquals(
+            "(line=1, column=2)",
+            pos.toTupleString()
+        );
+        MatcherAssert.assertThat(pos.toString(), containsString("!debug only!"));
+    }
+
+}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java
new file mode 100644
index 0000000000..188eb1cb7b
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java
@@ -0,0 +1,35 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.Test;
+
+/**
+ * @author Clément Fournier
+ */
+public class TextRange2dTest {
+
+    @Test
+    public void testCtors() {
+        TextRange2d pos = TextRange2d.range2d(1, 2, 3, 4);
+        TextRange2d pos2 = TextRange2d.range2d(TextPos2d.pos2d(1, 2), TextPos2d.pos2d(3, 4));
+        assertEquals(pos, pos2);
+    }
+
+    @Test
+    public void testToString() {
+        TextRange2d range = TextRange2d.range2d(1, 2, 3, 4);
+        assertEquals(
+            "1:2-3:4",
+            range.toDisplayStringWithColon()
+        );
+        MatcherAssert.assertThat(range.toString(), containsString("!debug only!"));
+    }
+
+}

From d0dc228b009656f31104a27d0e6ea28b368cfc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 16:58:42 +0200
Subject: [PATCH 120/180] Avoid calling indexOf too often in lines iterator

---
 .../sourceforge/pmd/lang/document/Chars.java  | 70 ++++++++++++++-----
 .../pmd/lang/document/TextDocumentTest.java   |  4 --
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index f9d4b91c1e..0b002b22d7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -17,6 +17,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -37,6 +38,15 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 public final class Chars implements CharSequence {
 
     public static final Chars EMPTY = wrap("");
+    /**
+     * Special sentinel used by {@link #lines()}.
+     */
+    private static final int NOT_TRIED = -2;
+
+    /**
+     * See {@link StringUtils#INDEX_NOT_FOUND}.
+     */
+    private static final int NOT_FOUND = -1;
 
     private final String str;
     private final int start;
@@ -161,20 +171,20 @@ public final class Chars implements CharSequence {
         final int max = start + len - searched.length();
 
         if (fromIndex < 0 || max < start + fromIndex) {
-            return -1;
+            return NOT_FOUND;
         } else if (searched.isEmpty()) {
             return 0;
         }
 
         final char fst = searched.charAt(0);
         int strpos = str.indexOf(fst, start + fromIndex);
-        while (strpos != -1 && strpos <= max) {
+        while (strpos != NOT_FOUND && strpos <= max) {
             if (str.startsWith(searched, strpos)) {
                 return strpos - start;
             }
             strpos = str.indexOf(fst, strpos + 1);
         }
-        return -1;
+        return NOT_FOUND;
     }
 
     /**
@@ -182,7 +192,7 @@ public final class Chars implements CharSequence {
      */
     public int indexOf(int ch, int fromIndex) {
         if (fromIndex < 0 || fromIndex >= len) {
-            return -1;
+            return NOT_FOUND;
         }
         // we want to avoid searching too far in the string
         // so we don't use String#indexOf, as it would be looking
@@ -196,7 +206,7 @@ public final class Chars implements CharSequence {
                 return i - start;
             }
         }
-        return -1;
+        return NOT_FOUND;
     }
 
     /**
@@ -204,7 +214,7 @@ public final class Chars implements CharSequence {
      */
     public int lastIndexOf(int ch, int fromIndex) {
         if (fromIndex < 0 || fromIndex >= len) {
-            return -1;
+            return NOT_FOUND;
         }
         // we want to avoid searching too far in the string
         // so we don't use String#indexOf, as it would be looking
@@ -217,7 +227,7 @@ public final class Chars implements CharSequence {
                 return i - start;
             }
         }
-        return -1;
+        return NOT_FOUND;
     }
 
     /**
@@ -460,6 +470,12 @@ public final class Chars implements CharSequence {
         return () -> new Iterator<Chars>() {
             final int max = len;
             int pos = 0;
+            // If those are NOT_TRIED, then we should scan ahead to find them
+            // If the scan fails then they'll stay -1 forever and won't be tried again.
+            // This is important to scan in documents where we know there are no
+            // CR characters, as in our normalized TextFileContent.
+            int nextCr = NOT_TRIED;
+            int nextLf = NOT_TRIED;
 
             @Override
             public boolean hasNext() {
@@ -468,28 +484,50 @@ public final class Chars implements CharSequence {
 
             @Override
             public Chars next() {
-                int curPos = pos;
-                int cr = indexOf('\r', curPos);
-                int lf = indexOf('\n', curPos);
+                final int curPos = pos;
+                if (nextCr == NOT_TRIED) {
+                    nextCr = indexOf('\r', curPos);
+                }
+                if (nextLf == NOT_TRIED) {
+                    nextLf = indexOf('\n', curPos);
+                }
+                final int cr = nextCr;
+                final int lf = nextLf;
 
-                if (cr != -1 && lf != -1) {
+                if (cr != NOT_FOUND && lf != NOT_FOUND) {
                     // found both CR and LF
                     int min = Math.min(cr, lf);
-                    pos = lf == cr + 1 ? lf + 1 // CRLF
-                                       : min + 1;
+                    if (lf == cr + 1) {
+                        // CRLF
+                        pos = lf + 1;
+                        nextCr = NOT_TRIED;
+                        nextLf = NOT_TRIED;
+                    } else {
+                        pos = min + 1;
+                        resetLookahead(cr, min);
+                    }
 
                     return subSequence(curPos, min);
-                } else if (cr == -1 && lf == -1) {
+                } else if (cr == NOT_FOUND && lf == NOT_FOUND) {
                     // no following line terminator, cut until the end
                     pos = max;
                     return subSequence(curPos, max);
                 } else {
                     // lf or cr (exactly one is != -1 and max returns that one)
                     int idx = Math.max(cr, lf);
+                    resetLookahead(cr, idx);
                     pos = idx + 1;
                     return subSequence(curPos, idx);
                 }
             }
+
+            private void resetLookahead(int cr, int idx) {
+                if (idx == cr) {
+                    nextCr = NOT_TRIED;
+                } else {
+                    nextLf = NOT_TRIED;
+                }
+            }
         };
     }
 
@@ -515,7 +553,7 @@ public final class Chars implements CharSequence {
                     throw new IndexOutOfBoundsException();
                 }
                 if (pos >= max) {
-                    return -1;
+                    return NOT_FOUND;
                 }
                 int toRead = Integer.min(max - pos, len);
                 str.getChars(pos, pos + toRead, cbuf, off);
@@ -525,7 +563,7 @@ public final class Chars implements CharSequence {
 
             @Override
             public int read() {
-                return pos >= max ? -1 : str.charAt(pos++);
+                return pos >= max ? NOT_FOUND : str.charAt(pos++);
             }
 
             @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index 983ba92b6e..a443e93189 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -11,9 +11,7 @@ import static org.junit.Assert.assertThrows;
 import java.io.IOException;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 
 import net.sourceforge.pmd.lang.DummyLanguageModule;
@@ -26,8 +24,6 @@ import junitparams.Parameters;
 @RunWith(JUnitParamsRunner.class)
 public class TextDocumentTest {
 
-    @Rule
-    public ExpectedException expect = ExpectedException.none();
     private final LanguageVersion dummyVersion = LanguageRegistry.getDefaultLanguage().getDefaultVersion();
 
     @Test

From 6cf5e09088b60d5302efb61540536eba63e45184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 17:01:22 +0200
Subject: [PATCH 121/180] Add test for text files

---
 .../pmd/lang/document/TextFile.java           | 19 +++-
 .../pmd/util/treeexport/TreeExportCli.java    |  2 +-
 .../pmd/lang/document/TextFilesTest.java      | 96 +++++++++++++++++++
 3 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
index 5b7c898eef..6b7ccff057 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
@@ -212,7 +212,24 @@ public interface TextFile extends Closeable {
      *
      * @throws NullPointerException If any parameter is null
      */
-    static TextFileBuilder forReader(Reader reader, String pathId, LanguageVersion languageVersion) {
+    static TextFile forReader(Reader reader, String pathId, LanguageVersion languageVersion) {
+        return builderForReader(reader, pathId, languageVersion).build();
+    }
+
+    /**
+     * Returns a read-only builder reading from a reader.
+     * The reader is first read when {@link TextFile#readContents()} is first
+     * called, and is closed when that method exits. Note that this may
+     * only be called once, afterwards, {@link TextFile#readContents()} will
+     * throw an {@link IOException}.
+     *
+     * @param reader          Text of the file
+     * @param pathId          File name to use as path id
+     * @param languageVersion Language version
+     *
+     * @throws NullPointerException If any parameter is null
+     */
+    static TextFileBuilder builderForReader(Reader reader, String pathId, LanguageVersion languageVersion) {
         return new ForReader(languageVersion, reader, pathId);
     }
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
index cdc35ff579..e8381171a1 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/treeexport/TreeExportCli.java
@@ -188,7 +188,7 @@ public class TreeExportCli {
             throw bail("One of --file or --read-stdin must be mentioned");
         } else if (readStdin) {
             io.stderr.println("Reading from stdin...");
-            textFile = TextFile.forReader(readFromSystemIn(), "stdin", langVersion).build();
+            textFile = TextFile.forReader(readFromSystemIn(), "stdin", langVersion);
         } else {
             textFile = TextFile.forPath(Paths.get(file), Charset.forName(encoding), langVersion);
         }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
new file mode 100644
index 0000000000..c165582980
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
@@ -0,0 +1,96 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.document;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.commons.io.IOUtils;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import net.sourceforge.pmd.lang.DummyLanguageModule;
+import net.sourceforge.pmd.lang.LanguageVersion;
+
+public class TextFilesTest {
+
+    @Rule
+    public TemporaryFolder tempDir = TemporaryFolder.builder().build();
+
+    private LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion();
+
+    @Test
+    public void testNioFile() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+        try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
+            Assert.assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
+            Assert.assertEquals(file.toString(), tf.getDisplayName());
+            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
+            Assert.assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testNioFileBuilder() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+        try (TextFile tf = TextFile.builderForPath(file, StandardCharsets.UTF_8, dummyVersion)
+                                   .withDisplayName("aname")
+                                   .build()) {
+            Assert.assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
+            Assert.assertEquals("aname", tf.getDisplayName());
+            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
+            Assert.assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testNioFileEscape() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
+        try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
+            Assert.assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testReaderFileEscape() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
+        try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion)) {
+            Assert.assertEquals("filename", tf.getPathId());
+            Assert.assertEquals("filename", tf.getDisplayName());
+            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
+            Assert.assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
+            Assert.assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+                TextFileContent.fromCharSeq("new content")
+            ));
+        }
+    }@Test
+    public void testStringFileEscape() throws IOException {
+        try (TextFile tf = TextFile.forCharSeq("cont\r\nents", "filename", dummyVersion)) {
+            Assert.assertEquals("filename", tf.getPathId());
+            Assert.assertEquals("filename", tf.getDisplayName());
+            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
+            Assert.assertEquals(Chars.wrap("cont\r\nent"), tf.readContents().getNormalizedText());
+            Assert.assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+                TextFileContent.fromCharSeq("new content")
+            ));
+        }
+    }
+
+    private @NonNull Path makeTmpFile(Charset charset, String content) throws IOException {
+        Path file = tempDir.newFile().toPath();
+        try (BufferedWriter writer = Files.newBufferedWriter(file, charset)) {
+            IOUtils.write(content, writer);
+        }
+        return file;
+    }
+
+}

From dae31bf3085ea329eb40f9ef3d11defaae879973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 17:11:33 +0200
Subject: [PATCH 122/180] Tests for readonlyness

---
 .../pmd/lang/document/FileCollector.java      |  12 +-
 .../pmd/lang/document/NioTextFile.java        |  13 ++-
 .../pmd/lang/document/TextFileBuilder.java    |  57 ++++++----
 .../pmd/lang/document/TextFilesTest.java      | 103 ++++++++++++++----
 4 files changed, 139 insertions(+), 46 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
index ef8867dee5..460a56537a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
@@ -48,6 +48,7 @@ import net.sourceforge.pmd.util.log.MessageReporter;
  */
 @SuppressWarnings("PMD.CloseResource")
 public final class FileCollector implements AutoCloseable {
+
     private static final Logger LOG = LoggerFactory.getLogger(FileCollector.class);
 
     private final List<TextFile> allFilesToProcess = new ArrayList<>();
@@ -167,8 +168,11 @@ public final class FileCollector implements AutoCloseable {
             reporter.error("Not a regular file {}", file);
             return false;
         }
-        NioTextFile nioTextFile = new NioTextFile(file, charset, discoverer.getDefaultLanguageVersion(language), getDisplayName(file));
-        addFileImpl(nioTextFile);
+        LanguageVersion lv = discoverer.getDefaultLanguageVersion(language);
+        Objects.requireNonNull(lv);
+        addFileImpl(TextFile.builderForPath(file, charset, lv)
+                            .withDisplayName(getDisplayName(file))
+                            .build());
         return true;
     }
 
@@ -371,7 +375,7 @@ public final class FileCollector implements AutoCloseable {
      */
     public void exclude(FileCollector excludeCollector) {
         Set<TextFile> toExclude = new HashSet<>(excludeCollector.allFilesToProcess);
-        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext();) {
+        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext(); ) {
             TextFile file = iterator.next();
             if (toExclude.contains(file)) {
                 LOG.trace("Excluding file {}", file.getPathId());
@@ -385,7 +389,7 @@ public final class FileCollector implements AutoCloseable {
      * collection.
      */
     public void filterLanguages(Set<Language> languages) {
-        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext();) {
+        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext(); ) {
             TextFile file = iterator.next();
             Language lang = file.getLanguageVersion().getLanguage();
             if (!languages.contains(lang)) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
index 21f96da6d7..f362a231cc 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
@@ -27,13 +27,19 @@ class NioTextFile extends BaseCloseable implements TextFile {
     private final Charset charset;
     private final LanguageVersion languageVersion;
     private final @Nullable String displayName;
+    private boolean readOnly;
 
-    NioTextFile(Path path, Charset charset, LanguageVersion languageVersion, @Nullable String displayName) {
+    NioTextFile(Path path,
+                Charset charset,
+                LanguageVersion languageVersion,
+                @Nullable String displayName,
+                boolean readOnly) {
         AssertionUtil.requireParamNotNull("path", path);
         AssertionUtil.requireParamNotNull("charset", charset);
         AssertionUtil.requireParamNotNull("language version", languageVersion);
 
         this.displayName = displayName;
+        this.readOnly = readOnly;
         this.path = path;
         this.charset = charset;
         this.languageVersion = languageVersion;
@@ -56,12 +62,15 @@ class NioTextFile extends BaseCloseable implements TextFile {
 
     @Override
     public boolean isReadOnly() {
-        return !Files.isWritable(path);
+        return readOnly || !Files.isWritable(path);
     }
 
     @Override
     public void writeContents(TextFileContent content) throws IOException {
         ensureOpen();
+        if (isReadOnly()) {
+            throw new ReadOnlyFileException();
+        }
         try (BufferedWriter bw = Files.newBufferedWriter(path, charset)) {
             if (content.getLineTerminator().equals(TextFileContent.NORMALIZED_LINE_TERM)) {
                 content.getNormalizedText().writeFully(bw);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileBuilder.java
index 2c1e066f10..f240b51b81 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileBuilder.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileBuilder.java
@@ -26,10 +26,41 @@ public abstract class TextFileBuilder {
         this.languageVersion = AssertionUtil.requireParamNotNull("language version", languageVersion);
     }
 
+    /**
+     * Specify that the built file is read only. Some text files are
+     * always read-only.
+     *
+     * @return This builder
+     */
+    public TextFileBuilder asReadOnly() {
+        // default is appropriate if the file type is always read-only
+        return this;
+    }
+
+
+    /**
+     * Sets a custom display name for the new file. If null, or this is
+     * never called, the display name defaults to the path ID.
+     *
+     * @param displayName A display name
+     *
+     * @return This builder
+     */
+    public TextFileBuilder withDisplayName(@Nullable String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Creates and returns the new text file.
+     */
+    public abstract TextFile build();
+
     static class ForNio extends TextFileBuilder {
 
         private final Path path;
         private final Charset charset;
+        private boolean readOnly = false;
 
         ForNio(LanguageVersion languageVersion, Path path, Charset charset) {
             super(languageVersion);
@@ -37,9 +68,15 @@ public abstract class TextFileBuilder {
             this.charset = AssertionUtil.requireParamNotNull("charset", charset);
         }
 
+        @Override
+        public TextFileBuilder asReadOnly() {
+            readOnly = true;
+            return this;
+        }
+
         @Override
         public TextFile build() {
-            return new NioTextFile(path, charset, languageVersion, displayName);
+            return new NioTextFile(path, charset, languageVersion, displayName, readOnly);
         }
     }
 
@@ -77,22 +114,4 @@ public abstract class TextFileBuilder {
         }
     }
 
-
-    /**
-     * Sets a custom display name for the new file. If null, or this is
-     * never called, the display name defaults to the path ID.
-     *
-     * @param displayName A display name
-     *
-     * @return This builder
-     */
-    public TextFileBuilder withDisplayName(@Nullable String displayName) {
-        this.displayName = displayName;
-        return this;
-    }
-
-    /**
-     * Creates and returns the new text file.
-     */
-    public abstract TextFile build();
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
index c165582980..a53ec06ef8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
@@ -4,6 +4,11 @@
 
 package net.sourceforge.pmd.lang.document;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -13,7 +18,6 @@ import java.nio.file.Path;
 
 import org.apache.commons.io.IOUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -32,10 +36,47 @@ public class TextFilesTest {
     public void testNioFile() throws IOException {
         Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
         try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
-            Assert.assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
-            Assert.assertEquals(file.toString(), tf.getDisplayName());
-            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
-            Assert.assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+            assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
+            assertEquals(file.toString(), tf.getDisplayName());
+            assertEquals(dummyVersion, tf.getLanguageVersion());
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testNioFileWrite() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+        try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+            assertFalse("readonly", tf.isReadOnly());
+
+            tf.writeContents(
+                TextFileContent.fromCharSeq("new content")
+            );
+
+            assertEquals(Chars.wrap("new content"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testNioFileExplicitReadOnly() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+        try (TextFile tf = TextFile.builderForPath(file, StandardCharsets.UTF_8, dummyVersion)
+                                   .asReadOnly().build()) {
+            assertTrue("readonly", tf.isReadOnly());
+
+            assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+                TextFileContent.fromCharSeq("new content")
+            ));
+        }
+    }
+
+    @Test
+    public void testNioFileCanBeReadMultipleTimes() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+        try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
         }
     }
 
@@ -45,10 +86,10 @@ public class TextFilesTest {
         try (TextFile tf = TextFile.builderForPath(file, StandardCharsets.UTF_8, dummyVersion)
                                    .withDisplayName("aname")
                                    .build()) {
-            Assert.assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
-            Assert.assertEquals("aname", tf.getDisplayName());
-            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
-            Assert.assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+            assertEquals(file.toAbsolutePath().toString(), tf.getPathId());
+            assertEquals("aname", tf.getDisplayName());
+            assertEquals(dummyVersion, tf.getLanguageVersion());
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
         }
     }
 
@@ -56,7 +97,7 @@ public class TextFilesTest {
     public void testNioFileEscape() throws IOException {
         Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
         try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
-            Assert.assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
+            assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
         }
     }
 
@@ -64,22 +105,42 @@ public class TextFilesTest {
     public void testReaderFileEscape() throws IOException {
         Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
         try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion)) {
-            Assert.assertEquals("filename", tf.getPathId());
-            Assert.assertEquals("filename", tf.getDisplayName());
-            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
-            Assert.assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
-            Assert.assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+            assertEquals("filename", tf.getPathId());
+            assertEquals("filename", tf.getDisplayName());
+            assertEquals(dummyVersion, tf.getLanguageVersion());
+            assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
+            assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
                 TextFileContent.fromCharSeq("new content")
             ));
         }
-    }@Test
+    }
+
+    @Test
     public void testStringFileEscape() throws IOException {
         try (TextFile tf = TextFile.forCharSeq("cont\r\nents", "filename", dummyVersion)) {
-            Assert.assertEquals("filename", tf.getPathId());
-            Assert.assertEquals("filename", tf.getDisplayName());
-            Assert.assertEquals(dummyVersion, tf.getLanguageVersion());
-            Assert.assertEquals(Chars.wrap("cont\r\nent"), tf.readContents().getNormalizedText());
-            Assert.assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+            assertEquals("filename", tf.getPathId());
+            assertEquals("filename", tf.getDisplayName());
+            assertEquals(dummyVersion, tf.getLanguageVersion());
+            assertEquals(Chars.wrap("cont\nents"), tf.readContents().getNormalizedText());
+            assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
+                TextFileContent.fromCharSeq("new content")
+            ));
+        }
+    }
+
+    @Test
+    public void testStringFileCanBeReadMultipleTimes() throws IOException {
+        try (TextFile tf = TextFile.forCharSeq("contents", "filename", dummyVersion)) {
+            assertEquals(Chars.wrap("contents"), tf.readContents().getNormalizedText());
+            assertEquals(Chars.wrap("contents"), tf.readContents().getNormalizedText());
+            assertEquals(Chars.wrap("contents"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testStringFileIsReadonly() throws IOException {
+        try (TextFile tf = TextFile.forCharSeq("contents", "filename", dummyVersion)) {
+            assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
                 TextFileContent.fromCharSeq("new content")
             ));
         }

From 996f81ccce4645cee1086392df05d469d6fb1e2c Mon Sep 17 00:00:00 2001
From: HoshiNoMei <11910516@mail.sustech.edu.cn>
Date: Sun, 24 Apr 2022 23:36:46 +0800
Subject: [PATCH 123/180] Modify the rule to meet the missing case

---
 .../src/main/resources/category/java/design.xml    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index f071a261f9..1835882366 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1289,7 +1289,8 @@ public void foo() throws Exception {
         <description>
 <![CDATA[
 Look for ternary operators with the form `condition ? literalBoolean : foo`
-or `condition ? foo : literalBoolean`.
+or `condition ? foo : literalBoolean`
+or `condition ? literalBoolean1 : literalBoolean2`.
 
 These expressions can be simplified respectively to
 `condition || foo`  when the literalBoolean is true
@@ -1297,6 +1298,11 @@ These expressions can be simplified respectively to
 or
 `!condition || foo` when the literalBoolean is true
 `condition && foo`  when the literalBoolean is false
+or
+`true`  when the literalBoolean are both true
+`false` when the literalBoolean are both false
+`condition`  when the literalBoolean1 is true and the literalBoolean2 is false
+`!condition` when the literalBoolean1 is false and the literalBoolean2 is true
 ]]>
         </description>
         <priority>3</priority>
@@ -1308,6 +1314,8 @@ or
 //ConditionalExpression[not(PrimaryExpression/*/Literal) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
 |
 //ConditionalExpression[not(Expression/PrimaryExpression/*/Literal) and (PrimaryExpression/*/Literal/BooleanLiteral)]
+|
+//ConditionalExpression[(PrimaryExpression/*/Literal/BooleanLiteral) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
 ]]>
                 </value>
             </property>
@@ -1330,6 +1338,10 @@ public class Foo {
     public void test4() {
         final boolean otherValue = condition ? something() : false; // can be as simple as condition && something();
     }
+
+    public boolean test5() {
+        return condition ? true : false; // can be as simple as return condition;
+    }
 }
 ]]>
         </example>

From dc40bc27b8b8c09f7982fd8eafe7bd723feb94d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 17:38:35 +0200
Subject: [PATCH 124/180] More tests

---
 .../pmd/lang/document/NioTextFile.java        |  2 +-
 .../lang/document/ReadOnlyFileException.java  |  4 ++
 .../pmd/lang/document/TextFile.java           |  2 +-
 .../pmd/lang/document/TextFileContent.java    | 19 +++---
 .../pmd/lang/document/TextPos2d.java          |  6 +-
 .../pmd/lang/document/TextRange2d.java        | 12 ++--
 .../document/internal/LanguageDiscoverer.java | 63 -------------------
 .../pmd/lang/document/FileLocationTest.java   |  7 +++
 .../document/SourceCodePositionerTest.java    |  4 ++
 .../pmd/lang/document/TextFilesTest.java      | 26 +++++++-
 .../pmd/lang/document/TextPos2dTest.java      | 22 +++++++
 .../pmd/lang/document/TextRange2dTest.java    | 20 ++++++
 12 files changed, 102 insertions(+), 85 deletions(-)
 delete mode 100644 pmd-core/src/main/java/net/sourceforge/pmd/lang/document/internal/LanguageDiscoverer.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
index f362a231cc..c0400e9294 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
@@ -69,7 +69,7 @@ class NioTextFile extends BaseCloseable implements TextFile {
     public void writeContents(TextFileContent content) throws IOException {
         ensureOpen();
         if (isReadOnly()) {
-            throw new ReadOnlyFileException();
+            throw new ReadOnlyFileException(this);
         }
         try (BufferedWriter bw = Files.newBufferedWriter(path, charset)) {
             if (content.getLineTerminator().equals(TextFileContent.NORMALIZED_LINE_TERM)) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/ReadOnlyFileException.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/ReadOnlyFileException.java
index 28b739c21c..df27cb13c1 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/ReadOnlyFileException.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/ReadOnlyFileException.java
@@ -10,4 +10,8 @@ package net.sourceforge.pmd.lang.document;
  */
 public class ReadOnlyFileException extends UnsupportedOperationException {
 
+    public ReadOnlyFileException(TextFile textFile) {
+        super("Read only: " + textFile.getPathId());
+    }
+
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
index 6b7ccff057..83ab966a47 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
@@ -109,7 +109,7 @@ public interface TextFile extends Closeable {
      * @throws ReadOnlyFileException If this text source is read-only
      */
     default void writeContents(TextFileContent content) throws IOException {
-        throw new ReadOnlyFileException();
+        throw new ReadOnlyFileException(this);
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
index 0d4234c5ae..cb77db852c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFileContent.java
@@ -30,11 +30,16 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  */
 public final class TextFileContent {
 
+    // the three line terminators we handle.
+    private static final String CRLF = "\r\n";
+    private static final String LF = "\n";
+    private static final String CR = "\r";
+
     /**
      * The normalized line ending used to replace platform-specific
      * line endings in the {@linkplain #getNormalizedText() normalized text}.
      */
-    public static final String NORMALIZED_LINE_TERM = "\n";
+    public static final String NORMALIZED_LINE_TERM = LF;
 
     /** The normalized line ending as a char. */
     public static final char NORMALIZED_LINE_TERM_CHAR = '\n';
@@ -225,10 +230,10 @@ public final class TextFileContent {
                     if (afterCr && c != NORMALIZED_LINE_TERM_CHAR) {
                         // we saw a \r last iteration, but didn't copy it
                         // it's not followed by an \n
-                        newLineTerm = "\r";
+                        newLineTerm = CR;
                         newLineOffset = bufOffset + i + offsetDiff;
                         if (i > 0) {
-                            cbuf[i - 1] = '\n'; // replace the \r with a \n
+                            cbuf[i - 1] = NORMALIZED_LINE_TERM_CHAR; // replace the \r with a \n
                         } else {
                             // The CR was trailing a buffer, so it's not in the current buffer and wasn't copied.
                             // Append a newline.
@@ -236,10 +241,10 @@ public final class TextFileContent {
                         }
                     } else {
                         if (afterCr) {
-                            newLineTerm = "\r\n";
+                            newLineTerm = CRLF;
 
                             if (i > 0) {
-                                cbuf[i - 1] = '\n'; // replace the \r with a \n
+                                cbuf[i - 1] = NORMALIZED_LINE_TERM_CHAR; // replace the \r with a \n
                                 // copy up to and including the \r, which was replaced
                                 result.append(cbuf, nextCharToCopy, i - nextCharToCopy);
                                 nextCharToCopy = i + 1; // set the next char to copy to after the \n
@@ -249,7 +254,7 @@ public final class TextFileContent {
                             offsetDiff--;
                         } else {
                             // just \n
-                            newLineTerm = "\n";
+                            newLineTerm = LF;
                         }
                         newLineOffset = bufOffset + i + offsetDiff + 1;
                     }
@@ -275,7 +280,7 @@ public final class TextFileContent {
         if (afterCr) { // we're at EOF, so it's not followed by \n
             result.append(NORMALIZED_LINE_TERM);
             positionerBuilder.addLineEndAtOffset(bufOffset);
-            detectedLineTerm = detectLineTerm(detectedLineTerm, "\r", fallbackLineSep);
+            detectedLineTerm = detectLineTerm(detectedLineTerm, CR, fallbackLineSep);
         }
 
         if (detectedLineTerm == null) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
index bdf767af3b..b554cd3eda 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
@@ -18,7 +18,7 @@ public final class TextPos2d implements Comparable<TextPos2d> {
         this.line = line;
         this.column = column;
 
-        assert line > 0 && column > 0 : "Invalid position" + parThis();
+        assert line > 0 && column > 0 : "Invalid position " + toTupleString();
     }
 
     /**
@@ -44,10 +44,6 @@ public final class TextPos2d implements Comparable<TextPos2d> {
         return new TextPos2d(line, column);
     }
 
-    private String parThis() {
-        return "(" + this + ")";
-    }
-
 
     /** Compares the start offset, then the length of a region. */
     @Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
index 25f6d49dc8..14519896a9 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextRange2d.java
@@ -4,12 +4,18 @@
 
 package net.sourceforge.pmd.lang.document;
 
+import java.util.Comparator;
 import java.util.Objects;
 
 /**
  * A place in a text document, represented as line/column information.
  */
 public final class TextRange2d implements Comparable<TextRange2d> {
+    private static final Comparator<TextRange2d> COMPARATOR =
+        Comparator.comparingInt(TextRange2d::getStartLine)
+            .thenComparingInt(TextRange2d::getStartColumn)
+            .thenComparingInt(TextRange2d::getEndLine)
+            .thenComparingInt(TextRange2d::getEndColumn);
 
     private final int startLine;
     private final int startCol;
@@ -69,11 +75,7 @@ public final class TextRange2d implements Comparable<TextRange2d> {
 
     @Override
     public int compareTo(TextRange2d o) {
-        int cmp = getStartPos().compareTo(o.getStartPos());
-        if (cmp != 0) {
-            return cmp;
-        }
-        return getEndPos().compareTo(o.getEndPos());
+        return COMPARATOR.compare(this, o);
     }
 
     public boolean contains(TextRange2d range) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/internal/LanguageDiscoverer.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/internal/LanguageDiscoverer.java
deleted file mode 100644
index 0544cc175c..0000000000
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/internal/LanguageDiscoverer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.document.internal;
-
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import net.sourceforge.pmd.lang.Language;
-import net.sourceforge.pmd.lang.LanguageRegistry;
-
-/**
- * Discovers the languages applicable to a file.
- */
-public class LanguageDiscoverer {
-
-
-    private final Language forcedLanguage;
-
-    /**
-     * Build a new instance.
-     *
-     * @param forcedLanguage If non-null, all files will be assigned this language.
-     */
-    public LanguageDiscoverer(Language forcedLanguage) {
-        this.forcedLanguage = forcedLanguage;
-    }
-
-    /**
-     * Get the Languages of a given source file.
-     *
-     * @param sourceFile The file.
-     *
-     * @return The Languages for the source file, may be empty.
-     */
-    public List<Language> getLanguagesForFile(Path sourceFile) {
-        return getLanguagesForFile(sourceFile.getFileName().toString());
-    }
-
-    /**
-     * Get the Languages of a given source file.
-     *
-     * @param fileName The file name.
-     *
-     * @return The Languages for the source file, may be empty.
-     */
-    public List<Language> getLanguagesForFile(String fileName) {
-        if (forcedLanguage != null) {
-            return Collections.singletonList(forcedLanguage);
-        }
-        String extension = getExtension(fileName);
-        return LanguageRegistry.findByExtension(extension);
-    }
-
-    // Get the extensions from a file
-    private String getExtension(String fileName) {
-        return StringUtils.substringAfterLast(fileName, ".");
-    }
-}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
index 5e9c353497..d0fb1e31d2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java
@@ -25,6 +25,13 @@ public class FileLocationTest {
         assertEquals(2, loc.getEndColumn());
     }
 
+    @Test
+    public void testToRange() {
+        TextRange2d range2d = TextRange2d.range2d(1, 1, 1, 2);
+        FileLocation loc = FileLocation.range("fname", range2d);
+        assertEquals(range2d, loc.toRange2d());
+    }
+
     @Test
     public void testToString() {
         FileLocation loc = FileLocation.range("fname", TextRange2d.range2d(1, 1, 1, 2));
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
index 5436b626bf..26a3c987c2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
@@ -63,6 +63,10 @@ public class SourceCodePositionerTest {
         assertEquals("abcd\ndef".length(), positioner.offsetFromLineColumn(2, 4));
 
         assertEquals("abcd\ndefghi\r\n".length(), positioner.offsetFromLineColumn(3, 1));
+        assertEquals(source.length(), positioner.offsetFromLineColumn(4, 4));
+        assertEquals(-1, positioner.offsetFromLineColumn(4, 5));
+        assertEquals(source.length(), positioner.offsetFromLineColumn(5, 1));
+        assertEquals(-1, positioner.offsetFromLineColumn(5, 2));
     }
 
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
index a53ec06ef8..fe807c00cb 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
@@ -50,11 +50,22 @@ public class TextFilesTest {
             assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
             assertFalse("readonly", tf.isReadOnly());
 
+            // write with CRLF
             tf.writeContents(
-                TextFileContent.fromCharSeq("new content")
+                TextFileContent.fromCharSeq("new content\r\n")
             );
 
-            assertEquals(Chars.wrap("new content"), tf.readContents().getNormalizedText());
+            TextFileContent read = tf.readContents();
+            // is normalized to LF when rereading
+            assertEquals(Chars.wrap("new content\n"), read.getNormalizedText());
+            // but line terminator is detected as CRLF
+            assertEquals("\r\n", read.getLineTerminator());
+
+            tf.writeContents(
+                TextFileContent.fromCharSeq("new content\n")
+            );
+
+            assertEquals(Chars.wrap("new content\n"), tf.readContents().getNormalizedText());
         }
     }
 
@@ -102,13 +113,21 @@ public class TextFilesTest {
     }
 
     @Test
-    public void testReaderFileEscape() throws IOException {
+    public void testReaderFile() throws IOException {
         Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
         try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion)) {
             assertEquals("filename", tf.getPathId());
             assertEquals("filename", tf.getDisplayName());
             assertEquals(dummyVersion, tf.getLanguageVersion());
             assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testReaderFileIsReadOnly() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent");
+        try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion)) {
+            assertTrue("readonly", tf.isReadOnly());
             assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
                 TextFileContent.fromCharSeq("new content")
             ));
@@ -140,6 +159,7 @@ public class TextFilesTest {
     @Test
     public void testStringFileIsReadonly() throws IOException {
         try (TextFile tf = TextFile.forCharSeq("contents", "filename", dummyVersion)) {
+            assertTrue("readonly", tf.isReadOnly());
             assertThrows(ReadOnlyFileException.class, () -> tf.writeContents(
                 TextFileContent.fromCharSeq("new content")
             ));
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
index 4546fede17..7b4e6165f9 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.document;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
@@ -33,4 +34,25 @@ public class TextPos2dTest {
         MatcherAssert.assertThat(pos.toString(), containsString("!debug only!"));
     }
 
+    @Test
+    public void testEquals() {
+        TextPos2d pos = TextPos2d.pos2d(1, 1);
+        TextPos2d pos2 = TextPos2d.pos2d(1, 2);
+        assertNotEquals(pos, pos2);
+        assertEquals(pos, TextPos2d.pos2d(1, 1));
+        assertEquals(pos2, pos2);
+    }
+
+    @Test
+    public void testCompareTo() {
+        TextPos2d pos = TextPos2d.pos2d(1, 1);
+        TextPos2d pos2 = TextPos2d.pos2d(1, 2);
+        TextPos2d pos3 = TextPos2d.pos2d(2, 1);
+
+        assertEquals(-1, pos.compareTo(pos2));
+        assertEquals(-1, pos.compareTo(pos3));
+        assertEquals(-1, pos2.compareTo(pos3));
+        assertEquals(1, pos2.compareTo(pos));
+        assertEquals(0, pos.compareTo(pos));
+    }
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java
index 188eb1cb7b..ed5f067fd8 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.document;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
@@ -22,6 +23,25 @@ public class TextRange2dTest {
         assertEquals(pos, pos2);
     }
 
+    @Test
+    public void testEquals() {
+        TextRange2d pos = TextRange2d.range2d(1, 1, 1, 1);
+        TextRange2d pos2 = TextRange2d.range2d(1, 1, 1, 2);
+        assertNotEquals(pos, pos2);
+        assertEquals(pos, pos);
+        assertEquals(pos2, pos2);
+    }
+
+    @Test
+    public void testCompareTo() {
+        TextRange2d pos = TextRange2d.range2d(1, 1, 1, 1);
+        TextRange2d pos2 = TextRange2d.range2d(1, 1, 1, 2);
+
+        assertEquals(-1, pos.compareTo(pos2));
+        assertEquals(1, pos2.compareTo(pos));
+        assertEquals(0, pos.compareTo(pos));
+    }
+
     @Test
     public void testToString() {
         TextRange2d range = TextRange2d.range2d(1, 2, 3, 4);

From 5bbc3fa8d1e919cfd39a77b17a3b3b97fb1dea86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 17:56:40 +0200
Subject: [PATCH 125/180] Test data source compat

---
 .../net/sourceforge/pmd/PMDConfiguration.java |  2 +-
 .../pmd/lang/document/FileCollector.java      |  4 +-
 .../pmd/lang/document/TextFile.java           |  9 ++-
 .../pmd/lang/document/TextFilesTest.java      | 62 +++++++++++++++++++
 4 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
index 72a0e6376f..589f8b2241 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
@@ -364,7 +364,7 @@ public class PMDConfiguration extends AbstractConfiguration {
         if (languageVersion == null) {
             // For compatibility with older code that does not always pass in
             // a correct filename.
-            languageVersion = languageVersionDiscoverer.getDefaultLanguageVersion(LanguageRegistry.getLanguage("Java"));
+            languageVersion = languageVersionDiscoverer.getDefaultLanguageVersion(LanguageRegistry.getDefaultLanguage());
         }
         return languageVersion;
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
index 460a56537a..5e481ca5cd 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FileCollector.java
@@ -375,7 +375,7 @@ public final class FileCollector implements AutoCloseable {
      */
     public void exclude(FileCollector excludeCollector) {
         Set<TextFile> toExclude = new HashSet<>(excludeCollector.allFilesToProcess);
-        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext(); ) {
+        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext();) {
             TextFile file = iterator.next();
             if (toExclude.contains(file)) {
                 LOG.trace("Excluding file {}", file.getPathId());
@@ -389,7 +389,7 @@ public final class FileCollector implements AutoCloseable {
      * collection.
      */
     public void filterLanguages(Set<Language> languages) {
-        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext(); ) {
+        for (Iterator<TextFile> iterator = allFilesToProcess.iterator(); iterator.hasNext();) {
             TextFile file = iterator.next();
             Language lang = file.getLanguageVersion().getLanguage();
             if (!languages.contains(lang)) {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
index 83ab966a47..15e3ed3c37 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextFile.java
@@ -244,16 +244,21 @@ public interface TextFile extends Closeable {
     @Deprecated
     @DeprecatedUntil700
     static TextFile dataSourceCompat(DataSource ds, PMDConfiguration config) {
+        String pathId = ds.getNiceFileName(false, null);
+        LanguageVersion languageVersion = config.getLanguageVersionOfFile(pathId);
+        if (languageVersion == null) {
+            throw new NullPointerException("no language version detected for " + pathId);
+        }
         class DataSourceTextFile extends BaseCloseable implements TextFile {
 
             @Override
             public @NonNull LanguageVersion getLanguageVersion() {
-                return config.getLanguageVersionOfFile(getPathId());
+                return languageVersion;
             }
 
             @Override
             public String getPathId() {
-                return ds.getNiceFileName(false, null);
+                return pathId;
             }
 
             @Override
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
index fe807c00cb..a694a213b2 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java
@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.document;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
@@ -22,8 +23,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import net.sourceforge.pmd.PMDConfiguration;
 import net.sourceforge.pmd.lang.DummyLanguageModule;
 import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.util.datasource.DataSource;
+import net.sourceforge.pmd.util.datasource.FileDataSource;
 
 public class TextFilesTest {
 
@@ -43,6 +47,64 @@ public class TextFilesTest {
         }
     }
 
+    @Test
+    public void testEquals() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content").toAbsolutePath();
+        try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion)) {
+            try (TextFile tf2 = TextFile.forCharSeq("some content", file.toString(), dummyVersion)) {
+                assertEquals(tf.getPathId(), tf2.getPathId());
+
+                assertNotEquals(tf, tf2);
+                assertNotEquals(tf2, tf);
+                assertEquals(tf, tf);
+                assertEquals(tf, TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion));
+            }
+        }
+    }
+
+    @Test
+    public void testStringDataSourceCompat() throws IOException {
+        DataSource ds = DataSource.forString("text", "filename.dummy");
+        PMDConfiguration config = new PMDConfiguration();
+        try (TextFile tf = TextFile.dataSourceCompat(ds, config)) {
+            assertEquals("filename.dummy", tf.getPathId());
+            assertEquals("filename.dummy", tf.getDisplayName());
+            assertEquals(DummyLanguageModule.getInstance().getDefaultVersion(), tf.getLanguageVersion());
+            assertEquals(Chars.wrap("text"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testFileDataSourceCompat() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");
+
+        DataSource ds = new FileDataSource(file.toFile());
+        PMDConfiguration config = new PMDConfiguration();
+        try (TextFile tf = TextFile.dataSourceCompat(ds, config)) {
+            assertEquals(ds.getNiceFileName(false, null), tf.getPathId());
+            assertEquals(ds.getNiceFileName(false, null), tf.getDisplayName());
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+    }
+
+    @Test
+    public void testFileDataSourceCompatWithEncoding() throws IOException {
+        Path file = makeTmpFile(StandardCharsets.UTF_16BE, "some content");
+
+        DataSource ds = new FileDataSource(file.toFile());
+        PMDConfiguration config = new PMDConfiguration();
+        config.setSourceEncoding(StandardCharsets.UTF_16BE.name());
+        try (TextFile tf = TextFile.dataSourceCompat(ds, config)) {
+            assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+
+        // different encoding to produce garbage, to make sure encoding is used
+        config.setSourceEncoding(StandardCharsets.UTF_16LE.name());
+        try (TextFile tf = TextFile.dataSourceCompat(ds, config)) {
+            assertNotEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText());
+        }
+    }
+
     @Test
     public void testNioFileWrite() throws IOException {
         Path file = makeTmpFile(StandardCharsets.UTF_8, "some content");

From 8a73559eb82f4d0414150a6f01f6bc2f5c119560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 18:24:03 +0200
Subject: [PATCH 126/180] Add tests for StringUtil

---
 .../net/sourceforge/pmd/util/StringUtil.java  | 46 +++++++++++++++----
 .../sourceforge/pmd/util/StringUtilTest.java  | 18 ++++++++
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 4c82ffe662..8cc32d3a66 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -278,16 +278,28 @@ public final class StringUtil {
      * leading characters can be removed to shift all the text in the strings to
      * the left without misaligning them.
      *
+     * <p>Note: the spec is described in
+     * <a
+     * href='https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html#stripIndent()'>String#stripIndent</a>
+     *
+     * <quote>
+     * The minimum indentation (min) is determined as follows:
+     * <ul>
+     *     <li>For each non-blank line (as defined by isBlank()), the leading white space characters are counted.
+     *     <li>The leading white space characters on the last line are also counted even if blank.
+     * </ul>
+     * The min value is the smallest of these counts.
+     * </quote>
+     *
      * @throws NullPointerException If the parameter is null
      */
     private static int maxCommonLeadingWhitespaceForAll(List<? extends CharSequence> lines) {
-        // the max *common* leading WS length is the min length of all leading WS
         int maxCommonWs = Integer.MAX_VALUE;
         for (int i = 0; i < lines.size(); i++) {
             CharSequence line = lines.get(i);
             // compute common prefix
-            if (!StringUtils.isAllBlank(line) || i == lines.size() - 1) {
-                maxCommonWs = Math.min(maxCommonWs, StringUtil.countLeadingWhitespace(line));
+            if (!StringUtils.isBlank(line) || i == lines.size() - 1) {
+                maxCommonWs = Math.min(maxCommonWs, countLeadingWhitespace(line));
             }
         }
         if (maxCommonWs == Integer.MAX_VALUE) {
@@ -318,8 +330,9 @@ public final class StringUtil {
     }
 
     /**
-     * Trim common indentation in the lines of the string.
-     * Does not discard
+     * Trim common indentation in the lines of the string, like
+     * {@link #appendWithoutCommonPrefix(List, int, StringBuilder)}.
+     *
      */
     public static StringBuilder trimIndent(Chars string) {
         List<Chars> lines = string.lineStream().collect(Collectors.toList());
@@ -328,6 +341,16 @@ public final class StringUtil {
         return sb;
     }
 
+    /**
+     * Trim the common indentation of the lines and append them into
+     * the given StringBuilder, separating lines with \n. Trailing
+     * whitespace is removed on each line. Note that blank lines do
+     * not count towards computing the max common indentation, except
+     * the last one.
+     *
+     * @param lines List of lines to join
+     * @param sb    Output StringBuilder
+     */
     public static void trimIndentIntoStringBuilder(List<Chars> lines, StringBuilder sb) {
         int prefixLength = maxCommonLeadingWhitespaceForAll(lines);
         appendWithoutCommonPrefix(lines, prefixLength, sb);
@@ -335,18 +358,22 @@ public final class StringUtil {
 
     private static void appendWithoutCommonPrefix(List<Chars> lines, int prefixLength, StringBuilder output) {
         for (int i = 0; i < lines.size(); i++) {
+            //  For each non-blank line, min leading white space characters are removed,
+            //  and any trailing white space characters are removed.
+            //  Blank lines are replaced with the empty string.
+
             Chars line = lines.get(i);
             // remove common whitespace prefix
-            if (!StringUtils.isAllBlank(line) && line.length() >= prefixLength) {
+            if (line.length() >= prefixLength && !StringUtils.isBlank(line)) {
                 line = line.subSequence(prefixLength, line.length());
             }
+            // trim trailing whitespace
             line = line.trimEnd();
+            // append
             line.appendChars(output);
 
             boolean isLastLine = i == lines.size() - 1;
-            boolean isFirstLine = i == 0;
-            // todo is this &&?
-            if (!isLastLine || !isFirstLine && !StringUtils.isAllBlank(line)) {
+            if (!isLastLine) {
                 output.append('\n'); // normalize line endings to LF
             }
         }
@@ -403,7 +430,6 @@ public final class StringUtil {
     }
 
 
-
     /**
      * Are the two String values the same. The Strings can be optionally trimmed
      * before checking. The Strings can be optionally compared ignoring case.
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
index 65014ed765..16fdfa606e 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
@@ -10,6 +10,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import net.sourceforge.pmd.lang.document.Chars;
+
 public class StringUtilTest {
 
     @Test
@@ -82,6 +84,22 @@ public class StringUtilTest {
         assertThat(StringUtil.removeSurrounding("qqq", 'q'), equalTo("q"));
     }
 
+    @Test
+    public void testTrimIndent() {
+        assertTrimIndent(" \n b \n c",
+                         "\nb\nc");
+
+        assertTrimIndent(" \nb \n c",
+                         "\nb\n c");
+
+        assertTrimIndent(" \n b \n c\n  ",
+                         "\nb\nc\n");
+    }
+
+    private void assertTrimIndent(String input, String output) {
+        assertThat(StringUtil.trimIndent(Chars.wrap(input)).toString(), equalTo(output));
+    }
+
     @Test
     public void testElide() {
         assertThat(StringUtil.elide("abc", 2, ""), equalTo("ab"));

From 4943dda381dc0631c733716db17dc23fd82c19b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 19:18:23 +0200
Subject: [PATCH 127/180] Cleanup trimming logic

---
 .../pmd/lang/apex/ast/ApexTreeBuilder.java    |  2 +-
 .../sourceforge/pmd/cpd/SimpleRenderer.java   |  6 +-
 .../sourceforge/pmd/lang/document/Chars.java  | 16 +++--
 .../sourceforge/pmd/util/CollectionUtil.java  | 11 +++
 .../net/sourceforge/pmd/util/StringUtil.java  | 71 +++++++++----------
 .../sourceforge/pmd/util/StringUtilTest.java  | 25 +++++++
 .../pmd/lang/java/ast/ASTStringLiteral.java   |  7 +-
 7 files changed, 92 insertions(+), 46 deletions(-)

diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
index c0a8b441c8..ca5e912e3c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
@@ -436,7 +436,7 @@ final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
             if (checkForCommentSuppression && commentText.startsWith("//")) {
                 Chars trimmed = commentText.subSequence("//".length(), commentText.length()).trimStart();
                 if (trimmed.startsWith(suppressMarker)) {
-                    Chars userMessage = trimmed.subSequence(suppressMarker.length(), trimmed.length()).trim();
+                    Chars userMessage = trimmed.subSequence(suppressMarker.length()).trim();
                     suppressMap.put(source.lineColumnAtOffset(startIdx).getLine(), userMessage.toString());
                 }
             }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
index 79e8cea468..5ce8ca7d48 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/SimpleRenderer.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.cpd.renderer.CPDRenderer;
+import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.util.StringUtil;
 
 public class SimpleRenderer implements Renderer, CPDRenderer {
@@ -49,8 +50,9 @@ public class SimpleRenderer implements Renderer, CPDRenderer {
         String source = match.getSourceCodeSlice();
 
         if (trimLeadingWhitespace) {
-            for (String line : StringUtil.linesWithTrimIndent(source)) {
-                writer.append(line).append(PMD.EOL);
+            for (Chars line : StringUtil.linesWithTrimIndent(source)) {
+                line.writeFully(writer);
+                writer.append(PMD.EOL);
             }
             return;
         }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 0b002b22d7..c408bf90b5 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -363,6 +363,14 @@ public final class Chars implements CharSequence {
         return slice(start, end - start);
     }
 
+    /**
+     * Returns the subsequence that starts at the given offset and ends
+     * at the end of this string. Similar to {@link String#substring(int)}.
+     */
+    public Chars subSequence(int start) {
+        return slice(start, len - start);
+    }
+
     /**
      * Slice a region of text.
      *
@@ -415,11 +423,11 @@ public final class Chars implements CharSequence {
     }
 
     private static void validateRangeWithAssert(int off, int len, int bound) {
-        assert len >= 0 && off >= 0 && (off + len) <= bound : invalidRange(off, len, bound);
+        assert len >= 0 && off >= 0 && off + len <= bound : invalidRange(off, len, bound);
     }
 
     private static void validateRange(int off, int len, int bound) {
-        if (len < 0 || off < 0 || (off + len) > bound) {
+        if (len < 0 || off < 0 || off + len > bound) {
             throw new IndexOutOfBoundsException(invalidRange(off, len, bound));
         }
     }
@@ -429,7 +437,7 @@ public final class Chars implements CharSequence {
     }
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
         // this already avoids the copy if start == 0 && len == str.length()
         return str.substring(start, start + len);
     }
@@ -548,7 +556,7 @@ public final class Chars implements CharSequence {
             private final int max = start + len;
 
             @Override
-            public int read(char[] cbuf, int off, int len) {
+            public int read(char @NonNull [] cbuf, int off, int len) {
                 if (len < 0 || off < 0 || off + len > cbuf.length) {
                     throw new IndexOutOfBoundsException();
                 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
index e15cda62cd..82e191cc1a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
@@ -40,6 +40,7 @@ import org.pcollections.PSet;
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.internal.util.AssertionUtil;
 import net.sourceforge.pmd.internal.util.IteratorUtil;
+import net.sourceforge.pmd.lang.document.Chars;
 
 /**
  * Generic collection and array-related utility functions for java.util types.
@@ -635,6 +636,16 @@ public final class CollectionUtil {
         return sb;
     }
 
+    public static @NonNull StringBuilder joinCharsIntoStringBuilder(List<Chars> lines, String delimiter) {
+        return joinOn(
+            new StringBuilder(),
+            lines,
+            (buf, line) -> line.appendChars(buf),
+            delimiter
+        );
+    }
+
+
     /**
      * Merge the second map into the first. If some keys are in common,
      * merge them using the merge function, like {@link Map#merge(Object, Object, BiFunction)}.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 8cc32d3a66..8456b2ccfe 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -279,8 +279,7 @@ public final class StringUtil {
      * the left without misaligning them.
      *
      * <p>Note: the spec is described in
-     * <a
-     * href='https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html#stripIndent()'>String#stripIndent</a>
+     * <a href='https://docs.oracle.com/en/java/javase/16/docs/api/java.base/java/lang/String.html#stripIndent()'>String#stripIndent</a>
      *
      * <quote>
      * The minimum indentation (min) is determined as follows:
@@ -309,33 +308,36 @@ public final class StringUtil {
         return maxCommonWs;
     }
 
+    /**
+     * Returns a list of
+     */
+    public static List<Chars> linesWithTrimIndent(String source) {
+        List<String> lines = Arrays.asList(source.split("\n"));
+        List<Chars> result = lines.stream().map(Chars::wrap).collect(CollectionUtil.toMutableList());
+        trimIndentInPlace(result);
+        return result;
+    }
 
     /**
-     * Trims off the leading characters off the strings up to the trimDepth
-     * specified. Returns the same strings if trimDepth = 0
-     *
-     * @return String[]
+     * @param lines mutable list
      */
-    private static String[] trimStartOn(String[] strings, int trimDepth) {
-
-        if (trimDepth == 0) {
-            return strings;
+    public static void trimIndentInPlace(List<Chars> lines) {
+        int trimDepth = maxCommonLeadingWhitespaceForAll(lines);
+        if (trimDepth > 0) {
+            lines.replaceAll(chars -> chars.length() >= trimDepth
+                                      ? chars.subSequence(trimDepth).trimEnd()
+                                      : chars.trimEnd());
         }
-
-        String[] results = new String[strings.length];
-        for (int i = 0; i < strings.length; i++) {
-            results[i] = strings[i].substring(trimDepth);
-        }
-        return results;
     }
 
     /**
      * Trim common indentation in the lines of the string, like
      * {@link #appendWithoutCommonPrefix(List, int, StringBuilder)}.
-     *
      */
     public static StringBuilder trimIndent(Chars string) {
-        List<Chars> lines = string.lineStream().collect(Collectors.toList());
+        List<Chars> lines = string.lineStream().collect(CollectionUtil.toMutableList());
+        trimIndentInPlace(lines);
+
         StringBuilder sb = new StringBuilder(string.length());
         trimIndentIntoStringBuilder(lines, sb);
         return sb;
@@ -365,7 +367,7 @@ public final class StringUtil {
             Chars line = lines.get(i);
             // remove common whitespace prefix
             if (line.length() >= prefixLength && !StringUtils.isBlank(line)) {
-                line = line.subSequence(prefixLength, line.length());
+                line = line.subSequence(prefixLength);
             }
             // trim trailing whitespace
             line = line.trimEnd();
@@ -398,17 +400,21 @@ public final class StringUtil {
             }
         }
 
-        int lastNonBlankLine = string.indexOf('\n', offsetOfLastNonBlankChar);
-        int firstNonBlankLine = string.lastIndexOf('\n', offsetOfFirstNonBlankChar);
+        // look backwards before the first non-blank char
+        int cutFromInclusive = string.lastIndexOf('\n', offsetOfFirstNonBlankChar);
+        // If firstNonBlankLineStart == -1, ie we're on the first line,
+        // we want to start at zero: then we add 1 to get 0
+        // If firstNonBlankLineStart >= 0, then it's the index of the
+        // \n, we want to cut right after that, so we add 1.
+        cutFromInclusive += 1;
 
-        return string.subSequence(
-            minus1Default(firstNonBlankLine, 0),
-            minus1Default(lastNonBlankLine, string.length())
-        );
-    }
+        // look forwards after the last non-blank char
+        int cutUntilExclusive = string.indexOf('\n', offsetOfLastNonBlankChar);
+        if (cutUntilExclusive == StringUtils.INDEX_NOT_FOUND) {
+            cutUntilExclusive = string.length();
+        }
 
-    private static int minus1Default(int i, int defaultValue) {
-        return i == -1 ? defaultValue : i;
+        return string.subSequence(cutFromInclusive, cutUntilExclusive);
     }
 
 
@@ -420,15 +426,6 @@ public final class StringUtil {
         return count;
     }
 
-    public static String[] linesWithTrimIndent(String source) {
-        String[] lines = source.split("\n");
-        int trimDepth = maxCommonLeadingWhitespaceForAll(Arrays.asList(lines));
-        if (trimDepth > 0) {
-            lines = trimStartOn(lines, trimDepth);
-        }
-        return lines;
-    }
-
 
     /**
      * Are the two String values the same. The Strings can be optionally trimmed
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
index 16fdfa606e..76cb245169 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
@@ -94,6 +94,7 @@ public class StringUtilTest {
 
         assertTrimIndent(" \n b \n c\n  ",
                          "\nb\nc\n");
+        assertTrimIndent("", "");
     }
 
     private void assertTrimIndent(String input, String output) {
@@ -107,4 +108,28 @@ public class StringUtilTest {
         assertThat(StringUtil.elide("abc", 2, ".."), equalTo(".."));
         assertThat(StringUtil.elide("abc", 3, ".."), equalTo("abc"));
     }
+
+    @Test
+    public void substringAfterLast() {
+        assertEquals("abc", StringUtil.substringAfterLast("a.abc", '.'));
+        assertEquals("abc", StringUtil.substringAfterLast("abc", '.'));
+    }
+
+    @Test
+    public void trimBlankLines() {
+        assertTrimBlankLinesEquals(" \n \n abc \n \n de \n \n ",
+                                   " abc \n \n de ");
+        assertTrimBlankLinesEquals("", "");
+    }
+
+    private void assertTrimBlankLinesEquals(String input, String output) {
+        assertEquals(
+            Chars.wrap(output),
+            StringUtil.trimBlankLines(Chars.wrap(input))
+        );
+    }
+
+    @Test
+    public void linesWithTrimIndent() {
+    }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index eb6cf5c377..004921b7da 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -12,6 +12,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.document.Chars;
+import net.sourceforge.pmd.util.CollectionUtil;
 import net.sourceforge.pmd.util.StringUtil;
 
 /**
@@ -83,8 +84,10 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
 
     static String determineTextBlockContent(Chars image) {
         List<Chars> lines = getContentLines(image);
-        StringBuilder sb = new StringBuilder(image.length());
-        StringUtil.trimIndentIntoStringBuilder(lines, sb);
+        // remove common prefix
+        StringUtil.trimIndentInPlace(lines);
+        // join with normalized end of line
+        StringBuilder sb = CollectionUtil.joinCharsIntoStringBuilder(lines, "\n");
         interpretEscapeSequences(sb);
         return sb.toString();
     }

From 89545272af0bdaa0cc194d37f7163aa0e37c09dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 19:33:21 +0200
Subject: [PATCH 128/180] Fix joinOn

---
 .../sourceforge/pmd/util/CollectionUtil.java  |  2 +-
 .../pmd/util/CollectionUtilTest.java          | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
index 82e191cc1a..3483a7f17d 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/CollectionUtil.java
@@ -626,12 +626,12 @@ public final class CollectionUtil {
                                            String delimiter) {
         boolean first = true;
         for (T t : iterable) {
-            appendItem.accept(sb, t);
             if (first) {
                 first = false;
             } else {
                 sb.append(delimiter);
             }
+            appendItem.accept(sb, t);
         }
         return sb;
     }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java
new file mode 100644
index 0000000000..08234fe50c
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java
@@ -0,0 +1,37 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.util;
+
+import static net.sourceforge.pmd.util.CollectionUtil.listOf;
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.document.Chars;
+
+/**
+ * @author Clément Fournier
+ */
+public class CollectionUtilTest {
+
+    @Test
+    public void testJoinOn() {
+        testJoinOn(listOf("a", "b", "c"), ".",
+                   "a.b.c");
+        testJoinOn(Collections.emptyList(), ".",
+                   "");
+    }
+
+    private void testJoinOn(List<String> toJoin, String delimiter, String expected) {
+        String actual = CollectionUtil.joinCharsIntoStringBuilder(
+            CollectionUtil.map(toJoin, Chars::wrap),
+            delimiter
+        ).toString();
+        assertEquals(expected, actual);
+    }
+}

From e4627fb8411571aec24de0aed522a0b44ad5b54b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 19:38:01 +0200
Subject: [PATCH 129/180] Move trimBlankLines

---
 .../sourceforge/pmd/lang/document/Chars.java  | 37 +++++++++++++++++++
 .../net/sourceforge/pmd/util/StringUtil.java  | 36 ------------------
 .../pmd/lang/document/CharsTest.java          | 13 +++++++
 .../sourceforge/pmd/util/StringUtilTest.java  | 14 -------
 .../pmd/testframework/RuleTst.java            |  3 +-
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index c408bf90b5..bb1cf4265c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -295,6 +295,43 @@ public final class Chars implements CharSequence {
         return trimStart().trimEnd();
     }
 
+    /**
+     * Remove trailing and leading blank lines. The resulting string
+     * does not end with a line terminator.
+     */
+    public Chars trimBlankLines() {
+        int offsetOfFirstNonBlankChar = length();
+        for (int i = 0; i < length(); i++) {
+            if (!Character.isWhitespace(charAt(i))) {
+                offsetOfFirstNonBlankChar = i;
+                break;
+            }
+        }
+        int offsetOfLastNonBlankChar = 0;
+        for (int i = length() - 1; i > offsetOfFirstNonBlankChar; i--) {
+            if (!Character.isWhitespace(charAt(i))) {
+                offsetOfLastNonBlankChar = i;
+                break;
+            }
+        }
+
+        // look backwards before the first non-blank char
+        int cutFromInclusive = lastIndexOf('\n', offsetOfFirstNonBlankChar);
+        // If firstNonBlankLineStart == -1, ie we're on the first line,
+        // we want to start at zero: then we add 1 to get 0
+        // If firstNonBlankLineStart >= 0, then it's the index of the
+        // \n, we want to cut right after that, so we add 1.
+        cutFromInclusive += 1;
+
+        // look forwards after the last non-blank char
+        int cutUntilExclusive = indexOf('\n', offsetOfLastNonBlankChar);
+        if (cutUntilExclusive == StringUtils.INDEX_NOT_FOUND) {
+            cutUntilExclusive = length();
+        }
+
+        return subSequence(cutFromInclusive, cutUntilExclusive);
+    }
+
     /**
      * Remove the suffix if it is present, otherwise returns this.
      */
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 8456b2ccfe..cc82caeb85 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -381,42 +381,6 @@ public final class StringUtil {
         }
     }
 
-    /**
-     * Remove trailing and leading blank lines.
-     */
-    public static Chars trimBlankLines(Chars string) {
-        int offsetOfFirstNonBlankChar = string.length();
-        for (int i = 0; i < string.length(); i++) {
-            if (!Character.isWhitespace(string.charAt(i))) {
-                offsetOfFirstNonBlankChar = i;
-                break;
-            }
-        }
-        int offsetOfLastNonBlankChar = 0;
-        for (int i = string.length() - 1; i > offsetOfFirstNonBlankChar; i--) {
-            if (!Character.isWhitespace(string.charAt(i))) {
-                offsetOfLastNonBlankChar = i;
-                break;
-            }
-        }
-
-        // look backwards before the first non-blank char
-        int cutFromInclusive = string.lastIndexOf('\n', offsetOfFirstNonBlankChar);
-        // If firstNonBlankLineStart == -1, ie we're on the first line,
-        // we want to start at zero: then we add 1 to get 0
-        // If firstNonBlankLineStart >= 0, then it's the index of the
-        // \n, we want to cut right after that, so we add 1.
-        cutFromInclusive += 1;
-
-        // look forwards after the last non-blank char
-        int cutUntilExclusive = string.indexOf('\n', offsetOfLastNonBlankChar);
-        if (cutUntilExclusive == StringUtils.INDEX_NOT_FOUND) {
-            cutUntilExclusive = string.length();
-        }
-
-        return string.subSequence(cutFromInclusive, cutUntilExclusive);
-    }
-
 
     private static int countLeadingWhitespace(CharSequence s) {
         int count = 0;
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index 7b193fcb29..e19a5a5366 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -310,4 +310,17 @@ public class CharsTest {
         assertThrows(IndexOutOfBoundsException.class, () -> chars.substring(0, 6));
     }
 
+
+    @Test
+    public void testTrimBlankLines() {
+        assertTrimBlankLinesEquals(" \n \n abc \n \n de \n \n ",
+                                   " abc \n \n de ");
+        assertTrimBlankLinesEquals("", "");
+    }
+
+    private void assertTrimBlankLinesEquals(String input, String expected) {
+        Chars actual = Chars.wrap(input).trimBlankLines();
+        assertEquals(Chars.wrap(expected), actual);
+    }
+
 }
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
index 76cb245169..8f9abce19d 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
@@ -115,20 +115,6 @@ public class StringUtilTest {
         assertEquals("abc", StringUtil.substringAfterLast("abc", '.'));
     }
 
-    @Test
-    public void trimBlankLines() {
-        assertTrimBlankLinesEquals(" \n \n abc \n \n de \n \n ",
-                                   " abc \n \n de ");
-        assertTrimBlankLinesEquals("", "");
-    }
-
-    private void assertTrimBlankLinesEquals(String input, String output) {
-        assertEquals(
-            Chars.wrap(output),
-            StringUtil.trimBlankLines(Chars.wrap(input))
-        );
-    }
-
     @Test
     public void linesWithTrimIndent() {
     }
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
index ff358b038b..d6deafb510 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -50,7 +50,6 @@ import net.sourceforge.pmd.processor.AbstractPMDProcessor;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
 import net.sourceforge.pmd.renderers.TextRenderer;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
-import net.sourceforge.pmd.util.StringUtil;
 
 /**
  * Advanced methods for test cases
@@ -486,7 +485,7 @@ public abstract class RuleTst {
                     throw new RuntimeException("No matching code fragment found for coderef");
                 }
             }
-            code = StringUtil.trimBlankLines(Chars.wrap(code)).toString();
+            code = Chars.wrap(code).trimBlankLines().toString();
 
             String description = getNodeValue(testCode, "description", true);
             int expectedProblems = Integer.parseInt(getNodeValue(testCode, "expected-problems", true).trim());

From 871fcc3cedd77943c721ac26935ec62219f8f988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 19:42:01 +0200
Subject: [PATCH 130/180] Finish cleaning up trimming logic

---
 .../net/sourceforge/pmd/util/StringUtil.java  | 61 ++++---------------
 .../sourceforge/pmd/util/StringUtilTest.java  |  6 +-
 .../pmd/lang/java/ast/ASTStringLiteral.java   |  1 +
 3 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index cc82caeb85..61e577c175 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -319,66 +319,29 @@ public final class StringUtil {
     }
 
     /**
+     * Trim the common indentation of each line in place in the input list.
+     * Trailing whitespace is removed on each line. Note that blank lines do
+     * not count towards computing the max common indentation, except
+     * the last one.
+     *
      * @param lines mutable list
      */
     public static void trimIndentInPlace(List<Chars> lines) {
         int trimDepth = maxCommonLeadingWhitespaceForAll(lines);
-        if (trimDepth > 0) {
-            lines.replaceAll(chars -> chars.length() >= trimDepth
-                                      ? chars.subSequence(trimDepth).trimEnd()
-                                      : chars.trimEnd());
-        }
+        lines.replaceAll(chars -> chars.length() >= trimDepth
+                                  ? chars.subSequence(trimDepth).trimEnd()
+                                  : chars.trimEnd());
     }
 
     /**
-     * Trim common indentation in the lines of the string, like
-     * {@link #appendWithoutCommonPrefix(List, int, StringBuilder)}.
+     * Trim common indentation in the lines of the string. Like
+     * {@link #trimIndentInPlace(List)} called with the list of lines
+     * and joined with {@code \n}.
      */
     public static StringBuilder trimIndent(Chars string) {
         List<Chars> lines = string.lineStream().collect(CollectionUtil.toMutableList());
         trimIndentInPlace(lines);
-
-        StringBuilder sb = new StringBuilder(string.length());
-        trimIndentIntoStringBuilder(lines, sb);
-        return sb;
-    }
-
-    /**
-     * Trim the common indentation of the lines and append them into
-     * the given StringBuilder, separating lines with \n. Trailing
-     * whitespace is removed on each line. Note that blank lines do
-     * not count towards computing the max common indentation, except
-     * the last one.
-     *
-     * @param lines List of lines to join
-     * @param sb    Output StringBuilder
-     */
-    public static void trimIndentIntoStringBuilder(List<Chars> lines, StringBuilder sb) {
-        int prefixLength = maxCommonLeadingWhitespaceForAll(lines);
-        appendWithoutCommonPrefix(lines, prefixLength, sb);
-    }
-
-    private static void appendWithoutCommonPrefix(List<Chars> lines, int prefixLength, StringBuilder output) {
-        for (int i = 0; i < lines.size(); i++) {
-            //  For each non-blank line, min leading white space characters are removed,
-            //  and any trailing white space characters are removed.
-            //  Blank lines are replaced with the empty string.
-
-            Chars line = lines.get(i);
-            // remove common whitespace prefix
-            if (line.length() >= prefixLength && !StringUtils.isBlank(line)) {
-                line = line.subSequence(prefixLength);
-            }
-            // trim trailing whitespace
-            line = line.trimEnd();
-            // append
-            line.appendChars(output);
-
-            boolean isLastLine = i == lines.size() - 1;
-            if (!isLastLine) {
-                output.append('\n'); // normalize line endings to LF
-            }
-        }
+        return CollectionUtil.joinCharsIntoStringBuilder(lines, "\n");
     }
 
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
index 8f9abce19d..45c008a6b5 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/StringUtilTest.java
@@ -98,7 +98,8 @@ public class StringUtilTest {
     }
 
     private void assertTrimIndent(String input, String output) {
-        assertThat(StringUtil.trimIndent(Chars.wrap(input)).toString(), equalTo(output));
+        String actual = StringUtil.trimIndent(Chars.wrap(input)).toString();
+        assertThat(actual, equalTo(output));
     }
 
     @Test
@@ -115,7 +116,4 @@ public class StringUtilTest {
         assertEquals("abc", StringUtil.substringAfterLast("abc", '.'));
     }
 
-    @Test
-    public void linesWithTrimIndent() {
-    }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index 004921b7da..be73eccec1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -88,6 +88,7 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
         StringUtil.trimIndentInPlace(lines);
         // join with normalized end of line
         StringBuilder sb = CollectionUtil.joinCharsIntoStringBuilder(lines, "\n");
+        // interpret escape sequences
         interpretEscapeSequences(sb);
         return sb.toString();
     }

From 0b44c7d247729c509768876689f7db7874700170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 24 Apr 2022 19:54:03 +0200
Subject: [PATCH 131/180] Fix test in pmd-java

RuleTst doesn't trim messages now
---
 .../java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
index e59544b468..85f6c7871c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml
@@ -852,7 +852,7 @@ class Assert {
         <expected-problems>1</expected-problems>
         <expected-linenumbers>4</expected-linenumbers>
         <expected-messages>
-            <message>Unnecessary qualifier 'java.lang': 'Math' is already in scope because it is declared in java.lang </message>
+            <message>Unnecessary qualifier 'java.lang': 'Math' is already in scope because it is declared in java.lang</message>
         </expected-messages>
         <code><![CDATA[
             class ComplexButNotFlagged {

From 28a454d15594b572eddbd2ad6d2e511dcda43ce2 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Mon, 25 Apr 2022 02:25:18 +0800
Subject: [PATCH 132/180] Update
 pmd-java/src/main/resources/category/java/design.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 pmd-java/src/main/resources/category/java/design.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 1835882366..58159b565b 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1311,11 +1311,7 @@ or
             <property name="xpath">
                 <value>
 <![CDATA[
-//ConditionalExpression[not(PrimaryExpression/*/Literal) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
-|
-//ConditionalExpression[not(Expression/PrimaryExpression/*/Literal) and (PrimaryExpression/*/Literal/BooleanLiteral)]
-|
-//ConditionalExpression[(PrimaryExpression/*/Literal/BooleanLiteral) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
+//ConditionalExpression[Expression/PrimaryExpression/*/Literal/BooleanLiteral]
 ]]>
                 </value>
             </property>

From 38d3c091d0007c075f02e23081f21e687ba07400 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Mon, 25 Apr 2022 02:27:26 +0800
Subject: [PATCH 133/180] Update
 pmd-java/src/main/resources/category/java/design.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 .../src/main/resources/category/java/design.xml  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 58159b565b..5b4d7bbc99 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1292,17 +1292,11 @@ Look for ternary operators with the form `condition ? literalBoolean : foo`
 or `condition ? foo : literalBoolean`
 or `condition ? literalBoolean1 : literalBoolean2`.
 
-These expressions can be simplified respectively to
-`condition || foo`  when the literalBoolean is true
-`!condition && foo` when the literalBoolean is false
-or
-`!condition || foo` when the literalBoolean is true
-`condition && foo`  when the literalBoolean is false
-or
-`true`  when the literalBoolean are both true
-`false` when the literalBoolean are both false
-`condition`  when the literalBoolean1 is true and the literalBoolean2 is false
-`!condition` when the literalBoolean1 is false and the literalBoolean2 is true
+These expressions can be simplified as follows:
+* `condition ? true : expr` simplifies to `condition || expr`
+* `condition ? false : expr` simplifies to `!condition && expr`
+* `condition ? expr : true` simplifies to `!condition || expr`
+* `condition ? expr : false` simplifies to `condition && expr`
 ]]>
         </description>
         <priority>3</priority>

From 56cc9fc1638bf8ec31dc40e1f177837d2185dce9 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Mon, 25 Apr 2022 02:35:34 +0800
Subject: [PATCH 134/180] make the description simple

---
 pmd-java/src/main/resources/category/java/design.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 5b4d7bbc99..9c90dabf44 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1289,8 +1289,7 @@ public void foo() throws Exception {
         <description>
 <![CDATA[
 Look for ternary operators with the form `condition ? literalBoolean : foo`
-or `condition ? foo : literalBoolean`
-or `condition ? literalBoolean1 : literalBoolean2`.
+or `condition ? foo : literalBoolean`.
 
 These expressions can be simplified as follows:
 * `condition ? true : expr` simplifies to `condition || expr`

From f1a2a77e642a86caf75faee25c24b87e7deb9db8 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Mon, 25 Apr 2022 03:31:19 +0800
Subject: [PATCH 135/180] modify the SimplifiedTernary test

---
 .../pmd/lang/java/rule/design/xml/SimplifiedTernary.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifiedTernary.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifiedTernary.xml
index 2002135780..1a01776aeb 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifiedTernary.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifiedTernary.xml
@@ -53,12 +53,12 @@ public class Foo {
     </test-code>
 
     <test-code>
-        <description>condition ? true : false</description>
-        <expected-problems>0</expected-problems>
+        <description>#3603 condition ? true : false</description>
+        <expected-problems>1</expected-problems>
         <code><![CDATA[
 public class Foo {
     public boolean test() {
-        return condition ? true : false; // Existing rule
+        return condition ? true : false;
     }
 }
         ]]></code>

From 1f9c7c57654648df6d25fdee54b48f4a5f58c69a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sun, 24 Apr 2022 22:26:46 +0200
Subject: [PATCH 136/180] [test] Print Test Method Name for failed rule tests

This helps to select just this failed test to
rerun it within the IDE.
Also replace parenthesis in the test case description.
---
 .../sourceforge/pmd/testframework/PMDTestRunner.java  |  8 ++++++++
 .../sourceforge/pmd/testframework/RuleTestRunner.java |  5 +----
 .../net/sourceforge/pmd/testframework/RuleTst.java    |  1 +
 .../sourceforge/pmd/testframework/TestDescriptor.java | 11 +++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PMDTestRunner.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PMDTestRunner.java
index a0e05007bf..4511625989 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PMDTestRunner.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PMDTestRunner.java
@@ -42,6 +42,8 @@ public class PMDTestRunner extends Runner implements Filterable, Sortable {
     private final RuleTestRunner ruleTests;
     private final ParentRunner<?> unitTests;
 
+    private final Description description;
+
     public PMDTestRunner(final Class<? extends SimpleAggregatorTst> klass) throws InitializationError {
         this.klass = klass;
         ruleTests = new RuleTestRunner(klass);
@@ -51,6 +53,8 @@ public class PMDTestRunner extends Runner implements Filterable, Sortable {
         } else {
             unitTests = new EmptyRunner(klass);
         }
+
+        this.description = createDescription();
     }
 
     @Override
@@ -76,6 +80,10 @@ public class PMDTestRunner extends Runner implements Filterable, Sortable {
 
     @Override
     public Description getDescription() {
+        return description;
+    }
+
+    private Description createDescription() {
         Description description = Description.createSuiteDescription(klass);
         description.addChild(createChildrenDescriptions(ruleTests, "Rule Tests"));
         if (ruleTests.hasUnitTests()) {
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
index 7420567b0b..7007053ffc 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
@@ -47,10 +47,7 @@ public class RuleTestRunner extends ParentRunner<TestDescriptor> {
     protected Description describeChild(TestDescriptor testCase) {
         Description description = testDescriptions.get(testCase);
         if (description == null) {
-            description = Description.createTestDescription(getTestClass().getJavaClass(),
-                testCase.getRule().getName() + "::"
-                        + testCase.getNumberInDocument() + " "
-                        + testCase.getDescription().replaceAll("\n|\r", " "));
+            description = Description.createTestDescription(getTestClass().getJavaClass().getName(), testCase.getTestMethodName());
             testDescriptions.putIfAbsent(testCase, description);
         }
         return description;
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
index 06c7fa9d38..244ff01fd1 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -239,6 +239,7 @@ public abstract class RuleTst {
                 + " problem(s) found.");
         System.out.println(" -> Expected messages: " + test.getExpectedMessages());
         System.out.println(" -> Expected line numbers: " + test.getExpectedLineNumbers());
+        System.out.println("Test Method Name: " + test.getTestMethodName());
         System.out.println();
         TextRenderer renderer = new TextRenderer();
         renderer.setWriter(new StringWriter());
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
index dcb4ba6fd4..894226a883 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
@@ -148,4 +148,15 @@ public class TestDescriptor {
     public boolean isUseAuxClasspath() {
         return useAuxClasspath;
     }
+
+    public String getTestMethodName() {
+        String methodName = getRule().getName() + "_"
+                + getNumberInDocument()
+                + "_"
+                + getDescription()
+                .replaceAll("\n|\r", "_")
+                .replaceAll("[\\(\\)]|\\s", "_");
+
+        return methodName;
+    }
 }

From 6ec5fe1073dd91abfded114ff8f194537c9693a5 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sun, 24 Apr 2022 22:44:05 +0200
Subject: [PATCH 137/180] Fix pmd

---
 .../net/sourceforge/pmd/testframework/TestDescriptor.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
index 894226a883..706f5f154b 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
@@ -150,13 +150,11 @@ public class TestDescriptor {
     }
 
     public String getTestMethodName() {
-        String methodName = getRule().getName() + "_"
+        return getRule().getName() + "_"
                 + getNumberInDocument()
                 + "_"
                 + getDescription()
                 .replaceAll("\n|\r", "_")
-                .replaceAll("[\\(\\)]|\\s", "_");
-
-        return methodName;
+                .replaceAll("[\\.\\(\\)]|\\s", "_");
     }
 }

From 3841e7d0c9bfcefda8ccdd1f5043bd65114c3c68 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Mon, 25 Apr 2022 06:50:56 +0800
Subject: [PATCH 138/180] Revert the original XPath

---
 pmd-java/src/main/resources/category/java/design.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 9c90dabf44..7f81f291dc 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1304,7 +1304,11 @@ These expressions can be simplified as follows:
             <property name="xpath">
                 <value>
 <![CDATA[
-//ConditionalExpression[Expression/PrimaryExpression/*/Literal/BooleanLiteral]
+//ConditionalExpression[not(PrimaryExpression/*/Literal) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
+|
+//ConditionalExpression[not(Expression/PrimaryExpression/*/Literal) and (PrimaryExpression/*/Literal/BooleanLiteral)]
+|
+//ConditionalExpression[(PrimaryExpression/*/Literal/BooleanLiteral) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
 ]]>
                 </value>
             </property>

From 6d83eda6be37c298dda825a86e9d21889084a9f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 26 Apr 2022 00:59:48 +0200
Subject: [PATCH 139/180] Fix sort on unmodifiable list

---
 pmd-core/src/main/java/net/sourceforge/pmd/PMD.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
index fc87782685..8bd518f276 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
@@ -14,6 +14,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
@@ -34,7 +35,6 @@ import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.reporting.ReportStats;
 import net.sourceforge.pmd.reporting.ReportStatsListener;
-import net.sourceforge.pmd.util.CollectionUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
 import net.sourceforge.pmd.util.log.MessageReporter;
 import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter;
@@ -140,9 +140,11 @@ public final class PMD {
             pmd.addRenderers(renderers);
             @SuppressWarnings("PMD.CloseResource")
             GlobalReportBuilderListener reportBuilder = new GlobalReportBuilderListener();
-            List<TextFile> textFiles = CollectionUtil.map(files, ds -> TextFile.dataSourceCompat(ds, configuration));
-            textFiles.sort(Comparator.comparing(TextFile::getPathId));
-            pmd.performAnalysisImpl(listOf(reportBuilder), textFiles);
+            List<TextFile> sortedFiles = files.stream()
+                                              .map(ds -> TextFile.dataSourceCompat(ds, configuration))
+                                              .sorted(Comparator.comparing(TextFile::getPathId))
+                                              .collect(Collectors.toList());
+            pmd.performAnalysisImpl(listOf(reportBuilder), sortedFiles);
             return reportBuilder.getResult();
         }
     }

From 5d07ce4bb8919f728dbf77302307cc6e5521f367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Tue, 26 Apr 2022 01:00:06 +0200
Subject: [PATCH 140/180] Deprecate DataSource

Update comments
---
 .../main/java/net/sourceforge/pmd/PMD.java    |  1 -
 .../sourceforge/pmd/cache/AnalysisCache.java  |  7 +++----
 .../pmd/lang/document/TextDocument.java       | 19 -------------------
 .../pmd/util/datasource/DataSource.java       |  5 +++++
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
index 8bd518f276..4dd8f5f2b7 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMD.java
@@ -126,7 +126,6 @@ public final class PMD {
      * @return Report in which violations are accumulated
      *
      * @throws Exception If there was a problem when opening or closing the renderers
-     *
      * @deprecated Use {@link PmdAnalysis}
      */
     @Deprecated
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java
index 274c740c1f..675df7b7f8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java
@@ -4,7 +4,6 @@
 
 package net.sourceforge.pmd.cache;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -12,9 +11,9 @@ import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.lang.document.TextDocument;
+import net.sourceforge.pmd.lang.document.TextFile;
 import net.sourceforge.pmd.reporting.FileAnalysisListener;
 import net.sourceforge.pmd.reporting.GlobalAnalysisListener;
-import net.sourceforge.pmd.util.datasource.DataSource;
 
 /**
  * An analysis cache for incremental analysis.
@@ -68,8 +67,8 @@ public interface AnalysisCache {
     void checkValidity(RuleSets ruleSets, ClassLoader auxclassPathClassLoader);
 
     /**
-     * Returns a listener that will be used like in {@link GlobalAnalysisListener#startFileAnalysis(DataSource)}.
-     * This should record violations, and call {@link #analysisFailed(File)}
+     * Returns a listener that will be used like in {@link GlobalAnalysisListener#startFileAnalysis(TextFile)}.
+     * This should record violations, and call {@link #analysisFailed(TextDocument)}
      * upon error.
      */
     FileAnalysisListener startFileAnalysis(TextDocument file);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index 6bb71432c8..6bfc817b09 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -77,25 +77,6 @@ public interface TextDocument extends Closeable {
     // todo text edition (there are some reverted commits in the branch
     //  with part of this, including a lot of tests)
 
-    /*
-        Summary of different coordinate systems:
-        Coordinate system:   Line/column            Offset
-        ==============================================================
-        Position:            TextPos2d              int >= 0
-        Range:               TextRange2d            TextRegion
-
-        (FileLocation is similar to TextRange2d in terms of position info)
-
-        Conversions:
-          line/column -> offset: offsetAtLineColumn
-          offset -> line/column: lineColumnAtOffset
-        Range conversions:
-          TextRegion  -> TextRange2d: toRegion
-          TextRange2d -> TextRegion: toRange2d
-
-          TextRegion -> FileLocation: toLocation
-          TextRange2d -> FileLocation: toLocation
-     */
 
     /**
      * Returns the language version that should be used to parse this file.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java
index 2f0085bceb..a215b7aea8 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/datasource/DataSource.java
@@ -9,11 +9,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 
+import net.sourceforge.pmd.lang.document.TextFile;
+
 /**
  * Represents a source file to be analyzed. Different implementations can get
  * the source file from different places: the filesystem, a zip or jar file,
  * etc.
+ *
+ * @deprecated Use {@link TextFile}
  */
+@Deprecated
 public interface DataSource extends Closeable {
 
     /**

From e951d6df8f976a23f0c840831109f53ee9366b84 Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Wed, 27 Apr 2022 04:07:02 +0800
Subject: [PATCH 141/180] Use a more clear XPath form to replace the former

---
 pmd-java/src/main/resources/category/java/design.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index 7f81f291dc..a5446a8304 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1304,11 +1304,11 @@ These expressions can be simplified as follows:
             <property name="xpath">
                 <value>
 <![CDATA[
-//ConditionalExpression[not(PrimaryExpression/*/Literal) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
-|
-//ConditionalExpression[not(Expression/PrimaryExpression/*/Literal) and (PrimaryExpression/*/Literal/BooleanLiteral)]
-|
-//ConditionalExpression[(PrimaryExpression/*/Literal/BooleanLiteral) and (Expression/PrimaryExpression/*/Literal/BooleanLiteral)]
+//ConditionalExpression[
+((PrimaryExpression/*/Literal/BooleanLiteral) or (Expression/PrimaryExpression/*/Literal/BooleanLiteral))
+and
+not((PrimaryExpression/*/Literal/NullLiteral) or (Expression/PrimaryExpression/*/Literal/NullLiteral))
+]
 ]]>
                 </value>
             </property>

From f29770f968e0271891b3908682ab70107c1a244b Mon Sep 17 00:00:00 2001
From: LaLucid <55886143+VoidxHoshi@users.noreply.github.com>
Date: Wed, 27 Apr 2022 05:47:07 +0800
Subject: [PATCH 142/180] Use a more clear XPath form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 pmd-java/src/main/resources/category/java/design.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index a5446a8304..b285179dba 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1304,11 +1304,9 @@ These expressions can be simplified as follows:
             <property name="xpath">
                 <value>
 <![CDATA[
-//ConditionalExpression[
-((PrimaryExpression/*/Literal/BooleanLiteral) or (Expression/PrimaryExpression/*/Literal/BooleanLiteral))
-and
-not((PrimaryExpression/*/Literal/NullLiteral) or (Expression/PrimaryExpression/*/Literal/NullLiteral))
-]
+//ConditionalExpression
+  [(Expression|.)/PrimaryExpression/*/Literal/BooleanLiteral]
+  [not((Expression|.)/PrimaryExpression/*/Literal/NullLiteral)]
 ]]>
                 </value>
             </property>

From 45e4ec9e983d327f37e05730c5dea66ee40ec21c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 09:58:59 +0200
Subject: [PATCH 143/180] [plsql] Migrate ExecuteImmediateBulkCollectTest to
 BaseTreeDumpTest

---
 pmd-plsql/etc/grammar/PldocAST.jjt            |   3 +
 .../ast/ExecuteImmediateBulkCollectTest.java  |  27 ++-
 .../ast/ExecuteImmediateBulkCollect1.pls      |   6 +-
 .../ast/ExecuteImmediateBulkCollect1.txt      |  74 ++++++
 .../ast/ExecuteImmediateBulkCollect2.pls      |   6 +-
 .../ast/ExecuteImmediateBulkCollect2.txt      | 221 ++++++++++++++++++
 .../ast/ExecuteImmediateBulkCollect3.pls      |   6 +-
 .../ast/ExecuteImmediateBulkCollect3.txt      | 160 +++++++++++++
 .../pmd/lang/plsql/ast/ParenthesisGroup0.pls  |   4 +
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  |   6 +-
 .../pmd/lang/plsql/ast/ParenthesisGroup1.pls  |   4 +
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  |   6 +-
 .../pmd/lang/plsql/ast/ParenthesisGroup2.pls  |   4 +
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  |   6 +-
 14 files changed, 518 insertions(+), 15 deletions(-)
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
 create mode 100644 pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 1ec8e28725..7013c9dd44 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2814,6 +2814,9 @@ ASTFetchStatement FetchStatement()  :
       { return jjtThis ; }
 }
 
+/**
+ * Execute Immediate: https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/EXECUTE-IMMEDIATE-statement.html#GUID-C3245A95-B85B-4280-A01F-12307B108DC8
+ */
 ASTEmbeddedSqlStatement EmbeddedSqlStatement()  :
 {}
 {
diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
index 8def0bb7af..63982ea168 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
@@ -4,27 +4,36 @@
 
 package net.sourceforge.pmd.lang.plsql.ast;
 
-import org.junit.Assert;
 import org.junit.Test;
 
-import net.sourceforge.pmd.lang.plsql.AbstractPLSQLParserTst;
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper;
+
+public class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest {
+
+    public ExecuteImmediateBulkCollectTest() {
+        super(new RelevantAttributePrinter(), ".pls");
+    }
+
+    @Override
+    public BaseParsingHelper<?, ?> getParser() {
+        return PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+    }
 
-public class ExecuteImmediateBulkCollectTest extends AbstractPLSQLParserTst {
     @Test
     public void testExecuteImmediateBulkCollect1() {
-        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect1.pls");
-        Assert.assertNotNull(input);
+        doTest("ExecuteImmediateBulkCollect1");
     }
 
     @Test
     public void testExecuteImmediateBulkCollect2() {
-        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect2.pls");
-        Assert.assertNotNull(input);
+        doTest("ExecuteImmediateBulkCollect2");
     }
 
     @Test
     public void testExecuteImmediateBulkCollect3() {
-        ASTInput input = plsql.parseResource("ExecuteImmediateBulkCollect3.pls");
-        Assert.assertNotNull(input);
+        doTest("ExecuteImmediateBulkCollect3");
     }
 }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
index f4951287e3..cbb83cd788 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;
@@ -12,4 +16,4 @@ BEGIN
    EXECUTE IMMEDIATE l_sql BULK COLLECT
       INTO l_data;
    --
-END EXAMPLE_PROCEDURE;
\ No newline at end of file
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
new file mode 100644
index 0000000000..6c18018e50
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
@@ -0,0 +1,74 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;
+   --
+   l_data t_data;
+   l_sql  VARCHAR2(500);
+   --
+BEGIN
+   --
+   l_sql := 'SELECT * FROM DUAL';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data;
+   --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- SubTypeDefinition[@CanonicalImage = "T_DATA", @Image = "t_data"]
+         |  |     +- QualifiedID[@CanonicalImage = "T_DATA", @Image = "t_data"]
+         |  |     +- Datatype[@CanonicalImage = "DUAL%ROWTYPE", @Image = "dual%ROWTYPE", @TypeImage = "dual%ROWTYPE"]
+         |  |     |  +- QualifiedName[@CanonicalImage = "DUAL", @Image = "dual"]
+         |  |     |     +- UnqualifiedID[@CanonicalImage = "DUAL", @Image = "dual"]
+         |  |     +- Datatype[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER", @TypeImage = "BINARY_INTEGER"]
+         |  |        +- ScalarDataTypeName[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA T_DATA", @Image = "l_data t_data"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA", @Image = "l_data"]
+         |  |        |  +- ID[@CanonicalImage = "L_DATA", @Image = "l_data"]
+         |  |        +- Datatype[@CanonicalImage = "T_DATA", @Image = "t_data", @TypeImage = "t_data"]
+         |  |           +- QualifiedName[@CanonicalImage = "T_DATA", @Image = "t_data"]
+         |  |              +- UnqualifiedID[@CanonicalImage = "T_DATA", @Image = "t_data"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |        +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
+         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
+         |              +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
+         |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- Expression[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
+         |              +- PrimaryPrefix[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @SelfModifier = false]
+         |                 +- Literal[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
+         |                    +- StringLiteral[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @String = "SELECT * FROM DUAL"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- EmbeddedSqlStatement[@CanonicalImage = null]
+         |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        +- BulkCollectIntoClause[@CanonicalImage = null]
+         |           +- CollectionName[@CanonicalImage = "L_DATA", @Image = "l_data"]
+         |              +- ID[@CanonicalImage = "L_DATA", @Image = "l_data"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
index bde3fe091e..51c5984d16 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
@@ -23,4 +27,4 @@ BEGIN
    EXECUTE IMMEDIATE l_sql BULK COLLECT
       INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;
    --
-END EXAMPLE_PROCEDURE;
\ No newline at end of file
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
new file mode 100644
index 0000000000..379336f71f
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
@@ -0,0 +1,221 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
+   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
+   --
+   l_data_key t_data_key;
+   l_data_description t_data_description;
+   l_sql  VARCHAR2(500);
+   p_rownum1 NUMBER(20);
+   p_rownum2 NUMBER(20);
+   --
+BEGIN
+   --
+   p_rownum1 := 10;
+   p_rownum2 := 30;
+   --
+   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
+             ' FROM DUAL '||' WHERE ROWNUM <= :p_rownum1 ' ||
+            'UNION ALL '||
+            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
+             ' FROM DUAL'||' WHERE ROWNUM <= :p_rownum2 ';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;
+   --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- SubTypeDefinition[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |     +- QualifiedID[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |     +- Datatype[@CanonicalImage = "NUMBER", @Image = "NUMBER", @TypeImage = "NUMBER"]
+         |  |     |  +- ScalarDataTypeName[@CanonicalImage = "NUMBER", @Image = "NUMBER"]
+         |  |     +- Datatype[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER", @TypeImage = "BINARY_INTEGER"]
+         |  |        +- ScalarDataTypeName[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- SubTypeDefinition[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |     +- QualifiedID[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |     +- Datatype[@CanonicalImage = "VARCHAR2(100)", @Image = "VARCHAR2(100)", @TypeImage = "VARCHAR2(100)"]
+         |  |     |  +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(100)", @Image = "VARCHAR2(100)"]
+         |  |     |     +- NumericLiteral[@CanonicalImage = "100", @Image = "100"]
+         |  |     +- Datatype[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER", @TypeImage = "BINARY_INTEGER"]
+         |  |        +- ScalarDataTypeName[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_KEY T_DATA_KEY", @Image = "l_data_key t_data_key"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        +- Datatype[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key", @TypeImage = "t_data_key"]
+         |  |           +- QualifiedName[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |              +- UnqualifiedID[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_DESCRIPTION T_DATA_DESCRIPTION", @Image = "l_data_description t_data_description"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        |  +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        +- Datatype[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description", @TypeImage = "t_data_description"]
+         |  |           +- QualifiedName[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |              +- UnqualifiedID[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |  |        |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |  |        +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
+         |  |           +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
+         |  |              +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "P_ROWNUM1 NUMBER(20)", @Image = "p_rownum1 NUMBER(20)"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |  |        |  +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |  |        +- Datatype[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)", @TypeImage = "NUMBER(20)"]
+         |  |           +- ScalarDataTypeName[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)"]
+         |  |              +- NumericLiteral[@CanonicalImage = "20", @Image = "20"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |        +- VariableOrConstantDeclarator[@CanonicalImage = "P_ROWNUM2 NUMBER(20)", @Image = "p_rownum2 NUMBER(20)"]
+         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           |  +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           +- Datatype[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)", @TypeImage = "NUMBER(20)"]
+         |              +- ScalarDataTypeName[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)"]
+         |                 +- NumericLiteral[@CanonicalImage = "20", @Image = "20"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- Expression[@CanonicalImage = "P_ROWNUM1 := 10", @Image = "p_rownum1 := 10"]
+         |        +- Assignment[@CanonicalImage = "P_ROWNUM1 := 10", @Image = "p_rownum1 := 10"]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = false]
+         |           |  +- SimpleExpression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |           |     +- Column[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |           |        +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |           +- Expression[@CanonicalImage = "10", @Image = "10"]
+         |              +- PrimaryPrefix[@CanonicalImage = "10", @Image = "10", @SelfModifier = false]
+         |                 +- Literal[@CanonicalImage = "10", @Image = "10"]
+         |                    +- NumericLiteral[@CanonicalImage = "10", @Image = "10"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- Expression[@CanonicalImage = "P_ROWNUM2 := 30", @Image = "p_rownum2 := 30"]
+         |        +- Assignment[@CanonicalImage = "P_ROWNUM2 := 30", @Image = "p_rownum2 := 30"]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = false]
+         |           |  +- SimpleExpression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           |     +- Column[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           |        +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           +- Expression[@CanonicalImage = "30", @Image = "30"]
+         |              +- PrimaryPrefix[@CanonicalImage = "30", @Image = "30", @SelfModifier = false]
+         |                 +- Literal[@CanonicalImage = "30", @Image = "30"]
+         |                    +- NumericLiteral[@CanonicalImage = "30", @Image = "30"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
+         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @String = " WHERE ROWNUM <= :p_rownum1 "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @SelfModifier = false]
+         |                    +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '"]
+         |                       +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @String = " WHERE ROWNUM <= :p_rownum2 "]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- EmbeddedSqlStatement[@CanonicalImage = null]
+         |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        +- BulkCollectIntoClause[@CanonicalImage = null]
+         |        |  +- CollectionName[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |        |  |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |        |  +- CollectionName[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |        |     +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |        +- Expression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |        |        +- Column[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |        |           +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |        +- Expression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = false]
+         |              +- SimpleExpression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |                 +- Column[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |                    +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls
index 74270792e3..9fac7557d8 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
@@ -18,4 +22,4 @@ BEGIN
    EXECUTE IMMEDIATE l_sql BULK COLLECT
       INTO l_data_key, l_data_description;
    --
-END EXAMPLE_PROCEDURE;
\ No newline at end of file
+END EXAMPLE_PROCEDURE;
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
new file mode 100644
index 0000000000..f8d384e4c9
--- /dev/null
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
@@ -0,0 +1,160 @@
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
+   --
+   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
+   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
+   --
+   l_data_key t_data_key;
+   l_data_description t_data_description;
+   l_sql  VARCHAR2(500);
+   --
+BEGIN
+   --
+   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
+             ' FROM DUAL '||
+            'UNION ALL '||
+            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
+             ' FROM DUAL';
+   --
+   EXECUTE IMMEDIATE l_sql BULK COLLECT
+      INTO l_data_key, l_data_description;
+   --
+END EXAMPLE_PROCEDURE;
+"]
+   +- Global[@CanonicalImage = null]
+      +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
+         +- DeclarativeSection[@CanonicalImage = null]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- SubTypeDefinition[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |     +- QualifiedID[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |     +- Datatype[@CanonicalImage = "NUMBER", @Image = "NUMBER", @TypeImage = "NUMBER"]
+         |  |     |  +- ScalarDataTypeName[@CanonicalImage = "NUMBER", @Image = "NUMBER"]
+         |  |     +- Datatype[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER", @TypeImage = "BINARY_INTEGER"]
+         |  |        +- ScalarDataTypeName[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- SubTypeDefinition[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |     +- QualifiedID[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |     +- Datatype[@CanonicalImage = "VARCHAR2(100)", @Image = "VARCHAR2(100)", @TypeImage = "VARCHAR2(100)"]
+         |  |     |  +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(100)", @Image = "VARCHAR2(100)"]
+         |  |     |     +- NumericLiteral[@CanonicalImage = "100", @Image = "100"]
+         |  |     +- Datatype[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER", @TypeImage = "BINARY_INTEGER"]
+         |  |        +- ScalarDataTypeName[@CanonicalImage = "BINARY_INTEGER", @Image = "BINARY_INTEGER"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_KEY T_DATA_KEY", @Image = "l_data_key t_data_key"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        +- Datatype[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key", @TypeImage = "t_data_key"]
+         |  |           +- QualifiedName[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  |              +- UnqualifiedID[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_DESCRIPTION T_DATA_DESCRIPTION", @Image = "l_data_description t_data_description"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        |  +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        +- Datatype[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description", @TypeImage = "t_data_description"]
+         |  |           +- QualifiedName[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  |              +- UnqualifiedID[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
+         |  +- DeclarativeUnit[@CanonicalImage = null]
+         |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
+         |        +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
+         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
+         |              +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
+         |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
+         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
+         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
+         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |        +- ArgumentList[@CanonicalImage = null]
+         |                 |           +- Argument[@CanonicalImage = null]
+         |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
+         |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
+         |                    +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
+         |                       +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
+         +- Statement[@CanonicalImage = null]
+         |  +- UnlabelledStatement[@CanonicalImage = null]
+         |     +- EmbeddedSqlStatement[@CanonicalImage = null]
+         |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |        +- BulkCollectIntoClause[@CanonicalImage = null]
+         |           +- CollectionName[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |           |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |           +- CollectionName[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |              +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
index 0026e24d5d..d283bc7619 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    CURSOR c_example IS
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
index 0602c49949..aaa2464d78 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -1,4 +1,8 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    CURSOR c_example IS
       SELECT a.owner, u.object_name, p.aggregate
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
index c5fd5d411d..9a88deabfc 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    CURSOR c_example IS
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
index 1d77da1f68..8bc9983c66 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -1,4 +1,8 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
    --
    CURSOR c_example IS
       SELECT a.owner, u.object_name, p.aggregate
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls
index cfd982322c..27696d02e9 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.pls
@@ -1,3 +1,7 @@
+--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
 CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
     --
     CURSOR c_test IS
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
index 329d2f56ae..ba0d002fba 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -1,4 +1,8 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
+-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+--
+
+CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
     --
     CURSOR c_test IS
         SELECT si.sid, sn.name, sa.age, ss.score, sp.parent

From 35b6cc79caddee2f6f2efbd0659efffb98967bd6 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 10:57:59 +0200
Subject: [PATCH 144/180] [plsql] Refactor execute immediate statement

- It is now more compliant to the specification
- Add new AST node DynamicReturnClause
---
 pmd-plsql/etc/grammar/PldocAST.jjt            | 26 ++++++++++++++-----
 .../plsql/ast/PLSQLParserVisitorAdapter.java  |  5 ++++
 .../lang/plsql/rule/AbstractPLSQLRule.java    |  6 +++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 7013c9dd44..769382e274 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2387,7 +2387,8 @@ ASTUnlabelledStatement UnlabelledStatement()  :
 	| OpenStatement()  ";"
 	| FetchStatement()  ";"
 	| Block()  ";"
-	| LOOKAHEAD(2) EmbeddedSqlStatement()
+	|   // Lookahead for EXECUTE IMMEDIATE to distinguish an identifier named "EXECUTE" from execute statement
+	    LOOKAHEAD(2) EmbeddedSqlStatement() ";"
 	| PipelineStatement()  ";"
 	| ConditionalCompilationStatement()  // Conditional Compilation works outside the normal parsing rules
         | InlinePragma() ";"
@@ -2821,12 +2822,23 @@ ASTEmbeddedSqlStatement EmbeddedSqlStatement()  :
 {}
 {
    <EXECUTE> <IMMEDIATE> StringExpression()
-    [ LOOKAHEAD(<BULK>) BulkCollectIntoClause() ] //#3687 Invoke this method to parse BULK COLLECT
-	[ <INTO> Name() ("," Name())* ]
-	[ UsingClause() ]
-	[ ( <RETURN> | <RETURNING> )  <INTO> Expression() ("," Expression())*] ";"
-	// PIPELINED FUNCTION OUTPUT
-      { return jjtThis ; }
+    [
+            ( IntoClause() | BulkCollectIntoClause() ) [ UsingClause() ]
+        |   UsingClause() [ DynamicReturnClause() ]
+        |   DynamicReturnClause()
+    ]
+    { return jjtThis; }
+}
+
+/**
+* https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/RETURNING-INTO-clause.html#GUID-38F735B9-1100-45AF-AE71-18FB74A899BE
+*/
+ASTDynamicReturnClause DynamicReturnClause() :
+{}
+{
+    ( <RETURN> | <RETURNING> )
+    ( IntoClause() | BulkCollectIntoClause() )
+    { return jjtThis; }
 }
 
 void UsingClause() #void :
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
index 81e247e122..7d9a4f3fce 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserVisitorAdapter.java
@@ -1116,4 +1116,9 @@ public class PLSQLParserVisitorAdapter implements PLSQLParserVisitor {
     public Object visit(ASTCursorSpecification node, Object data) {
         return visit((PLSQLNode) node, data);
     }
+
+    @Override
+    public Object visit(ASTDynamicReturnClause node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
 }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
index b424b36e8d..a89a524383 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java
@@ -66,6 +66,7 @@ import net.sourceforge.pmd.lang.plsql.ast.ASTDeclarativeSection;
 import net.sourceforge.pmd.lang.plsql.ast.ASTDeclarativeUnit;
 import net.sourceforge.pmd.lang.plsql.ast.ASTDeleteStatement;
 import net.sourceforge.pmd.lang.plsql.ast.ASTDirectory;
+import net.sourceforge.pmd.lang.plsql.ast.ASTDynamicReturnClause;
 import net.sourceforge.pmd.lang.plsql.ast.ASTElseClause;
 import net.sourceforge.pmd.lang.plsql.ast.ASTElsifClause;
 import net.sourceforge.pmd.lang.plsql.ast.ASTEmbeddedSqlStatement;
@@ -1440,6 +1441,11 @@ public abstract class AbstractPLSQLRule extends AbstractRule implements PLSQLPar
         return visit((PLSQLNode) node, data);
     }
 
+    @Override
+    public Object visit(ASTDynamicReturnClause node, Object data) {
+        return visit((PLSQLNode) node, data);
+    }
+
     // CPD-ON
 
     /*

From 8370d6253d3f4cd1b0a0ab90a3c2e3f824519482 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 11:34:25 +0200
Subject: [PATCH 145/180] [plsql] Fix usage of "IN" - it is a reserved word

---
 pmd-plsql/etc/grammar/PldocAST.jjt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt
index 769382e274..fbca5177c9 100644
--- a/pmd-plsql/etc/grammar/PldocAST.jjt
+++ b/pmd-plsql/etc/grammar/PldocAST.jjt
@@ -2823,7 +2823,8 @@ ASTEmbeddedSqlStatement EmbeddedSqlStatement()  :
 {
    <EXECUTE> <IMMEDIATE> StringExpression()
     [
-            ( IntoClause() | BulkCollectIntoClause() ) [ UsingClause() ]
+            IntoClause() [ UsingClause() ]
+        |   BulkCollectIntoClause() [ UsingClause() ]
         |   UsingClause() [ DynamicReturnClause() ]
         |   DynamicReturnClause()
     ]
@@ -2844,7 +2845,8 @@ ASTDynamicReturnClause DynamicReturnClause() :
 void UsingClause() #void :
 {}
 {
-    <USING> [ <IN> [ <OUT> ] | <OUT> ]  Expression() ("," [ <IN> [ <OUT> ] | <OUT> ] Expression())*
+    <USING> [ <IN> [ <OUT> ] | <OUT> ]  Expression()
+        ( "," [ <IN> [ <OUT> ] | <OUT> ] Expression() )*
 }
 
 ASTPipelineStatement PipelineStatement()  :
@@ -6600,7 +6602,6 @@ ASTID ID(): {}
 		//20120501 | <HEAP>
 		| <IF> //SYNTAX
 		//20120501 | <IMMEDIATE>
-		| <IN> //RESERVED WORD
 		| <INDEX> //RESERVED WORD
 		//20120501 | <INDICATOR>
 		| <INSERT> //SYNTAX  //RESERVED WORD
@@ -6833,7 +6834,6 @@ ASTQualifiedID QualifiedID(): {}
 		//20120501 | <HEAP>
 		//<IF>
 		//20120501 | <IMMEDIATE>
-		//<IN>
 		//<INDEX>
 		//20120501 | <INDICATOR>
 		//<INSERT>

From 061d0d67249f23e9618c7ad90de5518c499c42f1 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 11:35:52 +0200
Subject: [PATCH 146/180]  Add @Scrsloota as a contributor

---
 .all-contributorsrc                   |  9 ++++
 docs/pages/pmd/projectdocs/credits.md | 75 ++++++++++++++-------------
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4a058b2ad4..717e21a7d5 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6612,6 +6612,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Scrsloota",
+      "name": "Scrsloota",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91131546?v=4",
+      "profile": "https://github.com/Scrsloota",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index 6902116903..c0c5daead0 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -609,338 +609,339 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Scrsloota"><img src="https://avatars.githubusercontent.com/u/91131546?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scrsloota</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Scrsloota" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sschuberth"><img src="https://avatars.githubusercontent.com/u/349154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schuberth</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asschuberth" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itsmebasti"><img src="https://avatars.githubusercontent.com/u/12232063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schwarz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitsmebasti" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/laoseth"><img src="https://avatars.githubusercontent.com/u/16923065?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Seth Wilcox</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=laoseth" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zzzzfeng"><img src="https://avatars.githubusercontent.com/u/8851007?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zzzzfeng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azzzzfeng" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/magwas"><img src="https://avatars.githubusercontent.com/u/756838?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Árpád Magosányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amagwas" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/magwas"><img src="https://avatars.githubusercontent.com/u/756838?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Árpád Magosányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amagwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/clsaa"><img src="https://avatars.githubusercontent.com/u/32028545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>任贵杰</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aclsaa" title="Bug reports">🐛</a></td>
   </tr>
 </table>

From 84b6cfe93f7518868d2bb491dc0e43b4219262da Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 11:38:20 +0200
Subject: [PATCH 147/180] [doc] Update release notes (#3687, #3935)

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 962f226a13..4d4eca65f5 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -35,6 +35,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
 * plsql
   * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
+  * [#3687](https://github.com/pmd/pmd/issues/3687): \[plsql] Parsing exception EXECUTE IMMEDIATE l_sql BULK COLLECT INTO statement
 
 ### API Changes
 
@@ -42,6 +43,7 @@ This is a {{ site.pmd.release_type }} release.
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
 * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
 * [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
+* [#3935](https://github.com/pmd/pmd/pull/3935): \[plsql] Fix parser exception in EXECUTE IMMEDIATE BULK COLLECT #3687 - [@Scrsloota](https://github.com/Scrsloota)
 
 {% endtocmaker %}
 

From f48ab0e5099bb7186475856a37981b030cf272b8 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 11:57:30 +0200
Subject: [PATCH 148/180] [doc] Mark package n.s.p.lang.html experimental

---
 docs/pages/release_notes.md                         | 13 +++++++++++++
 .../net/sourceforge/pmd/lang/html/package-info.java |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pmd-html/src/main/java/net/sourceforge/pmd/lang/html/package-info.java

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index e637b652d1..2b993593cb 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -18,6 +18,14 @@ This is a {{ site.pmd.release_type }} release.
 
 This version of PMD ships a new language module to support analyzing of HTML.
 Support for HTML is experimental and might change without notice.
+The language implementation is not complete yet and the AST doesn't look
+well for text nodes and comment nodes and might be changed in the future.
+You can write your own rules, but we don't guarantee that the rules work with
+the next (minor) version of PMD without adjustments.
+
+Please give us feedback about how practical this new language is in
+[discussions](https://github.com/pmd/pmd/discussions). Please report
+missing features or bugs as new [issues](https://github.com/pmd/pmd/issues).
 
 #### New rules
 
@@ -68,6 +76,11 @@ Support for HTML is experimental and might change without notice.
 
 ### API Changes
 
+#### Experimental APIs
+
+* The module `pmd-html` is entirely experimental right now. Anything in the package
+  `net.sourceforge.pmd.lang.html` should be used cautiously.
+
 ### External Contributions
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
 * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/package-info.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/package-info.java
new file mode 100644
index 0000000000..72286a3ccb
--- /dev/null
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/package-info.java
@@ -0,0 +1,6 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+@net.sourceforge.pmd.annotation.Experimental
+package net.sourceforge.pmd.lang.html;

From 56cc599b919f39eec28894ddc5efbdbd163b83f4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Thu, 28 Apr 2022 12:11:08 +0200
Subject: [PATCH 149/180] Update
 pmd-core/src/main/java/net/sourceforge/pmd/Report.java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clément Fournier <clement.fournier76@gmail.com>
---
 pmd-core/src/main/java/net/sourceforge/pmd/Report.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
index 40dd28177c..4ae30ee948 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/Report.java
@@ -38,7 +38,7 @@ import net.sourceforge.pmd.util.Predicate;
  * internalized in PMD 7.
  *
  * <p>For special use cases, like filtering the report after PMD analysis and
- * before rendering the report, some limited mutating operations are provided:
+ * before rendering the report, some transformation operations are provided:
  * <ul>
  *     <li>{@link #filterViolations(Predicate)}</li>
  *     <li>{@link #union(Report)}</li>

From 0af388360783424968c83cef233dcd3b8629d3b8 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 15:00:55 +0200
Subject: [PATCH 150/180] [doc] Update release notes (#3603, #3938)

---
 docs/pages/release_notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 962f226a13..3c1aa11a75 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -31,6 +31,7 @@ This is a {{ site.pmd.release_type }} release.
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3068](https://github.com/pmd/pmd/issues/3068): \[java] Some tests should not depend on real rules
+  * [#3603](https://github.com/pmd/pmd/issues/3603): \[java] SimplifiedTernary: no violation for 'condition ? true : false' case
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
   * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
 * plsql
@@ -42,6 +43,7 @@ This is a {{ site.pmd.release_type }} release.
 * [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
 * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
 * [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
+* [#3938](https://github.com/pmd/pmd/pull/3938): \[java] Modify SimplifiedTernary to meet the missing case #3603 - [@VoidxHoshi](https://github.com/VoidxHoshi)
 
 {% endtocmaker %}
 

From d94f85f4437d0bc55c8723d9bfcc15033b7f10f3 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 15:01:16 +0200
Subject: [PATCH 151/180]  Add @VoidxHoshi as a contributor

---
 .all-contributorsrc                   |   9 ++
 docs/pages/pmd/projectdocs/credits.md | 123 +++++++++++++-------------
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4a058b2ad4..e957b1573d 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6612,6 +6612,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "VoidxHoshi",
+      "name": "LaLucid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55886143?v=4",
+      "profile": "https://github.com/VoidxHoshi",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index 6902116903..855f09edf4 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -395,552 +395,553 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/vanlooverenkoen"><img src="https://avatars.githubusercontent.com/u/21172855?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Koen Van Looveren</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanlooverenkoen" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kris-scheibe"><img src="https://avatars.githubusercontent.com/u/20039785?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kris Scheibe</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kris-scheibe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akris-scheibe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kthanky"><img src="https://avatars.githubusercontent.com/u/13259828?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kunal Thanki</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akthanky" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/VoidxHoshi"><img src="https://avatars.githubusercontent.com/u/55886143?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LaLucid</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=VoidxHoshi" title="Code">💻</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/larry-diamond-3964042/"><img src="https://avatars.githubusercontent.com/u/1066589?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Larry Diamond</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=larrydiamond" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alarrydiamond" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lars-sh.de/"><img src="https://avatars.githubusercontent.com/u/880198?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lars Knickrehm</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alars-sh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgabrielgr"><img src="https://avatars.githubusercontent.com/u/760959?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leo Gutierrez</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algabrielgr" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/LiGaOg"><img src="https://avatars.githubusercontent.com/u/72175888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LiGaOg</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=LiGaOg" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/LiGaOg"><img src="https://avatars.githubusercontent.com/u/72175888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>LiGaOg</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=LiGaOg" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Lintsi"><img src="https://avatars.githubusercontent.com/u/6848650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lintsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALintsi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://linusfernandes.com/"><img src="https://avatars.githubusercontent.com/u/24714685?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Linus Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AFernal73" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/LixonLookose"><img src="https://avatars.githubusercontent.com/u/66419481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lixon Lookose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALixonLookose" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/logesh14"><img src="https://avatars.githubusercontent.com/u/30902439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Logesh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alogesh14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lolgab"><img src="https://avatars.githubusercontent.com/u/5793054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lorenzo Gabriele</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alolgab" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ledoyen"><img src="https://avatars.githubusercontent.com/u/6298315?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Loïc Ledoyen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aledoyen" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lssilva"><img src="https://avatars.githubusercontent.com/u/7464888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Silva</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alssilva" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lssilva"><img src="https://avatars.githubusercontent.com/u/7464888?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Silva</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alssilva" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lsoncini"><img src="https://avatars.githubusercontent.com/u/12226579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lucas Soncini</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lsoncini" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Alsoncini" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lslonina"><img src="https://avatars.githubusercontent.com/u/12303865?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukasz Slonina</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alslonina" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lukebray"><img src="https://avatars.githubusercontent.com/u/39488446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukebray</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ALukebray" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lgoldstein"><img src="https://avatars.githubusercontent.com/u/1436205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lyor Goldstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Algoldstein" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mcmics.jnet24.de/"><img src="https://avatars.githubusercontent.com/u/4604206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MCMicS</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMCMicS" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Macarse"><img src="https://avatars.githubusercontent.com/u/24915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Macarse</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMacarse" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://pmd.github.io/"><img src="https://avatars.githubusercontent.com/u/26070915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Machine account for PMD</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pmd-bot" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://pmd.github.io/"><img src="https://avatars.githubusercontent.com/u/26070915?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Machine account for PMD</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pmd-bot" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/msiemczyk"><img src="https://avatars.githubusercontent.com/u/5693250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maciek Siemczyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsiemczyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maikelsteneker"><img src="https://avatars.githubusercontent.com/u/2788927?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maikel Steneker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=maikelsteneker" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amaikelsteneker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maksim-m"><img src="https://avatars.githubusercontent.com/u/1863269?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maksim Moiseikin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaksim-m" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/koma0277"><img src="https://avatars.githubusercontent.com/u/35556790?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manfred Koch</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akoma0277" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/manuel-moya-ferrer-11163168/"><img src="https://avatars.githubusercontent.com/u/15876612?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Moya Ferrer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=mmoyaferrer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ammoyaferrer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mryan43"><img src="https://avatars.githubusercontent.com/u/223869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Manuel Ryan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amryan43" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/touzoku"><img src="https://avatars.githubusercontent.com/u/1285662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marat Vyshegorodtsev</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atouzoku" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/touzoku"><img src="https://avatars.githubusercontent.com/u/1285662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marat Vyshegorodtsev</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atouzoku" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelhaerle"><img src="https://avatars.githubusercontent.com/u/5338817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcel Härle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelhaerle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcello-fialho"><img src="https://avatars.githubusercontent.com/u/28719666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcello Fialho</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcello-fialho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://lidel.org/"><img src="https://avatars.githubusercontent.com/u/157609?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcin Rataj</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alidel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/adamcin"><img src="https://avatars.githubusercontent.com/u/524972?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Adamcin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aadamcin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/markhall82"><img src="https://avatars.githubusercontent.com/u/22261511?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=markhall82" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarkhall82" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mark.koli.ch/"><img src="https://avatars.githubusercontent.com/u/1202420?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Kolich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkkolich" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/markpritchard"><img src="https://avatars.githubusercontent.com/u/8234070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Pritchard</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkpritchard" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/markpritchard"><img src="https://avatars.githubusercontent.com/u/8234070?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Pritchard</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarkpritchard" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/maggu2810"><img src="https://avatars.githubusercontent.com/u/204670?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Markus Rathgeb</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amaggu2810" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://marquiswang.com/"><img src="https://avatars.githubusercontent.com/u/358220?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marquis Wang</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarquiswang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martofeld"><img src="https://avatars.githubusercontent.com/u/5756343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Feldsztejn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartofeld" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://twitter.com/theneva"><img src="https://avatars.githubusercontent.com/u/1404650?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Lehmann</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheneva" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.spamer.me.uk/"><img src="https://avatars.githubusercontent.com/u/2852862?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Spamer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMartin-Spamer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/martin-tarjanyi"><img src="https://avatars.githubusercontent.com/u/17810336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin Tarjányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amartin-tarjanyi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/MatFl"><img src="https://avatars.githubusercontent.com/u/8408624?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatFl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMatFl" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/MatFl"><img src="https://avatars.githubusercontent.com/u/8408624?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatFl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMatFl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mateusz-stefanski"><img src="https://avatars.githubusercontent.com/u/28163508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mateusz Stefanski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amateusz-stefanski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mathieugouin"><img src="https://avatars.githubusercontent.com/u/11562302?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathieu Gouin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amathieugouin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MatiasComercio"><img src="https://avatars.githubusercontent.com/u/9677633?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MatiasComercio</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=MatiasComercio" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AMatiasComercio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mbenson"><img src="https://avatars.githubusercontent.com/u/487462?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Benson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ambenson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MPoorter"><img src="https://avatars.githubusercontent.com/u/25356097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt De Poorter</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMPoorter" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frizbog"><img src="https://avatars.githubusercontent.com/u/2901857?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Harrah</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrizbog" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mattnelson"><img src="https://avatars.githubusercontent.com/u/1894657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Nelson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amattnelson" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mattnelson"><img src="https://avatars.githubusercontent.com/u/1894657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matt Nelson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amattnelson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/blackmamo"><img src="https://avatars.githubusercontent.com/u/35695811?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Amos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ablackmamo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mduggan"><img src="https://avatars.githubusercontent.com/u/3765590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Duggan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amduggan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/qualidafial"><img src="https://avatars.githubusercontent.com/u/38629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Hall</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aqualidafial" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matifraga"><img src="https://avatars.githubusercontent.com/u/7543268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matías Fraga</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=matifraga" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amatifraga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marob"><img src="https://avatars.githubusercontent.com/u/3486231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maxime Robert</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=marob" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Amarob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MetaBF"><img src="https://avatars.githubusercontent.com/u/101029254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MetaBF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMetaBF" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://boyl.es/"><img src="https://avatars.githubusercontent.com/u/17732072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelboyles" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://boyl.es/"><img src="https://avatars.githubusercontent.com/u/17732072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelboyles" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikebell90"><img src="https://avatars.githubusercontent.com/u/780301?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikebell90" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://reifyworks.com/"><img src="https://avatars.githubusercontent.com/u/2878?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Bernstein</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mclay"><img src="https://avatars.githubusercontent.com/u/393727?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Clay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amclay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mikedombrowski.com/"><img src="https://avatars.githubusercontent.com/u/3926405?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Dombrowski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMikeDombo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TheRealHaui"><img src="https://avatars.githubusercontent.com/u/6312834?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hausegger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheRealHaui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/michaelhoefer"><img src="https://avatars.githubusercontent.com/u/479449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Hoefer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichaelhoefer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.rrsoftware.de/"><img src="https://avatars.githubusercontent.com/u/1881640?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Möbius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARocketRider" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.rrsoftware.de/"><img src="https://avatars.githubusercontent.com/u/1881640?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Möbius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARocketRider" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mnlipp.github.io/"><img src="https://avatars.githubusercontent.com/u/1446020?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael N. Lipp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnlipp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mpellegrini"><img src="https://avatars.githubusercontent.com/u/466696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Pellegrini</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ampellegrini" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pl.linkedin.com/in/mkordas/"><img src="https://avatars.githubusercontent.com/u/5467276?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michal Kordas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkordas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.greenpath.pl/"><img src="https://avatars.githubusercontent.com/u/986194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Borek</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amichalborek" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coola"><img src="https://avatars.githubusercontent.com/u/83182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michał Kuliński</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoola" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mnunezdm.com/"><img src="https://avatars.githubusercontent.com/u/10410852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Miguel Núñez Díaz-Montes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amnunezdm" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/impmihai"><img src="https://avatars.githubusercontent.com/u/22995337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihai Ionut</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aimpmihai" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/impmihai"><img src="https://avatars.githubusercontent.com/u/22995337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mihai Ionut</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aimpmihai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mhankus"><img src="https://avatars.githubusercontent.com/u/6095361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mirek Hankus</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amhankus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ImmortalPawn"><img src="https://avatars.githubusercontent.com/u/30688679?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mladjan Gadzic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AImmortalPawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MrAngry52"><img src="https://avatars.githubusercontent.com/u/30026386?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MrAngry52</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMrAngry52" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/muminc"><img src="https://avatars.githubusercontent.com/u/934067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Muminur Choudhury</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amuminc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Drofff"><img src="https://avatars.githubusercontent.com/u/45700628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mykhailo Palahuta</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Drofff" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADrofff" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nagendra080389"><img src="https://avatars.githubusercontent.com/u/6088582?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nagendra Kumar Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANagendra080389" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://bit.ly/nahuelbarrios"><img src="https://avatars.githubusercontent.com/u/196234?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nahuel Barrios</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abarriosnahuel" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://bit.ly/nahuelbarrios"><img src="https://avatars.githubusercontent.com/u/196234?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nahuel Barrios</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abarriosnahuel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nbraun-Google"><img src="https://avatars.githubusercontent.com/u/52723353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Braun</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anbraun-Google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nathanspectacular"><img src="https://avatars.githubusercontent.com/u/88563519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anathanspectacular" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/numeralnathan"><img src="https://avatars.githubusercontent.com/u/1236594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anumeralnathan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mastodon.tetaneutral.net/@roipoussiere"><img src="https://avatars.githubusercontent.com/u/1665542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathanaël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aroipoussiere" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nazdravi"><img src="https://avatars.githubusercontent.com/u/273093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nazdravi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANazdravi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Neha-Dhonde"><img src="https://avatars.githubusercontent.com/u/31505059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neha-Dhonde</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANeha-Dhonde" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/njdoyle"><img src="https://avatars.githubusercontent.com/u/316852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Doyle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anjdoyle" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/njdoyle"><img src="https://avatars.githubusercontent.com/u/316852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Doyle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anjdoyle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/NickButcher1"><img src="https://avatars.githubusercontent.com/u/8671565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Butcher</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANickButcher1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicoabie"><img src="https://avatars.githubusercontent.com/u/2797992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Gallinal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicoabie" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niktekusho"><img src="https://avatars.githubusercontent.com/u/18280135?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicola Dal Maso</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniktekusho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/1997376/nicolas-filotto"><img src="https://avatars.githubusercontent.com/u/1618116?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Filotto</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=essobedo" title="Code">💻</a></td>
     <td align="center"><a href="https://www.salesforcecraft.dev/"><img src="https://avatars.githubusercontent.com/u/8916229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Chursin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anchursin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://vanniktech.com/"><img src="https://avatars.githubusercontent.com/u/5759366?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niklas Baudy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanniktech" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/havrikov"><img src="https://avatars.githubusercontent.com/u/29175267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolas Havrikov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahavrikov" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/havrikov"><img src="https://avatars.githubusercontent.com/u/29175267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolas Havrikov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahavrikov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://nileshvirkar.github.io/"><img src="https://avatars.githubusercontent.com/u/24671786?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nilesh Virkar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANileshVirkar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nimit-patel"><img src="https://avatars.githubusercontent.com/u/13987001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nimit Patel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Animit-patel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niranjanh"><img src="https://avatars.githubusercontent.com/u/23009945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Harpale</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniranjanh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noahsussman"><img src="https://avatars.githubusercontent.com/u/31490710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sussman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoahsussman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Noah0120"><img src="https://avatars.githubusercontent.com/u/86766856?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah0120</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANoah0120" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://noamtamim.com/"><img src="https://avatars.githubusercontent.com/u/10047237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noam Tamim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoamtamim" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/grandinj"><img src="https://avatars.githubusercontent.com/u/796121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noel Grandin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agrandinj" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/grandinj"><img src="https://avatars.githubusercontent.com/u/796121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noel Grandin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agrandinj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OlafHaalstra"><img src="https://avatars.githubusercontent.com/u/6420723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olaf Haalstra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOlafHaalstra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Oleg-Pavlenko-EPAM"><img src="https://avatars.githubusercontent.com/u/82513963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleg Pavlenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOleg-Pavlenko-EPAM" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dykov"><img src="https://avatars.githubusercontent.com/u/36415196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleksii Dykov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dykov" title="Code">💻</a></td>
     <td align="center"><a href="http://www.eikemeier.com/"><img src="https://avatars.githubusercontent.com/u/604196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Eikemeier</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeikemeier" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pyxide"><img src="https://avatars.githubusercontent.com/u/9992381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olivier Parent</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pyxide" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apyxide" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ollieabbey"><img src="https://avatars.githubusercontent.com/u/52665918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ollie Abbey</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ollieabbey" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aollieabbey" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/OverDrone"><img src="https://avatars.githubusercontent.com/u/8506029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OverDrone</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOverDrone" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/OverDrone"><img src="https://avatars.githubusercontent.com/u/8506029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OverDrone</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOverDrone" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ozangulle"><img src="https://avatars.githubusercontent.com/u/1334150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ozan Gulle</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ozangulle" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aozangulle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/PJ17101"><img src="https://avatars.githubusercontent.com/u/31703044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PUNEET JAIN</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APJ17101" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parbatiSF"><img src="https://avatars.githubusercontent.com/u/37078591?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Parbati Bose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AparbatiSF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/paulberg"><img src="https://avatars.githubusercontent.com/u/3239883?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Berg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apaulberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbludov"><img src="https://avatars.githubusercontent.com/u/900805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Bludov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbludov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/malejpavouk"><img src="https://avatars.githubusercontent.com/u/4127023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Mička</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amalejpavouk" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pnsantos"><img src="https://avatars.githubusercontent.com/u/630567?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Nuno Santos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apnsantos" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pnsantos"><img src="https://avatars.githubusercontent.com/u/630567?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Nuno Santos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apnsantos" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pedrorijo.com/"><img src="https://avatars.githubusercontent.com/u/1999050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Rijo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apedrorijo91" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://belaran.eu/wordpress/"><img src="https://avatars.githubusercontent.com/u/117836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pelisse Romain</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arpelisse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MisterSquishy"><img src="https://avatars.githubusercontent.com/u/5599894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pete Davids</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMisterSquishy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://blog.bruin.sg/"><img src="https://avatars.githubusercontent.com/u/4156901?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Bruin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auncletall" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pchittum"><img src="https://avatars.githubusercontent.com/u/1127876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Chittum</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pchittum" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apchittum" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/petercudmore"><img src="https://avatars.githubusercontent.com/u/12710815?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Cudmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apetercudmore" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pkasson"><img src="https://avatars.githubusercontent.com/u/3072247?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kasson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apkasson" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pkasson"><img src="https://avatars.githubusercontent.com/u/3072247?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kasson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apkasson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.code-cop.org/"><img src="https://avatars.githubusercontent.com/u/830028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kofler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acodecop" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gpbp"><img src="https://avatars.githubusercontent.com/u/18648177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pham Hai Trung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agpbp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/acanda"><img src="https://avatars.githubusercontent.com/u/174978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Graf</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=acanda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aacanda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krallus"><img src="https://avatars.githubusercontent.com/u/29927450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Hachey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrallus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pozil.github.io/"><img src="https://avatars.githubusercontent.com/u/5071767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philippe Ozil</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apozil" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phinehasz"><img src="https://avatars.githubusercontent.com/u/36982629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phinehas Artemix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphinehasz" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/fluxroot"><img src="https://avatars.githubusercontent.com/u/247365?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phokham Nonava</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afluxroot" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/fluxroot"><img src="https://avatars.githubusercontent.com/u/247365?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phokham Nonava</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afluxroot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szyman23"><img src="https://avatars.githubusercontent.com/u/4140681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Szymański</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszyman23" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pzygielo"><img src="https://avatars.githubusercontent.com/u/11896137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotrek Żygieło</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pzygielo" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apzygielo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/pranayjaiswal"><img src="https://avatars.githubusercontent.com/u/1728493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pranay Jaiswal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apranayjswl007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kamath-prasad"><img src="https://avatars.githubusercontent.com/u/28445395?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasad Kamath</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akamath-prasad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Prasanna-Loga"><img src="https://avatars.githubusercontent.com/u/36530081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasanna</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APrasanna-Loga" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Presh-AR"><img src="https://avatars.githubusercontent.com/u/20354066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Presh-AR</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APresh-AR" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Puneet1726"><img src="https://avatars.githubusercontent.com/u/26565880?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet1726</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APuneet1726" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Puneet1726"><img src="https://avatars.githubusercontent.com/u/26565880?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet1726</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APuneet1726" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrfyda"><img src="https://avatars.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael Cortês</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrfyda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RaheemShaik999"><img src="https://avatars.githubusercontent.com/u/43146735?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RaheemShaik999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARaheemShaik999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshggwp"><img src="https://avatars.githubusercontent.com/u/8025160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RajeshR</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rajeshggwp" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshggwp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ramachandra-mohan"><img src="https://avatars.githubusercontent.com/u/22360770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ramachandra Mohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aramachandra-mohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.walkmod.com/"><img src="https://avatars.githubusercontent.com/u/1483433?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raquel Pau</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arpau" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://ravikiranj.net/"><img src="https://avatars.githubusercontent.com/u/389491?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ravikiran Janardhana</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aravikiranj" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://twitter.com/reda_benh"><img src="https://avatars.githubusercontent.com/u/1609466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reda Benhemmouche</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARedaBenh" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://twitter.com/reda_benh"><img src="https://avatars.githubusercontent.com/u/1609466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reda Benhemmouche</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARedaBenh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dogeforce.com/"><img src="https://avatars.githubusercontent.com/u/6956403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Oliveira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=renatoliveira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arenatoliveira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rdicroce"><img src="https://avatars.githubusercontent.com/u/1458922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rich DiCroce</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ardicroce" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://developer.riotgames.com/"><img src="https://avatars.githubusercontent.com/u/33143437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Riot R1cket</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARiotR1cket" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rishjain.me/"><img src="https://avatars.githubusercontent.com/u/25207823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabh Jain</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajainrish" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rishabhdeepsingh"><img src="https://avatars.githubusercontent.com/u/28526643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RishabhDeep Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arishabhdeepsingh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmartinus"><img src="https://avatars.githubusercontent.com/u/12573669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robbie Martinus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmartinus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armartinus" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/RobertHenry6bev"><img src="https://avatars.githubusercontent.com/u/4371939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Henry</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobertHenry6bev" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/RobertHenry6bev"><img src="https://avatars.githubusercontent.com/u/4371939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Henry</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobertHenry6bev" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertpainsi"><img src="https://avatars.githubusercontent.com/u/1794599?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Painsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertpainsi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Sebanisu"><img src="https://avatars.githubusercontent.com/u/1035905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Russell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASebanisu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsoesemann"><img src="https://avatars.githubusercontent.com/u/8180281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Sösemann</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Documentation">📖</a> <a href="#talk-rsoesemann" title="Talks">📢</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsoesemann" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertwhitebit"><img src="https://avatars.githubusercontent.com/u/11049034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Whitebit</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertwhitebit" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://androbin.de/"><img src="https://avatars.githubusercontent.com/u/16437156?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Richtsfeld</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AAndrobin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.whatsthistimestamp.com/"><img src="https://avatars.githubusercontent.com/u/16778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Stocker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=robinst" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arobinst" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.robinwils.com/"><img src="https://avatars.githubusercontent.com/u/5617025?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Wils</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobin-Wils" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.robinwils.com/"><img src="https://avatars.githubusercontent.com/u/5617025?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Wils</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobin-Wils" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RochusOest"><img src="https://avatars.githubusercontent.com/u/65393072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RochusOest</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARochusOest" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rodolfonoviski"><img src="https://avatars.githubusercontent.com/u/7316374?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodolfo Noviski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arodolfonoviski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Casara"><img src="https://avatars.githubusercontent.com/u/2224686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Casara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ACasara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rtfpessoa.xyz/"><img src="https://avatars.githubusercontent.com/u/902384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Artfpessoa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsalvador"><img src="https://avatars.githubusercontent.com/u/1301827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roman Salvador</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsalvador" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsalvador" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.rblasch.org/"><img src="https://avatars.githubusercontent.com/u/52590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ronald Blaschke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arblasch" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/TWiStErRob"><img src="https://avatars.githubusercontent.com/u/2906988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Róbert Papp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATWiStErRob" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/TWiStErRob"><img src="https://avatars.githubusercontent.com/u/2906988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Róbert Papp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATWiStErRob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://saikat.hashnode.dev/"><img src="https://avatars.githubusercontent.com/u/41847480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saikat Sengupta</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3As4ik4t" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miplodder.github.io/"><img src="https://avatars.githubusercontent.com/u/22195621?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saksham Handu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AmiPlodder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Saladoc"><img src="https://avatars.githubusercontent.com/u/36816545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saladoc</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASaladoc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SalesforceBobLightning"><img src="https://avatars.githubusercontent.com/u/39457343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Salesforce Bob Lightning</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASalesforceBobLightning" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SamCarlberg"><img src="https://avatars.githubusercontent.com/u/6320992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Carlberg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASamCarlberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://d.hatena.ne.jp/megascus/"><img src="https://avatars.githubusercontent.com/u/976085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Kubo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amegascus" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/scottkennedy"><img src="https://avatars.githubusercontent.com/u/881690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Kennedy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascottkennedy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/scottkennedy"><img src="https://avatars.githubusercontent.com/u/881690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Kennedy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascottkennedy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sschuberth"><img src="https://avatars.githubusercontent.com/u/349154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schuberth</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asschuberth" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itsmebasti"><img src="https://avatars.githubusercontent.com/u/12232063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schwarz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitsmebasti" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/laoseth"><img src="https://avatars.githubusercontent.com/u/16923065?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Seth Wilcox</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=laoseth" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zzzzfeng"><img src="https://avatars.githubusercontent.com/u/8851007?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zzzzfeng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azzzzfeng" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/magwas"><img src="https://avatars.githubusercontent.com/u/756838?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Árpád Magosányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amagwas" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/magwas"><img src="https://avatars.githubusercontent.com/u/756838?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Árpád Magosányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amagwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/clsaa"><img src="https://avatars.githubusercontent.com/u/32028545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>任贵杰</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aclsaa" title="Bug reports">🐛</a></td>
   </tr>
 </table>

From 3336b1ccd4dba81fc63385375c78a425cc498f3c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 15:05:26 +0200
Subject: [PATCH 152/180] [doc] Update release notes

---
 docs/pages/release_notes.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 400d774f08..b97f2a6c0f 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -32,19 +32,20 @@ This is a {{ site.pmd.release_type }} release.
   * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
 * java
   * [#3068](https://github.com/pmd/pmd/issues/3068): \[java] Some tests should not depend on real rules
-  * [#3603](https://github.com/pmd/pmd/issues/3603): \[java] SimplifiedTernary: no violation for 'condition ? true : false' case
   * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
-  * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
 * java-bestpractices
+  * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
   * [#1185](https://github.com/pmd/pmd/issues/1185): \[java] ArrayIsStoredDirectly false positive with field access
   * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
   * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
   * [#3929](https://github.com/pmd/pmd/issues/3929): \[java] ArrayIsStoredDirectly should report the assignment rather than formal parameter
+* java-design
+  * [#3603](https://github.com/pmd/pmd/issues/3603): \[java] SimplifiedTernary: no violation for 'condition ? true : false' case
 * java-performance
   * [#3867](https://github.com/pmd/pmd/issues/3867): \[java] UseArraysAsList with method call
 * plsql
-  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
   * [#3687](https://github.com/pmd/pmd/issues/3687): \[plsql] Parsing exception EXECUTE IMMEDIATE l_sql BULK COLLECT INTO statement
+  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
 ### API Changes
 

From 73f670b11a9110de581a10c4763929a5b046cdd4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 28 Apr 2022 16:00:53 +0200
Subject: [PATCH 153/180] [plsql] Fix compile and test errors

---
 .../ast/ExecuteImmediateBulkCollectTest.java  |   2 +-
 .../ast/ExecuteImmediateBulkCollect1.txt      |  43 ++----
 .../ast/ExecuteImmediateBulkCollect2.txt      | 146 +++++++-----------
 .../ast/ExecuteImmediateBulkCollect3.txt      | 113 ++++++--------
 4 files changed, 115 insertions(+), 189 deletions(-)

diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
index 63982ea168..0d06ef1c5f 100644
--- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java
@@ -19,7 +19,7 @@ public class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest {
 
     @Override
     public BaseParsingHelper<?, ?> getParser() {
-        return PlsqlParsingHelper.WITH_PROCESSING.withResourceContext(getClass());
+        return PlsqlParsingHelper.DEFAULT.withResourceContext(getClass());
     }
 
     @Test
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
index 6c18018e50..64026947bf 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
@@ -1,26 +1,7 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;
-   --
-   l_data t_data;
-   l_sql  VARCHAR2(500);
-   --
-BEGIN
-   --
-   l_sql := 'SELECT * FROM DUAL';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;\n   --\n   l_data t_data;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT * FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
          |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          +- DeclarativeSection[@CanonicalImage = null]
@@ -35,7 +16,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA T_DATA", @Image = "l_data t_data"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA", @Image = "l_data"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_DATA", @Image = "l_data"]
          |  |        |  +- ID[@CanonicalImage = "L_DATA", @Image = "l_data"]
          |  |        +- Datatype[@CanonicalImage = "T_DATA", @Image = "t_data", @TypeImage = "t_data"]
          |  |           +- QualifiedName[@CanonicalImage = "T_DATA", @Image = "t_data"]
@@ -43,28 +24,28 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |        +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
-         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
          |              +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
          |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
-         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT * FROM DUAL\'", @Image = "l_sql := \'SELECT * FROM DUAL\'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT * FROM DUAL\'", @Image = "l_sql := \'SELECT * FROM DUAL\'"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
-         |              +- PrimaryPrefix[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @SelfModifier = false]
-         |                 +- Literal[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
-         |                    +- StringLiteral[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @String = "SELECT * FROM DUAL"]
+         |           +- Expression[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'"]
+         |              +- PrimaryPrefix[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'", @SelfModifier = "false"]
+         |                 +- Literal[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'"]
+         |                    +- StringLiteral[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'", @String = "SELECT * FROM DUAL"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
          |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
index 379336f71f..a5e2758937 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
@@ -1,37 +1,7 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
-   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
-   --
-   l_data_key t_data_key;
-   l_data_description t_data_description;
-   l_sql  VARCHAR2(500);
-   p_rownum1 NUMBER(20);
-   p_rownum2 NUMBER(20);
-   --
-BEGIN
-   --
-   p_rownum1 := 10;
-   p_rownum2 := 30;
-   --
-   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
-             ' FROM DUAL '||' WHERE ROWNUM <= :p_rownum1 ' ||
-            'UNION ALL '||
-            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
-             ' FROM DUAL'||' WHERE ROWNUM <= :p_rownum2 ';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   p_rownum1 NUMBER(20);\n   p_rownum2 NUMBER(20);\n   --\nBEGIN\n   --\n   p_rownum1 := 10;\n   p_rownum2 := 30;\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\' WHERE ROWNUM <= :p_rownum1 \' ||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\'||\' WHERE ROWNUM <= :p_rownum2 \';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
          |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          +- DeclarativeSection[@CanonicalImage = null]
@@ -53,7 +23,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_KEY T_DATA_KEY", @Image = "l_data_key t_data_key"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
          |  |        |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
          |  |        +- Datatype[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key", @TypeImage = "t_data_key"]
          |  |           +- QualifiedName[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
@@ -61,7 +31,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_DESCRIPTION T_DATA_DESCRIPTION", @Image = "l_data_description t_data_description"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |  |        |  +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |  |        +- Datatype[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description", @TypeImage = "t_data_description"]
          |  |           +- QualifiedName[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
@@ -69,7 +39,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_SQL", @Image = "l_sql"]
          |  |        |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |  |        +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
          |  |           +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
@@ -77,7 +47,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "P_ROWNUM1 NUMBER(20)", @Image = "p_rownum1 NUMBER(20)"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |  |        |  +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |  |        +- Datatype[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)", @TypeImage = "NUMBER(20)"]
          |  |           +- ScalarDataTypeName[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)"]
@@ -85,7 +55,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |        +- VariableOrConstantDeclarator[@CanonicalImage = "P_ROWNUM2 NUMBER(20)", @Image = "p_rownum2 NUMBER(20)"]
-         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
+         |           +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |           |  +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |           +- Datatype[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)", @TypeImage = "NUMBER(20)"]
          |              +- ScalarDataTypeName[@CanonicalImage = "NUMBER(20)", @Image = "NUMBER(20)"]
@@ -94,112 +64,112 @@ END EXAMPLE_PROCEDURE;
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- Expression[@CanonicalImage = "P_ROWNUM1 := 10", @Image = "p_rownum1 := 10"]
          |        +- Assignment[@CanonicalImage = "P_ROWNUM1 := 10", @Image = "p_rownum1 := 10"]
-         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = false]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = "false"]
          |           |  +- SimpleExpression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |           |     +- Column[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |           |        +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |           +- Expression[@CanonicalImage = "10", @Image = "10"]
-         |              +- PrimaryPrefix[@CanonicalImage = "10", @Image = "10", @SelfModifier = false]
+         |              +- PrimaryPrefix[@CanonicalImage = "10", @Image = "10", @SelfModifier = "false"]
          |                 +- Literal[@CanonicalImage = "10", @Image = "10"]
          |                    +- NumericLiteral[@CanonicalImage = "10", @Image = "10"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- Expression[@CanonicalImage = "P_ROWNUM2 := 30", @Image = "p_rownum2 := 30"]
          |        +- Assignment[@CanonicalImage = "P_ROWNUM2 := 30", @Image = "p_rownum2 := 30"]
-         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = false]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = "false"]
          |           |  +- SimpleExpression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |           |     +- Column[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |           |        +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |           +- Expression[@CanonicalImage = "30", @Image = "30"]
-         |              +- PrimaryPrefix[@CanonicalImage = "30", @Image = "30", @SelfModifier = false]
+         |              +- PrimaryPrefix[@CanonicalImage = "30", @Image = "30", @SelfModifier = "false"]
          |                 +- Literal[@CanonicalImage = "30", @Image = "30"]
          |                    +- NumericLiteral[@CanonicalImage = "30", @Image = "30"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |           +- Expression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |              +- AdditiveExpression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @String = "SELECT 1, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @String = " WHERE ROWNUM <= :p_rownum1 "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'", @String = " WHERE ROWNUM <= :p_rownum1 "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @SelfModifier = false]
-         |                    +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '"]
-         |                       +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @String = " WHERE ROWNUM <= :p_rownum2 "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @String = " FROM DUAL"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'", @SelfModifier = "false"]
+         |                    +- Literal[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'"]
+         |                       +- StringLiteral[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'", @String = " WHERE ROWNUM <= :p_rownum2 "]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
          |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
@@ -209,12 +179,12 @@ END EXAMPLE_PROCEDURE;
          |        |  +- CollectionName[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |        |     +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |        +- Expression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = false]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1", @SelfModifier = "false"]
          |        |     +- SimpleExpression[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |        |        +- Column[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |        |           +- ID[@CanonicalImage = "P_ROWNUM1", @Image = "p_rownum1"]
          |        +- Expression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
-         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = false]
+         |           +- PrimaryPrefix[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2", @SelfModifier = "false"]
          |              +- SimpleExpression[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |                 +- Column[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
          |                    +- ID[@CanonicalImage = "P_ROWNUM2", @Image = "p_rownum2"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
index f8d384e4c9..9a9b249e0f 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
@@ -1,32 +1,7 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
-   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
-   --
-   l_data_key t_data_key;
-   l_data_description t_data_description;
-   l_sql  VARCHAR2(500);
-   --
-BEGIN
-   --
-   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
-             ' FROM DUAL '||
-            'UNION ALL '||
-            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
-             ' FROM DUAL';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data_key, l_data_description;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0", @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
-         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
+         +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = "1"]
          |  +- ObjectNameDeclaration[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          |     +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
          +- DeclarativeSection[@CanonicalImage = null]
@@ -48,7 +23,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_KEY T_DATA_KEY", @Image = "l_data_key t_data_key"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
          |  |        |  +- ID[@CanonicalImage = "L_DATA_KEY", @Image = "l_data_key"]
          |  |        +- Datatype[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key", @TypeImage = "t_data_key"]
          |  |           +- QualifiedName[@CanonicalImage = "T_DATA_KEY", @Image = "t_data_key"]
@@ -56,7 +31,7 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "L_DATA_DESCRIPTION T_DATA_DESCRIPTION", @Image = "l_data_description t_data_description"]
-         |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
+         |  |        +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |  |        |  +- ID[@CanonicalImage = "L_DATA_DESCRIPTION", @Image = "l_data_description"]
          |  |        +- Datatype[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description", @TypeImage = "t_data_description"]
          |  |           +- QualifiedName[@CanonicalImage = "T_DATA_DESCRIPTION", @Image = "t_data_description"]
@@ -64,91 +39,91 @@ END EXAMPLE_PROCEDURE;
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |        +- VariableOrConstantDeclarator[@CanonicalImage = "L_SQL VARCHAR2(500)", @Image = "l_sql VARCHAR2(500)"]
-         |           +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "L_SQL", @Image = "l_sql"]
+         |           +- VariableOrConstantDeclaratorId[@Array = "false", @ArrayDepth = "0", @CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |  +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           +- Datatype[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)", @TypeImage = "VARCHAR2(500)"]
          |              +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(500)", @Image = "VARCHAR2(500)"]
          |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |           +- Expression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |              +- AdditiveExpression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @String = "SELECT 1, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @SelfModifier = "false"]
+         |                 |  +- Literal[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = "false"]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     |  +- ID[@CanonicalImage = "CHR", @Image = "CHR"]
-         |                 |     +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
+         |                 |     +- Arguments[@ArgumentCount = "1", @CanonicalImage = null]
          |                 |        +- ArgumentList[@CanonicalImage = null]
          |                 |           +- Argument[@CanonicalImage = null]
          |                 |              +- Expression[@CanonicalImage = "39", @Image = "39"]
-         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
+         |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = "false"]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
-         |                    +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
-         |                       +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @SelfModifier = "false"]
+         |                    +- Literal[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'"]
+         |                       +- StringLiteral[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @String = " FROM DUAL"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
          |        +- StringExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
+         |        |  +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = "false"]
          |        |     +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |        +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |        |           +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]

From 57dfc7fb40d315106d6882b0b132db82ce55fa4c Mon Sep 17 00:00:00 2001
From: naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Fri, 29 Apr 2022 01:00:46 +0000
Subject: [PATCH 154/180] chore: Set permissions for GitHub actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
---
 .github/workflows/troubleshooting.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/troubleshooting.yml b/.github/workflows/troubleshooting.yml
index 31a90eef7f..04ac1cd39c 100644
--- a/.github/workflows/troubleshooting.yml
+++ b/.github/workflows/troubleshooting.yml
@@ -2,6 +2,9 @@ name: troubleshooting
 
 on: workflow_dispatch
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}

From c224209d7fe12f0b7e2a1c34b25f6ee562f8addc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 11:38:52 +0200
Subject: [PATCH 155/180] [test] Backport NodePrinters.kt from pmd7

---
 .../pmd/lang/html/ast/PositionTest.java       |  18 +-
 .../lang/html/ast/testdata/SimpleHtmlFile.txt |  21 +-
 .../lang/html/ast/testdata/SimpleXmlFile.txt  |  12 +-
 .../html/ast/testdata/TemplateFragment.txt    | 139 +++++--------
 .../ast/jdkversiontests/java15/TextBlocks.txt | 187 +++---------------
 .../java16/PatternMatchingInstanceof.txt      |  34 ++--
 .../java/ast/jdkversiontests/java16/Point.txt |   2 +-
 .../ast/jdkversiontests/java16/Records.txt    |   4 +-
 .../java17p/DealingWithNull.txt               |  28 +--
 .../java17p/EnhancedTypeCheckingSwitch.txt    |  16 +-
 .../GuardedAndParenthesizedPatterns.txt       |  24 +--
 .../java17p/PatternsInSwitchLabels.txt        |   8 +-
 .../ScopeOfPatternVariableDeclarations.txt    |  16 +-
 .../java18p/DealingWithNull.txt               |  50 ++---
 .../java18p/EnhancedTypeCheckingSwitch.txt    |  16 +-
 .../java18p/ExhaustiveSwitch.txt              |  20 +-
 .../GuardedAndParenthesizedPatterns.txt       |  38 ++--
 .../java18p/PatternsInSwitchLabels.txt        |   8 +-
 .../java18p/RefiningPatternsInSwitch.txt      |  14 +-
 .../ScopeOfPatternVariableDeclarations.txt    |  16 +-
 .../pmd/lang/ast/test/NodePrinters.kt         |  53 +++--
 .../ast/ExecuteImmediateBulkCollect1.txt      |  33 +---
 .../ast/ExecuteImmediateBulkCollect2.txt      |  94 +++------
 .../ast/ExecuteImmediateBulkCollect3.txt      |  77 +++-----
 .../pmd/lang/plsql/ast/OpenForStatement.txt   | 130 ++----------
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  |  27 +--
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  |  27 +--
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  |  29 +--
 .../pmd/lang/plsql/ast/ParsingExclusion.txt   |  17 +-
 .../pmd/lang/plsql/ast/SelectIntoArray.txt    |  24 +--
 .../ast/SqlPlusLexicalVariablesIssue195.txt   |   8 +-
 31 files changed, 366 insertions(+), 824 deletions(-)

diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
index 37b7d21322..c4169de683 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java
@@ -5,20 +5,15 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import java.util.Set;
-
 import org.junit.Test;
 
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.test.BaseNodeAttributePrinter;
 import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
 import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
-import net.sourceforge.pmd.lang.ast.xpath.Attribute;
-import net.sourceforge.pmd.util.CollectionUtil;
+import net.sourceforge.pmd.lang.ast.test.CoordinatesPrinter;
 
 public class PositionTest extends BaseTreeDumpTest {
     public PositionTest() {
-        super(new PositionRenderer(), ".html");
+        super(CoordinatesPrinter.INSTANCE, ".html");
     }
 
     @Override
@@ -30,13 +25,4 @@ public class PositionTest extends BaseTreeDumpTest {
     public void testPositions() {
         doTest("SimpleHtmlFile2");
     }
-
-    private static class PositionRenderer extends BaseNodeAttributePrinter {
-        private final Set<String> pos = CollectionUtil.asSet(new String[] {"BeginLine", "BeginColumn", "EndLine", "EndColumn"});
-
-        @Override
-        protected boolean ignoreAttribute(Node node, Attribute attribute) {
-            return !pos.contains(attribute.getName());
-        }
-    }
 }
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
index 058a83898d..6d8af325b6 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleHtmlFile.txt
@@ -1,22 +1,15 @@
 +- #document[@NodeName = "#document"]
    +- #doctype[@Name = "html", @NodeName = "#doctype", @PublicId = "", @SystemId = ""]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- html[@NodeName = "html"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- head[@NodeName = "head"]
    |  |  +- #text[@Image = "hello", @NodeName = "#text", @NormalizedText = "hello", @Text = "hello"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- body[@NodeName = "body"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
    |  |  +- h1[@NodeName = "h1"]
    |  |  |  +- #text[@Image = "world", @NodeName = "#text", @NormalizedText = "world", @Text = "world"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
index a5c715bfb0..9c25c1a1fc 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/SimpleXmlFile.txt
@@ -1,13 +1,9 @@
 +- #document[@NodeName = "#document"]
    +- #declaration[@Name = "xml", @NodeName = "#declaration"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- root[@NodeName = "root"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-  "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n  "]
    |  +- child[@NodeName = "child", @attr1 = "value1"]
    |  |  +- #text[@Image = "text & entities", @NodeName = "#text", @NormalizedText = "text & entities", @Text = "text & entities"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
diff --git a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
index c9e048e3be..6b4d6a4f40 100644
--- a/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
+++ b/pmd-html/src/test/resources/net/sourceforge/pmd/lang/html/ast/testdata/TemplateFragment.txt
@@ -1,130 +1,83 @@
 +- #document[@NodeName = "#document"]
    +- #comment[@Data = " from https://raw.githubusercontent.com/trailheadapps/lwc-recipes-oss/main/src/modules/ui/app/app.html ", @NodeName = "#comment"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
    +- template[@NodeName = "template"]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
    |  +- section[@NodeName = "section", @class = "content container page-background"]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
    |  |  +- ui-navbar[@NodeName = "ui-navbar", @nav-items = "{navigationItems}", @oncategorychange = "{handleCategoryChange}", @selected-item = "{currentNavigationItem}"]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-
-        "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n\n        "]
    |  |  +- article[@NodeName = "article", @class = "container"]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-            "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n            "]
    |  |  |  +- div[@NodeName = "div"]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.hello.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello[@NodeName = "recipe-hello"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-binding[@NodeName = "recipe-hello-binding"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-expressions[@NodeName = "recipe-hello-expressions"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-expressions-track[@NodeName = "recipe-hello-expressions-track"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-conditional-rendering[@NodeName = "recipe-hello-conditional-rendering"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-hello-for-each[@NodeName = "recipe-hello-for-each"]
    |  |  |  |  |  +- recipe-hello-iterator[@NodeName = "recipe-hello-iterator"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.composition.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-basics[@NodeName = "recipe-composition-basics"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-iteration[@NodeName = "recipe-composition-iteration"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-contact-search[@NodeName = "recipe-composition-contact-search"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-composition-dynamic[@NodeName = "recipe-composition-dynamic"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.child.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-simple[@NodeName = "recipe-event-simple"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-with-data[@NodeName = "recipe-event-with-data"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-event-bubbling[@NodeName = "recipe-event-bubbling"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.parent.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-property[@NodeName = "recipe-api-property"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-function[@NodeName = "recipe-api-function"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-api-setter-getter[@NodeName = "recipe-api-setter-getter"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.misc.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-shared-java-script[@NodeName = "recipe-misc-shared-java-script"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-rest-api-call[@NodeName = "recipe-misc-rest-api-call"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-dom-query[@NodeName = "recipe-misc-dom-query"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-misc-multiple-templates[@NodeName = "recipe-misc-multiple-templates"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- template[@NodeName = "template", @if:true = "{navigationItems.party.visible}"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-libs-d3[@NodeName = "recipe-libs-d3"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                    "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                    "]
    |  |  |  |  |  +- recipe-libs-chartjs[@NodeName = "recipe-libs-chartjs"]
-   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-                "]
+   |  |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n                "]
    |  |  |  |  +- ui-navfooter[@NodeName = "ui-navfooter", @label-next = "{nextNavigationItem}", @label-previous = "{previousNavigationItem}", @onnextclicked = "{handleNavigateNext}", @onpreviousclicked = "{handleNavigatePrevious}"]
-   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-            "]
-   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-        "]
-   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-    "]
-   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
-   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "
-"]
+   |  |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n            "]
+   |  |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n        "]
+   |  |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n    "]
+   |  +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
+   +- #text[@Image = " ", @NodeName = "#text", @NormalizedText = " ", @Text = "\n"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
index bf7dda49e0..0077112339 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java15/TextBlocks.txt
@@ -30,24 +30,7 @@
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                      <html>   
-                          <body>
-                              <p>Hello, world</p>    
-                          </body> 
-                      </html>   
-                      """", @FloatLiteral = false, @Image = """"
-                      <html>   
-                          <body>
-                              <p>Hello, world</p>    
-                          </body> 
-                      </html>   
-                      """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "<html>
-    <body>
-        <p>Hello, world</p>
-    </body>
-</html>
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                      <html>   \n                          <body>\n                              <p>Hello, world</p>    \n                          </body> \n                      </html>   \n                      \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                      <html>   \n                          <body>\n                              <p>Hello, world</p>    \n                          </body> \n                      </html>   \n                      \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "<html>\n    <body>\n        <p>Hello, world</p>\n    </body>\n</html>\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -72,18 +55,7 @@
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                       SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`
-                       WHERE `CITY` = 'INDIANAPOLIS'
-                       ORDER BY `EMP_ID`, `LAST_NAME`;
-                       """", @FloatLiteral = false, @Image = """"
-                       SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`
-                       WHERE `CITY` = 'INDIANAPOLIS'
-                       ORDER BY `EMP_ID`, `LAST_NAME`;
-                       """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`
-WHERE `CITY` = 'INDIANAPOLIS'
-ORDER BY `EMP_ID`, `LAST_NAME`;
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                       SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`\n                       WHERE `CITY` = \'INDIANAPOLIS\'\n                       ORDER BY `EMP_ID`, `LAST_NAME`;\n                       \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                       SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`\n                       WHERE `CITY` = \'INDIANAPOLIS\'\n                       ORDER BY `EMP_ID`, `LAST_NAME`;\n                       \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "SELECT `EMP_ID`, `LAST_NAME` FROM `EMPLOYEE_TB`\nWHERE `CITY` = \'INDIANAPOLIS\'\nORDER BY `EMP_ID`, `LAST_NAME`;\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -118,7 +90,7 @@ ORDER BY `EMP_ID`, `LAST_NAME`;
                      |                          +- Expression[@StandAlonePrimitive = false]
                      |                             +- PrimaryExpression[]
                      |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""js"", @FloatLiteral = false, @Image = ""js"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""js"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"js\"", @FloatLiteral = false, @Image = "\"js\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"js\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "obj", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "Object"]
@@ -137,24 +109,7 @@ ORDER BY `EMP_ID`, `LAST_NAME`;
                      |                          +- Expression[@StandAlonePrimitive = false]
                      |                             +- PrimaryExpression[]
                      |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                                 function hello() {
-                                     print('"Hello, world"');
-                                 }
-                                 
-                                 hello();
-                                 """", @FloatLiteral = false, @Image = """"
-                                 function hello() {
-                                     print('"Hello, world"');
-                                 }
-                                 
-                                 hello();
-                                 """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "function hello() {
-    print('"Hello, world"');
-}
-
-hello();
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                                 function hello() {\n                                     print(\'\"Hello, world\"\');\n                                 }\n                                 \n                                 hello();\n                                 \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                                 function hello() {\n                                     print(\'\"Hello, world\"\');\n                                 }\n                                 \n                                 hello();\n                                 \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "function hello() {\n    print(\'\"Hello, world\"\');\n}\n\nhello();\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "htmlWithEscapes", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -166,24 +121,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                      <html>
-                          <body>
-                              <p>Hello, world</p>
-                          </body>
-                      </html>
-                      """", @FloatLiteral = false, @Image = """"
-                      <html>
-                          <body>
-                              <p>Hello, world</p>
-                          </body>
-                      </html>
-                      """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "<html>
-    <body>
-        <p>Hello, world</p>
-    </body>
-</html>
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                      <html>\\r\n                          <body>\\r\n                              <p>Hello, world</p>\\r\n                          </body>\\r\n                      </html>\\r\n                      \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                      <html>\\r\n                          <body>\\r\n                              <p>Hello, world</p>\\r\n                          </body>\\r\n                      </html>\\r\n                      \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "<html>\r\n    <body>\r\n        <p>Hello, world</p>\r\n    </body>\r\n</html>\r\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -208,9 +146,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                winter"""", @FloatLiteral = false, @Image = """"
-                winter"""", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "winter", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                winter\"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                winter\"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "winter", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "period", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -222,12 +158,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                        winter
-                        """", @FloatLiteral = false, @Image = """"
-                        winter
-                        """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "winter
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                        winter\n                        \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                        winter\n                        \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "winter\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "greeting", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -239,12 +170,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-            Hi, "Bob"
-            """", @FloatLiteral = false, @Image = """"
-            Hi, "Bob"
-            """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Hi, "Bob"
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n            Hi, \"Bob\"\n            \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n            Hi, \"Bob\"\n            \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Hi, \"Bob\"\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "salutation", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -256,15 +182,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-            Hi,
-             "Bob"
-            """", @FloatLiteral = false, @Image = """"
-            Hi,
-             "Bob"
-            """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Hi,
- "Bob"
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n            Hi,\n             \"Bob\"\n            \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n            Hi,\n             \"Bob\"\n            \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Hi,\n \"Bob\"\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "empty", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -276,9 +194,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                       """", @FloatLiteral = false, @Image = """"
-                       """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                       \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                       \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "quote", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -290,12 +206,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                       "
-                       """", @FloatLiteral = false, @Image = """"
-                       "
-                       """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = ""
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                       \"\n                       \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                       \"\n                       \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "\"\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "backslash", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -307,12 +218,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                           \
-                           """", @FloatLiteral = false, @Image = """"
-                           \
-                           """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                           \\\\\n                           \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                           \\\\\n                           \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "\\\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "normalStringLiteral", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -324,7 +230,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "code", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -336,18 +242,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-            String text = """
-                A text block inside a text block
-            """;
-            """", @FloatLiteral = false, @Image = """"
-            String text = """
-                A text block inside a text block
-            """;
-            """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "String text = """
-    A text block inside a text block
-""";
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n            String text = \\\"\"\"\n                A text block inside a text block\n            \\\"\"\";\n            \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n            String text = \\\"\"\"\n                A text block inside a text block\n            \\\"\"\";\n            \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "String text = \"\"\"\n    A text block inside a text block\n\"\"\";\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "text", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -359,15 +254,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                      Lorem ipsum dolor sit amet, consectetur adipiscing 
-                      elit, sed do eiusmod tempor incididunt ut labore 
-                      et dolore magna aliqua.
-                      """", @FloatLiteral = false, @Image = """"
-                      Lorem ipsum dolor sit amet, consectetur adipiscing 
-                      elit, sed do eiusmod tempor incididunt ut labore 
-                      et dolore magna aliqua.
-                      """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                      Lorem ipsum dolor sit amet, consectetur adipiscing \\\n                      elit, sed do eiusmod tempor incididunt ut labore \\\n                      et dolore magna aliqua.\\\n                      \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                      Lorem ipsum dolor sit amet, consectetur adipiscing \\\n                      elit, sed do eiusmod tempor incididunt ut labore \\\n                      et dolore magna aliqua.\\\n                      \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -392,18 +279,7 @@ hello();
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                        red  s
-                        greens
-                        blue s
-                        """", @FloatLiteral = false, @Image = """"
-                        red  s
-                        greens
-                        blue s
-                        """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "red   
-green 
-blue  
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                        red  \\s\n                        green\\s\n                        blue \\s\n                        \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                        red  \\s\n                        green\\s\n                        blue \\s\n                        \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "red   \ngreen \nblue  \n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -428,15 +304,7 @@ blue
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-
-test
-"""", @FloatLiteral = false, @Image = """"
-
-test
-"""", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "
-test
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n\ntest\n\"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n\ntest\n\"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "\ntest\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -456,14 +324,11 @@ test
                      |                                   +- Expression[@StandAlonePrimitive = false]
                      |                                   |  +- PrimaryExpression[]
                      |                                   |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                                   |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""
-"", @FloatLiteral = false, @Image = ""
-"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""
-"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                                   |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\\n\"", @FloatLiteral = false, @Image = "\"\\n\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"\\n\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                                   +- Expression[@StandAlonePrimitive = false]
                      |                                      +- PrimaryExpression[]
                      |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""<LF>"", @FloatLiteral = false, @Image = ""<LF>"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""<LF>"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"<LF>\"", @FloatLiteral = false, @Image = "\"<LF>\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"<LF>\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- LocalVariableDeclaration[@Abstract = false, @Array = false, @ArrayDepth = 0, @Default = false, @Final = false, @Modifiers = 0, @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = false, @Strictfp = false, @Synchronized = false, @Transient = false, @TypeInferred = false, @VariableName = "bs", @Volatile = false]
                      |     +- Type[@Array = false, @ArrayDepth = 0, @ArrayType = false, @TypeImage = "String"]
@@ -475,12 +340,7 @@ test
                      |           +- Expression[@StandAlonePrimitive = false]
                      |              +- PrimaryExpression[]
                      |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = """"
-                \test
-                """", @FloatLiteral = false, @Image = """"
-                \test
-                """", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "	est
-", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\"\"\n                \\\\test\n                \"\"\"", @FloatLiteral = false, @Image = "\"\"\"\n                \\\\test\n                \"\"\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = true, @TextBlockContent = "\\test\n", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                         +- Statement[]
                            +- StatementExpression[]
@@ -500,11 +360,8 @@ test
                                                          +- Expression[@StandAlonePrimitive = false]
                                                          |  +- PrimaryExpression[]
                                                          |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                         |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""
-"", @FloatLiteral = false, @Image = ""
-"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""
-"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                         |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"\\n\"", @FloatLiteral = false, @Image = "\"\\n\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"\\n\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                                                          +- Expression[@StandAlonePrimitive = false]
                                                             +- PrimaryExpression[]
                                                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                                  +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""<LF>"", @FloatLiteral = false, @Image = ""<LF>"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""<LF>"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                                  +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"<LF>\"", @FloatLiteral = false, @Image = "\"<LF>\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"<LF>\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
index 07cc3abbd3..00f533dd0e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/PatternMatchingInstanceof.txt
@@ -13,7 +13,7 @@
             |           +- Expression[@StandAlonePrimitive = false]
             |              +- PrimaryExpression[]
             |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""other string"", @FloatLiteral = false, @Image = ""other string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""other string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"other string\"", @FloatLiteral = false, @Image = "\"other string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"other string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 0, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test", @Modifiers = 1, @Name = "test", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = false, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -31,7 +31,7 @@
             |        |           +- Expression[@StandAlonePrimitive = false]
             |        |              +- PrimaryExpression[]
             |        |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""abc"", @FloatLiteral = false, @Image = ""abc"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""abc"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"abc\"", @FloatLiteral = false, @Image = "\"abc\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"abc\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |        |  +- Statement[]
             |        |     +- IfStatement[@Else = true]
@@ -60,7 +60,7 @@
             |        |        |     |                       +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |        |     |                          +- PrimaryExpression[]
             |        |        |     |                          |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""a) obj == s: "", @FloatLiteral = false, @Image = ""a) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""a) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"a) obj == s: \"", @FloatLiteral = false, @Image = "\"a) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"a) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |     |                          +- PrimaryExpression[]
             |        |        |     |                             +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |     |                                +- Expression[@StandAlonePrimitive = false]
@@ -81,7 +81,7 @@
             |        |        |     |        +- Expression[@StandAlonePrimitive = false]
             |        |        |     |           +- PrimaryExpression[]
             |        |        |     |              +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |     |                 +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""other value"", @FloatLiteral = false, @Image = ""other value"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""other value"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |     |                 +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"other value\"", @FloatLiteral = false, @Image = "\"other value\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"other value\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |     +- BlockStatement[@Allocation = false]
             |        |        |        +- Statement[]
             |        |        |           +- StatementExpression[]
@@ -95,13 +95,13 @@
             |        |        |                             +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""changed s to "", @FloatLiteral = false, @Image = ""changed s to "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""changed s to "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"changed s to \"", @FloatLiteral = false, @Image = "\"changed s to \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"changed s to \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |                                |     +- Name[@Image = "s"]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "": obj == s: "", @FloatLiteral = false, @Image = "": obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "": obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\": obj == s: \"", @FloatLiteral = false, @Image = "\": obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\": obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |                                      +- Expression[@StandAlonePrimitive = false]
@@ -127,7 +127,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""b) obj == s: "", @FloatLiteral = false, @Image = ""b) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""b) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"b) obj == s: \"", @FloatLiteral = false, @Image = "\"b) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"b) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -170,7 +170,7 @@
             |        |        |                             +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""c) obj == s: "", @FloatLiteral = false, @Image = ""c) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""c) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"c) obj == s: \"", @FloatLiteral = false, @Image = "\"c) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"c) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |                                      +- Expression[@StandAlonePrimitive = false]
@@ -196,7 +196,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""d) obj == s: "", @FloatLiteral = false, @Image = ""d) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""d) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"d) obj == s: \"", @FloatLiteral = false, @Image = "\"d) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"d) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -245,7 +245,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""e) obj == s: "", @FloatLiteral = false, @Image = ""e) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""e) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"e) obj == s: \"", @FloatLiteral = false, @Image = "\"e) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"e) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -294,7 +294,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""f) obj == s: "", @FloatLiteral = false, @Image = ""f) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""f) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"f) obj == s: \"", @FloatLiteral = false, @Image = "\"f) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"f) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -333,7 +333,7 @@
             |        |        |                             +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""g) obj == s: "", @FloatLiteral = false, @Image = ""g) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""g) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"g) obj == s: \"", @FloatLiteral = false, @Image = "\"g) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"g) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |                                      +- Expression[@StandAlonePrimitive = false]
@@ -359,7 +359,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""h) obj == s: "", @FloatLiteral = false, @Image = ""h) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""h) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"h) obj == s: \"", @FloatLiteral = false, @Image = "\"h) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"h) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -401,7 +401,7 @@
             |        |        |                             +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""i) obj == s: "", @FloatLiteral = false, @Image = ""i) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""i) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"i) obj == s: \"", @FloatLiteral = false, @Image = "\"i) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"i) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        |                                +- PrimaryExpression[]
             |        |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |        |                                      +- Expression[@StandAlonePrimitive = false]
@@ -427,7 +427,7 @@
             |        |                                      +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |        |                                         +- PrimaryExpression[]
             |        |                                         |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""j) obj == s: "", @FloatLiteral = false, @Image = ""j) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""j) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                         |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"j) obj == s: \"", @FloatLiteral = false, @Image = "\"j) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"j) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                         +- PrimaryExpression[]
             |        |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |        |                                               +- Expression[@StandAlonePrimitive = false]
@@ -469,7 +469,7 @@
             |                 |                             +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                                +- PrimaryExpression[]
             |                 |                                |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""k) obj == s: "", @FloatLiteral = false, @Image = ""k) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""k) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"k) obj == s: \"", @FloatLiteral = false, @Image = "\"k) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"k) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                                +- PrimaryExpression[]
             |                 |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                                      +- Expression[@StandAlonePrimitive = false]
@@ -495,7 +495,7 @@
             |                                               +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                                                  +- PrimaryExpression[]
             |                                                  |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                                  |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""l) obj == s: "", @FloatLiteral = false, @Image = ""l) obj == s: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""l) obj == s: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                                  |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"l) obj == s: \"", @FloatLiteral = false, @Image = "\"l) obj == s: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"l) obj == s: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                                                  +- PrimaryExpression[]
             |                                                     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                                                        +- Expression[@StandAlonePrimitive = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
index 341c9f28da..90d0291656 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Point.txt
@@ -58,7 +58,7 @@
                                              +- AdditiveExpression[@Image = "+", @Operator = "+"]
                                                 +- PrimaryExpression[]
                                                 |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""p = "", @FloatLiteral = false, @Image = ""p = "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""p = "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"p = \"", @FloatLiteral = false, @Image = "\"p = \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"p = \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                                                 +- PrimaryExpression[]
                                                    +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
                                                       +- Name[@Image = "p"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
index dbdbaa18b7..d0248e939c 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java16/Records.txt
@@ -89,7 +89,7 @@
             |        |     |                                +- Expression[@StandAlonePrimitive = false]
             |        |     |                                   +- PrimaryExpression[]
             |        |     |                                      +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |     |                                         +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""too big"", @FloatLiteral = false, @Image = ""too big"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""too big"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |     |                                         +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"too big\"", @FloatLiteral = false, @Image = "\"too big\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"too big\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |     +- BlockStatement[@Allocation = false]
             |        |     |  +- Statement[]
             |        |     |     +- StatementExpression[]
@@ -170,7 +170,7 @@
             |        |                                                     +- Expression[@StandAlonePrimitive = false]
             |        |                                                     |  +- PrimaryExpression[]
             |        |                                                     |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                                     |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""(%d,%d)"", @FloatLiteral = false, @Image = ""(%d,%d)"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""(%d,%d)"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                                     |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"(%d,%d)\"", @FloatLiteral = false, @Image = "\"(%d,%d)\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"(%d,%d)\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |                                                     +- Expression[@StandAlonePrimitive = false]
             |        |                                                     |  +- PrimaryExpression[]
             |        |                                                     |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
index f7395cff4e..2e81b3be14 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/DealingWithNull.txt
@@ -37,7 +37,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""null!"", @FloatLiteral = false, @Image = ""null!"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""null!"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"null!\"", @FloatLiteral = false, @Image = "\"null!\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"null!\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -55,7 +55,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String"", @FloatLiteral = false, @Image = ""String"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String\"", @FloatLiteral = false, @Image = "\"String\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -68,7 +68,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Something else"", @FloatLiteral = false, @Image = ""Something else"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Something else"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Something else\"", @FloatLiteral = false, @Image = "\"Something else\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Something else\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test2", @Modifiers = 16, @Name = "test2", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -119,7 +119,7 @@
             |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                       +- PrimaryExpression[]
             |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String: "", @FloatLiteral = false, @Image = ""String: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String: \"", @FloatLiteral = false, @Image = "\"String: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                             +- Name[@Image = "s"]
@@ -140,7 +140,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Integer"", @FloatLiteral = false, @Image = ""Integer"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Integer"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Integer\"", @FloatLiteral = false, @Image = "\"Integer\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Integer\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -153,7 +153,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default"", @FloatLiteral = false, @Image = ""default"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default\"", @FloatLiteral = false, @Image = "\"default\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test3", @Modifiers = 16, @Name = "test3", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -196,7 +196,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String, including null"", @FloatLiteral = false, @Image = ""String, including null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String, including null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String, including null\"", @FloatLiteral = false, @Image = "\"String, including null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String, including null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |        |  +- Statement[]
             |        |        |     +- BreakStatement[]
@@ -213,7 +213,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |           +- Statement[]
             |        |              +- BreakStatement[]
@@ -246,7 +246,7 @@
             |        |        |                 +- Expression[@StandAlonePrimitive = false]
             |        |        |                    +- PrimaryExpression[]
             |        |        |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String, including null"", @FloatLiteral = false, @Image = ""String, including null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String, including null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String, including null\"", @FloatLiteral = false, @Image = "\"String, including null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String, including null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- SwitchLabeledExpression[]
             |        |           +- SwitchLabel[@Default = true]
             |        |           +- Expression[@StandAlonePrimitive = false]
@@ -259,7 +259,7 @@
             |        |                          +- Expression[@StandAlonePrimitive = false]
             |        |                             +- PrimaryExpression[]
             |        |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |        |  +- Statement[]
             |        |     +- SwitchStatement[@DefaultCase = true, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -286,7 +286,7 @@
             |        |                             +- Expression[@StandAlonePrimitive = false]
             |        |                                +- PrimaryExpression[]
             |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                      +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""The rest (including null)"", @FloatLiteral = false, @Image = ""The rest (including null)"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""The rest (including null)"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                      +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"The rest (including null)\"", @FloatLiteral = false, @Image = "\"The rest (including null)\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"The rest (including null)\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |           +- Statement[]
             |              +- SwitchStatement[@DefaultCase = true, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -311,7 +311,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""The rest (including null)"", @FloatLiteral = false, @Image = ""The rest (including null)"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""The rest (including null)"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"The rest (including null)\"", @FloatLiteral = false, @Image = "\"The rest (including null)\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"The rest (including null)\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
                +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
                   +- ResultType[@Void = true, @returnsArray = false]
@@ -335,7 +335,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -412,7 +412,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                         +- Statement[]
                            +- StatementExpression[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
index d5ea56fdf2..15082ceb4e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/EnhancedTypeCheckingSwitch.txt
@@ -37,7 +37,7 @@
    |        |                 |                 +- Expression[@StandAlonePrimitive = false]
    |        |                 |                    +- PrimaryExpression[]
    |        |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""null"", @FloatLiteral = false, @Image = ""null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"null\"", @FloatLiteral = false, @Image = "\"null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -55,7 +55,7 @@
    |        |                 |                 +- Expression[@StandAlonePrimitive = false]
    |        |                 |                    +- PrimaryExpression[]
    |        |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String"", @FloatLiteral = false, @Image = ""String"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String\"", @FloatLiteral = false, @Image = "\"String\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -74,7 +74,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Color with "", @FloatLiteral = false, @Image = ""Color with "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Color with "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Color with \"", @FloatLiteral = false, @Image = "\"Color with \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Color with \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                       |  |  +- Name[@Image = "c.values"]
@@ -83,7 +83,7 @@
    |        |                 |                       |  +- PrimarySuffix[@ArgumentCount = -1, @Arguments = false, @ArrayDereference = false, @Image = "length"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "" values"", @FloatLiteral = false, @Image = "" values"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "" values"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\" values\"", @FloatLiteral = false, @Image = "\" values\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\" values\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -102,7 +102,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Record class: "", @FloatLiteral = false, @Image = ""Record class: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Record class: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Record class: \"", @FloatLiteral = false, @Image = "\"Record class: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Record class: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                          |  +- Name[@Image = "p.toString"]
@@ -126,7 +126,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Array of ints of length"", @FloatLiteral = false, @Image = ""Array of ints of length"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Array of ints of length"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Array of ints of length\"", @FloatLiteral = false, @Image = "\"Array of ints of length\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Array of ints of length\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                             +- Name[@Image = "ia.length"]
@@ -142,7 +142,7 @@
    |        |                                   +- Expression[@StandAlonePrimitive = false]
    |        |                                      +- PrimaryExpression[]
    |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Something else"", @FloatLiteral = false, @Image = ""Something else"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Something else"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Something else\"", @FloatLiteral = false, @Image = "\"Something else\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Something else\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
    |           +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
    |              +- ResultType[@Void = true, @returnsArray = false]
@@ -165,7 +165,7 @@
    |                 |           +- Expression[@StandAlonePrimitive = false]
    |                 |              +- PrimaryExpression[]
    |                 |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |                 |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |                 |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |                 +- BlockStatement[@Allocation = false]
    |                    +- Statement[]
    |                       +- StatementExpression[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
index 028f55ff39..833fd9b0e5 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/GuardedAndParenthesizedPatterns.txt
@@ -50,7 +50,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""single char string"", @FloatLiteral = false, @Image = ""single char string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""single char string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"single char string\"", @FloatLiteral = false, @Image = "\"single char string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"single char string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -68,7 +68,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""string"", @FloatLiteral = false, @Image = ""string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"string\"", @FloatLiteral = false, @Image = "\"string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 1]
@@ -96,7 +96,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""integer 1"", @FloatLiteral = false, @Image = ""integer 1"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""integer 1"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"integer 1\"", @FloatLiteral = false, @Image = "\"integer 1\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"integer 1\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 3]
@@ -124,7 +124,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""long 1 with parens"", @FloatLiteral = false, @Image = ""long 1 with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""long 1 with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"long 1 with parens\"", @FloatLiteral = false, @Image = "\"long 1 with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"long 1 with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 3]
@@ -142,7 +142,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""double with parens"", @FloatLiteral = false, @Image = ""double with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""double with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"double with parens\"", @FloatLiteral = false, @Image = "\"double with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"double with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -155,7 +155,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "instanceOfPattern", @Modifiers = 16, @Name = "instanceOfPattern", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -204,7 +204,7 @@
             |        |                                   +- Expression[@StandAlonePrimitive = false]
             |        |                                      +- PrimaryExpression[]
             |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least two characters"", @FloatLiteral = false, @Image = ""A string containing at least two characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least two characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least two characters\"", @FloatLiteral = false, @Image = "\"A string containing at least two characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least two characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |        |  +- Statement[]
             |        |     +- IfStatement[@Else = false]
@@ -254,7 +254,7 @@
             |        |                                   +- Expression[@StandAlonePrimitive = false]
             |        |                                      +- PrimaryExpression[]
             |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least three characters"", @FloatLiteral = false, @Image = ""A string containing at least three characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least three characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least three characters\"", @FloatLiteral = false, @Image = "\"A string containing at least three characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least three characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |           +- Statement[]
             |              +- IfStatement[@Else = false]
@@ -292,7 +292,7 @@
             |                                            +- Expression[@StandAlonePrimitive = false]
             |                                               +- PrimaryExpression[]
             |                                                  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                                     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least four characters"", @FloatLiteral = false, @Image = ""A string containing at least four characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least four characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                                     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least four characters\"", @FloatLiteral = false, @Image = "\"A string containing at least four characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least four characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
                +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
                   +- ResultType[@Void = true, @returnsArray = false]
@@ -316,7 +316,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""a"", @FloatLiteral = false, @Image = ""a"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""a"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"a\"", @FloatLiteral = false, @Image = "\"a\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"a\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -329,7 +329,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""fooo"", @FloatLiteral = false, @Image = ""fooo"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""fooo"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"fooo\"", @FloatLiteral = false, @Image = "\"fooo\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"fooo\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -368,7 +368,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""abcde"", @FloatLiteral = false, @Image = ""abcde"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""abcde"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"abcde\"", @FloatLiteral = false, @Image = "\"abcde\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"abcde\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                         +- Statement[]
                            +- StatementExpression[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
index c13492cb44..71557a780e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/PatternsInSwitchLabels.txt
@@ -56,7 +56,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""int %d"", @FloatLiteral = false, @Image = ""int %d"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""int %d"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"int %d\"", @FloatLiteral = false, @Image = "\"int %d\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"int %d\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -78,7 +78,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""long %d"", @FloatLiteral = false, @Image = ""long %d"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""long %d"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"long %d\"", @FloatLiteral = false, @Image = "\"long %d\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"long %d\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -100,7 +100,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""double %f"", @FloatLiteral = false, @Image = ""double %f"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""double %f"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"double %f\"", @FloatLiteral = false, @Image = "\"double %f\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"double %f\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -122,7 +122,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String %s"", @FloatLiteral = false, @Image = ""String %s"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String %s"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String %s\"", @FloatLiteral = false, @Image = "\"String %s\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String %s\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
index 1a11900d39..e2d6b63390 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java17p/ScopeOfPatternVariableDeclarations.txt
@@ -55,7 +55,7 @@
             |                 |     |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |     |                                      +- PrimaryExpression[]
             |                 |     |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Ding!"", @FloatLiteral = false, @Image = ""Ding!"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Ding!"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Ding!\"", @FloatLiteral = false, @Image = "\"Ding!\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Ding!\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |     +- BlockStatement[@Allocation = false]
             |                 |        +- Statement[]
             |                 |           +- StatementExpression[]
@@ -68,7 +68,7 @@
             |                 |                          +- Expression[@StandAlonePrimitive = false]
             |                 |                             +- PrimaryExpression[]
             |                 |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Character"", @FloatLiteral = false, @Image = ""Character"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Character"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Character\"", @FloatLiteral = false, @Image = "\"Character\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Character\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledThrowStatement[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -88,7 +88,7 @@
             |                 |                          +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                             +- PrimaryExpression[]
             |                 |                             |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                             |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Invalid Integer argument of value "", @FloatLiteral = false, @Image = ""Invalid Integer argument of value "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Invalid Integer argument of value "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                             |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Invalid Integer argument of value \"", @FloatLiteral = false, @Image = "\"Invalid Integer argument of value \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Invalid Integer argument of value \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                             +- PrimaryExpression[]
             |                 |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                                |  +- Name[@Image = "i.intValue"]
@@ -151,7 +151,7 @@
             |                 |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |                                      +- PrimaryExpression[]
             |                 |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Ding "", @FloatLiteral = false, @Image = ""Ding "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Ding "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Ding \"", @FloatLiteral = false, @Image = "\"Ding \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Ding \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- BlockStatement[@Allocation = false]
             |                 |  +- Statement[]
             |                 |     +- IfStatement[@Else = false]
@@ -179,7 +179,7 @@
             |                 |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |                                      +- PrimaryExpression[]
             |                 |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Tab "", @FloatLiteral = false, @Image = ""Tab "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Tab "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Tab \"", @FloatLiteral = false, @Image = "\"Tab \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Tab \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- BlockStatement[@Allocation = false]
             |                 |  +- Statement[]
             |                 |     +- StatementExpression[]
@@ -192,7 +192,7 @@
             |                 |                    +- Expression[@StandAlonePrimitive = false]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""character"", @FloatLiteral = false, @Image = ""character"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""character"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"character\"", @FloatLiteral = false, @Image = "\"character\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"character\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabel[@Default = true]
             |                 +- BlockStatement[@Allocation = false]
             |                    +- Statement[]
@@ -225,7 +225,7 @@
                      |                    +- Expression[@StandAlonePrimitive = true]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "'A'", @FloatLiteral = false, @Image = "'A'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "'A'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "\'A\'", @FloatLiteral = false, @Image = "\'A\'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "\'A\'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                         +- Statement[]
                            +- StatementExpression[]
@@ -238,4 +238,4 @@
                                           +- Expression[@StandAlonePrimitive = true]
                                              +- PrimaryExpression[]
                                                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                   +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "'	'", @FloatLiteral = false, @Image = "'	'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "'	'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                   +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "\'\\t\'", @FloatLiteral = false, @Image = "\'\\t\'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "\'\\t\'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
index 72878864b5..de92235cf5 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/DealingWithNull.txt
@@ -37,17 +37,17 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Oops"", @FloatLiteral = false, @Image = ""Oops"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Oops"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Oops\"", @FloatLiteral = false, @Image = "\"Oops\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Oops\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- Expression[@StandAlonePrimitive = false]
             |                 |  |  |  +- PrimaryExpression[]
             |                 |  |  |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |  |  |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Foo"", @FloatLiteral = false, @Image = ""Foo"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Foo"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |  |  |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Foo\"", @FloatLiteral = false, @Image = "\"Foo\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Foo\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |  |  +- Expression[@StandAlonePrimitive = false]
             |                 |  |     +- PrimaryExpression[]
             |                 |  |        +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |  |           +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Bar"", @FloatLiteral = false, @Image = ""Bar"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Bar"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |  |           +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Bar\"", @FloatLiteral = false, @Image = "\"Bar\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Bar\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |  +- Expression[@StandAlonePrimitive = false]
             |                 |     +- PrimaryExpression[]
             |                 |        +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -58,7 +58,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Great"", @FloatLiteral = false, @Image = ""Great"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Great"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Great\"", @FloatLiteral = false, @Image = "\"Great\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Great\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -71,7 +71,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Ok"", @FloatLiteral = false, @Image = ""Ok"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Ok"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Ok\"", @FloatLiteral = false, @Image = "\"Ok\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Ok\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "testStringOrNull", @Modifiers = 16, @Name = "testStringOrNull", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -113,7 +113,7 @@
             |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                       +- PrimaryExpression[]
             |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String: "", @FloatLiteral = false, @Image = ""String: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String: \"", @FloatLiteral = false, @Image = "\"String: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                             +- Name[@Image = "s"]
@@ -129,7 +129,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test", @Modifiers = 16, @Name = "test", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -165,7 +165,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""null!"", @FloatLiteral = false, @Image = ""null!"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""null!"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"null!\"", @FloatLiteral = false, @Image = "\"null!\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"null!\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -183,7 +183,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String"", @FloatLiteral = false, @Image = ""String"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String\"", @FloatLiteral = false, @Image = "\"String\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -196,7 +196,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Something else"", @FloatLiteral = false, @Image = ""Something else"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Something else"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Something else\"", @FloatLiteral = false, @Image = "\"Something else\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Something else\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test2", @Modifiers = 16, @Name = "test2", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -247,7 +247,7 @@
             |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                       +- PrimaryExpression[]
             |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String: "", @FloatLiteral = false, @Image = ""String: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String: \"", @FloatLiteral = false, @Image = "\"String: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                             +- Name[@Image = "s"]
@@ -268,7 +268,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Integer"", @FloatLiteral = false, @Image = ""Integer"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Integer"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Integer\"", @FloatLiteral = false, @Image = "\"Integer\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Integer\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -281,7 +281,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default"", @FloatLiteral = false, @Image = ""default"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default\"", @FloatLiteral = false, @Image = "\"default\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "test3", @Modifiers = 16, @Name = "test3", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -324,7 +324,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String, including null"", @FloatLiteral = false, @Image = ""String, including null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String, including null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String, including null\"", @FloatLiteral = false, @Image = "\"String, including null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String, including null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |        |  +- Statement[]
             |        |        |     +- BreakStatement[]
@@ -341,7 +341,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |           +- Statement[]
             |        |              +- BreakStatement[]
@@ -374,7 +374,7 @@
             |        |        |                 +- Expression[@StandAlonePrimitive = false]
             |        |        |                    +- PrimaryExpression[]
             |        |        |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String, including null"", @FloatLiteral = false, @Image = ""String, including null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String, including null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String, including null\"", @FloatLiteral = false, @Image = "\"String, including null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String, including null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- SwitchLabeledExpression[]
             |        |           +- SwitchLabel[@Default = true]
             |        |           +- Expression[@StandAlonePrimitive = false]
@@ -387,7 +387,7 @@
             |        |                          +- Expression[@StandAlonePrimitive = false]
             |        |                             +- PrimaryExpression[]
             |        |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |        |  +- Statement[]
             |        |     +- SwitchStatement[@DefaultCase = true, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = true]
@@ -414,7 +414,7 @@
             |        |                             +- Expression[@StandAlonePrimitive = false]
             |        |                                +- PrimaryExpression[]
             |        |                                   +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                      +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""The rest (including null)"", @FloatLiteral = false, @Image = ""The rest (including null)"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""The rest (including null)"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                      +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"The rest (including null)\"", @FloatLiteral = false, @Image = "\"The rest (including null)\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"The rest (including null)\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |           +- Statement[]
             |              +- SwitchStatement[@DefaultCase = true, @ExhaustiveEnumSwitch = false, @FallthroughSwitch = false]
@@ -439,7 +439,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""The rest (including null)"", @FloatLiteral = false, @Image = ""The rest (including null)"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""The rest (including null)"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"The rest (including null)\"", @FloatLiteral = false, @Image = "\"The rest (including null)\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"The rest (including null)\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
                +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
                   +- ResultType[@Void = true, @returnsArray = false]
@@ -463,7 +463,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -540,7 +540,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -581,7 +581,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Foo"", @FloatLiteral = false, @Image = ""Foo"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Foo"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Foo\"", @FloatLiteral = false, @Image = "\"Foo\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Foo\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -594,7 +594,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Bar"", @FloatLiteral = false, @Image = ""Bar"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Bar"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Bar\"", @FloatLiteral = false, @Image = "\"Bar\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Bar\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -607,7 +607,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""baz"", @FloatLiteral = false, @Image = ""baz"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""baz"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"baz\"", @FloatLiteral = false, @Image = "\"baz\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"baz\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -634,4 +634,4 @@
                                           +- Expression[@StandAlonePrimitive = false]
                                              +- PrimaryExpression[]
                                                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""some string"", @FloatLiteral = false, @Image = ""some string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""some string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"some string\"", @FloatLiteral = false, @Image = "\"some string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"some string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
index d5ea56fdf2..15082ceb4e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/EnhancedTypeCheckingSwitch.txt
@@ -37,7 +37,7 @@
    |        |                 |                 +- Expression[@StandAlonePrimitive = false]
    |        |                 |                    +- PrimaryExpression[]
    |        |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""null"", @FloatLiteral = false, @Image = ""null"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""null"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"null\"", @FloatLiteral = false, @Image = "\"null\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"null\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -55,7 +55,7 @@
    |        |                 |                 +- Expression[@StandAlonePrimitive = false]
    |        |                 |                    +- PrimaryExpression[]
    |        |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String"", @FloatLiteral = false, @Image = ""String"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String\"", @FloatLiteral = false, @Image = "\"String\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -74,7 +74,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Color with "", @FloatLiteral = false, @Image = ""Color with "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Color with "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Color with \"", @FloatLiteral = false, @Image = "\"Color with \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Color with \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                       |  |  +- Name[@Image = "c.values"]
@@ -83,7 +83,7 @@
    |        |                 |                       |  +- PrimarySuffix[@ArgumentCount = -1, @Arguments = false, @ArrayDereference = false, @Image = "length"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "" values"", @FloatLiteral = false, @Image = "" values"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "" values"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\" values\"", @FloatLiteral = false, @Image = "\" values\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\" values\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 +- SwitchLabeledExpression[]
    |        |                 |  +- SwitchLabel[@Default = false]
    |        |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -102,7 +102,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Record class: "", @FloatLiteral = false, @Image = ""Record class: "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Record class: "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Record class: \"", @FloatLiteral = false, @Image = "\"Record class: \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Record class: \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                          |  +- Name[@Image = "p.toString"]
@@ -126,7 +126,7 @@
    |        |                 |                    +- AdditiveExpression[@Image = "+", @Operator = "+"]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                       |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Array of ints of length"", @FloatLiteral = false, @Image = ""Array of ints of length"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Array of ints of length"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                 |                       |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Array of ints of length\"", @FloatLiteral = false, @Image = "\"Array of ints of length\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Array of ints of length\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        |                 |                       +- PrimaryExpression[]
    |        |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
    |        |                 |                             +- Name[@Image = "ia.length"]
@@ -142,7 +142,7 @@
    |        |                                   +- Expression[@StandAlonePrimitive = false]
    |        |                                      +- PrimaryExpression[]
    |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Something else"", @FloatLiteral = false, @Image = ""Something else"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Something else"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Something else\"", @FloatLiteral = false, @Image = "\"Something else\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Something else\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |        +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
    |           +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
    |              +- ResultType[@Void = true, @returnsArray = false]
@@ -165,7 +165,7 @@
    |                 |           +- Expression[@StandAlonePrimitive = false]
    |                 |              +- PrimaryExpression[]
    |                 |                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-   |                 |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""test"", @FloatLiteral = false, @Image = ""test"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""test"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+   |                 |                    +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"test\"", @FloatLiteral = false, @Image = "\"test\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"test\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
    |                 +- BlockStatement[@Allocation = false]
    |                    +- Statement[]
    |                       +- StatementExpression[]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
index ce57bb07ea..99203d9819 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ExhaustiveSwitch.txt
@@ -112,7 +112,7 @@
             |                 |                    +- Expression[@StandAlonePrimitive = false]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Integer"", @FloatLiteral = false, @Image = ""Integer"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Integer"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Integer\"", @FloatLiteral = false, @Image = "\"Integer\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Integer\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- BlockStatement[@Allocation = false]
             |                 |  +- Statement[]
             |                 |     +- BreakStatement[]
@@ -238,7 +238,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A"", @FloatLiteral = false, @Image = ""A"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A\"", @FloatLiteral = false, @Image = "\"A\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |        |  +- Statement[]
             |        |        |     +- BreakStatement[]
@@ -260,7 +260,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""C"", @FloatLiteral = false, @Image = ""C"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""C"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"C\"", @FloatLiteral = false, @Image = "\"C\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"C\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |        |  +- Statement[]
             |        |        |     +- BreakStatement[]
@@ -277,7 +277,7 @@
             |        |        |                    +- Expression[@StandAlonePrimitive = false]
             |        |        |                       +- PrimaryExpression[]
             |        |        |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case, should be B"", @FloatLiteral = false, @Image = ""default case, should be B"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case, should be B"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |        |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case, should be B\"", @FloatLiteral = false, @Image = "\"default case, should be B\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case, should be B\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        |        +- BlockStatement[@Allocation = false]
             |        |           +- Statement[]
             |        |              +- BreakStatement[]
@@ -385,7 +385,7 @@
                      |                                   +- Expression[@StandAlonePrimitive = false]
                      |                                      +- PrimaryExpression[]
                      |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""a string"", @FloatLiteral = false, @Image = ""a string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""a string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"a string\"", @FloatLiteral = false, @Image = "\"a string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"a string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -440,7 +440,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""a string"", @FloatLiteral = false, @Image = ""a string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""a string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"a string\"", @FloatLiteral = false, @Image = "\"a string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"a string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -482,7 +482,7 @@
                      |                       +- AdditiveExpression[@Image = "+", @Operator = "+"]
                      |                          +- PrimaryExpression[]
                      |                          |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A:"", @FloatLiteral = false, @Image = ""A:"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A:"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A:\"", @FloatLiteral = false, @Image = "\"A:\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A:\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                          +- PrimaryExpression[]
                      |                             +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
                      |                             |  +- Name[@Image = "testSealedExhaustive"]
@@ -508,7 +508,7 @@
                      |                       +- AdditiveExpression[@Image = "+", @Operator = "+"]
                      |                          +- PrimaryExpression[]
                      |                          |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""B:"", @FloatLiteral = false, @Image = ""B:"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""B:"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"B:\"", @FloatLiteral = false, @Image = "\"B:\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"B:\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                          +- PrimaryExpression[]
                      |                             +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
                      |                             |  +- Name[@Image = "testSealedExhaustive"]
@@ -534,7 +534,7 @@
                      |                       +- AdditiveExpression[@Image = "+", @Operator = "+"]
                      |                          +- PrimaryExpression[]
                      |                          |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""C:"", @FloatLiteral = false, @Image = ""C:"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""C:"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                          |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"C:\"", @FloatLiteral = false, @Image = "\"C:\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"C:\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                          +- PrimaryExpression[]
                      |                             +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
                      |                             |  +- Name[@Image = "testSealedExhaustive"]
@@ -615,7 +615,7 @@
                                              +- AdditiveExpression[@Image = "+", @Operator = "+"]
                                                 +- PrimaryExpression[]
                                                 |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""F:"", @FloatLiteral = false, @Image = ""F:"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""F:"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"F:\"", @FloatLiteral = false, @Image = "\"F:\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"F:\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                                                 +- PrimaryExpression[]
                                                    +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
                                                    |  +- Name[@Image = "testGenericSealedExhaustive"]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
index c9c3d0a1c5..c55afb51bf 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/GuardedAndParenthesizedPatterns.txt
@@ -50,7 +50,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""single char string"", @FloatLiteral = false, @Image = ""single char string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""single char string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"single char string\"", @FloatLiteral = false, @Image = "\"single char string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"single char string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -68,7 +68,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""string"", @FloatLiteral = false, @Image = ""string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"string\"", @FloatLiteral = false, @Image = "\"string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 1]
@@ -96,7 +96,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""integer 1"", @FloatLiteral = false, @Image = ""integer 1"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""integer 1"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"integer 1\"", @FloatLiteral = false, @Image = "\"integer 1\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"integer 1\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 3]
@@ -124,7 +124,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""long 1 with parens"", @FloatLiteral = false, @Image = ""long 1 with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""long 1 with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"long 1 with parens\"", @FloatLiteral = false, @Image = "\"long 1 with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"long 1 with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 3]
@@ -142,7 +142,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""double with parens"", @FloatLiteral = false, @Image = ""double with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""double with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"double with parens\"", @FloatLiteral = false, @Image = "\"double with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"double with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -155,7 +155,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "testWithNull", @Modifiers = 16, @Name = "testWithNull", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -204,7 +204,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""single char string"", @FloatLiteral = false, @Image = ""single char string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""single char string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"single char string\"", @FloatLiteral = false, @Image = "\"single char string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"single char string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -222,7 +222,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""string"", @FloatLiteral = false, @Image = ""string"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""string"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"string\"", @FloatLiteral = false, @Image = "\"string\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"string\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 1]
@@ -250,7 +250,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""integer 1"", @FloatLiteral = false, @Image = ""integer 1"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""integer 1"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"integer 1\"", @FloatLiteral = false, @Image = "\"integer 1\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"integer 1\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- GuardedPattern[@ParenthesisDepth = 3]
@@ -278,7 +278,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""long 1 with parens"", @FloatLiteral = false, @Image = ""long 1 with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""long 1 with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"long 1 with parens\"", @FloatLiteral = false, @Image = "\"long 1 with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"long 1 with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 3]
@@ -296,7 +296,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""double with parens"", @FloatLiteral = false, @Image = ""double with parens"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""double with parens"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"double with parens\"", @FloatLiteral = false, @Image = "\"double with parens\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"double with parens\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- Expression[@StandAlonePrimitive = false]
@@ -314,7 +314,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""null!"", @FloatLiteral = false, @Image = ""null!"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""null!"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"null!\"", @FloatLiteral = false, @Image = "\"null!\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"null!\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -327,7 +327,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""default case"", @FloatLiteral = false, @Image = ""default case"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""default case"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"default case\"", @FloatLiteral = false, @Image = "\"default case\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"default case\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "instanceOfPattern", @Modifiers = 16, @Name = "instanceOfPattern", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -376,7 +376,7 @@
             |        |                                   +- Expression[@StandAlonePrimitive = false]
             |        |                                      +- PrimaryExpression[]
             |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least two characters"", @FloatLiteral = false, @Image = ""A string containing at least two characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least two characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least two characters\"", @FloatLiteral = false, @Image = "\"A string containing at least two characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least two characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |        |  +- Statement[]
             |        |     +- IfStatement[@Else = false]
@@ -426,7 +426,7 @@
             |        |                                   +- Expression[@StandAlonePrimitive = false]
             |        |                                      +- PrimaryExpression[]
             |        |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least three characters"", @FloatLiteral = false, @Image = ""A string containing at least three characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least three characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |        |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least three characters\"", @FloatLiteral = false, @Image = "\"A string containing at least three characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least three characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |        +- BlockStatement[@Allocation = false]
             |           +- Statement[]
             |              +- IfStatement[@Else = false]
@@ -464,7 +464,7 @@
             |                                            +- Expression[@StandAlonePrimitive = false]
             |                                               +- PrimaryExpression[]
             |                                                  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                                     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A string containing at least four characters"", @FloatLiteral = false, @Image = ""A string containing at least four characters"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A string containing at least four characters"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                                     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A string containing at least four characters\"", @FloatLiteral = false, @Image = "\"A string containing at least four characters\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A string containing at least four characters\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
                +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
                   +- ResultType[@Void = true, @returnsArray = false]
@@ -488,7 +488,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""a"", @FloatLiteral = false, @Image = ""a"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""a"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"a\"", @FloatLiteral = false, @Image = "\"a\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = true, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"a\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -501,7 +501,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""fooo"", @FloatLiteral = false, @Image = ""fooo"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""fooo"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"fooo\"", @FloatLiteral = false, @Image = "\"fooo\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"fooo\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- StatementExpression[]
@@ -540,7 +540,7 @@
                      |                    +- Expression[@StandAlonePrimitive = false]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""abcde"", @FloatLiteral = false, @Image = ""abcde"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""abcde"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"abcde\"", @FloatLiteral = false, @Image = "\"abcde\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"abcde\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                      |  +- Statement[]
                      |     +- TryStatement[@Finally = false, @TryWithResources = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
index c13492cb44..71557a780e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/PatternsInSwitchLabels.txt
@@ -56,7 +56,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""int %d"", @FloatLiteral = false, @Image = ""int %d"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""int %d"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"int %d\"", @FloatLiteral = false, @Image = "\"int %d\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"int %d\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -78,7 +78,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""long %d"", @FloatLiteral = false, @Image = ""long %d"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""long %d"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"long %d\"", @FloatLiteral = false, @Image = "\"long %d\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"long %d\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -100,7 +100,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""double %f"", @FloatLiteral = false, @Image = ""double %f"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""double %f"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"double %f\"", @FloatLiteral = false, @Image = "\"double %f\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"double %f\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
@@ -122,7 +122,7 @@
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                 |  +- PrimaryExpression[]
                      |                 |                 |     +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""String %s"", @FloatLiteral = false, @Image = ""String %s"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""String %s"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                 |                 |        +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"String %s\"", @FloatLiteral = false, @Image = "\"String %s\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"String %s\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      |                 |                 +- Expression[@StandAlonePrimitive = false]
                      |                 |                    +- PrimaryExpression[]
                      |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
index 87d4845579..8af1afb7bc 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/RefiningPatternsInSwitch.txt
@@ -114,7 +114,7 @@
             |                 |              |                    +- Expression[@StandAlonePrimitive = false]
             |                 |              |                       +- PrimaryExpression[]
             |                 |              |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |              |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Large triangle"", @FloatLiteral = false, @Image = ""Large triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Large triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |              |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Large triangle\"", @FloatLiteral = false, @Image = "\"Large triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Large triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |              +- BlockStatement[@Allocation = false]
             |                 |                 +- Statement[]
             |                 |                    +- BreakStatement[]
@@ -131,7 +131,7 @@
             |                                      +- Expression[@StandAlonePrimitive = false]
             |                                         +- PrimaryExpression[]
             |                                            +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                               +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A shape, possibly a small triangle"", @FloatLiteral = false, @Image = ""A shape, possibly a small triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A shape, possibly a small triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                               +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A shape, possibly a small triangle\"", @FloatLiteral = false, @Image = "\"A shape, possibly a small triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A shape, possibly a small triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "testTriangleRefined", @Modifiers = 16, @Name = "testTriangleRefined", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -180,7 +180,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Large triangle"", @FloatLiteral = false, @Image = ""Large triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Large triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Large triangle\"", @FloatLiteral = false, @Image = "\"Large triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Large triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -193,7 +193,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""A shape, possibly a small triangle"", @FloatLiteral = false, @Image = ""A shape, possibly a small triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""A shape, possibly a small triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"A shape, possibly a small triangle\"", @FloatLiteral = false, @Image = "\"A shape, possibly a small triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"A shape, possibly a small triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
             |  +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "testTriangleRefined2", @Modifiers = 16, @Name = "testTriangleRefined2", @Native = false, @PackagePrivate = true, @Private = false, @Protected = false, @Public = false, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = false, @Transient = false, @Void = true, @Volatile = false]
             |     +- ResultType[@Void = true, @returnsArray = false]
@@ -242,7 +242,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Large triangle"", @FloatLiteral = false, @Image = ""Large triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Large triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Large triangle\"", @FloatLiteral = false, @Image = "\"Large triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Large triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -260,7 +260,7 @@
             |                 |                 +- Expression[@StandAlonePrimitive = false]
             |                 |                    +- PrimaryExpression[]
             |                 |                       +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Small triangle"", @FloatLiteral = false, @Image = ""Small triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Small triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                          +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Small triangle\"", @FloatLiteral = false, @Image = "\"Small triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Small triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledExpression[]
             |                    +- SwitchLabel[@Default = true]
             |                    +- Expression[@StandAlonePrimitive = false]
@@ -273,7 +273,7 @@
             |                                   +- Expression[@StandAlonePrimitive = false]
             |                                      +- PrimaryExpression[]
             |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Non-triangle"", @FloatLiteral = false, @Image = ""Non-triangle"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Non-triangle"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Non-triangle\"", @FloatLiteral = false, @Image = "\"Non-triangle\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Non-triangle\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             +- ClassOrInterfaceBodyDeclaration[@AnonymousInnerClass = false, @EnumChild = false, @Kind = DeclarationKind.METHOD]
                +- MethodDeclaration[@Abstract = false, @Arity = 1, @Default = false, @Final = false, @InterfaceMember = false, @Kind = MethodLikeKind.METHOD, @MethodName = "main", @Modifiers = 17, @Name = "main", @Native = false, @PackagePrivate = false, @Private = false, @Protected = false, @Public = true, @Static = true, @Strictfp = false, @Synchronized = false, @SyntacticallyAbstract = false, @SyntacticallyPublic = true, @Transient = false, @Void = true, @Volatile = false]
                   +- ResultType[@Void = true, @returnsArray = false]
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
index 1a11900d39..e2d6b63390 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java18p/ScopeOfPatternVariableDeclarations.txt
@@ -55,7 +55,7 @@
             |                 |     |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |     |                                      +- PrimaryExpression[]
             |                 |     |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Ding!"", @FloatLiteral = false, @Image = ""Ding!"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Ding!"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |     |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Ding!\"", @FloatLiteral = false, @Image = "\"Ding!\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Ding!\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |     +- BlockStatement[@Allocation = false]
             |                 |        +- Statement[]
             |                 |           +- StatementExpression[]
@@ -68,7 +68,7 @@
             |                 |                          +- Expression[@StandAlonePrimitive = false]
             |                 |                             +- PrimaryExpression[]
             |                 |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Character"", @FloatLiteral = false, @Image = ""Character"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Character"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                   +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Character\"", @FloatLiteral = false, @Image = "\"Character\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Character\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabeledThrowStatement[]
             |                 |  +- SwitchLabel[@Default = false]
             |                 |  |  +- TypePattern[@ParenthesisDepth = 0]
@@ -88,7 +88,7 @@
             |                 |                          +- AdditiveExpression[@Image = "+", @Operator = "+"]
             |                 |                             +- PrimaryExpression[]
             |                 |                             |  +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                             |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Invalid Integer argument of value "", @FloatLiteral = false, @Image = ""Invalid Integer argument of value "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Invalid Integer argument of value "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                             |     +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Invalid Integer argument of value \"", @FloatLiteral = false, @Image = "\"Invalid Integer argument of value \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Invalid Integer argument of value \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 |                             +- PrimaryExpression[]
             |                 |                                +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
             |                 |                                |  +- Name[@Image = "i.intValue"]
@@ -151,7 +151,7 @@
             |                 |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |                                      +- PrimaryExpression[]
             |                 |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Ding "", @FloatLiteral = false, @Image = ""Ding "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Ding "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Ding \"", @FloatLiteral = false, @Image = "\"Ding \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Ding \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- BlockStatement[@Allocation = false]
             |                 |  +- Statement[]
             |                 |     +- IfStatement[@Else = false]
@@ -179,7 +179,7 @@
             |                 |                                   +- Expression[@StandAlonePrimitive = false]
             |                 |                                      +- PrimaryExpression[]
             |                 |                                         +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""Tab "", @FloatLiteral = false, @Image = ""Tab "", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""Tab "", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                                            +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"Tab \"", @FloatLiteral = false, @Image = "\"Tab \"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"Tab \"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- BlockStatement[@Allocation = false]
             |                 |  +- Statement[]
             |                 |     +- StatementExpression[]
@@ -192,7 +192,7 @@
             |                 |                    +- Expression[@StandAlonePrimitive = false]
             |                 |                       +- PrimaryExpression[]
             |                 |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = ""character"", @FloatLiteral = false, @Image = ""character"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = ""character"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+            |                 |                             +- Literal[@CharLiteral = false, @DoubleLiteral = false, @EscapedStringLiteral = "\"character\"", @FloatLiteral = false, @Image = "\"character\"", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = true, @TextBlock = false, @TextBlockContent = "\"character\"", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
             |                 +- SwitchLabel[@Default = true]
             |                 +- BlockStatement[@Allocation = false]
             |                    +- Statement[]
@@ -225,7 +225,7 @@
                      |                    +- Expression[@StandAlonePrimitive = true]
                      |                       +- PrimaryExpression[]
                      |                          +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                     |                             +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "'A'", @FloatLiteral = false, @Image = "'A'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "'A'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                     |                             +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "\'A\'", @FloatLiteral = false, @Image = "\'A\'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "\'A\'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
                      +- BlockStatement[@Allocation = false]
                         +- Statement[]
                            +- StatementExpression[]
@@ -238,4 +238,4 @@
                                           +- Expression[@StandAlonePrimitive = true]
                                              +- PrimaryExpression[]
                                                 +- PrimaryPrefix[@SuperModifier = false, @ThisModifier = false]
-                                                   +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "'	'", @FloatLiteral = false, @Image = "'	'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "'	'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
+                                                   +- Literal[@CharLiteral = true, @DoubleLiteral = false, @EscapedStringLiteral = "\'\\t\'", @FloatLiteral = false, @Image = "\'\\t\'", @IntLiteral = false, @LongLiteral = false, @SingleCharacterStringLiteral = false, @StringLiteral = false, @TextBlock = false, @TextBlockContent = "\'\\t\'", @ValueAsDouble = NaN, @ValueAsFloat = NaN, @ValueAsInt = 0, @ValueAsLong = 0]
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodePrinters.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodePrinters.kt
index c2b76c3a23..d1391bceb4 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodePrinters.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodePrinters.kt
@@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.ast.test
 
 import net.sourceforge.pmd.lang.ast.Node
 import net.sourceforge.pmd.lang.ast.xpath.Attribute
+import net.sourceforge.pmd.util.StringUtil
 import net.sourceforge.pmd.util.treeexport.TextTreeRenderer
-import org.apache.commons.lang3.StringEscapeUtils
 
 /**
  * Prints just the structure, like so:
@@ -33,35 +33,66 @@ open class RelevantAttributePrinter : BaseNodeAttributePrinter() {
 
 }
 
+/**
+ * Only prints the begin/end coordinates.
+ */
+object CoordinatesPrinter : BaseNodeAttributePrinter() {
+
+    private val Considered = setOf("BeginLine", "EndLine", "BeginColumn", "EndColumn")
+
+    override fun fillAttributes(node: Node, result: MutableList<AttributeInfo>) {
+        result += AttributeInfo("BeginLine", node.beginLine)
+        result += AttributeInfo("EndLine", node.endLine)
+        result += AttributeInfo("EndColumn", node.endColumn)
+        result += AttributeInfo("BeginColumn", node.beginColumn)
+    }
+
+    override fun ignoreAttribute(node: Node, attribute: Attribute): Boolean =
+            attribute.name !in Considered
+
+}
+
 /**
  * Base attribute printer, subclass to filter attributes.
  */
 open class BaseNodeAttributePrinter : TextTreeRenderer(true, -1) {
 
+    data class AttributeInfo(val name: String, val value: Any?)
+
     protected open fun ignoreAttribute(node: Node, attribute: Attribute): Boolean = true
 
+    protected open fun fillAttributes(node: Node, result: MutableList<AttributeInfo>) {
+        node.xPathAttributesIterator
+                .asSequence()
+                .filterNot { ignoreAttribute(node, it) }
+                .map { AttributeInfo(it.name, it.value) }
+                .forEach { result += it }
+    }
+
+
     override fun appendNodeInfoLn(out: Appendable, node: Node) {
         out.append(node.xPathNodeName)
 
-        node.xPathAttributesIterator
-            .asSequence()
-            // sort to get deterministic results
-            .sortedBy { it.name }
-            .filterNot { ignoreAttribute(node, it) }
-            .joinTo(buffer = out, prefix = "[", postfix = "]") {
-                "@${it.name} = ${valueToString(it.value)}"
-            }
+        val attrs = mutableListOf<AttributeInfo>().also { fillAttributes(node, it) }
+
+        // sort to get deterministic results
+        attrs.sortBy { it.name }
+
+        attrs.joinTo(buffer = out, prefix = "[", postfix = "]") {
+            "@${it.name} = ${valueToString(it.value)}"
+        }
 
         out.append("\n")
     }
 
     protected open fun valueToString(value: Any?): String? {
         return when (value) {
-            is String -> "\"" + StringEscapeUtils.unescapeJava(value) + "\""
+            is String -> "\"" + StringUtil.escapeJava(value) + "\""
             is Char -> '\''.toString() + value.toString().replace("'".toRegex(), "\\'") + '\''.toString()
             is Enum<*> -> value.enumDeclaringClass.simpleName + "." + value.name
             is Class<*> -> value.canonicalName?.let { "$it.class" }
-            is Number, is Boolean, null -> value.toString()
+            is Number, is Boolean -> value.toString()
+            null -> "null"
             else -> null
         }
     }
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
index 6c18018e50..66c85d1839 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
@@ -1,23 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;
-   --
-   l_data t_data;
-   l_sql  VARCHAR2(500);
-   --
-BEGIN
-   --
-   l_sql := 'SELECT * FROM DUAL';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;\n   --\n   l_data t_data;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT * FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
@@ -50,16 +31,16 @@ END EXAMPLE_PROCEDURE;
          |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT * FROM DUAL'", @Image = "l_sql := 'SELECT * FROM DUAL'"]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT * FROM DUAL\'", @Image = "l_sql := \'SELECT * FROM DUAL\'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT * FROM DUAL\'", @Image = "l_sql := \'SELECT * FROM DUAL\'"]
          |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
-         |              +- PrimaryPrefix[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @SelfModifier = false]
-         |                 +- Literal[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'"]
-         |                    +- StringLiteral[@CanonicalImage = "'SELECT * FROM DUAL'", @Image = "'SELECT * FROM DUAL'", @String = "SELECT * FROM DUAL"]
+         |           +- Expression[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'"]
+         |              +- PrimaryPrefix[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'", @SelfModifier = false]
+         |                 +- Literal[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'"]
+         |                    +- StringLiteral[@CanonicalImage = "\'SELECT * FROM DUAL\'", @Image = "\'SELECT * FROM DUAL\'", @String = "SELECT * FROM DUAL"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
index 379336f71f..8965dd564c 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
@@ -1,34 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
-   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
-   --
-   l_data_key t_data_key;
-   l_data_description t_data_description;
-   l_sql  VARCHAR2(500);
-   p_rownum1 NUMBER(20);
-   p_rownum2 NUMBER(20);
-   --
-BEGIN
-   --
-   p_rownum1 := 10;
-   p_rownum2 := 30;
-   --
-   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
-             ' FROM DUAL '||' WHERE ROWNUM <= :p_rownum1 ' ||
-            'UNION ALL '||
-            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
-             ' FROM DUAL'||' WHERE ROWNUM <= :p_rownum2 ';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   p_rownum1 NUMBER(20);\n   p_rownum2 NUMBER(20);\n   --\nBEGIN\n   --\n   p_rownum1 := 10;\n   p_rownum2 := 30;\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\' WHERE ROWNUM <= :p_rownum1 \' ||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\'||\' WHERE ROWNUM <= :p_rownum2 \';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
@@ -116,17 +86,17 @@ END EXAMPLE_PROCEDURE;
          |                    +- NumericLiteral[@CanonicalImage = "30", @Image = "30"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
          |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :P_ROWNUM1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || ' WHERE ROWNUM <= :p_rownum1 ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL' || ' WHERE ROWNUM <= :p_rownum2 '"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
+         |           +- Expression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |              +- AdditiveExpression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :P_ROWNUM1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \' WHERE ROWNUM <= :p_rownum1 \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\' || \' WHERE ROWNUM <= :p_rownum2 \'"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @String = "SELECT 1, "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -138,9 +108,9 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @String = "First key"]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -152,18 +122,18 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM1 '", @Image = "' WHERE ROWNUM <= :p_rownum1 '", @String = " WHERE ROWNUM <= :p_rownum1 "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM1 \'", @Image = "\' WHERE ROWNUM <= :p_rownum1 \'", @String = " WHERE ROWNUM <= :p_rownum1 "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @String = "SELECT 2, "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -175,9 +145,9 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @String = "Second key "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -189,12 +159,12 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @SelfModifier = false]
-         |                    +- Literal[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '"]
-         |                       +- StringLiteral[@CanonicalImage = "' WHERE ROWNUM <= :P_ROWNUM2 '", @Image = "' WHERE ROWNUM <= :p_rownum2 '", @String = " WHERE ROWNUM <= :p_rownum2 "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @String = " FROM DUAL"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'", @SelfModifier = false]
+         |                    +- Literal[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'"]
+         |                       +- StringLiteral[@CanonicalImage = "\' WHERE ROWNUM <= :P_ROWNUM2 \'", @Image = "\' WHERE ROWNUM <= :p_rownum2 \'", @String = " WHERE ROWNUM <= :p_rownum2 "]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
index f8d384e4c9..14ea63e5da 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
@@ -1,29 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;
-   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;
-   --
-   l_data_key t_data_key;
-   l_data_description t_data_description;
-   l_sql  VARCHAR2(500);
-   --
-BEGIN
-   --
-   l_sql := 'SELECT 1, ' || CHR(39) || 'First key' || CHR(39) || 
-             ' FROM DUAL '||
-            'UNION ALL '||
-            'SELECT 2, ' || CHR(39) || 'Second key ' || CHR(39) || 
-             ' FROM DUAL';
-   --
-   EXECUTE IMMEDIATE l_sql BULK COLLECT
-      INTO l_data_key, l_data_description;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
@@ -71,17 +46,17 @@ END EXAMPLE_PROCEDURE;
          |                 +- NumericLiteral[@CanonicalImage = "500", @Image = "500"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
-         |     +- Expression[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |        +- Assignment[@CanonicalImage = "L_SQL := 'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "l_sql := 'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
+         |     +- Expression[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |        +- Assignment[@CanonicalImage = "L_SQL := \'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "l_sql := \'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
          |           +- PrimaryPrefix[@CanonicalImage = "L_SQL", @Image = "l_sql", @SelfModifier = false]
          |           |  +- SimpleExpression[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |     +- Column[@CanonicalImage = "L_SQL", @Image = "l_sql"]
          |           |        +- ID[@CanonicalImage = "L_SQL", @Image = "l_sql"]
-         |           +- Expression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |              +- AdditiveExpression[@CanonicalImage = "'SELECT 1, ' || CHR || 'FIRST KEY' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'SECOND KEY ' || CHR || ' FROM DUAL'", @Image = "'SELECT 1, ' || CHR || 'First key' || CHR || ' FROM DUAL ' || 'UNION ALL ' || 'SELECT 2, ' || CHR || 'Second key ' || CHR || ' FROM DUAL'"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 1, '", @Image = "'SELECT 1, '", @String = "SELECT 1, "]
+         |           +- Expression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |              +- AdditiveExpression[@CanonicalImage = "\'SELECT 1, \' || CHR || \'FIRST KEY\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'SECOND KEY \' || CHR || \' FROM DUAL\'", @Image = "\'SELECT 1, \' || CHR || \'First key\' || CHR || \' FROM DUAL \' || \'UNION ALL \' || \'SELECT 2, \' || CHR || \'Second key \' || CHR || \' FROM DUAL\'"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 1, \'", @Image = "\'SELECT 1, \'", @String = "SELECT 1, "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -93,9 +68,9 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'FIRST KEY'", @Image = "'First key'", @String = "First key"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'FIRST KEY\'", @Image = "\'First key\'", @String = "First key"]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -107,15 +82,15 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "' FROM DUAL '", @Image = "' FROM DUAL '", @String = " FROM DUAL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'UNION ALL '", @Image = "'UNION ALL '", @String = "UNION ALL "]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SELECT 2, '", @Image = "'SELECT 2, '", @String = "SELECT 2, "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\' FROM DUAL \'", @Image = "\' FROM DUAL \'", @String = " FROM DUAL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'UNION ALL \'", @Image = "\'UNION ALL \'", @String = "UNION ALL "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SELECT 2, \'", @Image = "\'SELECT 2, \'", @String = "SELECT 2, "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -127,9 +102,9 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @SelfModifier = false]
-         |                 |  +- Literal[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '"]
-         |                 |     +- StringLiteral[@CanonicalImage = "'SECOND KEY '", @Image = "'Second key '", @String = "Second key "]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @SelfModifier = false]
+         |                 |  +- Literal[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'"]
+         |                 |     +- StringLiteral[@CanonicalImage = "\'SECOND KEY \'", @Image = "\'Second key \'", @String = "Second key "]
          |                 +- PrimaryPrefix[@CanonicalImage = "CHR", @Image = "CHR", @SelfModifier = false]
          |                 |  +- FunctionCall[@CanonicalImage = "CHR", @Image = "CHR"]
          |                 |     +- FunctionName[@CanonicalImage = "CHR", @Image = "CHR"]
@@ -141,9 +116,9 @@ END EXAMPLE_PROCEDURE;
          |                 |                 +- PrimaryPrefix[@CanonicalImage = "39", @Image = "39", @SelfModifier = false]
          |                 |                    +- Literal[@CanonicalImage = "39", @Image = "39"]
          |                 |                       +- NumericLiteral[@CanonicalImage = "39", @Image = "39"]
-         |                 +- PrimaryPrefix[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @SelfModifier = false]
-         |                    +- Literal[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'"]
-         |                       +- StringLiteral[@CanonicalImage = "' FROM DUAL'", @Image = "' FROM DUAL'", @String = " FROM DUAL"]
+         |                 +- PrimaryPrefix[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @SelfModifier = false]
+         |                    +- Literal[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'"]
+         |                       +- StringLiteral[@CanonicalImage = "\' FROM DUAL\'", @Image = "\' FROM DUAL\'", @String = " FROM DUAL"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- EmbeddedSqlStatement[@CanonicalImage = null]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/OpenForStatement.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/OpenForStatement.txt
index 9697ba6fb1..65078e5959 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/OpenForStatement.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/OpenForStatement.txt
@@ -1,66 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- See https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/OPEN-FOR-statement.html#GUID-EB7AF439-FDD3-4461-9E3F-B621E8ABFB96
--- https://github.com/pmd/pmd/issues/3487
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE t_ref_cursor IS REF CURSOR;
-   --
-   l_ref_cursor t_ref_cursor;
-   --
-BEGIN
-   --
-   OPEN l_ref_cursor FOR
-      SELECT *
-        FROM DUAL;
-   --
-END EXAMPLE_PROCEDURE;
-
---
--- Example 6-26 Fetching Data with Cursor Variables
--- https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/static-sql.html#GUID-AA5A2016-1B76-4961-9AFB-EB052F0D0FB2
---
-DECLARE
-  cv SYS_REFCURSOR;  -- cursor variable
- 
-  v_lastname  employees.last_name%TYPE;  -- variable for last_name
-  v_jobid     employees.job_id%TYPE;     -- variable for job_id
- 
-  query_2 VARCHAR2(200) :=
-    'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id';
- 
-  v_employees employees%ROWTYPE;  -- record variable row of table
- 
-BEGIN
-  OPEN cv FOR
-    SELECT last_name, job_id FROM employees
-    WHERE REGEXP_LIKE (job_id, 'S[HT]_CLERK')
-    ORDER BY last_name;
- 
-  LOOP  -- Fetches 2 columns into variables
-    FETCH cv INTO v_lastname, v_jobid;
-    EXIT WHEN cv%NOTFOUND;
-    DBMS_OUTPUT.PUT_LINE( RPAD(v_lastname, 25, ' ') || v_jobid );
-  END LOOP;
- 
-  DBMS_OUTPUT.PUT_LINE( '-------------------------------------' );
- 
-  OPEN cv FOR query_2;
- 
-  LOOP  -- Fetches entire row into the v_employees record
-    FETCH cv INTO v_employees;
-    EXIT WHEN cv%NOTFOUND;
-    DBMS_OUTPUT.PUT_LINE( RPAD(v_employees.last_name, 25, ' ') ||
-                               v_employees.job_id );
-  END LOOP;
- 
-  CLOSE cv;
-END;
-/
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- See https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/OPEN-FOR-statement.html#GUID-EB7AF439-FDD3-4461-9E3F-B621E8ABFB96\n-- https://github.com/pmd/pmd/issues/3487\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_ref_cursor IS REF CURSOR;\n   --\n   l_ref_cursor t_ref_cursor;\n   --\nBEGIN\n   --\n   OPEN l_ref_cursor FOR\n      SELECT *\n        FROM DUAL;\n   --\nEND EXAMPLE_PROCEDURE;\n\n--\n-- Example 6-26 Fetching Data with Cursor Variables\n-- https://docs.oracle.com/en/database/oracle/oracle-database/18/lnpls/static-sql.html#GUID-AA5A2016-1B76-4961-9AFB-EB052F0D0FB2\n--\nDECLARE\n  cv SYS_REFCURSOR;  -- cursor variable\n \n  v_lastname  employees.last_name%TYPE;  -- variable for last_name\n  v_jobid     employees.job_id%TYPE;     -- variable for job_id\n \n  query_2 VARCHAR2(200) :=\n    \'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\';\n \n  v_employees employees%ROWTYPE;  -- record variable row of table\n \nBEGIN\n  OPEN cv FOR\n    SELECT last_name, job_id FROM employees\n    WHERE REGEXP_LIKE (job_id, \'S[HT]_CLERK\')\n    ORDER BY last_name;\n \n  LOOP  -- Fetches 2 columns into variables\n    FETCH cv INTO v_lastname, v_jobid;\n    EXIT WHEN cv%NOTFOUND;\n    DBMS_OUTPUT.PUT_LINE( RPAD(v_lastname, 25, \' \') || v_jobid );\n  END LOOP;\n \n  DBMS_OUTPUT.PUT_LINE( \'-------------------------------------\' );\n \n  OPEN cv FOR query_2;\n \n  LOOP  -- Fetches entire row into the v_employees record\n    FETCH cv INTO v_employees;\n    EXIT WHEN cv%NOTFOUND;\n    DBMS_OUTPUT.PUT_LINE( RPAD(v_employees.last_name, 25, \' \') ||\n                               v_employees.job_id );\n  END LOOP;\n \n  CLOSE cv;\nEND;\n/\n"]
    +- Global[@CanonicalImage = null]
    |  +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
    |     +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
@@ -123,43 +61,17 @@ END;
          |  |              +- QualifiedID[@CanonicalImage = "JOB_ID", @Image = "job_id"]
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |  |  +- VariableOrConstantDeclaration[@CanonicalImage = null]
-         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "QUERY_2 VARCHAR2(200) := 'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "query_2 VARCHAR2(200) := 'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'"]
+         |  |     +- VariableOrConstantDeclarator[@CanonicalImage = "QUERY_2 VARCHAR2(200) := \'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "query_2 VARCHAR2(200) := \'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'"]
          |  |        +- VariableOrConstantDeclaratorId[@Array = false, @ArrayDepth = 0, @CanonicalImage = "QUERY_2", @Image = "query_2"]
          |  |        |  +- ID[@CanonicalImage = "QUERY_2", @Image = "query_2"]
          |  |        +- Datatype[@CanonicalImage = "VARCHAR2(200)", @Image = "VARCHAR2(200)", @TypeImage = "VARCHAR2(200)"]
          |  |        |  +- ScalarDataTypeName[@CanonicalImage = "VARCHAR2(200)", @Image = "VARCHAR2(200)"]
          |  |        |     +- NumericLiteral[@CanonicalImage = "200", @Image = "200"]
-         |  |        +- VariableOrConstantInitializer[@CanonicalImage = "'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'"]
-         |  |           +- Expression[@CanonicalImage = "'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'"]
-         |  |              +- PrimaryPrefix[@CanonicalImage = "'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'", @SelfModifier = false]
-         |  |                 +- Literal[@CanonicalImage = "'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'"]
-         |  |                    +- StringLiteral[@CanonicalImage = "'SELECT * FROM EMPLOYEES
-    WHERE REGEXP_LIKE (JOB_ID, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY JOB_ID'", @Image = "'SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id'", @String = "SELECT * FROM employees
-    WHERE REGEXP_LIKE (job_id, ''[ACADFIMKSA]_M[ANGR]'')
-    ORDER BY job_id"]
+         |  |        +- VariableOrConstantInitializer[@CanonicalImage = "\'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "\'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'"]
+         |  |           +- Expression[@CanonicalImage = "\'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "\'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'"]
+         |  |              +- PrimaryPrefix[@CanonicalImage = "\'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "\'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'", @SelfModifier = false]
+         |  |                 +- Literal[@CanonicalImage = "\'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "\'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'"]
+         |  |                    +- StringLiteral[@CanonicalImage = "\'SELECT * FROM EMPLOYEES\n    WHERE REGEXP_LIKE (JOB_ID, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY JOB_ID\'", @Image = "\'SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id\'", @String = "SELECT * FROM employees\n    WHERE REGEXP_LIKE (job_id, \'\'[ACADFIMKSA]_M[ANGR]\'\')\n    ORDER BY job_id"]
          |  +- DeclarativeUnit[@CanonicalImage = null]
          |     +- VariableOrConstantDeclaration[@CanonicalImage = null]
          |        +- VariableOrConstantDeclarator[@CanonicalImage = "V_EMPLOYEES EMPLOYEES%ROWTYPE", @Image = "v_employees employees%ROWTYPE"]
@@ -201,10 +113,10 @@ END;
          |           |           |     +- SimpleExpression[@CanonicalImage = "JOB_ID", @Image = "job_id"]
          |           |           |        +- Column[@CanonicalImage = "JOB_ID", @Image = "job_id"]
          |           |           |           +- ID[@CanonicalImage = "JOB_ID", @Image = "job_id"]
-         |           |           +- SqlExpression[@CanonicalImage = "'S[HT]_CLERK'", @Image = "'S[HT]_CLERK'"]
-         |           |              +- PrimaryPrefix[@CanonicalImage = "'S[HT]_CLERK'", @Image = "'S[HT]_CLERK'", @SelfModifier = false]
-         |           |                 +- Literal[@CanonicalImage = "'S[HT]_CLERK'", @Image = "'S[HT]_CLERK'"]
-         |           |                    +- StringLiteral[@CanonicalImage = "'S[HT]_CLERK'", @Image = "'S[HT]_CLERK'", @String = "S[HT]_CLERK"]
+         |           |           +- SqlExpression[@CanonicalImage = "\'S[HT]_CLERK\'", @Image = "\'S[HT]_CLERK\'"]
+         |           |              +- PrimaryPrefix[@CanonicalImage = "\'S[HT]_CLERK\'", @Image = "\'S[HT]_CLERK\'", @SelfModifier = false]
+         |           |                 +- Literal[@CanonicalImage = "\'S[HT]_CLERK\'", @Image = "\'S[HT]_CLERK\'"]
+         |           |                    +- StringLiteral[@CanonicalImage = "\'S[HT]_CLERK\'", @Image = "\'S[HT]_CLERK\'", @String = "S[HT]_CLERK"]
          |           +- OrderByClause[@CanonicalImage = null]
          |              +- SqlExpression[@CanonicalImage = "LAST_NAME", @Image = "last_name"]
          |                 +- PrimaryPrefix[@CanonicalImage = "LAST_NAME", @Image = "last_name", @SelfModifier = false]
@@ -268,9 +180,9 @@ END;
          |                                      |           |        +- Literal[@CanonicalImage = "25", @Image = "25"]
          |                                      |           |           +- NumericLiteral[@CanonicalImage = "25", @Image = "25"]
          |                                      |           +- Argument[@CanonicalImage = null]
-         |                                      |              +- Expression[@CanonicalImage = "' '", @Image = "' '"]
-         |                                      |                 +- PrimaryPrefix[@CanonicalImage = "' '", @Image = "' '", @SelfModifier = false]
-         |                                      |                    +- Literal[@CanonicalImage = "' '", @Image = "' '"]
+         |                                      |              +- Expression[@CanonicalImage = "\' \'", @Image = "\' \'"]
+         |                                      |                 +- PrimaryPrefix[@CanonicalImage = "\' \'", @Image = "\' \'", @SelfModifier = false]
+         |                                      |                    +- Literal[@CanonicalImage = "\' \'", @Image = "\' \'"]
          |                                      +- PrimaryPrefix[@CanonicalImage = "V_JOBID", @Image = "v_jobid", @SelfModifier = false]
          |                                         +- SimpleExpression[@CanonicalImage = "V_JOBID", @Image = "v_jobid"]
          |                                            +- Column[@CanonicalImage = "V_JOBID", @Image = "v_jobid"]
@@ -286,10 +198,10 @@ END;
          |              +- Arguments[@ArgumentCount = 1, @CanonicalImage = null]
          |                 +- ArgumentList[@CanonicalImage = null]
          |                    +- Argument[@CanonicalImage = null]
-         |                       +- Expression[@CanonicalImage = "'-------------------------------------'", @Image = "'-------------------------------------'"]
-         |                          +- PrimaryPrefix[@CanonicalImage = "'-------------------------------------'", @Image = "'-------------------------------------'", @SelfModifier = false]
-         |                             +- Literal[@CanonicalImage = "'-------------------------------------'", @Image = "'-------------------------------------'"]
-         |                                +- StringLiteral[@CanonicalImage = "'-------------------------------------'", @Image = "'-------------------------------------'", @String = "-------------------------------------"]
+         |                       +- Expression[@CanonicalImage = "\'-------------------------------------\'", @Image = "\'-------------------------------------\'"]
+         |                          +- PrimaryPrefix[@CanonicalImage = "\'-------------------------------------\'", @Image = "\'-------------------------------------\'", @SelfModifier = false]
+         |                             +- Literal[@CanonicalImage = "\'-------------------------------------\'", @Image = "\'-------------------------------------\'"]
+         |                                +- StringLiteral[@CanonicalImage = "\'-------------------------------------\'", @Image = "\'-------------------------------------\'", @String = "-------------------------------------"]
          +- Statement[@CanonicalImage = null]
          |  +- UnlabelledStatement[@CanonicalImage = null]
          |     +- OpenStatement[@CanonicalImage = null]
@@ -357,9 +269,9 @@ END;
          |                                      |           |        +- Literal[@CanonicalImage = "25", @Image = "25"]
          |                                      |           |           +- NumericLiteral[@CanonicalImage = "25", @Image = "25"]
          |                                      |           +- Argument[@CanonicalImage = null]
-         |                                      |              +- Expression[@CanonicalImage = "' '", @Image = "' '"]
-         |                                      |                 +- PrimaryPrefix[@CanonicalImage = "' '", @Image = "' '", @SelfModifier = false]
-         |                                      |                    +- Literal[@CanonicalImage = "' '", @Image = "' '"]
+         |                                      |              +- Expression[@CanonicalImage = "\' \'", @Image = "\' \'"]
+         |                                      |                 +- PrimaryPrefix[@CanonicalImage = "\' \'", @Image = "\' \'", @SelfModifier = false]
+         |                                      |                    +- Literal[@CanonicalImage = "\' \'", @Image = "\' \'"]
          |                                      +- PrimaryPrefix[@CanonicalImage = "V_EMPLOYEES.JOB_ID", @Image = "v_employees.job_id", @SelfModifier = false]
          |                                         +- SimpleExpression[@CanonicalImage = "V_EMPLOYEES.JOB_ID", @Image = "v_employees.job_id"]
          |                                            +- TableName[@CanonicalImage = "V_EMPLOYEES", @Image = "v_employees"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
index aaa2464d78..98181dbc20 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -1,29 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   CURSOR c_example IS
-      SELECT a.owner, u.object_name, p.aggregate
-        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
-               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id
-               INNER JOIN (ALL_PROCEDURES p) ON
-               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type
-       WHERE a.owner = USER;
-   --
-BEGIN
-   --
-   FOR l_object IN c_example LOOP
-      --
-      DBMS_OUTPUT.Put_Line(l_object.owner);
-      DBMS_OUTPUT.Put_Line(l_object.object_name);
-      DBMS_OUTPUT.Put_Line(l_object.aggregate);
-      --
-   END LOOP;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
index 8bc9983c66..25349ff15d 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -1,29 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   CURSOR c_example IS
-      SELECT a.owner, u.object_name, p.aggregate
-        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON
-               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)
-               INNER JOIN (ALL_PROCEDURES p) ON
-               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)
-       WHERE a.owner = USER;
-   --
-BEGIN
-   --
-   FOR l_object IN c_example LOOP
-      --
-      DBMS_OUTPUT.Put_Line(l_object.owner);
-      DBMS_OUTPUT.Put_Line(l_object.object_name);
-      DBMS_OUTPUT.Put_Line(l_object.aggregate);
-      --
-   END LOOP;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   CURSOR c_example IS\n      SELECT a.owner, u.object_name, p.aggregate\n        FROM (((USER_OBJECTS u) INNER JOIN (ALL_OBJECTS a) ON\n               u.object_name = a.object_name AND u.object_type = a.object_type AND u.object_id = a.object_id)\n               INNER JOIN (ALL_PROCEDURES p) ON\n               p.owner = a.owner AND p.object_name = a.object_name AND p.object_type = a.object_type)\n       WHERE a.owner = USER;\n   --\nBEGIN\n   --\n   FOR l_object IN c_example LOOP\n      --\n      DBMS_OUTPUT.Put_Line(l_object.owner);\n      DBMS_OUTPUT.Put_Line(l_object.object_name);\n      DBMS_OUTPUT.Put_Line(l_object.aggregate);\n      --\n   END LOOP;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
index ba0d002fba..a0a5106dc1 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -1,23 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- BSD-style license; for more info see http://pmd.sourceforge.net/license.html
---
-
-CREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS
-    --
-    CURSOR c_test IS
-        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent
-        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)
-            INNER JOIN
-            (STUDENT_SCORE ss) on si.sid = sp.sid)
-            INNER JOIN
-            (STUDENT_PARENT sp) on si.sid = sp.sid)
-        WHERE si.sid = '114514';
-    --
-BEGIN
-    --
-    --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE TEST_PROCEDURE IS\n    --\n    CURSOR c_test IS\n        SELECT si.sid, sn.name, sa.age, ss.score, sp.parent\n        FROM ((((STUDENT_INFO si) INNER JOIN (STUDENT_AGE sa) on si.sid = sa.sid)\n            INNER JOIN\n            (STUDENT_SCORE ss) on si.sid = sp.sid)\n            INNER JOIN\n            (STUDENT_PARENT sp) on si.sid = sp.sid)\n        WHERE si.sid = \'114514\';\n    --\nBEGIN\n    --\n    --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = 1]
@@ -147,8 +128,8 @@ END EXAMPLE_PROCEDURE;
          |                          |        |  +- ID[@CanonicalImage = "SI", @Image = "si"]
          |                          |        +- Column[@CanonicalImage = "SID", @Image = "sid"]
          |                          |           +- ID[@CanonicalImage = "SID", @Image = "sid"]
-         |                          +- SqlExpression[@CanonicalImage = "'114514'", @Image = "'114514'"]
-         |                             +- PrimaryPrefix[@CanonicalImage = "'114514'", @Image = "'114514'", @SelfModifier = false]
-         |                                +- Literal[@CanonicalImage = "'114514'", @Image = "'114514'"]
-         |                                   +- StringLiteral[@CanonicalImage = "'114514'", @Image = "'114514'", @String = "114514"]
+         |                          +- SqlExpression[@CanonicalImage = "\'114514\'", @Image = "\'114514\'"]
+         |                             +- PrimaryPrefix[@CanonicalImage = "\'114514\'", @Image = "\'114514\'", @SelfModifier = false]
+         |                                +- Literal[@CanonicalImage = "\'114514\'", @Image = "\'114514\'"]
+         |                                   +- StringLiteral[@CanonicalImage = "\'114514\'", @Image = "\'114514\'", @String = "114514"]
          +- ID[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE"]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
index a0f21db435..1fea26da47 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
@@ -1,19 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 6, @ExcludedRangesCount = 2, @Sourcecode = "begin
-  do_something();
-  -- pmd-exclude-begin: PMD does not like dbms_lob.trim (clash with TrimExpression)
-  dbms_lob.trim(the_blob, 1000);
-  -- pmd-exclude-end
-  do_something_else(x);
-end;
-/
-
-select dummy from dual a
-where 1=1
-  -- pmd-exclude-begin: PMD does not like scalar subqueries in WHERE conditions
-  and 'J' = (select max('J') from dual b)
-  -- pmd-exclude-end
-;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 6, @ExcludedRangesCount = 2, @Sourcecode = "begin\n  do_something();\n  -- pmd-exclude-begin: PMD does not like dbms_lob.trim (clash with TrimExpression)\n  dbms_lob.trim(the_blob, 1000);\n  -- pmd-exclude-end\n  do_something_else(x);\nend;\n/\n\nselect dummy from dual a\nwhere 1=1\n  -- pmd-exclude-begin: PMD does not like scalar subqueries in WHERE conditions\n  and \'J\' = (select max(\'J\') from dual b)\n  -- pmd-exclude-end\n;\n"]
    +- Global[@CanonicalImage = null]
    |  +- Block[@CanonicalImage = null]
    |     +- Statement[@CanonicalImage = null]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
index 2709539e5e..0c6b7feed7 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
@@ -1,26 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--
--- See https://github.com/pmd/pmd/issues/3515
---
-
-CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
-   --
-   TYPE example_data_rt IS RECORD(
-      field_one   PLS_INTEGER,
-      field_two   PLS_INTEGER,
-      field_three PLS_INTEGER);
-   --
-   TYPE example_data_aat IS TABLE OF example_data_rt INDEX BY BINARY_INTEGER;
-   --
-   l_example_data example_data_aat;
-   --
-BEGIN
-   --
-   SELECT 1 field_value_one, 2 field_value_two, 3 field_value_three
-     INTO l_example_data(1).field_one,l_example_data(1).field_two,l_example_data(1).field_three
-     FROM DUAL;
-   --
-END EXAMPLE_PROCEDURE;
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- See https://github.com/pmd/pmd/issues/3515\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE example_data_rt IS RECORD(\n      field_one   PLS_INTEGER,\n      field_two   PLS_INTEGER,\n      field_three PLS_INTEGER);\n   --\n   TYPE example_data_aat IS TABLE OF example_data_rt INDEX BY BINARY_INTEGER;\n   --\n   l_example_data example_data_aat;\n   --\nBEGIN\n   --\n   SELECT 1 field_value_one, 2 field_value_two, 3 field_value_three\n     INTO l_example_data(1).field_one,l_example_data(1).field_two,l_example_data(1).field_three\n     FROM DUAL;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
index d5ddc15d5a..2771c23abf 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
@@ -1,9 +1,3 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "
--- see https://github.com/pmd/pmd/issues/195
--- both define and spool are SQL*Plus commands, and they should not be ended with a semi-colon.
-
-define patch_name = acme_module
-spool &patch_name..log
-"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "\n-- see https://github.com/pmd/pmd/issues/195\n-- both define and spool are SQL*Plus commands, and they should not be ended with a semi-colon.\n\ndefine patch_name = acme_module\nspool &patch_name..log\n"]
    +- SqlPlusCommand[@CanonicalImage = "DEFINE PATCH_NAME = ACME_MODULE", @Image = "define patch_name = acme_module "]
    +- SqlPlusCommand[@CanonicalImage = "SPOOL &PATCH_NAME. . LOG", @Image = "spool &patch_name. . log "]

From 94057f688d041ad140604bb1fb1249bad54adb31 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 11:56:36 +0200
Subject: [PATCH 156/180] [doc] Update release notes (#3943)

---
 docs/pages/release_notes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 7435aeab16..c3bcdfd719 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -103,6 +103,7 @@ missing features or bugs as new [issues](https://github.com/pmd/pmd/issues).
 * [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
 * [#3935](https://github.com/pmd/pmd/pull/3935): \[plsql] Fix parser exception in EXECUTE IMMEDIATE BULK COLLECT #3687 - [@Scrsloota](https://github.com/Scrsloota)
 * [#3938](https://github.com/pmd/pmd/pull/3938): \[java] Modify SimplifiedTernary to meet the missing case #3603 - [@VoidxHoshi](https://github.com/VoidxHoshi)
+* [#3943](https://github.com/pmd/pmd/pull/3943): chore: Set permissions for GitHub actions - [@naveensrinivasan](https://github.com/naveensrinivasan)
 
 {% endtocmaker %}
 

From 47beb1c3cdcb8af1a0334c1c16bf589e760a3077 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 11:57:00 +0200
Subject: [PATCH 157/180]  Add @naveensrinivasan as a contributor

---
 .all-contributorsrc                   |   9 +++
 docs/pages/pmd/projectdocs/credits.md | 101 +++++++++++++-------------
 2 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 66cd053fa8..dcac68bf60 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6630,6 +6630,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "naveensrinivasan",
+      "name": "Naveen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/172697?v=4",
+      "profile": "https://naveensrinivasan.dev/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md
index b252c1d257..3f6b6213cf 100644
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
@@ -496,451 +496,452 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/nathanspectacular"><img src="https://avatars.githubusercontent.com/u/88563519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anathanspectacular" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/numeralnathan"><img src="https://avatars.githubusercontent.com/u/1236594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathan Reynolds</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anumeralnathan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://mastodon.tetaneutral.net/@roipoussiere"><img src="https://avatars.githubusercontent.com/u/1665542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nathanaël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aroipoussiere" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://naveensrinivasan.dev/"><img src="https://avatars.githubusercontent.com/u/172697?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Naveen</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=naveensrinivasan" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Nazdravi"><img src="https://avatars.githubusercontent.com/u/273093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nazdravi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANazdravi" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Neha-Dhonde"><img src="https://avatars.githubusercontent.com/u/31505059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neha-Dhonde</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANeha-Dhonde" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Neha-Dhonde"><img src="https://avatars.githubusercontent.com/u/31505059?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neha-Dhonde</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANeha-Dhonde" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/njdoyle"><img src="https://avatars.githubusercontent.com/u/316852?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicholas Doyle</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anjdoyle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/NickButcher1"><img src="https://avatars.githubusercontent.com/u/8671565?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Butcher</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANickButcher1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicoabie"><img src="https://avatars.githubusercontent.com/u/2797992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nico Gallinal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicoabie" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niktekusho"><img src="https://avatars.githubusercontent.com/u/18280135?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicola Dal Maso</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniktekusho" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/1997376/nicolas-filotto"><img src="https://avatars.githubusercontent.com/u/1618116?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Filotto</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=essobedo" title="Code">💻</a></td>
     <td align="center"><a href="https://www.salesforcecraft.dev/"><img src="https://avatars.githubusercontent.com/u/8916229?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Chursin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anchursin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://vanniktech.com/"><img src="https://avatars.githubusercontent.com/u/5759366?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niklas Baudy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanniktech" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://vanniktech.com/"><img src="https://avatars.githubusercontent.com/u/5759366?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niklas Baudy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avanniktech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/havrikov"><img src="https://avatars.githubusercontent.com/u/29175267?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikolas Havrikov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahavrikov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://nileshvirkar.github.io/"><img src="https://avatars.githubusercontent.com/u/24671786?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nilesh Virkar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANileshVirkar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nimit-patel"><img src="https://avatars.githubusercontent.com/u/13987001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nimit Patel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Animit-patel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/niranjanh"><img src="https://avatars.githubusercontent.com/u/23009945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Harpale</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aniranjanh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noahsussman"><img src="https://avatars.githubusercontent.com/u/31490710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sussman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoahsussman" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Noah0120"><img src="https://avatars.githubusercontent.com/u/86766856?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah0120</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANoah0120" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://noamtamim.com/"><img src="https://avatars.githubusercontent.com/u/10047237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noam Tamim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoamtamim" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://noamtamim.com/"><img src="https://avatars.githubusercontent.com/u/10047237?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noam Tamim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoamtamim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/grandinj"><img src="https://avatars.githubusercontent.com/u/796121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noel Grandin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agrandinj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OlafHaalstra"><img src="https://avatars.githubusercontent.com/u/6420723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olaf Haalstra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOlafHaalstra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Oleg-Pavlenko-EPAM"><img src="https://avatars.githubusercontent.com/u/82513963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleg Pavlenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOleg-Pavlenko-EPAM" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dykov"><img src="https://avatars.githubusercontent.com/u/36415196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oleksii Dykov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dykov" title="Code">💻</a></td>
     <td align="center"><a href="http://www.eikemeier.com/"><img src="https://avatars.githubusercontent.com/u/604196?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oliver Eikemeier</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeikemeier" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pyxide"><img src="https://avatars.githubusercontent.com/u/9992381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Olivier Parent</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pyxide" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apyxide" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ollieabbey"><img src="https://avatars.githubusercontent.com/u/52665918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ollie Abbey</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ollieabbey" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aollieabbey" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ollieabbey"><img src="https://avatars.githubusercontent.com/u/52665918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ollie Abbey</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ollieabbey" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aollieabbey" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/OverDrone"><img src="https://avatars.githubusercontent.com/u/8506029?v=4?s=100" width="100px;" alt=""/><br /><sub><b>OverDrone</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AOverDrone" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ozangulle"><img src="https://avatars.githubusercontent.com/u/1334150?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ozan Gulle</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ozangulle" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aozangulle" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/PJ17101"><img src="https://avatars.githubusercontent.com/u/31703044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PUNEET JAIN</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APJ17101" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parbatiSF"><img src="https://avatars.githubusercontent.com/u/37078591?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Parbati Bose</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AparbatiSF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/paulberg"><img src="https://avatars.githubusercontent.com/u/3239883?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Paul Berg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apaulberg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbludov"><img src="https://avatars.githubusercontent.com/u/900805?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Bludov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbludov" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/malejpavouk"><img src="https://avatars.githubusercontent.com/u/4127023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Mička</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amalejpavouk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/malejpavouk"><img src="https://avatars.githubusercontent.com/u/4127023?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel Mička</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amalejpavouk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pnsantos"><img src="https://avatars.githubusercontent.com/u/630567?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Nuno Santos</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apnsantos" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://pedrorijo.com/"><img src="https://avatars.githubusercontent.com/u/1999050?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pedro Rijo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apedrorijo91" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://belaran.eu/wordpress/"><img src="https://avatars.githubusercontent.com/u/117836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pelisse Romain</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rpelisse" title="Documentation">📖</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arpelisse" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MisterSquishy"><img src="https://avatars.githubusercontent.com/u/5599894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pete Davids</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMisterSquishy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://blog.bruin.sg/"><img src="https://avatars.githubusercontent.com/u/4156901?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Bruin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auncletall" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pchittum"><img src="https://avatars.githubusercontent.com/u/1127876?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Chittum</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pchittum" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apchittum" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/petercudmore"><img src="https://avatars.githubusercontent.com/u/12710815?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Cudmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apetercudmore" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/petercudmore"><img src="https://avatars.githubusercontent.com/u/12710815?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Cudmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apetercudmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pkasson"><img src="https://avatars.githubusercontent.com/u/3072247?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kasson</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apkasson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.code-cop.org/"><img src="https://avatars.githubusercontent.com/u/830028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Kofler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acodecop" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gpbp"><img src="https://avatars.githubusercontent.com/u/18648177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pham Hai Trung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agpbp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/acanda"><img src="https://avatars.githubusercontent.com/u/174978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Graf</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=acanda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aacanda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krallus"><img src="https://avatars.githubusercontent.com/u/29927450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Hachey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrallus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://pozil.github.io/"><img src="https://avatars.githubusercontent.com/u/5071767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philippe Ozil</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apozil" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/phinehasz"><img src="https://avatars.githubusercontent.com/u/36982629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phinehas Artemix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphinehasz" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/phinehasz"><img src="https://avatars.githubusercontent.com/u/36982629?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phinehas Artemix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphinehasz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fluxroot"><img src="https://avatars.githubusercontent.com/u/247365?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Phokham Nonava</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afluxroot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szyman23"><img src="https://avatars.githubusercontent.com/u/4140681?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotr Szymański</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszyman23" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pzygielo"><img src="https://avatars.githubusercontent.com/u/11896137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Piotrek Żygieło</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=pzygielo" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Apzygielo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/pranayjaiswal"><img src="https://avatars.githubusercontent.com/u/1728493?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pranay Jaiswal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apranayjswl007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kamath-prasad"><img src="https://avatars.githubusercontent.com/u/28445395?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasad Kamath</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akamath-prasad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Prasanna-Loga"><img src="https://avatars.githubusercontent.com/u/36530081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Prasanna</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APrasanna-Loga" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Presh-AR"><img src="https://avatars.githubusercontent.com/u/20354066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Presh-AR</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APresh-AR" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Presh-AR"><img src="https://avatars.githubusercontent.com/u/20354066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Presh-AR</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APresh-AR" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Puneet1726"><img src="https://avatars.githubusercontent.com/u/26565880?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Puneet1726</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3APuneet1726" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrfyda"><img src="https://avatars.githubusercontent.com/u/593860?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rafael Cortês</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrfyda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RaheemShaik999"><img src="https://avatars.githubusercontent.com/u/43146735?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RaheemShaik999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARaheemShaik999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshggwp"><img src="https://avatars.githubusercontent.com/u/8025160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RajeshR</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rajeshggwp" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshggwp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ramachandra-mohan"><img src="https://avatars.githubusercontent.com/u/22360770?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ramachandra Mohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aramachandra-mohan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.walkmod.com/"><img src="https://avatars.githubusercontent.com/u/1483433?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raquel Pau</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arpau" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://ravikiranj.net/"><img src="https://avatars.githubusercontent.com/u/389491?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ravikiran Janardhana</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aravikiranj" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://ravikiranj.net/"><img src="https://avatars.githubusercontent.com/u/389491?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ravikiran Janardhana</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aravikiranj" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://twitter.com/reda_benh"><img src="https://avatars.githubusercontent.com/u/1609466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Reda Benhemmouche</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARedaBenh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dogeforce.com/"><img src="https://avatars.githubusercontent.com/u/6956403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Renato Oliveira</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=renatoliveira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arenatoliveira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rdicroce"><img src="https://avatars.githubusercontent.com/u/1458922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rich DiCroce</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ardicroce" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://developer.riotgames.com/"><img src="https://avatars.githubusercontent.com/u/33143437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Riot R1cket</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARiotR1cket" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rishjain.me/"><img src="https://avatars.githubusercontent.com/u/25207823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rishabh Jain</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajainrish" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rishabhdeepsingh"><img src="https://avatars.githubusercontent.com/u/28526643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RishabhDeep Singh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arishabhdeepsingh" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rmartinus"><img src="https://avatars.githubusercontent.com/u/12573669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robbie Martinus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmartinus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armartinus" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rmartinus"><img src="https://avatars.githubusercontent.com/u/12573669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robbie Martinus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmartinus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armartinus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RobertHenry6bev"><img src="https://avatars.githubusercontent.com/u/4371939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Henry</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobertHenry6bev" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertpainsi"><img src="https://avatars.githubusercontent.com/u/1794599?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Painsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertpainsi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Sebanisu"><img src="https://avatars.githubusercontent.com/u/1035905?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Russell</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASebanisu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsoesemann"><img src="https://avatars.githubusercontent.com/u/8180281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Sösemann</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Code">💻</a> <a href="https://github.com/pmd/pmd/commits?author=rsoesemann" title="Documentation">📖</a> <a href="#talk-rsoesemann" title="Talks">📢</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsoesemann" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/robertwhitebit"><img src="https://avatars.githubusercontent.com/u/11049034?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robert Whitebit</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arobertwhitebit" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://androbin.de/"><img src="https://avatars.githubusercontent.com/u/16437156?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Richtsfeld</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AAndrobin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.whatsthistimestamp.com/"><img src="https://avatars.githubusercontent.com/u/16778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Stocker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=robinst" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arobinst" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.whatsthistimestamp.com/"><img src="https://avatars.githubusercontent.com/u/16778?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Stocker</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=robinst" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arobinst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.robinwils.com/"><img src="https://avatars.githubusercontent.com/u/5617025?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin Wils</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARobin-Wils" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/RochusOest"><img src="https://avatars.githubusercontent.com/u/65393072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>RochusOest</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ARochusOest" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rodolfonoviski"><img src="https://avatars.githubusercontent.com/u/7316374?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodolfo Noviski</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arodolfonoviski" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Casara"><img src="https://avatars.githubusercontent.com/u/2224686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Casara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ACasara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rtfpessoa.xyz/"><img src="https://avatars.githubusercontent.com/u/902384?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo Fernandes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Artfpessoa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rsalvador"><img src="https://avatars.githubusercontent.com/u/1301827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roman Salvador</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rsalvador" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Arsalvador" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.rblasch.org/"><img src="https://avatars.githubusercontent.com/u/52590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ronald Blaschke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arblasch" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.rblasch.org/"><img src="https://avatars.githubusercontent.com/u/52590?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ronald Blaschke</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arblasch" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TWiStErRob"><img src="https://avatars.githubusercontent.com/u/2906988?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Róbert Papp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATWiStErRob" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://saikat.hashnode.dev/"><img src="https://avatars.githubusercontent.com/u/41847480?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saikat Sengupta</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3As4ik4t" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miplodder.github.io/"><img src="https://avatars.githubusercontent.com/u/22195621?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saksham Handu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AmiPlodder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Saladoc"><img src="https://avatars.githubusercontent.com/u/36816545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Saladoc</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASaladoc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SalesforceBobLightning"><img src="https://avatars.githubusercontent.com/u/39457343?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Salesforce Bob Lightning</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASalesforceBobLightning" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SamCarlberg"><img src="https://avatars.githubusercontent.com/u/6320992?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Carlberg</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASamCarlberg" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://d.hatena.ne.jp/megascus/"><img src="https://avatars.githubusercontent.com/u/976085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Kubo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amegascus" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://d.hatena.ne.jp/megascus/"><img src="https://avatars.githubusercontent.com/u/976085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Satoshi Kubo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amegascus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scottkennedy"><img src="https://avatars.githubusercontent.com/u/881690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Kennedy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascottkennedy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SCWells72"><img src="https://avatars.githubusercontent.com/u/7671043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Wells</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASCWells72" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=SCWells72" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Scrsloota"><img src="https://avatars.githubusercontent.com/u/91131546?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scrsloota</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Scrsloota" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/TheBoegl"><img src="https://avatars.githubusercontent.com/u/1990469?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Bögl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATheBoegl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sschuberth"><img src="https://avatars.githubusercontent.com/u/349154?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schuberth</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asschuberth" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itsmebasti"><img src="https://avatars.githubusercontent.com/u/12232063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Schwarz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitsmebasti" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/sgorbaty"><img src="https://avatars.githubusercontent.com/u/407097?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Gorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asgorbaty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://skozlov.net/"><img src="https://avatars.githubusercontent.com/u/3817455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Kozlov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Askozlov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuthus"><img src="https://avatars.githubusercontent.com/u/6282044?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sergey Yanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xuthus" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Axuthus" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/laoseth"><img src="https://avatars.githubusercontent.com/u/16923065?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Seth Wilcox</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=laoseth" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/prophet1906"><img src="https://avatars.githubusercontent.com/u/32415088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shubham</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=prophet1906" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aprophet1906" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/MessShawn"><img src="https://avatars.githubusercontent.com/u/3095801?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Xiao</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AMessShawn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Srini1993"><img src="https://avatars.githubusercontent.com/u/24495100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Srinivasan Venkatachalam</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASrini1993" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/kullfar"><img src="https://avatars.githubusercontent.com/u/736714?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Gromov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akullfar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://smyachenkov.com/"><img src="https://avatars.githubusercontent.com/u/10816424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stanislav Myachenkov</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=smyachenkov" title="Code">💻</a></td>
     <td align="center"><a href="https://www.stefan-birkner.de/"><img src="https://avatars.githubusercontent.com/u/711349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Birkner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanbirkner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bohni"><img src="https://avatars.githubusercontent.com/u/1252254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Bohn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abohni" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xylo"><img src="https://avatars.githubusercontent.com/u/577869?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Endrullis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axylo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kloessst"><img src="https://avatars.githubusercontent.com/u/16407766?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Klöss-Schuster</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akloessst" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wolfs"><img src="https://avatars.githubusercontent.com/u/423186?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Wolf</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awolfs" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://wissel.net/"><img src="https://avatars.githubusercontent.com/u/542549?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephan H. Wissel</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStwissel" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.stephengroat.com/"><img src="https://avatars.githubusercontent.com/u/1159138?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astephengroat" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/eekboom"><img src="https://avatars.githubusercontent.com/u/717179?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stephen Friedrich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aeekboom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sbabula/"><img src="https://avatars.githubusercontent.com/u/5806843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Steve Babula</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=babula" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/stefanoportelli"><img src="https://avatars.githubusercontent.com/u/26385026?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stexxe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astefanoportelli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stianlagstad"><img src="https://avatars.githubusercontent.com/u/4340859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stian Lågstad</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astianlagstad" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/StuartClayton5"><img src="https://avatars.githubusercontent.com/u/3109872?v=4?s=100" width="100px;" alt=""/><br /><sub><b>StuartClayton5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AStuartClayton5" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/SupunArunoda"><img src="https://avatars.githubusercontent.com/u/12041588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Supun Arunoda</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASupunArunoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/suren39"><img src="https://avatars.githubusercontent.com/u/2401754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suren Abrahamyan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuren39" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SwatiBGupta1110"><img src="https://avatars.githubusercontent.com/u/89257671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SwatiBGupta1110</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASwatiBGupta1110" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/SyedThoufich"><img src="https://avatars.githubusercontent.com/u/58038531?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SyedThoufich</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ASyedThoufich" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/szymex"><img src="https://avatars.githubusercontent.com/u/2721874?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Szymon Sasin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aszymex" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/T-chuangxin"><img src="https://avatars.githubusercontent.com/u/28993085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>T-chuangxin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AT-chuangxin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://ateraimemo.com/"><img src="https://avatars.githubusercontent.com/u/2842060?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TERAI Atsuhiro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaterai" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.tiobe.com/"><img src="https://avatars.githubusercontent.com/u/2196103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TIOBE Software</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tiobe" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atiobe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tsmock"><img src="https://avatars.githubusercontent.com/u/45215054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Smock</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atsmock" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/DTecheira"><img src="https://avatars.githubusercontent.com/u/1074288?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Techeira Damián</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=DTecheira" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ADTecheira" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.dreamops.org/"><img src="https://avatars.githubusercontent.com/u/1641984?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ted Husted</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATedHusted" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TehBakker"><img src="https://avatars.githubusercontent.com/u/7705294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TehBakker</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATehBakker" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agitter-badger" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/theodoor"><img src="https://avatars.githubusercontent.com/u/1332244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Theodoor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atheodoor" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Thihup"><img src="https://avatars.githubusercontent.com/u/13357965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thiago Henrique Hüpner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThihup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thibaultmeyer"><img src="https://avatars.githubusercontent.com/u/1005086?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Meyer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athibaultmeyer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.thomas-guettler.de/"><img src="https://avatars.githubusercontent.com/u/414336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Güttler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguettli" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tjoneslo"><img src="https://avatars.githubusercontent.com/u/1969458?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Jones-Low</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atjoneslo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Snap252"><img src="https://avatars.githubusercontent.com/u/10380619?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Smith</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Snap252" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3ASnap252" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThrawnCA"><img src="https://avatars.githubusercontent.com/u/3080440?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ThrawnCA</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AThrawnCA" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Thunderforge"><img src="https://avatars.githubusercontent.com/u/6200170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thunderforge</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Thunderforge" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AThunderforge" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/TimvdLippe"><img src="https://avatars.githubusercontent.com/u/5948271?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim van der Lippe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATimvdLippe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://miranda-ng.org/"><img src="https://avatars.githubusercontent.com/u/2698843?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Weimer</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tweimer" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atweimer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://tdaly.co.uk/"><img src="https://avatars.githubusercontent.com/u/2606341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tom Daly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atomdaly" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TomerFi"><img src="https://avatars.githubusercontent.com/u/28388442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomer Figenblat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATomerFi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tomidelucca"><img src="https://avatars.githubusercontent.com/u/1288160?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tomi De Lucca</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=tomidelucca" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atomidelucca" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tkleiber"><img src="https://avatars.githubusercontent.com/u/2185441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Torsten Kleiber</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atkleiber" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/TrackerSB"><img src="https://avatars.githubusercontent.com/u/6358523?v=4?s=100" width="100px;" alt=""/><br /><sub><b>TrackerSB</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ATrackerSB" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.cs.hm.edu/die_fakultaet/ansprechpartner/professoren/hafner/index.de.html"><img src="https://avatars.githubusercontent.com/u/503338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ullrich Hafner</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auhafner" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/utkuc"><img src="https://avatars.githubusercontent.com/u/15714598?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Utku Cuhadaroglu</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=utkuc" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Autkuc" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.vbrandl.net/"><img src="https://avatars.githubusercontent.com/u/20639051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valentin Brandl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avbrandl" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Nimfadora"><img src="https://avatars.githubusercontent.com/u/10544767?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Valeria</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3ANimfadora" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anisimov-reveal"><img src="https://avatars.githubusercontent.com/u/69147166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vasily Anisimov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanisimov-reveal" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vickenty"><img src="https://avatars.githubusercontent.com/u/914873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vickenty Fesunov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avickenty" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.irit.fr/~Victor.Noel/"><img src="https://avatars.githubusercontent.com/u/160975?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Victor Noël</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avictornoel" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vgalloy"><img src="https://avatars.githubusercontent.com/u/11443605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Galloy</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=vgalloy" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vhuynh4thalesgroup"><img src="https://avatars.githubusercontent.com/u/50705525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent HUYNH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avhuynh4thalesgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vmaurin"><img src="https://avatars.githubusercontent.com/u/17569830?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Maurin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avmaurin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/don-vip"><img src="https://avatars.githubusercontent.com/u/596867?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vincent Privat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adon-vip" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Vishhwas"><img src="https://avatars.githubusercontent.com/u/44495700?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vishhwas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AVishhwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vitarb"><img src="https://avatars.githubusercontent.com/u/1311694?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avitarb" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.topixoft.com/"><img src="https://avatars.githubusercontent.com/u/275446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaly Polonetsky</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvitaly" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/vojtapol"><img src="https://avatars.githubusercontent.com/u/7419355?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtech Polivka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avojtapol" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vszholobov"><img src="https://avatars.githubusercontent.com/u/73242083?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod Zholobov</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avszholobov" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/vyom-yadav-66a97918b/"><img src="https://avatars.githubusercontent.com/u/73882557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vyom Yadav</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=Vyom-Yadav" title="Code">💻</a></td>
     <td align="center"><a href="https://wsdjeg.spacevim.org/"><img src="https://avatars.githubusercontent.com/u/13142418?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wang Shidong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awsdjeg" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/uberbinge"><img src="https://avatars.githubusercontent.com/u/1692495?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Waqas Ahmed</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Auberbinge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wje600"><img src="https://avatars.githubusercontent.com/u/25891952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wayne J. Earl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awje600" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Wchenghui"><img src="https://avatars.githubusercontent.com/u/28353797?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wchenghui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AWchenghui" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.willwinder.com/"><img src="https://avatars.githubusercontent.com/u/125509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Will Winder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YodaDaCoda"><img src="https://avatars.githubusercontent.com/u/365349?v=4?s=100" width="100px;" alt=""/><br /><sub><b>William Brockhus</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YodaDaCoda" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYodaDaCoda" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wkurniawan07"><img src="https://avatars.githubusercontent.com/u/7261051?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wilson Kurniawan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awkurniawan07" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wimdeblauwe"><img src="https://avatars.githubusercontent.com/u/1115823?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Wim Deblauwe</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awimdeblauwe" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/woongsikchoi"><img src="https://avatars.githubusercontent.com/u/3905257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Woongsik Choi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awoongsikchoi" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://xenoamess.com/"><img src="https://avatars.githubusercontent.com/u/17455337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>XenoAmess</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=XenoAmess" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AXenoAmess" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyang25"><img src="https://avatars.githubusercontent.com/u/34642309?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yang</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=duanyang25" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/YaroslavTER"><img src="https://avatars.githubusercontent.com/u/13270181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YaroslavTER</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AYaroslavTER" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/YYoungC"><img src="https://avatars.githubusercontent.com/u/55069165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Young Chan</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=YYoungC" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AYYoungC" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://dailyco.github.io/"><img src="https://avatars.githubusercontent.com/u/48382813?v=4?s=100" width="100px;" alt=""/><br /><sub><b>YuJin Kim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adailyco" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuridolzhenko"><img src="https://avatars.githubusercontent.com/u/1915205?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yuri Dolzhenko</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuridolzhenko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/lazylead"><img src="https://avatars.githubusercontent.com/u/1651114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yurii Dubinka</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adgroup" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zolyfarkas"><img src="https://avatars.githubusercontent.com/u/144085?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoltan Farkas</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azolyfarkas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Zustin"><img src="https://avatars.githubusercontent.com/u/87302257?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zustin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AZustin" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/aaronhurst-google"><img src="https://avatars.githubusercontent.com/u/86377278?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aaronhurst-google</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaaronhurst-google" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/alexmodis"><img src="https://avatars.githubusercontent.com/u/60091729?v=4?s=100" width="100px;" alt=""/><br /><sub><b>alexmodis</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aalexmodis" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://andreoss.sdf.org/"><img src="https://avatars.githubusercontent.com/u/49783909?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andreoss</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aandreoss" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/andrey81inmd"><img src="https://avatars.githubusercontent.com/u/2624682?v=4?s=100" width="100px;" alt=""/><br /><sub><b>andrey81inmd</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=andrey81inmd" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aandrey81inmd" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/anicoara"><img src="https://avatars.githubusercontent.com/u/835182?v=4?s=100" width="100px;" alt=""/><br /><sub><b>anicoara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aanicoara" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.twitter.com/arunprasathav"><img src="https://avatars.githubusercontent.com/u/5299114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>arunprasathav</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaruncollections" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/asiercamara"><img src="https://avatars.githubusercontent.com/u/38685011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>asiercamara</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aasiercamara" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/astillich-igniti"><img src="https://avatars.githubusercontent.com/u/57359104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>astillich-igniti</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=astillich-igniti" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/avesolovksyy"><img src="https://avatars.githubusercontent.com/u/46165403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avesolovksyy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavesolovksyy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/vishva007"><img src="https://avatars.githubusercontent.com/u/6756036?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avishvat</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Avishva007" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/avivmu"><img src="https://avatars.githubusercontent.com/u/19804341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avivmu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aavivmu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/axelbarfod1"><img src="https://avatars.githubusercontent.com/u/32651536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>axelbarfod1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aaxelbarfod1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/b-3-n"><img src="https://avatars.githubusercontent.com/u/7460509?v=4?s=100" width="100px;" alt=""/><br /><sub><b>b-3-n</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ab-3-n" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/balbhadra9"><img src="https://avatars.githubusercontent.com/u/43748088?v=4?s=100" width="100px;" alt=""/><br /><sub><b>balbhadra9</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abalbhadra9" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/base23de"><img src="https://avatars.githubusercontent.com/u/37408753?v=4?s=100" width="100px;" alt=""/><br /><sub><b>base23de</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abase23de" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/bergander"><img src="https://avatars.githubusercontent.com/u/8858497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>bergander</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abergander" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/berkam"><img src="https://avatars.githubusercontent.com/u/26228441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>berkam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=berkam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aberkam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/breizh31"><img src="https://avatars.githubusercontent.com/u/15649505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>breizh31</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Abreizh31" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/caesarkim"><img src="https://avatars.githubusercontent.com/u/6069184?v=4?s=100" width="100px;" alt=""/><br /><sub><b>caesarkim</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acaesarkim" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/carolyujing"><img src="https://avatars.githubusercontent.com/u/6173449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>carolyujing</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acarolyujing" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cesares-basilico"><img src="https://avatars.githubusercontent.com/u/14895641?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cesares-basilico</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acesares-basilico" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/chrite"><img src="https://avatars.githubusercontent.com/u/53291173?v=4?s=100" width="100px;" alt=""/><br /><sub><b>chrite</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Achrite" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.dannyvanheumen.nl/"><img src="https://avatars.githubusercontent.com/u/1936470?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cobratbq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acobratbq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/coladict"><img src="https://avatars.githubusercontent.com/u/1909837?v=4?s=100" width="100px;" alt=""/><br /><sub><b>coladict</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acoladict" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cosmoJFH"><img src="https://avatars.githubusercontent.com/u/19255991?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cosmoJFH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AcosmoJFH" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cristalp"><img src="https://avatars.githubusercontent.com/u/12525759?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cristalp</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acristalp" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/crunsk"><img src="https://avatars.githubusercontent.com/u/5631441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>crunsk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acrunsk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cwholmes"><img src="https://avatars.githubusercontent.com/u/14796526?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cwholmes</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acwholmes" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/cyberjj999"><img src="https://avatars.githubusercontent.com/u/51283594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyberjj999</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyberjj999" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/cyw3"><img src="https://avatars.githubusercontent.com/u/11549103?v=4?s=100" width="100px;" alt=""/><br /><sub><b>cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Acyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/d1ss0nanz"><img src="https://avatars.githubusercontent.com/u/7532776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>d1ss0nanz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ad1ss0nanz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/danbrycefairsailcom"><img src="https://avatars.githubusercontent.com/u/25037396?v=4?s=100" width="100px;" alt=""/><br /><sub><b>danbrycefairsailcom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adanbrycefairsailcom" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dariansanity"><img src="https://avatars.githubusercontent.com/u/28553192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dariansanity</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adariansanity" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/darrenmiliband"><img src="https://avatars.githubusercontent.com/u/62128185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>darrenmiliband</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adarrenmiliband" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/davidburstrom"><img src="https://avatars.githubusercontent.com/u/1671931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>davidburstrom</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adavidburstrom" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dbirkman-paloalto"><img src="https://avatars.githubusercontent.com/u/53145780?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dbirkman-paloalto</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adbirkman-paloalto" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/deepak-patra"><img src="https://avatars.githubusercontent.com/u/8747728?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deepak-patra</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adeepak-patra" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=dependabot[bot]" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Adependabot[bot]" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dinesh150"><img src="https://avatars.githubusercontent.com/u/88079095?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dinesh150</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adinesh150" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/diziaq"><img src="https://avatars.githubusercontent.com/u/6733997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>diziaq</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adiziaq" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dreaminzero-cell"><img src="https://avatars.githubusercontent.com/u/24776498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dreaminpast123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adreaminzero-cell" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/duanyanan"><img src="https://avatars.githubusercontent.com/u/22003836?v=4?s=100" width="100px;" alt=""/><br /><sub><b>duanyanan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aduanyanan" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dutt-sanjay"><img src="https://avatars.githubusercontent.com/u/70677817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dutt-sanjay</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adutt-sanjay" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dylanleung"><img src="https://avatars.githubusercontent.com/u/1852360?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dylanleung</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adylanleung" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dzeigler"><img src="https://avatars.githubusercontent.com/u/1615832?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dzeigler</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Adzeigler" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ekkirala"><img src="https://avatars.githubusercontent.com/u/44954455?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ekkirala</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aekkirala" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/emersonmoura"><img src="https://avatars.githubusercontent.com/u/5419868?v=4?s=100" width="100px;" alt=""/><br /><sub><b>emersonmoura</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aemersonmoura" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://juejin.cn/user/1063982985642525"><img src="https://avatars.githubusercontent.com/u/24585054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fairy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aguxiaonian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/filiprafalowicz"><img src="https://avatars.githubusercontent.com/u/24355557?v=4?s=100" width="100px;" alt=""/><br /><sub><b>filiprafalowicz</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=filiprafalowicz" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/foxmason"><img src="https://avatars.githubusercontent.com/u/33361071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>foxmason</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afoxmason" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/frankegabor"><img src="https://avatars.githubusercontent.com/u/13273444?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankegabor</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afrankegabor" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fanlw0816"><img src="https://avatars.githubusercontent.com/u/22781995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>frankl</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afanlw0816" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/freafrea"><img src="https://avatars.githubusercontent.com/u/39403091?v=4?s=100" width="100px;" alt=""/><br /><sub><b>freafrea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afreafrea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/fsapatin"><img src="https://avatars.githubusercontent.com/u/10675254?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fsapatin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Afsapatin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gracia19"><img src="https://avatars.githubusercontent.com/u/32557952?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gracia19</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agracia19" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ief2009"><img src="https://avatars.githubusercontent.com/u/1955449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guo fei</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aief2009" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/gurmsc5"><img src="https://avatars.githubusercontent.com/u/26914263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gurmsc5</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Agurmsc5" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gwilymatgearset"><img src="https://avatars.githubusercontent.com/u/43957113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gwilymatgearset</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=gwilymatgearset" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Agwilymatgearset" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/haigsn"><img src="https://avatars.githubusercontent.com/u/52993319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>haigsn</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahaigsn" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hemanshu070"><img src="https://avatars.githubusercontent.com/u/32012651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hemanshu070</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahemanshu070" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/henrik242"><img src="https://avatars.githubusercontent.com/u/129931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>henrik242</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahenrik242" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hongpuwu"><img src="https://avatars.githubusercontent.com/u/19198552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongpuwu</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ahongpuwu" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hvbtup"><img src="https://avatars.githubusercontent.com/u/7644776?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hvbtup</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=hvbtup" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ahvbtup" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.igniti.de/"><img src="https://avatars.githubusercontent.com/u/7207145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>igniti GmbH</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aigniti-gmbh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ilovezfs"><img src="https://avatars.githubusercontent.com/u/5268928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ilovezfs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ailovezfs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/itaigilo"><img src="https://avatars.githubusercontent.com/u/13402361?v=4?s=100" width="100px;" alt=""/><br /><sub><b>itaigilo</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aitaigilo" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jakivey32"><img src="https://avatars.githubusercontent.com/u/36869603?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jakivey32</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajakivey32" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jbennett2091"><img src="https://avatars.githubusercontent.com/u/16721671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jbennett2091</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajbennett2091" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jcamerin"><img src="https://avatars.githubusercontent.com/u/7663252?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jcamerin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajcamerin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/jkeener1"><img src="https://avatars.githubusercontent.com/u/11696155?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jkeener1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajkeener1" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jmetertea"><img src="https://avatars.githubusercontent.com/u/33323555?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jmetertea</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ajmetertea" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/johnra2"><img src="https://avatars.githubusercontent.com/u/90150885?v=4?s=100" width="100px;" alt=""/><br /><sub><b>johnra2</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=johnra2" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/josemanuelrolon"><img src="https://avatars.githubusercontent.com/u/1685807?v=4?s=100" width="100px;" alt=""/><br /><sub><b>josemanuelrolon</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=josemanuelrolon" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Ajosemanuelrolon" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kabroxiko"><img src="https://avatars.githubusercontent.com/u/20568120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kabroxiko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kabroxiko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akabroxiko" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/karwer"><img src="https://avatars.githubusercontent.com/u/862540?v=4?s=100" width="100px;" alt=""/><br /><sub><b>karwer</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akarwer" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kaulonline"><img src="https://avatars.githubusercontent.com/u/1171723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kaulonline</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akaulonline" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kdaemonv"><img src="https://avatars.githubusercontent.com/u/5984651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kdaemonv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akdaemonv" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/kenji21"><img src="https://avatars.githubusercontent.com/u/1105089?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kenji21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=kenji21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Akenji21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kfranic"><img src="https://avatars.githubusercontent.com/u/26544594?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kfranic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akfranic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/khalidkh"><img src="https://avatars.githubusercontent.com/u/6832066?v=4?s=100" width="100px;" alt=""/><br /><sub><b>khalidkh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akhalidkh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/krzyk"><img src="https://avatars.githubusercontent.com/u/105730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>krzyk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Akrzyk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lasselindqvist"><img src="https://avatars.githubusercontent.com/u/13466645?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lasselindqvist</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alasselindqvist" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lihuaib"><img src="https://avatars.githubusercontent.com/u/3365643?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lihuaib</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alihuaib" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/lonelyma1021"><img src="https://avatars.githubusercontent.com/u/22359014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lonelyma1021</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alonelyma1021" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/lpeddy"><img src="https://avatars.githubusercontent.com/u/48803108?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lpeddy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alpeddy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lujie.ac.cn/"><img src="https://avatars.githubusercontent.com/u/2918158?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lujiefsi</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=lujiefsi" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lyriccoder"><img src="https://avatars.githubusercontent.com/u/20803206?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lyriccoder</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Alyriccoder" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcelmore"><img src="https://avatars.githubusercontent.com/u/2975481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>marcelmore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amarcelmore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matchboxy"><img src="https://avatars.githubusercontent.com/u/6457674?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matchbox</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatchboxy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/matthiaskraaz"><img src="https://avatars.githubusercontent.com/u/5954500?v=4?s=100" width="100px;" alt=""/><br /><sub><b>matthiaskraaz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amatthiaskraaz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mkeller-ergon"><img src="https://avatars.githubusercontent.com/u/23031669?v=4?s=100" width="100px;" alt=""/><br /><sub><b>meandonlyme</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amkeller-ergon" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mikesive"><img src="https://avatars.githubusercontent.com/u/4043189?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mikesive</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amikesive" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/milossesic"><img src="https://avatars.githubusercontent.com/u/20756244?v=4?s=100" width="100px;" alt=""/><br /><sub><b>milossesic</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amilossesic" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mriddell95"><img src="https://avatars.githubusercontent.com/u/25618660?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mriddell95</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amriddell95" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mrlzh"><img src="https://avatars.githubusercontent.com/u/13222791?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mrlzh</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amrlzh" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/msloan"><img src="https://avatars.githubusercontent.com/u/1783723?v=4?s=100" width="100px;" alt=""/><br /><sub><b>msloan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amsloan" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mucharlaravalika"><img src="https://avatars.githubusercontent.com/u/32505587?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mucharlaravalika</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amucharlaravalika" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mvenneman"><img src="https://avatars.githubusercontent.com/u/1266912?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mvenneman</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amvenneman" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nareshl119"><img src="https://avatars.githubusercontent.com/u/39321364?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nareshl119</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anareshl119" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/nicolas-harraudeau-sonarsource"><img src="https://avatars.githubusercontent.com/u/40498978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nicolas-harraudeau-sonarsource</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anicolas-harraudeau-sonarsource" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/noerremark"><img src="https://avatars.githubusercontent.com/u/4252411?v=4?s=100" width="100px;" alt=""/><br /><sub><b>noerremark</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anoerremark" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/novsirion"><img src="https://avatars.githubusercontent.com/u/7797113?v=4?s=100" width="100px;" alt=""/><br /><sub><b>novsirion</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Anovsirion" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/oggboy"><img src="https://avatars.githubusercontent.com/u/4798818?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oggboy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoggboy" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://journal.lampetty.net/archive/category/in%20English"><img src="https://avatars.githubusercontent.com/u/78990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>oinume</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aoinume" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/orimarko"><img src="https://avatars.githubusercontent.com/u/17137249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>orimarko</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=orimarko" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aorimarko" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/pagarwal-ignitetech"><img src="https://avatars.githubusercontent.com/u/30888430?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pallavi agarwal</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apagarwal-ignitetech" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/parksungrin"><img src="https://avatars.githubusercontent.com/u/29750262?v=4?s=100" width="100px;" alt=""/><br /><sub><b>parksungrin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aparksungrin" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patpatpat123"><img src="https://avatars.githubusercontent.com/u/43899031?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patpatpat123</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatpatpat123" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/patriksevallius"><img src="https://avatars.githubusercontent.com/u/7291479?v=4?s=100" width="100px;" alt=""/><br /><sub><b>patriksevallius</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apatriksevallius" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pbrajesh1"><img src="https://avatars.githubusercontent.com/u/32388299?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pbrajesh1</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apbrajesh1" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/phoenix384"><img src="https://avatars.githubusercontent.com/u/3883662?v=4?s=100" width="100px;" alt=""/><br /><sub><b>phoenix384</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aphoenix384" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/piotrszymanski-sc"><img src="https://avatars.githubusercontent.com/u/71124942?v=4?s=100" width="100px;" alt=""/><br /><sub><b>piotrszymanski-sc</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=piotrszymanski-sc" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/plan3d"><img src="https://avatars.githubusercontent.com/u/76825073?v=4?s=100" width="100px;" alt=""/><br /><sub><b>plan3d</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aplan3d" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/poojasix"><img src="https://avatars.githubusercontent.com/u/85337280?v=4?s=100" width="100px;" alt=""/><br /><sub><b>poojasix</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apoojasix" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/prabhushrikant"><img src="https://avatars.githubusercontent.com/u/6848200?v=4?s=100" width="100px;" alt=""/><br /><sub><b>prabhushrikant</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aprabhushrikant" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/pujitha8783"><img src="https://avatars.githubusercontent.com/u/20646357?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pujitha8783</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Apujitha8783" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/r-r-a-j"><img src="https://avatars.githubusercontent.com/u/33902071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>r-r-a-j</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ar-r-a-j" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/raghujayjunk"><img src="https://avatars.githubusercontent.com/u/48074475?v=4?s=100" width="100px;" alt=""/><br /><sub><b>raghujayjunk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Araghujayjunk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rajeshveera"><img src="https://avatars.githubusercontent.com/u/1306514?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeshveera</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeshveera" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/rajeswarreddy88"><img src="https://avatars.githubusercontent.com/u/48543250?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rajeswarreddy88</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arajeswarreddy88" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/recdevs"><img src="https://avatars.githubusercontent.com/u/63118273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>recdevs</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arecdevs" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/reudismam"><img src="https://avatars.githubusercontent.com/u/1970407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>reudismam</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=reudismam" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Areudismam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rijkt"><img src="https://avatars.githubusercontent.com/u/56129985?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rijkt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arijkt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rillig-tk"><img src="https://avatars.githubusercontent.com/u/46376960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rillig-tk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arillig-tk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/rmohan20"><img src="https://avatars.githubusercontent.com/u/58573547?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rmohan20</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=rmohan20" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Armohan20" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://rxmicro.io/"><img src="https://avatars.githubusercontent.com/u/54791695?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rxmicro</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Arxmicro" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ryan-gustafson"><img src="https://avatars.githubusercontent.com/u/1227016?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ryan-gustafson</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=ryan-gustafson" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Aryan-gustafson" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sabi0"><img src="https://avatars.githubusercontent.com/u/11509875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sabi0</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asabi0" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/scais"><img src="https://avatars.githubusercontent.com/u/4539192?v=4?s=100" width="100px;" alt=""/><br /><sub><b>scais</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ascais" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sebbASF"><img src="https://avatars.githubusercontent.com/u/16689231?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sebbASF</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsebbASF" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sergeygorbaty"><img src="https://avatars.githubusercontent.com/u/14813710?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sergeygorbaty</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sergeygorbaty" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/shilko2013"><img src="https://avatars.githubusercontent.com/u/33313482?v=4?s=100" width="100px;" alt=""/><br /><sub><b>shilko2013</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ashilko2013" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/simeonKondr"><img src="https://avatars.githubusercontent.com/u/42644177?v=4?s=100" width="100px;" alt=""/><br /><sub><b>simeonKondr</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AsimeonKondr" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/snajberk"><img src="https://avatars.githubusercontent.com/u/3585281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snajberk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnajberk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sniperrifle2004"><img src="https://avatars.githubusercontent.com/u/18223222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sniperrifle2004</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asniperrifle2004" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/snuyanzin"><img src="https://avatars.githubusercontent.com/u/403174?v=4?s=100" width="100px;" alt=""/><br /><sub><b>snuyanzin</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asnuyanzin" title="Bug reports">🐛</a> <a href="https://github.com/pmd/pmd/commits?author=snuyanzin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/sratz"><img src="https://avatars.githubusercontent.com/u/14908423?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sratz</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asratz" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/stonio"><img src="https://avatars.githubusercontent.com/u/19952825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stonio</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Astonio" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sturton"><img src="https://avatars.githubusercontent.com/u/1734891?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sturton</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=sturton" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Asturton" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/sudharmohan"><img src="https://avatars.githubusercontent.com/u/16752281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sudharmohan</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asudharmohan" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/suruchidawar"><img src="https://avatars.githubusercontent.com/u/30810931?v=4?s=100" width="100px;" alt=""/><br /><sub><b>suruchidawar</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asuruchidawar" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/svenfinitiv"><img src="https://avatars.githubusercontent.com/u/5653724?v=4?s=100" width="100px;" alt=""/><br /><sub><b>svenfinitiv</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asvenfinitiv" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tashiscool"><img src="https://avatars.githubusercontent.com/u/1057457?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tashiscool</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atashiscool" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/test-git-hook"><img src="https://avatars.githubusercontent.com/u/49142715?v=4?s=100" width="100px;" alt=""/><br /><sub><b>test-git-hook</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atest-git-hook" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/testation21"><img src="https://avatars.githubusercontent.com/u/47239708?v=4?s=100" width="100px;" alt=""/><br /><sub><b>testation21</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=testation21" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Atestation21" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/thanosa"><img src="https://avatars.githubusercontent.com/u/24596498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>thanosa</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Athanosa" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tiandiyixian"><img src="https://avatars.githubusercontent.com/u/27055337?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tiandiyixian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atiandiyixian" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tobwoerk"><img src="https://avatars.githubusercontent.com/u/11739442?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobwoerk</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atobwoerk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tprouvot"><img src="https://avatars.githubusercontent.com/u/35368290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tprouvot</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atprouvot" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trentchilders"><img src="https://avatars.githubusercontent.com/u/6664350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trentchilders</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrentchilders" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/triandicAnt"><img src="https://avatars.githubusercontent.com/u/2345902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>triandicAnt</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3AtriandicAnt" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/trishul14"><img src="https://avatars.githubusercontent.com/u/24551131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>trishul14</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Atrishul14" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xmtsui"><img src="https://avatars.githubusercontent.com/u/1542690?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tsui</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axmtsui" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/winhkey"><img src="https://avatars.githubusercontent.com/u/4877808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>winhkey</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awinhkey" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/witherspore"><img src="https://avatars.githubusercontent.com/u/813263?v=4?s=100" width="100px;" alt=""/><br /><sub><b>witherspore</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awitherspore" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wjljack"><img src="https://avatars.githubusercontent.com/u/1182478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wjljack</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awjljack" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/wuchiuwong"><img src="https://avatars.githubusercontent.com/u/15967553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wuchiuwong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Awuchiuwong" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/songxing10000"><img src="https://avatars.githubusercontent.com/u/10040131?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xingsong</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Asongxing10000" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xioayuge"><img src="https://avatars.githubusercontent.com/u/45328272?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xioayuge</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axioayuge" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xnYi9wRezm"><img src="https://avatars.githubusercontent.com/u/61201892?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xnYi9wRezm</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=xnYi9wRezm" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3AxnYi9wRezm" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/xuanuy"><img src="https://avatars.githubusercontent.com/u/3894777?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xuanuy</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axuanuy" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/xyf0921"><img src="https://avatars.githubusercontent.com/u/17350974?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xyf0921</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Axyf0921" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yalechen-cyw3"><img src="https://avatars.githubusercontent.com/u/34886223?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yalechen-cyw3</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayalechen-cyw3" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yasuharu-sato"><img src="https://avatars.githubusercontent.com/u/45546628?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yasuharu-sato</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayasuharu-sato" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zenglian"><img src="https://avatars.githubusercontent.com/u/5268434?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zenglian</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azenglian" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zgrzyt93"><img src="https://avatars.githubusercontent.com/u/54275965?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zgrzyt93</b></sub></a><br /><a href="https://github.com/pmd/pmd/commits?author=zgrzyt93" title="Code">💻</a> <a href="https://github.com/pmd/pmd/issues?q=author%3Azgrzyt93" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zhangxinngang"><img src="https://avatars.githubusercontent.com/u/6891146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zh3ng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azhangxinngang" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/yuchen1013"><img src="https://avatars.githubusercontent.com/u/17316917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zt_soft</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Ayuchen1013" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ztt79"><img src="https://avatars.githubusercontent.com/u/48408552?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ztt79</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aztt79" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/zzzzfeng"><img src="https://avatars.githubusercontent.com/u/8851007?v=4?s=100" width="100px;" alt=""/><br /><sub><b>zzzzfeng</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Azzzzfeng" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/magwas"><img src="https://avatars.githubusercontent.com/u/756838?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Árpád Magosányi</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Amagwas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/clsaa"><img src="https://avatars.githubusercontent.com/u/32028545?v=4?s=100" width="100px;" alt=""/><br /><sub><b>任贵杰</b></sub></a><br /><a href="https://github.com/pmd/pmd/issues?q=author%3Aclsaa" title="Bug reports">🐛</a></td>

From 4eb2471939d49fe325fb2af1f60bf8b7b31c733d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 12:01:29 +0200
Subject: [PATCH 158/180] Update gems

Fixes Command injection in ruby-git
(https://github.com/pmd/pmd/security/dependabot/21)
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 453188095e..6c82745bd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     concurrent-ruby (1.1.10)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.5.0)
+    danger (8.6.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -56,9 +56,9 @@ GEM
     fugit (1.5.3)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    git (1.10.2)
+    git (1.11.0)
       rchardet (~> 1.8)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

From 094bb1310ae011e484ad7c61dc1c66b0320c8f0d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 12:05:44 +0200
Subject: [PATCH 159/180] Update gems

---
 docs/Gemfile.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 9c0396cead..48b6705d7b 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.4.7)
+    activesupport (6.0.4.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -51,9 +51,9 @@ GEM
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (225)
+    github-pages (226)
       github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.0)
+      jekyll (= 3.9.2)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.2.0)
@@ -88,12 +88,12 @@ GEM
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
       jemoji (= 0.12.0)
-      kramdown (= 2.3.1)
+      kramdown (= 2.3.2)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.12.5, < 2.0)
+      nokogiri (>= 1.13.4, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -108,7 +108,7 @@ GEM
     http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (3.9.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -216,7 +216,7 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

From efcc58308604a8210677f11c6dd5ae816fb458dc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 29 Apr 2022 12:22:44 +0200
Subject: [PATCH 160/180] [test] Improve test method name, display test method

---
 .../pmd/testframework/RuleTst.java            |  1 +
 .../pmd/testframework/TestDescriptor.java     |  3 ++-
 .../pmd/testframework/TestDescriptorTest.java | 27 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pmd-test/src/test/java/net/sourceforge/pmd/testframework/TestDescriptorTest.java

diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
index 244ff01fd1..02981054d6 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -240,6 +240,7 @@ public abstract class RuleTst {
         System.out.println(" -> Expected messages: " + test.getExpectedMessages());
         System.out.println(" -> Expected line numbers: " + test.getExpectedLineNumbers());
         System.out.println("Test Method Name: " + test.getTestMethodName());
+        System.out.println("    @org.junit.Test public void " + test.getTestMethodName() + "() {}");
         System.out.println();
         TextRenderer renderer = new TextRenderer();
         renderer.setWriter(new StringWriter());
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
index 706f5f154b..8161ef4155 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/TestDescriptor.java
@@ -155,6 +155,7 @@ public class TestDescriptor {
                 + "_"
                 + getDescription()
                 .replaceAll("\n|\r", "_")
-                .replaceAll("[\\.\\(\\)]|\\s", "_");
+                .replaceAll("[^\\w\\d_$]", "_")
+                .replaceAll("\\s+", "_");
     }
 }
diff --git a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/TestDescriptorTest.java b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/TestDescriptorTest.java
new file mode 100644
index 0000000000..ae8024ed13
--- /dev/null
+++ b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/TestDescriptorTest.java
@@ -0,0 +1,27 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.testframework;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import net.sourceforge.pmd.lang.rule.MockRule;
+
+public class TestDescriptorTest {
+    @Test
+    public void testMethodName() {
+        Assert.assertEquals("MockRule_1_Name", create("Name"));
+        Assert.assertEquals("MockRule_1_Tests_xyz", create("Tests xyz"));
+        Assert.assertEquals("MockRule_1_Tests_xyz__false_positive_", create("Tests xyz (false positive)"));
+        Assert.assertEquals("MockRule_1_Tests_xyz__123", create("Tests xyz #123"));
+    }
+
+    private String create(String description) {
+        TestDescriptor descriptor = new TestDescriptor("foo", description, 0,
+                new MockRule("MockRule", "desc", "msg", "ruleset"));
+        descriptor.setNumberInDocument(1);
+        return descriptor.getTestMethodName();
+    }
+}

From e4577c47ea9e71044aea6c773584fcdb98ef281a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 09:18:09 +0200
Subject: [PATCH 161/180] [doc] Add user survey to release notes (#3814)

---
 docs/pages/release_notes.md     | 9 +++++++++
 docs/pages/release_notes_old.md | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index c3bcdfd719..e13519c596 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -14,6 +14,15 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
+#### PMD User Survey
+
+Help shape the future of PMD by telling us how you use it.
+
+Our little survey is still open in case you didn't participate yet.
+Please participate in our survey at <https://forms.gle/4d8r1a1RDzfixHDc7>.
+
+Thank you!
+
 #### Support for HTML
 
 This version of PMD ships a new language module to support analyzing of HTML.
diff --git a/docs/pages/release_notes_old.md b/docs/pages/release_notes_old.md
index 22658ab447..4a5dfda4bf 100644
--- a/docs/pages/release_notes_old.md
+++ b/docs/pages/release_notes_old.md
@@ -14,6 +14,7 @@ This is a minor release.
 ### Table Of Contents
 
 * [New and noteworthy](#new-and-noteworthy)
+    * [PMD User Survey](#pmd-user-survey)
     * [Java 18 Support](#java-18-support)
     * [Better XML XPath support](#better-xml-xpath-support)
     * [New XPath functions](#new-xpath-functions)
@@ -27,6 +28,14 @@ This is a minor release.
 
 ### New and noteworthy
 
+#### PMD User Survey
+
+Help shape the future of PMD by telling us how you use it.
+
+Please participate in our survey at <https://forms.gle/4d8r1a1RDzfixHDc7>.
+
+Thank you!
+
 #### Java 18 Support
 
 This release of PMD brings support for Java 18. There are no new standard language features.

From 2212ff1fca16dd5e9d49d2d21fe9b7ecb0950b6f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 09:25:31 +0200
Subject: [PATCH 162/180] Prepare pmd release 6.45.0

---
 docs/_config.yml                     |  2 +-
 docs/pages/next_major_development.md | 12 ++++++++++++
 docs/pages/release_notes.md          |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 68b6947986..9a81552a06 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,7 +1,7 @@
 repository: pmd/pmd
 
 pmd:
-    version: 6.45.0-SNAPSHOT
+    version: 6.45.0
     previous_version: 6.44.0
     date: 30-April-2022
     release_type: minor
diff --git a/docs/pages/next_major_development.md b/docs/pages/next_major_development.md
index e3a78af4e1..c95ad82a89 100644
--- a/docs/pages/next_major_development.md
+++ b/docs/pages/next_major_development.md
@@ -125,6 +125,18 @@ the breaking API changes will be performed in 7.0.0.
 an API is tagged as `@Deprecated` or not in the latest minor release. During the development of 7.0.0,
 we may decide to remove some APIs that were not tagged as deprecated, though we'll try to avoid it." %}
 
+#### 6.45.0
+
+##### Experimental APIs
+
+* Report has two new methods which allow limited mutations of a given report:
+    * {% jdoc !!core::Report#filterViolations(net.sourceforge.pmd.util.Predicate) %} creates a new report with
+      some violations removed with a given predicate based filter.
+    * {% jdoc !!core::Report#union(net.sourceforge.pmd.Report) %} can combine two reports into a single new Report.
+* {% jdoc !!core::util.Predicate %} will be replaced in PMD7 with the standard Predicate interface from java8.
+* The module `pmd-html` is entirely experimental right now. Anything in the package
+  `net.sourceforge.pmd.lang.html` should be used cautiously.
+
 #### 6.44.0
 
 ##### Deprecated API
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index e13519c596..1256c51f6e 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -114,5 +114,10 @@ missing features or bugs as new [issues](https://github.com/pmd/pmd/issues).
 * [#3938](https://github.com/pmd/pmd/pull/3938): \[java] Modify SimplifiedTernary to meet the missing case #3603 - [@VoidxHoshi](https://github.com/VoidxHoshi)
 * [#3943](https://github.com/pmd/pmd/pull/3943): chore: Set permissions for GitHub actions - [@naveensrinivasan](https://github.com/naveensrinivasan)
 
+### Stats
+* 97 commits
+* 31 closed tickets & PRs
+* Days since last release: 33
+
 {% endtocmaker %}
 

From 1d2b40b3c0ad670c886a2e5c8ce62df467be3184 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 09:38:19 +0200
Subject: [PATCH 163/180] [maven-release-plugin] prepare release
 pmd_releases/6.45.0

---
 pmd-apex-jorje/pom.xml                     | 2 +-
 pmd-apex/pom.xml                           | 2 +-
 pmd-core/pom.xml                           | 2 +-
 pmd-cpp/pom.xml                            | 2 +-
 pmd-cs/pom.xml                             | 2 +-
 pmd-dart/pom.xml                           | 2 +-
 pmd-dist/pom.xml                           | 2 +-
 pmd-doc/pom.xml                            | 2 +-
 pmd-fortran/pom.xml                        | 2 +-
 pmd-go/pom.xml                             | 2 +-
 pmd-groovy/pom.xml                         | 2 +-
 pmd-html/pom.xml                           | 2 +-
 pmd-java/pom.xml                           | 2 +-
 pmd-java8/pom.xml                          | 2 +-
 pmd-javascript/pom.xml                     | 2 +-
 pmd-jsp/pom.xml                            | 2 +-
 pmd-kotlin/pom.xml                         | 2 +-
 pmd-lang-test/pom.xml                      | 2 +-
 pmd-lua/pom.xml                            | 2 +-
 pmd-matlab/pom.xml                         | 2 +-
 pmd-modelica/pom.xml                       | 2 +-
 pmd-objectivec/pom.xml                     | 2 +-
 pmd-perl/pom.xml                           | 2 +-
 pmd-php/pom.xml                            | 2 +-
 pmd-plsql/pom.xml                          | 2 +-
 pmd-python/pom.xml                         | 2 +-
 pmd-ruby/pom.xml                           | 2 +-
 pmd-scala-modules/pmd-scala-common/pom.xml | 2 +-
 pmd-scala-modules/pmd-scala_2.12/pom.xml   | 2 +-
 pmd-scala-modules/pmd-scala_2.13/pom.xml   | 2 +-
 pmd-scala/pom.xml                          | 2 +-
 pmd-swift/pom.xml                          | 2 +-
 pmd-test/pom.xml                           | 2 +-
 pmd-visualforce/pom.xml                    | 2 +-
 pmd-vm/pom.xml                             | 2 +-
 pmd-xml/pom.xml                            | 2 +-
 pom.xml                                    | 6 +++---
 37 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index 5697071519..2177615299 100644
--- a/pmd-apex-jorje/pom.xml
+++ b/pmd-apex-jorje/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.45.0-SNAPSHOT</version>
+    <version>6.45.0</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index add57cacad..d8a22c3385 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 3a5b8baa85..30bebc0fb7 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 9a2e1f73d6..8fc1d92b24 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 16a218ffcb..4260b044a0 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index 6cb0d6cf73..f476ab63d3 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index ca44f39d0b..099acacb6a 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 120154f459..0a3c51fe72 100644
--- a/pmd-doc/pom.xml
+++ b/pmd-doc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 18a3d0d28a..6a03daecd1 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index ca4d6d83c7..dc9d4e5223 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 61baf2b8c9..667c7227c2 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
index 8e35a9cf2b..e04f55eb67 100644
--- a/pmd-html/pom.xml
+++ b/pmd-html/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 246d4e724b..6bdda22f52 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 318e38a082..be251fbad0 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 417de06881..9607b1cca4 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index 4580722684..ccd9fe605d 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index 384e31e80b..ff01da1429 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index d138311451..2fb392ac97 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index aa86e5adab..30a6de5977 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index b6e09e11d1..a4c9c911b3 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index d4cd60d9b0..68b619bbbb 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 0371376c9f..0c578a951a 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index e6fc6e13b9..4d46246e39 100644
--- a/pmd-perl/pom.xml
+++ b/pmd-perl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 06a17a3508..35bea733d2 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 6874aceeab..b36d939c5b 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 7e7337c031..2b3fa7f334 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 683a2110fe..a611b8120d 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index edd18d9b0c..87052553b3 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index f0371d6c2c..44921d47f5 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index cfc266253a..b62798dae2 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index 8be793a5d4..d1f1a19930 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index c714ee6a67..61c5a04d09 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index f6e41ef144..2d6a6cbc17 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 3e2bd2cfac..9182fc71fd 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index dfbecb3abc..3328d08a20 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index c52f923011..e4e13d5708 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0-SNAPSHOT</version>
+        <version>6.45.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index b045e9e6e7..56fa392558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.45.0-SNAPSHOT</version>
+    <version>6.45.0</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -55,7 +55,7 @@
         <connection>scm:git:git://github.com/pmd/pmd.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/pmd/pmd.git</developerConnection>
         <url>https://github.com/pmd/pmd</url>
-        <tag>HEAD</tag>
+        <tag>pmd_releases/6.45.0</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>
@@ -76,7 +76,7 @@
     </issueManagement>
 
     <properties>
-        <project.build.outputTimestamp>2022-03-27T15:01:59Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2022-04-30T07:25:51Z</project.build.outputTimestamp>
 
         <java.version>7</java.version>
 

From ec64315ad78ec8dc71a32fe83da62a100049ecdc Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 09:38:24 +0200
Subject: [PATCH 164/180] [maven-release-plugin] prepare for next development
 iteration

---
 pmd-apex-jorje/pom.xml                     | 2 +-
 pmd-apex/pom.xml                           | 2 +-
 pmd-core/pom.xml                           | 2 +-
 pmd-cpp/pom.xml                            | 2 +-
 pmd-cs/pom.xml                             | 2 +-
 pmd-dart/pom.xml                           | 2 +-
 pmd-dist/pom.xml                           | 2 +-
 pmd-doc/pom.xml                            | 2 +-
 pmd-fortran/pom.xml                        | 2 +-
 pmd-go/pom.xml                             | 2 +-
 pmd-groovy/pom.xml                         | 2 +-
 pmd-html/pom.xml                           | 2 +-
 pmd-java/pom.xml                           | 2 +-
 pmd-java8/pom.xml                          | 2 +-
 pmd-javascript/pom.xml                     | 2 +-
 pmd-jsp/pom.xml                            | 2 +-
 pmd-kotlin/pom.xml                         | 2 +-
 pmd-lang-test/pom.xml                      | 2 +-
 pmd-lua/pom.xml                            | 2 +-
 pmd-matlab/pom.xml                         | 2 +-
 pmd-modelica/pom.xml                       | 2 +-
 pmd-objectivec/pom.xml                     | 2 +-
 pmd-perl/pom.xml                           | 2 +-
 pmd-php/pom.xml                            | 2 +-
 pmd-plsql/pom.xml                          | 2 +-
 pmd-python/pom.xml                         | 2 +-
 pmd-ruby/pom.xml                           | 2 +-
 pmd-scala-modules/pmd-scala-common/pom.xml | 2 +-
 pmd-scala-modules/pmd-scala_2.12/pom.xml   | 2 +-
 pmd-scala-modules/pmd-scala_2.13/pom.xml   | 2 +-
 pmd-scala/pom.xml                          | 2 +-
 pmd-swift/pom.xml                          | 2 +-
 pmd-test/pom.xml                           | 2 +-
 pmd-visualforce/pom.xml                    | 2 +-
 pmd-vm/pom.xml                             | 2 +-
 pmd-xml/pom.xml                            | 2 +-
 pom.xml                                    | 6 +++---
 37 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/pmd-apex-jorje/pom.xml b/pmd-apex-jorje/pom.xml
index 2177615299..778d8ff8f9 100644
--- a/pmd-apex-jorje/pom.xml
+++ b/pmd-apex-jorje/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.45.0</version>
+    <version>6.46.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index d8a22c3385..9c0e6b93a9 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 30bebc0fb7..bd5ed97a91 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 8fc1d92b24..3c72c91f0c 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 4260b044a0..220db5815e 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml
index f476ab63d3..f49e28721e 100644
--- a/pmd-dart/pom.xml
+++ b/pmd-dart/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 099acacb6a..66d4134964 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml
index 0a3c51fe72..db23e84ae7 100644
--- a/pmd-doc/pom.xml
+++ b/pmd-doc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 6a03daecd1..d41d7c00db 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index dc9d4e5223..2b222b6828 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 667c7227c2..0ee77da952 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
index e04f55eb67..60d5d84c58 100644
--- a/pmd-html/pom.xml
+++ b/pmd-html/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 6bdda22f52..b85810aaeb 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index be251fbad0..789472025c 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 9607b1cca4..d4256cf9bc 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index ccd9fe605d..baef67d1fc 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-kotlin/pom.xml b/pmd-kotlin/pom.xml
index ff01da1429..fb25975fec 100644
--- a/pmd-kotlin/pom.xml
+++ b/pmd-kotlin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lang-test/pom.xml b/pmd-lang-test/pom.xml
index 2fb392ac97..c657cdd6b8 100644
--- a/pmd-lang-test/pom.xml
+++ b/pmd-lang-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-lua/pom.xml b/pmd-lua/pom.xml
index 30a6de5977..169eee58b6 100644
--- a/pmd-lua/pom.xml
+++ b/pmd-lua/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index a4c9c911b3..278632df19 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index 68b619bbbb..39ace11468 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 0c578a951a..fda16dfe0b 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index 4d46246e39..53060f5e27 100644
--- a/pmd-perl/pom.xml
+++ b/pmd-perl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 35bea733d2..21fee6046d 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index b36d939c5b..7eb1da955f 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 2b3fa7f334..3170b0ba55 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index a611b8120d..35fb4b5753 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 87052553b3..949c221a80 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index 44921d47f5..244b9c52ab 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index b62798dae2..1206d12f5d 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd-scala-common</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../pmd-scala-common</relativePath>
     </parent>
 
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index d1f1a19930..211a199e81 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 61c5a04d09..dcfe7b980a 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index 2d6a6cbc17..6922c448a0 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 9182fc71fd..deb955ece6 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 3328d08a20..6faab019c3 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index e4e13d5708..407bb1aa7f 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>6.45.0</version>
+        <version>6.46.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 56fa392558..c986b3a6fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>6.45.0</version>
+    <version>6.46.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -55,7 +55,7 @@
         <connection>scm:git:git://github.com/pmd/pmd.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/pmd/pmd.git</developerConnection>
         <url>https://github.com/pmd/pmd</url>
-        <tag>pmd_releases/6.45.0</tag>
+        <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>
@@ -76,7 +76,7 @@
     </issueManagement>
 
     <properties>
-        <project.build.outputTimestamp>2022-04-30T07:25:51Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2022-04-30T07:38:24Z</project.build.outputTimestamp>
 
         <java.version>7</java.version>
 

From b5dfd05c00324ba551c837da0c818ca39a90a038 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 09:41:05 +0200
Subject: [PATCH 165/180] Prepare next development version [skip ci]

---
 docs/_config.yml                |   6 +-
 docs/pages/release_notes.md     |  99 -------------------------
 docs/pages/release_notes_old.md | 126 ++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 102 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index 9a81552a06..211a788da0 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,9 +1,9 @@
 repository: pmd/pmd
 
 pmd:
-    version: 6.45.0
-    previous_version: 6.44.0
-    date: 30-April-2022
+    version: 6.46.0-SNAPSHOT
+    previous_version: 6.45.0
+    date: 28-May-2022
     release_type: minor
 
 # release types: major, minor, bugfix
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 1256c51f6e..b8f8783555 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -14,110 +14,11 @@ This is a {{ site.pmd.release_type }} release.
 
 ### New and noteworthy
 
-#### PMD User Survey
-
-Help shape the future of PMD by telling us how you use it.
-
-Our little survey is still open in case you didn't participate yet.
-Please participate in our survey at <https://forms.gle/4d8r1a1RDzfixHDc7>.
-
-Thank you!
-
-#### Support for HTML
-
-This version of PMD ships a new language module to support analyzing of HTML.
-Support for HTML is experimental and might change without notice.
-The language implementation is not complete yet and the AST doesn't look
-well for text nodes and comment nodes and might be changed in the future.
-You can write your own rules, but we don't guarantee that the rules work with
-the next (minor) version of PMD without adjustments.
-
-Please give us feedback about how practical this new language is in
-[discussions](https://github.com/pmd/pmd/discussions). Please report
-missing features or bugs as new [issues](https://github.com/pmd/pmd/issues).
-
-#### New rules
-
-* The HTML rule {% rule html/bestpractices/AvoidInlineStyles %} finds elements which use a style attribute.
-  In order to help maintaining a webpage it is considered good practice to separate content and styles. Instead
-  of inline styles one should use CSS files and classes.
-
-```xml
-    <rule ref="category/html/bestpractices.xml/AvoidInlineStyles" />
-```
-
-* The HTML rule {% rule html/bestpractices/UnnecessaryTypeAttribute %} finds "link" and "script" elements which
-  still have a "type" attribute. This is not necessary anymore since modern browsers automatically use CSS and
-  JavaScript.
-
-```xml
-      <rule ref="category/html/bestpractices.xml/UnnecessaryTypeAttribute" />
-```
-
-* The HTML rule {% rule html/bestpractices/UseAltAttributeForImages %} finds "img" elements without an "alt"
-  attribute. An alternate text should always be provided in order to help screen readers.
-
-```xml
-      <rule ref="category/html/bestpractices.xml/UseAltAttributeForImages" />
-```
-
-#### Modified rules
-
-*   The Java rule {% rule java/bestpractices/UnusedPrivateField %} has a new property `ignoredFieldNames`.
-    The default ignores serialization-specific fields (eg `serialVersionUID`).
-    The property can be used to ignore more fields based on their name.
-    Note that the rule used to ignore fields named `IDENT`, but doesn't anymore (add this value to the property to restore the old behaviour).
-
 ### Fixed Issues
-* core
-  * [#3792](https://github.com/pmd/pmd/issues/3792): \[core] Allow to filter violations in Report
-  * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
-  * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
-  * [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
-  * [#3896](https://github.com/pmd/pmd/pull/3896): \[core] Fix ast-dump CLI when reading from stdin
-* doc
-  * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
-* java
-  * [#3068](https://github.com/pmd/pmd/issues/3068): \[java] Some tests should not depend on real rules
-  * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
-* java-bestpractices
-  * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
-  * [#1185](https://github.com/pmd/pmd/issues/1185): \[java] ArrayIsStoredDirectly false positive with field access
-  * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
-  * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
-  * [#3929](https://github.com/pmd/pmd/issues/3929): \[java] ArrayIsStoredDirectly should report the assignment rather than formal parameter
-* java-design
-  * [#3603](https://github.com/pmd/pmd/issues/3603): \[java] SimplifiedTernary: no violation for 'condition ? true : false' case
-* java-performance
-  * [#3867](https://github.com/pmd/pmd/issues/3867): \[java] UseArraysAsList with method call
-* plsql
-  * [#3687](https://github.com/pmd/pmd/issues/3687): \[plsql] Parsing exception EXECUTE IMMEDIATE l_sql BULK COLLECT INTO statement
-  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
 
 ### API Changes
 
-#### Experimental APIs
-
-* Report has two new methods which allow limited mutations of a given report:
-  * {% jdoc !!core::Report#filterViolations(net.sourceforge.pmd.util.Predicate) %} creates a new report with
-    some violations removed with a given predicate based filter.
-  * {% jdoc !!core::Report#union(net.sourceforge.pmd.Report) %} can combine two reports into a single new Report.
-* {% jdoc !!core::util.Predicate %} will be replaced in PMD7 with the standard Predicate interface from java8.
-* The module `pmd-html` is entirely experimental right now. Anything in the package
-  `net.sourceforge.pmd.lang.html` should be used cautiously.
-
 ### External Contributions
-* [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
-* [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
-* [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
-* [#3935](https://github.com/pmd/pmd/pull/3935): \[plsql] Fix parser exception in EXECUTE IMMEDIATE BULK COLLECT #3687 - [@Scrsloota](https://github.com/Scrsloota)
-* [#3938](https://github.com/pmd/pmd/pull/3938): \[java] Modify SimplifiedTernary to meet the missing case #3603 - [@VoidxHoshi](https://github.com/VoidxHoshi)
-* [#3943](https://github.com/pmd/pmd/pull/3943): chore: Set permissions for GitHub actions - [@naveensrinivasan](https://github.com/naveensrinivasan)
-
-### Stats
-* 97 commits
-* 31 closed tickets & PRs
-* Days since last release: 33
 
 {% endtocmaker %}
 
diff --git a/docs/pages/release_notes_old.md b/docs/pages/release_notes_old.md
index 4a5dfda4bf..1d546c49c1 100644
--- a/docs/pages/release_notes_old.md
+++ b/docs/pages/release_notes_old.md
@@ -5,6 +5,132 @@ permalink: pmd_release_notes_old.html
 
 Previous versions of PMD can be downloaded here: https://github.com/pmd/pmd/releases
 
+## 30-April-2022 - 6.45.0
+
+The PMD team is pleased to announce PMD 6.45.0.
+
+This is a minor release.
+
+### Table Of Contents
+
+* [New and noteworthy](#new-and-noteworthy)
+    * [PMD User Survey](#pmd-user-survey)
+    * [Support for HTML](#support-for-html)
+    * [New rules](#new-rules)
+    * [Modified rules](#modified-rules)
+* [Fixed Issues](#fixed-issues)
+* [API Changes](#api-changes)
+    * [Experimental APIs](#experimental-apis)
+* [External Contributions](#external-contributions)
+* [Stats](#stats)
+
+### New and noteworthy
+
+#### PMD User Survey
+
+Help shape the future of PMD by telling us how you use it.
+
+Our little survey is still open in case you didn't participate yet.
+Please participate in our survey at <https://forms.gle/4d8r1a1RDzfixHDc7>.
+
+Thank you!
+
+#### Support for HTML
+
+This version of PMD ships a new language module to support analyzing of HTML.
+Support for HTML is experimental and might change without notice.
+The language implementation is not complete yet and the AST doesn't look
+well for text nodes and comment nodes and might be changed in the future.
+You can write your own rules, but we don't guarantee that the rules work with
+the next (minor) version of PMD without adjustments.
+
+Please give us feedback about how practical this new language is in
+[discussions](https://github.com/pmd/pmd/discussions). Please report
+missing features or bugs as new [issues](https://github.com/pmd/pmd/issues).
+
+#### New rules
+
+* The HTML rule [`AvoidInlineStyles`](https://pmd.github.io/pmd-6.45.0/pmd_rules_html_bestpractices.html#avoidinlinestyles) finds elements which use a style attribute.
+  In order to help maintaining a webpage it is considered good practice to separate content and styles. Instead
+  of inline styles one should use CSS files and classes.
+
+```xml
+    <rule ref="category/html/bestpractices.xml/AvoidInlineStyles" />
+```
+
+* The HTML rule [`UnnecessaryTypeAttribute`](https://pmd.github.io/pmd-6.45.0/pmd_rules_html_bestpractices.html#unnecessarytypeattribute) finds "link" and "script" elements which
+  still have a "type" attribute. This is not necessary anymore since modern browsers automatically use CSS and
+  JavaScript.
+
+```xml
+      <rule ref="category/html/bestpractices.xml/UnnecessaryTypeAttribute" />
+```
+
+* The HTML rule [`UseAltAttributeForImages`](https://pmd.github.io/pmd-6.45.0/pmd_rules_html_bestpractices.html#usealtattributeforimages) finds "img" elements without an "alt"
+  attribute. An alternate text should always be provided in order to help screen readers.
+
+```xml
+      <rule ref="category/html/bestpractices.xml/UseAltAttributeForImages" />
+```
+
+#### Modified rules
+
+*   The Java rule [`UnusedPrivateField`](https://pmd.github.io/pmd-6.45.0/pmd_rules_java_bestpractices.html#unusedprivatefield) has a new property `ignoredFieldNames`.
+    The default ignores serialization-specific fields (eg `serialVersionUID`).
+    The property can be used to ignore more fields based on their name.
+    Note that the rule used to ignore fields named `IDENT`, but doesn't anymore (add this value to the property to restore the old behaviour).
+
+### Fixed Issues
+* core
+  * [#3792](https://github.com/pmd/pmd/issues/3792): \[core] Allow to filter violations in Report
+  * [#3881](https://github.com/pmd/pmd/issues/3881): \[core] SARIF renderer depends on platform default encoding
+  * [#3882](https://github.com/pmd/pmd/pull/3882): \[core] Fix AssertionError about exhaustive switch
+  * [#3884](https://github.com/pmd/pmd/issues/3884): \[core] XML report via ant task contains XML header twice
+  * [#3896](https://github.com/pmd/pmd/pull/3896): \[core] Fix ast-dump CLI when reading from stdin
+* doc
+  * [#2505](https://github.com/pmd/pmd/issues/2505): \[doc] Improve side bar to show release date
+* java
+  * [#3068](https://github.com/pmd/pmd/issues/3068): \[java] Some tests should not depend on real rules
+  * [#3889](https://github.com/pmd/pmd/pull/3889): \[java] Catch LinkageError in UselessOverridingMethodRule
+* java-bestpractices
+  * [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable
+  * [#1185](https://github.com/pmd/pmd/issues/1185): \[java] ArrayIsStoredDirectly false positive with field access
+  * [#1474](https://github.com/pmd/pmd/issues/1474): \[java] ArrayIsStoredDirectly false positive with method call
+  * [#3879](https://github.com/pmd/pmd/issues/3879) \[java] ArrayIsStoredDirectly reports duplicated violation
+  * [#3929](https://github.com/pmd/pmd/issues/3929): \[java] ArrayIsStoredDirectly should report the assignment rather than formal parameter
+* java-design
+  * [#3603](https://github.com/pmd/pmd/issues/3603): \[java] SimplifiedTernary: no violation for 'condition ? true : false' case
+* java-performance
+  * [#3867](https://github.com/pmd/pmd/issues/3867): \[java] UseArraysAsList with method call
+* plsql
+  * [#3687](https://github.com/pmd/pmd/issues/3687): \[plsql] Parsing exception EXECUTE IMMEDIATE l_sql BULK COLLECT INTO statement
+  * [#3706](https://github.com/pmd/pmd/issues/3706): \[plsql] Parsing exception CURSOR statement with parenthesis groupings
+
+### API Changes
+
+#### Experimental APIs
+
+* Report has two new methods which allow limited mutations of a given report:
+  * <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.45.0/net/sourceforge/pmd/Report.html#filterViolations(net.sourceforge.pmd.util.Predicate)"><code>Report#filterViolations</code></a> creates a new report with
+    some violations removed with a given predicate based filter.
+  * <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.45.0/net/sourceforge/pmd/Report.html#union(net.sourceforge.pmd.Report)"><code>Report#union</code></a> can combine two reports into a single new Report.
+* <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.45.0/net/sourceforge/pmd/util/Predicate.html#"><code>net.sourceforge.pmd.util.Predicate</code></a> will be replaced in PMD7 with the standard Predicate interface from java8.
+* The module `pmd-html` is entirely experimental right now. Anything in the package
+  `net.sourceforge.pmd.lang.html` should be used cautiously.
+
+### External Contributions
+* [#3883](https://github.com/pmd/pmd/pull/3883): \[doc] Improve side bar by Adding Release Date - [@jasonqiu98](https://github.com/jasonqiu98)
+* [#3910](https://github.com/pmd/pmd/pull/3910): \[java] UnusedPrivateField - Allow the ignored fieldnames to be configurable - [@laoseth](https://github.com/laoseth)
+* [#3928](https://github.com/pmd/pmd/pull/3928): \[plsql] Fix plsql parsing error in parenthesis groups - [@LiGaOg](https://github.com/LiGaOg)
+* [#3935](https://github.com/pmd/pmd/pull/3935): \[plsql] Fix parser exception in EXECUTE IMMEDIATE BULK COLLECT #3687 - [@Scrsloota](https://github.com/Scrsloota)
+* [#3938](https://github.com/pmd/pmd/pull/3938): \[java] Modify SimplifiedTernary to meet the missing case #3603 - [@VoidxHoshi](https://github.com/VoidxHoshi)
+* [#3943](https://github.com/pmd/pmd/pull/3943): chore: Set permissions for GitHub actions - [@naveensrinivasan](https://github.com/naveensrinivasan)
+
+### Stats
+* 97 commits
+* 31 closed tickets & PRs
+* Days since last release: 33
+
 ## 27-March-2022 - 6.44.0
 
 The PMD team is pleased to announce PMD 6.44.0.

From 86891b0c6d143da49f15d738b19192e086e9286c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 30 Apr 2022 10:27:59 +0200
Subject: [PATCH 166/180] Bump pmd from 6.44.0 to 6.45.0

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c986b3a6fd..08d245b8ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,22 +406,22 @@
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.45.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-java</artifactId>
-                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.45.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-jsp</artifactId>
-                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.45.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-javascript</artifactId>
-                            <version>6.44.0</version> <!-- pmd.dogfood.version -->
+                            <version>6.45.0</version> <!-- pmd.dogfood.version -->
                         </dependency>
                         <!-- This contains the dogfood ruleset -->
                         <dependency>

From 772ccb3386c8203b0e180291472f1134476630a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 14:03:59 +0200
Subject: [PATCH 167/180] Cleanups in Chars

Co-authored-by: Andreas Dangel <andreas.dangel@adangel.org>
---
 .../java/net/sourceforge/pmd/lang/document/Chars.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index bb1cf4265c..13be61a02e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -103,8 +103,8 @@ public final class Chars implements CharSequence {
     }
 
     /**
-     * Copies 'len' characters from index 'from' into the given array,
-     * starting at 'off'.
+     * Copies 'count' characters from index 'srcBegin' into the given array,
+     * starting at 'dstBegin'.
      *
      * @param srcBegin Start offset in this CharSequence
      * @param cbuf     Character array
@@ -177,7 +177,7 @@ public final class Chars implements CharSequence {
         }
 
         final char fst = searched.charAt(0);
-        int strpos = str.indexOf(fst, start + fromIndex);
+        int strpos = str.indexOf(fst, idx(fromIndex));
         while (strpos != NOT_FOUND && strpos <= max) {
             if (str.startsWith(searched, strpos)) {
                 return strpos - start;
@@ -252,7 +252,7 @@ public final class Chars implements CharSequence {
         if (fromIndex < 0 || fromIndex + 1 > len) {
             return false;
         }
-        return str.charAt(start + fromIndex) == prefix;
+        return str.charAt(idx(fromIndex)) == prefix;
     }
 
     /**
@@ -446,6 +446,9 @@ public final class Chars implements CharSequence {
      * Returns the substring between the given offsets.
      * given length.
      *
+     * <p>Note: Unlike slice or subSequence, this method will create a new String which involves copying the 
+     * backing char array. Don't use it unnecessarily.
+     *
      * @param start Start offset ({@code 0 <= start < this.length()})
      * @param end   End offset ({@code start <= end <= this.length()})
      *

From 7ed2b6610ae8bb7aca8200922d74ac731815227c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 14:11:16 +0200
Subject: [PATCH 168/180] Stop using long to mask line/col

---
 .../pmd/lang/document/RootTextDocument.java   | 20 ++++++++-----------
 .../lang/document/SourceCodePositioner.java   | 19 +++---------------
 .../document/SourceCodePositionerTest.java    | 12 -----------
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index dae3fed124..873fba75c5 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -74,27 +74,23 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
 
         // We use longs to return both numbers at the same time
         // This limits us to 2 billion lines or columns, which is FINE
-        long bpos = positioner.lineColFromOffset(region.getStartOffset(), true);
-        long epos = region.isEmpty() ? bpos
-                                     : positioner.lineColFromOffset(region.getEndOffset(), false);
+        TextPos2d bpos = positioner.lineColFromOffset(region.getStartOffset(), true);
+        TextPos2d epos = region.isEmpty() ? bpos
+                                          : positioner.lineColFromOffset(region.getEndOffset(), false);
 
         return new FileLocation(
             fileName,
-            SourceCodePositioner.unmaskLine(bpos),
-            SourceCodePositioner.unmaskCol(bpos),
-            SourceCodePositioner.unmaskLine(epos),
-            SourceCodePositioner.unmaskCol(epos),
+            bpos.getLine(),
+            bpos.getColumn(),
+            epos.getLine(),
+            epos.getColumn(),
             region
         );
     }
 
     @Override
     public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
-        long longPos = content.getPositioner().lineColFromOffset(offset, inclusive);
-        return TextPos2d.pos2d(
-            SourceCodePositioner.unmaskLine(longPos),
-            SourceCodePositioner.unmaskCol(longPos)
-        );
+        return content.getPositioner().lineColFromOffset(offset, inclusive);
     }
 
     @Override
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
index ed4301b827..424f8db48f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
@@ -37,7 +37,7 @@ final class SourceCodePositioner {
         return lineOffsets;
     }
 
-    long lineColFromOffset(int offset, boolean inclusive) {
+    TextPos2d lineColFromOffset(int offset, boolean inclusive) {
         AssertionUtil.requireInInclusiveRange("offset", offset, 0, sourceCodeLength);
 
         int line = searchLineOffset(offset);
@@ -51,23 +51,10 @@ final class SourceCodePositioner {
             // handle. This is because an offset may be interpreted as the index
             // of a character, or the caret position between two characters. This
             // is relevant when building text regions, to respect inclusivity, etc.
-            return maskLineCol(lineIdx, getLastColumnOfLine(lineIdx));
+            return TextPos2d.pos2d(lineIdx, getLastColumnOfLine(lineIdx));
         }
 
-        return maskLineCol(line, 1 + offset - lineOffsets[lineIdx]);
-    }
-
-    // test only
-    static long maskLineCol(int line, int col) {
-        return (long) line << 32 | (long) col;
-    }
-
-    static int unmaskLine(long lineCol) {
-        return (int) (lineCol >> 32);
-    }
-
-    static int unmaskCol(long lineCol) {
-        return (int) lineCol;
+        return TextPos2d.pos2d(line, 1 + offset - lineOffsets[lineIdx]);
     }
 
     /**
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
index 26a3c987c2..7aa7c89ab1 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java
@@ -153,16 +153,4 @@ public class SourceCodePositionerTest {
         assertArrayEquals(new int[] { 0, 41, 50, 51 }, positioner.getLineOffsets());
     }
 
-    @Test
-    public void longOffsetMasking() {
-        assertMasking(1, 4);
-        assertMasking(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-
-    private void assertMasking(int line, int col) {
-        long l = SourceCodePositioner.maskLineCol(line, col);
-        assertEquals(line, SourceCodePositioner.unmaskLine(l));
-        assertEquals(col, SourceCodePositioner.unmaskCol(l));
-    }
-
 }

From 1b7560dd7c3b6ec361048327b7ad748a87d06423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 14:25:16 +0200
Subject: [PATCH 169/180] Fix HTML module

Requires Chars#newReader
to support marks
---
 .../sourceforge/pmd/lang/document/Chars.java  | 104 ++++++++++++------
 .../pmd/lang/html/ast/ASTHtmlDocument.java    |   2 +-
 .../pmd/lang/html/ast/AbstractHtmlNode.java   |  16 ++-
 .../pmd/lang/html/ast/HtmlParser.java         |   5 +-
 .../pmd/lang/html/ast/HtmlTokenizer.java      |  35 +++---
 .../pmd/lang/html/ast/HtmlTreeBuilder.java    |   6 +-
 .../pmd/lang/html/ast/LineNumbers.java        |  19 ++--
 .../pmd/lang/html/HtmlJavaRuleTest.java       |  19 +---
 .../pmd/lang/html/HtmlParsingHelper.java      |  24 ++++
 .../pmd/lang/html/HtmlXPathRuleTest.java      |  41 +++----
 10 files changed, 155 insertions(+), 116 deletions(-)
 create mode 100644 pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlParsingHelper.java

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 13be61a02e..a2318f5876 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -446,8 +446,9 @@ public final class Chars implements CharSequence {
      * Returns the substring between the given offsets.
      * given length.
      *
-     * <p>Note: Unlike slice or subSequence, this method will create a new String which involves copying the 
-     * backing char array. Don't use it unnecessarily.
+     * <p>Note: Unlike slice or subSequence, this method will create a
+     * new String which involves copying the backing char array. Don't
+     * use it unnecessarily.
      *
      * @param start Start offset ({@code 0 <= start < this.length()})
      * @param end   End offset ({@code start <= end <= this.length()})
@@ -591,40 +592,79 @@ public final class Chars implements CharSequence {
      * Returns a new reader for the whole contents of this char sequence.
      */
     public Reader newReader() {
-        return new Reader() {
-            private int pos = start;
-            private final int max = start + len;
+        return new CharsReader(this);
+    }
 
-            @Override
-            public int read(char @NonNull [] cbuf, int off, int len) {
-                if (len < 0 || off < 0 || off + len > cbuf.length) {
-                    throw new IndexOutOfBoundsException();
-                }
-                if (pos >= max) {
-                    return NOT_FOUND;
-                }
-                int toRead = Integer.min(max - pos, len);
-                str.getChars(pos, pos + toRead, cbuf, off);
-                pos += toRead;
-                return toRead;
-            }
+    private static final class CharsReader extends Reader {
 
-            @Override
-            public int read() {
-                return pos >= max ? NOT_FOUND : str.charAt(pos++);
-            }
+        private Chars chars;
+        private int pos;
+        private final int max;
+        private int mark = -1;
 
-            @Override
-            public long skip(long n) {
-                int oldPos = pos;
-                pos = Math.min(max, pos + (int) n);
-                return pos - oldPos;
-            }
+        private CharsReader(Chars chars) {
+            this.chars = chars;
+            this.pos = chars.start;
+            this.max = chars.start + chars.len;
+        }
 
-            @Override
-            public void close() {
-                // nothing to do
+        @Override
+        public int read(char @NonNull [] cbuf, int off, int len) throws IOException {
+            if (len < 0 || off < 0 || off + len > cbuf.length) {
+                throw new IndexOutOfBoundsException();
             }
-        };
+            ensureOpen();
+            if (pos >= max) {
+                return NOT_FOUND;
+            }
+            int toRead = Integer.min(max - pos, len);
+            chars.str.getChars(pos, pos + toRead, cbuf, off);
+            pos += toRead;
+            return toRead;
+        }
+
+        @Override
+        public int read() throws IOException {
+            ensureOpen();
+            return pos >= max ? NOT_FOUND : chars.str.charAt(pos++);
+        }
+
+        @Override
+        public long skip(long n) throws IOException {
+            ensureOpen();
+            int oldPos = pos;
+            pos = Math.min(max, pos + (int) n);
+            return pos - oldPos;
+        }
+
+        private void ensureOpen() throws IOException {
+            if (chars == null) {
+                throw new IOException("Closed");
+            }
+        }
+
+        @Override
+        public void close() {
+            chars = null;
+        }
+
+        @Override
+        public void mark(int readAheadLimit) {
+            mark = pos;
+        }
+
+        @Override
+        public void reset() throws IOException {
+            ensureOpen();
+            if (mark == -1) {
+                throw new IOException("Reader was not marked");
+            }
+            pos = mark;
+        }
+
+        @Override
+        public boolean markSupported() {
+            return true;
+        }
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
index 16527686b8..c9f962a375 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/ASTHtmlDocument.java
@@ -13,7 +13,7 @@ import net.sourceforge.pmd.lang.ast.AstInfo;
 import net.sourceforge.pmd.lang.ast.Parser;
 import net.sourceforge.pmd.lang.ast.RootNode;
 
-public class ASTHtmlDocument extends ASTHtmlElement implements RootNode {
+public final class ASTHtmlDocument extends ASTHtmlElement implements RootNode {
 
     private final AstInfo<ASTHtmlDocument> astInfo;
 
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
index 288c80c2cd..bd45efd915 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/AbstractHtmlNode.java
@@ -8,11 +8,14 @@ package net.sourceforge.pmd.lang.html.ast;
 import org.jsoup.nodes.Node;
 
 import net.sourceforge.pmd.lang.ast.AstVisitor;
-import net.sourceforge.pmd.lang.ast.impl.AbstractNodeWithTextCoordinates;
+import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
+import net.sourceforge.pmd.lang.document.TextRegion;
 
-abstract class AbstractHtmlNode<T extends Node> extends AbstractNodeWithTextCoordinates<AbstractHtmlNode<?>, HtmlNode> implements HtmlNode {
+abstract class AbstractHtmlNode<T extends Node> extends AbstractNode<AbstractHtmlNode<?>, HtmlNode> implements HtmlNode {
 
     protected final T node;
+    protected int startOffset;
+    protected int endOffset;
 
     AbstractHtmlNode(T node) {
         this.node = node;
@@ -27,6 +30,11 @@ abstract class AbstractHtmlNode<T extends Node> extends AbstractNodeWithTextCoor
         return node.nodeName();
     }
 
+    @Override
+    public TextRegion getTextRegion() {
+        return TextRegion.fromBothOffsets(startOffset, endOffset);
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public final <P, R> R acceptVisitor(AstVisitor<? super P, ? extends R> visitor, P data) {
@@ -44,8 +52,4 @@ abstract class AbstractHtmlNode<T extends Node> extends AbstractNodeWithTextCoor
         super.addChild(child, index);
     }
 
-    @Override
-    protected void setCoords(int bline, int bcol, int eline, int ecol) {
-        super.setCoords(bline, bcol, eline, ecol);
-    }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
index a2ce2533b0..db3d09d393 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlParser.java
@@ -14,9 +14,8 @@ public final class HtmlParser implements net.sourceforge.pmd.lang.ast.Parser {
 
     @Override
     public ASTHtmlDocument parse(ParserTask task) {
-        String data = task.getSourceText();
-        Document doc = Parser.xmlParser().parseInput(data, "");
+        Document doc = Parser.xmlParser().parseInput(task.getTextDocument().getText().newReader(), "");
         HtmlTreeBuilder builder = new HtmlTreeBuilder();
-        return builder.build(doc, data, task, new HashMap<>());
+        return builder.build(doc, task, new HashMap<>());
     }
 }
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
index f99793cb55..55cb84f311 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTokenizer.java
@@ -4,35 +4,37 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.cpd.TokenEntry;
 import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.Tokens;
-import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
-import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
+import net.sourceforge.pmd.lang.document.CpdCompat;
+import net.sourceforge.pmd.lang.document.TextDocument;
 
 public class HtmlTokenizer implements Tokenizer {
-    private static final Logger LOG = LoggerFactory.getLogger(HtmlTokenizer.class);
 
     @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-        ParserTask task = new ParserTask(
-                LanguageRegistry.getLanguage(HtmlLanguageModule.NAME).getDefaultVersion(),
-                sourceCode.getFileName(),
-                sourceCode.getCodeBuffer().toString(),
-                SemanticErrorReporter.reportToLogger(LOG)
-        );
+        try (TextDocument textDoc = TextDocument.create(CpdCompat.cpdCompat(sourceCode))) {
+            ParserTask task = new ParserTask(
+                textDoc,
+                SemanticErrorReporter.noop()// fixme
+            );
 
-        HtmlParser parser = new HtmlParser();
-        ASTHtmlDocument root = parser.parse(task);
+            HtmlParser parser = new HtmlParser();
+            ASTHtmlDocument root = parser.parse(task);
 
-        traverse(root, tokenEntries);
-        tokenEntries.add(TokenEntry.EOF);
+            traverse(root, tokenEntries);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        } finally {
+            tokenEntries.add(TokenEntry.EOF);
+        }
     }
 
     private void traverse(HtmlNode node, Tokens tokenEntries) {
@@ -42,8 +44,7 @@ public class HtmlTokenizer implements Tokenizer {
             image = ((ASTHtmlTextNode) node).getText();
         }
 
-        TokenEntry token = new TokenEntry(image, node.getXPathNodeName(), node.getBeginLine(),
-                node.getBeginColumn(), node.getEndColumn());
+        TokenEntry token = new TokenEntry(image, node.getReportLocation());
         tokenEntries.add(token);
 
         for (HtmlNode child : node.children()) {
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
index 44d0996fdc..cc927ddf79 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeBuilder.java
@@ -20,11 +20,13 @@ import net.sourceforge.pmd.lang.ast.Parser;
 
 final class HtmlTreeBuilder {
 
-    public ASTHtmlDocument build(Document doc, String htmlString, Parser.ParserTask task, Map<Integer, String> suppressMap) {
+    public ASTHtmlDocument build(Document doc,
+                                 Parser.ParserTask task,
+                                 Map<Integer, String> suppressMap) {
         ASTHtmlDocument root = new ASTHtmlDocument(doc, task, suppressMap);
         addChildren(root, doc);
 
-        LineNumbers lineNumbers = new LineNumbers(root, htmlString);
+        LineNumbers lineNumbers = new LineNumbers(root);
         lineNumbers.determine();
 
         return root;
diff --git a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
index 6ee33e7c8e..d7ae63af8b 100644
--- a/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
+++ b/pmd-html/src/main/java/net/sourceforge/pmd/lang/html/ast/LineNumbers.java
@@ -4,17 +4,16 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import net.sourceforge.pmd.lang.ast.SourceCodePositioner;
+
+import net.sourceforge.pmd.lang.document.Chars;
 
 class LineNumbers {
     private final ASTHtmlDocument document;
-    private String htmlString;
-    private SourceCodePositioner sourceCodePositioner;
+    private final Chars htmlString;
 
-    LineNumbers(ASTHtmlDocument document, String htmlString) {
+    LineNumbers(ASTHtmlDocument document) {
         this.document = document;
-        this.htmlString = htmlString;
-        this.sourceCodePositioner = new SourceCodePositioner(htmlString);
+        this.htmlString = document.getTextDocument().getText();
     }
 
     public void determine() {
@@ -80,17 +79,13 @@ class LineNumbers {
 
     private void setBeginLocation(AbstractHtmlNode<?> n, int index) {
         if (n != null) {
-            int line = sourceCodePositioner.lineNumberFromOffset(index);
-            int column = sourceCodePositioner.columnFromOffset(line, index);
-            n.setCoords(line, column, line, column);
+            n.startOffset = index;
         }
     }
 
     private void setEndLocation(AbstractHtmlNode<?> n, int index) {
         if (n != null) {
-            int line = sourceCodePositioner.lineNumberFromOffset(index);
-            int column = sourceCodePositioner.columnFromOffset(line, index);
-            n.setCoords(n.getBeginLine(), n.getBeginColumn(), line, column);
+            n.endOffset = index;
         }
     }
 }
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
index 6f0acc19b9..dc3a69cadf 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java
@@ -4,21 +4,15 @@
 
 package net.sourceforge.pmd.lang.html;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.Parser;
-import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
-import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement;
 import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule;
 import net.sourceforge.pmd.lang.rule.xpath.Attribute;
@@ -63,14 +57,7 @@ public class HtmlJavaRuleTest {
     }
 
     private List<RuleViolation> runRule(String html, Rule rule) {
-        LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
-        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser();
-        ParserTask parserTask = new ParserTask(htmlLanguage, "n/a", html, SemanticErrorReporter.noop());
-        Node node = parser.parse(parserTask);
-
-        List<RuleViolation> violations = new ArrayList<>();
-        RuleContext context = RuleContext.create(violations::add, rule);
-        rule.apply(node, context);
-        return violations;
+        Report report = HtmlParsingHelper.DEFAULT.executeRule(rule, html);
+        return report.getViolations();
     }
 }
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlParsingHelper.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlParsingHelper.java
new file mode 100644
index 0000000000..7b55840446
--- /dev/null
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlParsingHelper.java
@@ -0,0 +1,24 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.html;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.html.ast.ASTHtmlDocument;
+
+public class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> {
+
+    public static final HtmlParsingHelper DEFAULT = new HtmlParsingHelper(Params.getDefault());
+
+    public HtmlParsingHelper(BaseParsingHelper.Params params) {
+        super(HtmlLanguageModule.NAME, ASTHtmlDocument.class, params);
+    }
+
+    @Override
+    protected @NonNull HtmlParsingHelper clone(@NonNull Params params) {
+        return new HtmlParsingHelper(params);
+    }
+}
diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
index f6dca7ab97..f54640b6b3 100644
--- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
+++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java
@@ -4,35 +4,29 @@
 
 package net.sourceforge.pmd.lang.html;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.Report;
 import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.Parser;
-import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
-import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 
 public class HtmlXPathRuleTest {
+
     // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter
     private static final String LIGHTNING_WEB_COMPONENT = "<!-- helloExpressions.html -->\n"
-            + "<template>\n"
-            + "    <p>Hello, { greeting}!</p>\n"
-            + "    <lightning-input label=\"Name\" value={ greeting} onchange={handleChange}></lightning-input>"
-            + "    <div class=\"slds-m-around_medium\">\n"
-            + "        <lightning-input name='firstName' label=\"First Name\" onchange={handleChange}></lightning-input>\n"
-            + "        <lightning-input name='lastName' label=\"Last Name\" onchange={handleChange}></lightning-input>\n"
-            + "        <p class=\"slds-m-top_medium\">Uppercased Full Name: {uppercasedFullName}</p>\n"
-            + "    </div>\n"
-            + "</template>";
+        + "<template>\n"
+        + "    <p>Hello, { greeting}!</p>\n"
+        + "    <lightning-input label=\"Name\" value={ greeting} onchange={handleChange}></lightning-input>"
+        + "    <div class=\"slds-m-around_medium\">\n"
+        + "        <lightning-input name='firstName' label=\"First Name\" onchange={handleChange}></lightning-input>\n"
+        + "        <lightning-input name='lastName' label=\"Last Name\" onchange={handleChange}></lightning-input>\n"
+        + "        <p class=\"slds-m-top_medium\">Uppercased Full Name: {uppercasedFullName}</p>\n"
+        + "    </div>\n"
+        + "</template>";
 
     @Test
     public void selectTextNode() {
@@ -57,17 +51,10 @@ public class HtmlXPathRuleTest {
     }
 
     private List<RuleViolation> runXPath(String html, String xpath) {
-        LanguageVersion htmlLanguage = LanguageRegistry.findLanguageByTerseName(HtmlLanguageModule.TERSE_NAME).getDefaultVersion();
-        Parser parser = htmlLanguage.getLanguageVersionHandler().getParser();
-        ParserTask parserTask = new ParserTask(htmlLanguage, "n/a", html, SemanticErrorReporter.noop());
-        Node node = parser.parse(parserTask);
-
-        List<RuleViolation> violations = new ArrayList<>();
         XPathRule rule = new XPathRule(XPathVersion.DEFAULT, xpath);
         rule.setMessage("test");
-        rule.setLanguage(htmlLanguage.getLanguage());
-        RuleContext context = RuleContext.create(violations::add, rule);
-        rule.apply(node, context);
-        return violations;
+        rule.setLanguage(HtmlParsingHelper.DEFAULT.getLanguage());
+        Report report = HtmlParsingHelper.DEFAULT.executeRule(rule, html);
+        return report.getViolations();
     }
 }

From 94f90ffbbf5fd540c2f7fb34ca82e4bd7c267e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 14:54:22 +0200
Subject: [PATCH 170/180] Add tests for Chars#newReader

---
 .../pmd/lang/document/CharsTest.java          | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index e19a5a5366..9fd02c3620 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -14,6 +14,7 @@ import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.io.Reader;
 import java.io.StringWriter;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -323,4 +324,160 @@ public class CharsTest {
         assertEquals(Chars.wrap(expected), actual);
     }
 
+
+    @Test
+    public void testReaderSingleChars() throws IOException {
+        Chars bc = Chars.wrap("a \n  \r\nbc db").slice(1, 9);
+        //                      ------------
+
+        try (Reader reader = bc.newReader()) {
+            assertEquals(' ', reader.read());
+            assertEquals('\n', reader.read());
+            assertEquals(' ', reader.read());
+            assertEquals(' ', reader.read());
+            assertEquals('\r', reader.read());
+            assertEquals('\n', reader.read());
+            assertEquals('b', reader.read());
+            assertEquals('c', reader.read());
+            assertEquals(' ', reader.read());
+            assertEquals(-1, reader.read());
+        }
+    }
+
+    @Test
+    public void testReaderBuffer() throws IOException {
+        Chars bc = Chars.wrap("a \n  \r\nbc db").slice(1, 9);
+        //                      ------------
+
+        char[] cbuf = new char[4];
+
+        try (Reader reader = bc.newReader()) {
+            assertEquals(4, reader.read(cbuf));
+            assertCharBufEquals(" \n  ", cbuf);
+            assertEquals(4, reader.read(cbuf));
+            assertCharBufEquals("\r\nbc", cbuf);
+            assertEquals(1, reader.read(cbuf));
+            assertCharBufEquals(" \nbc", cbuf);
+            assertEquals(-1, reader.read(cbuf));
+        }
+    }
+
+    @Test
+    public void testReaderSlicedBuffer() throws IOException {
+        Chars bc = Chars.wrap("a \n  \r\nbc db").slice(1, 9);
+        //                      ------------
+
+        // use \0 as padding before and after
+        char[] cbuf = new char[6];
+
+        try (Reader reader = bc.newReader()) {
+            assertEquals(4, reader.read(cbuf, 1, 4));
+            assertCharBufEquals("\0 \n  \0", cbuf);
+            assertEquals(5, reader.read(cbuf, 1, 5));
+            assertCharBufEquals("\0\r\nbc ", cbuf);
+            assertEquals(-1, reader.read(cbuf));
+            assertEquals(-1, reader.read());
+            assertEquals(-1, reader.read(cbuf, 1, 4));
+        }
+    }
+
+    @Test
+    public void testReadClosed() throws IOException {
+        Chars bc = Chars.wrap("a \n  \r\nbc db").slice(1, 9);
+        //                      ------------
+
+        Reader reader = bc.newReader();
+        reader.close();
+        assertThrows(IOException.class, reader::read);
+    }
+
+    @Test
+    public void testReaderMark() throws IOException {
+        Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9);
+        //                      ------------
+
+        try (Reader reader = bc.newReader()) {
+            assertTrue("markSupported", reader.markSupported());
+
+            assertEquals('b', reader.read());
+            assertEquals('c', reader.read());
+            assertEquals('d', reader.read());
+            assertEquals('e', reader.read());
+
+            reader.mark(10);
+
+            assertEquals('f', reader.read());
+            assertEquals('g', reader.read());
+
+            reader.reset();
+
+            assertEquals('f', reader.read());
+            assertEquals('g', reader.read());
+
+            reader.reset(); // reset doesn't clear the mark
+
+            assertEquals('f', reader.read());
+            assertEquals('g', reader.read());
+        }
+    }
+
+    @Test
+    public void testReaderMissingMark() throws IOException {
+        Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9);
+        //                      ------------
+
+        try (Reader reader = bc.newReader()) {
+            assertTrue("markSupported", reader.markSupported());
+
+            assertEquals('b', reader.read());
+            assertThrows(IOException.class, reader::reset);
+        }
+    }
+
+    @Test
+    public void testReaderSkip() throws IOException {
+        Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9);
+        //                      ------------
+
+        try (Reader reader = bc.newReader()) {
+            assertEquals('b', reader.read());
+            assertEquals('c', reader.read());
+            assertEquals('d', reader.read());
+            assertEquals('e', reader.read());
+
+            reader.mark(10);
+            assertEquals(2, reader.skip(2));
+
+            assertEquals('h', reader.read());
+            assertEquals('i', reader.read());
+
+            reader.reset();
+
+            assertEquals('f', reader.read());
+            assertEquals('g', reader.read());
+        }
+    }
+
+    @Test
+    public void testReaderInvalidParams() throws IOException {
+        Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9);
+        //                      ------------
+        char[] cbuf = new char[4];
+
+        try (Reader reader = bc.newReader()) {
+            assertTrue("markSupported", reader.markSupported());
+
+            assertEquals('b', reader.read());
+            assertThrows(NullPointerException.class, () -> reader.read(null, 0, 0));
+            assertThrows(IndexOutOfBoundsException.class, () -> reader.read(cbuf, -1, 0));
+            assertThrows(IndexOutOfBoundsException.class, () -> reader.read(cbuf, 1, 12));
+            assertThrows(IndexOutOfBoundsException.class, () -> reader.read(cbuf, 1, -1));
+        }
+    }
+
+    private static void assertCharBufEquals(String expected, char[] cbuf) {
+        String actual = new String(cbuf);
+        assertEquals(expected, actual);
+    }
+
 }

From ec4a638d44bee6344aad62c9dd6b398215d9e86a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:01:16 +0200
Subject: [PATCH 171/180] Clarify one test

---
 .../main/java/net/sourceforge/pmd/lang/document/Chars.java  | 3 ++-
 .../sourceforge/pmd/lang/document/TextFileContentTest.java  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index a2318f5876..32834826c2 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -506,7 +506,8 @@ public final class Chars implements CharSequence {
         return h;
     }
 
-    private boolean isFullString() {
+    // test only
+    boolean isFullString() {
         return start == 0 && len == str.length();
     }
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
index 05dd38fed9..136a9f4f5f 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java
@@ -60,8 +60,10 @@ public class TextFileContentTest {
         TextFileContent content = origin.normalize("\ufeffabc");
         Chars normalizedText = content.getNormalizedText();
         Assert.assertEquals(Chars.wrap("abc"), normalizedText);
-        // this means the underlying string does not start with the bom marker
-        // it's useful for performance to have `textDocument.getText().toString()` be O(1).
+        // This means the string underlying the Chars does not start with the bom marker.
+        // It's useful for performance to have `textDocument.getText().toString()` be O(1),
+        // and not create a new string.
+        Assert.assertTrue("should be full string", normalizedText.isFullString());
         Assert.assertSame(normalizedText.toString(), normalizedText.toString());
     }
 

From 17948d1cb8436e48acf5654928cb91ec22daa2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:05:48 +0200
Subject: [PATCH 172/180] Fix some comments

---
 .../java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java  | 2 --
 pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java  | 2 --
 .../java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java | 1 -
 3 files changed, 5 deletions(-)

diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
index a92c78b4e6..c2623f7f6c 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
@@ -226,9 +226,7 @@ public class ApexParserTest extends ApexParserTestBase {
     private int visitPosition(Node node, int count) {
         int result = count + 1;
         FileLocation loc = node.getReportLocation();
-        // todo rename to getStartLine
         Assert.assertTrue(loc.getStartLine() > 0);
-        // todo rename to getStartLine
         Assert.assertTrue(loc.getStartColumn() > 0);
         Assert.assertTrue(loc.getEndLine() > 0);
         Assert.assertTrue(loc.getEndColumn() > 0);
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
index 1fe15d8e5d..2d5ad99b4a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/TokenEntry.java
@@ -78,8 +78,6 @@ public class TokenEntry implements Comparable<TokenEntry> {
     }
 
     public TokenEntry(String image, FileLocation location) {
-        // todo rename to getStartLine
-        // todo rename to getStartLine
         this(image, location.getFileName(), location.getStartLine(), location.getStartColumn(), location.getEndColumn());
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
index 59c9d66de6..aa8ecb78be 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/JavaMetrics.java
@@ -451,7 +451,6 @@ public final class JavaMetrics {
         // the report location is now not necessarily the entire node.
         FileLocation loc = node.getTextDocument().toLocation(node.getTextRegion());
 
-        // todo rename to getStartLine
         return 1 + loc.getEndLine() - loc.getStartLine();
     }
 

From 7c536288e894e6a9e07c3473ab743893879a2124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:27:17 +0200
Subject: [PATCH 173/180] Cleanup apex tests

---
 .../pmd/lang/apex/ast/ApexParserTest.java     | 52 +++++++++++--------
 .../pmd/lang/document/NioTextFile.java        |  4 +-
 .../pmd/lang/ast/test/NodeExtensions.kt       |  2 +-
 .../pmd/lang/ast/test/TestUtils.kt            | 19 +++++--
 4 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
index c2623f7f6c..ae6b37127d 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
@@ -4,10 +4,12 @@
 
 package net.sourceforge.pmd.lang.apex.ast;
 
+import static net.sourceforge.pmd.lang.ast.test.NodeExtensionsKt.textOfReportLocation;
 import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertPosition;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -18,7 +20,6 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.ast.Node;
@@ -75,22 +76,22 @@ public class ApexParserTest extends ApexParserTestBase {
         assertLineNumbersForTestCode(rootNode);
     }
 
-    private void assertLineNumbersForTestCode(ASTUserClassOrInterface<?> rootNode) {
+    private void assertLineNumbersForTestCode(ASTUserClassOrInterface<?> classNode) {
         // whole source code, well from the beginning of the class
         // name Modifier of the class - doesn't work. This node just
         // sees the identifier ("SimpleClass")
         // assertPosition(rootNode.getChild(0), 1, 1, 1, 6);
 
-        // "public"
-        assertPosition(rootNode, 1, 14, 1, 25);
+        // identifier: "SimpleClass"
+        assertPosition(classNode, 1, 14, 1, 25);
+        assertTextEquals("SimpleClass", classNode);
 
-        // "method1" - starts with identifier until end of its block statement
-        Node method1 = rootNode.getChild(1);
+        // identifier: "method1"
+        Node method1 = classNode.getChild(1);
+        assertTextEquals("method1", method1);
         assertPosition(method1, 2, 17, 2, 24);
-        // Modifier of method1 - doesn't work. This node just sees the
-        // identifier ("method1")
-        // assertPosition(method1.getChild(0), 2, 17, 2, 20); // "public" for
-        // method1
+        // modifiers have same location
+        assertPosition(method1.getChild(0), 2, 17, 2, 24);
 
         // BlockStatement - the whole method body
         Node blockStatement = method1.getChild(1);
@@ -100,6 +101,7 @@ public class ApexParserTest extends ApexParserTestBase {
         // the expression ("System.out...")
         Node expressionStatement = blockStatement.getChild(0);
         assertPosition(expressionStatement, 3, 20, 3, 35);
+        assertTextEquals("println('abc');", expressionStatement);
     }
 
     @Test
@@ -189,36 +191,36 @@ public class ApexParserTest extends ApexParserTestBase {
     }
 
     @Test
-    @Ignore("This is buggy, I'd like to stop pretending our reportLocation is a real node position")
-    public void verifyLineColumnNumbersInnerClasses() throws Exception {
+    public void verifyLineColumnNumbersInnerClasses() {
         ASTApexFile rootNode = apex.parseResource("InnerClassLocations.cls");
         Assert.assertNotNull(rootNode);
 
         visitPosition(rootNode, 0);
 
-        Assert.assertEquals("InnerClassLocations", rootNode.getMainNode().getSimpleName());
+        ASTUserClassOrInterface<?> classNode = rootNode.getMainNode();
+        Assert.assertEquals("InnerClassLocations", classNode.getSimpleName());
+        assertTextEquals("InnerClassLocations", classNode);
         // Note: Apex parser doesn't provide positions for "public class" keywords. The
         // position of the UserClass node is just the identifier. So, the node starts
         // with the identifier and not with the first keyword in the file...
-        assertPosition(rootNode, 1, 14, 16, 2);
+        assertPosition(classNode, 1, 14, 1, 33);
 
-        List<ASTUserClass> classes = rootNode.descendants(ASTUserClass.class).toList();
+        List<ASTUserClass> classes = classNode.descendants(ASTUserClass.class).toList();
         Assert.assertEquals(2, classes.size());
         Assert.assertEquals("bar1", classes.get(0).getSimpleName());
         List<ASTMethod> methods = classes.get(0).children(ASTMethod.class).toList();
         Assert.assertEquals(2, methods.size()); // m() and synthetic clone()
         Assert.assertEquals("m", methods.get(0).getImage());
-        assertPosition(methods.get(0), 4, 21, 7, 9);
+        assertPosition(methods.get(0), 4, 21, 4, 22);
         Assert.assertEquals("clone", methods.get(1).getImage());
-        assertPosition(methods.get(1), 7, 9, 7, 9);
+        assertFalse(methods.get(1).hasRealLoc());
+        assertPosition(methods.get(1), 3, 18, 3, 22);
 
-        // Position of the first inner class: starts with the identifier "bar1" and ends with
-        // the last real method m(). The last bracket it actually on the next line 8, but we
-        // don't see this in the AST.
-        assertPosition(classes.get(0), 3, 18, 7, 9);
+        // Position of the first inner class is its identifier
+        assertPosition(classes.get(0), 3, 18, 3, 22);
 
-        Assert.assertEquals("bar2", classes.get(1).getImage());
-        assertPosition(classes.get(1), 10, 18, 14, 9);
+        Assert.assertEquals("bar2", classes.get(1).getSimpleName());
+        assertPosition(classes.get(1), 10, 18, 10, 22);
     }
 
     // TEST HELPER
@@ -235,4 +237,8 @@ public class ApexParserTest extends ApexParserTestBase {
         }
         return result;
     }
+
+    private void assertTextEquals(String expected, Node expressionStatement) {
+        assertEquals(expected, textOfReportLocation(expressionStatement));
+    }
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
index c0400e9294..95e7086818 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/NioTextFile.java
@@ -27,6 +27,7 @@ class NioTextFile extends BaseCloseable implements TextFile {
     private final Charset charset;
     private final LanguageVersion languageVersion;
     private final @Nullable String displayName;
+    private final String pathId;
     private boolean readOnly;
 
     NioTextFile(Path path,
@@ -43,6 +44,7 @@ class NioTextFile extends BaseCloseable implements TextFile {
         this.path = path;
         this.charset = charset;
         this.languageVersion = languageVersion;
+        this.pathId = path.toAbsolutePath().toString();
     }
 
     @Override
@@ -57,7 +59,7 @@ class NioTextFile extends BaseCloseable implements TextFile {
 
     @Override
     public String getPathId() {
-        return path.toAbsolutePath().toString();
+        return pathId;
     }
 
     @Override
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
index 6a1ba946b2..a0a0ac071e 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodeExtensions.kt
@@ -23,7 +23,7 @@ infix fun TextAvailableNode.shouldHaveText(str: String) {
 inline fun <reified T : Node> Node.getDescendantsOfType(): List<T> = descendants(T::class.java).toList()
 inline fun <reified T : Node> Node.getFirstDescendantOfType(): T = descendants(T::class.java).firstOrThrow()
 
-fun TextAvailableNode.textOfReportLocation(): String? =
+fun Node.textOfReportLocation(): String? =
         reportLocation.regionInFile?.let(textDocument::sliceText)?.toString()
 
 
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
index d43e2b1f14..5819192522 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/TestUtils.kt
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang.ast.test
 
+import io.kotest.assertions.withClue
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.equalityMatcher
 import io.kotest.matchers.should
@@ -94,13 +95,21 @@ fun assertSuppressed(report: Report, size: Int): List<Report.SuppressedViolation
     return report.suppressedViolations
 }
 
-/** Checks the coordinates of this node. */
+/**
+ * Checks the coordinates of this node.
+ * Note that this tests the report location which might not be
+ * the exact boundaries of the node in the text.
+ *
+ * See [Node.getReportLocation].
+ */
 fun Node.assertPosition(bline: Int, bcol: Int, eline: Int, ecol: Int) {
     reportLocation.apply {
-        this::getStartLine shouldBe bline
-        this::getStartColumn shouldBe bcol
-        this::getEndLine shouldBe eline
-        this::getEndColumn shouldBe ecol
+        withClue(this.toRange2d()) {
+            this::getStartLine shouldBe bline
+            this::getStartColumn shouldBe bcol
+            this::getEndLine shouldBe eline
+            this::getEndColumn shouldBe ecol
+        }
     }
 }
 

From 3c04526a65c1276abc76953dbd8f9f1551bd611b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:36:42 +0200
Subject: [PATCH 174/180] Update plsql references

---
 .../net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt     | 2 +-
 .../net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt      | 2 +-
 .../pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
index 608a8241ac..7022ea8e0a 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParsingExclusion.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "6", @ExcludedRangesCount = "2"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 6, @ExcludedRangesCount = 2]
    +- Global[@CanonicalImage = null]
    |  +- Block[@CanonicalImage = null]
    |     +- Statement[@CanonicalImage = null]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
index 0d163bdd0d..78b8418f5b 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SelectIntoArray.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
index efec9a5183..b549a06aef 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/SqlPlusLexicalVariablesIssue195.txt
@@ -1,3 +1,3 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- SqlPlusCommand[@CanonicalImage = "DEFINE PATCH_NAME = ACME_MODULE", @Image = "define patch_name = acme_module "]
    +- SqlPlusCommand[@CanonicalImage = "SPOOL &PATCH_NAME. . LOG", @Image = "spool &patch_name. . log "]

From 515df821d8b78ac184666f88c471f1a31f86b8f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:39:06 +0200
Subject: [PATCH 175/180] doc

---
 .../net/sourceforge/pmd/lang/document/SourceCodePositioner.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
index 424f8db48f..cf8caab34c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/SourceCodePositioner.java
@@ -184,6 +184,8 @@ final class SourceCodePositioner {
 
     /**
      * Builds a new positioner for the given char sequence.
+     * The char sequence should have its newline delimiters normalized
+     * to {@link TextFileContent#NORMALIZED_LINE_TERM}.
      * The char sequence should not change state (eg a {@link StringBuilder})
      * after construction, otherwise this positioner becomes unreliable.
      *

From d1d2f3011911497a11d6aec5733c6d79e9f51fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 15:50:40 +0200
Subject: [PATCH 176/180] Remove some things from TextDocument

---
 .../ast/impl/javacc/JavaccTokenDocument.java  |  2 +
 .../pmd/lang/document/BaseMappedDocument.java | 14 +---
 .../lang/document/FragmentedTextDocument.java | 45 ++--------
 .../pmd/lang/document/TextDocument.java       | 82 -------------------
 .../pmd/lang/document/TextPos2d.java          |  5 --
 .../pmd/lang/document/TextDocumentTest.java   |  2 +-
 pmd-java/etc/grammar/Java.jjt                 |  4 +-
 .../sourceforge/pmd/cpd/JavaTokenizer.java    |  3 +-
 pmd-plsql/etc/grammar/PLSQL.jjt               |  1 +
 .../pmd/cpd/ScalaTokenAdapter.java            |  2 +-
 10 files changed, 17 insertions(+), 143 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
index 3538b6d4ff..3dca87e381 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaccTokenDocument.java
@@ -57,6 +57,8 @@ public final class JavaccTokenDocument extends TokenDocument<JavaccToken> {
          * @param text Source doc
          *
          * @see EscapeTranslator
+         *
+         * TODO move that to LanguageVersionHandler once #3919 (Merge CPD and PMD language) is implemented
          */
         protected TextDocument translate(TextDocument text) throws MalformedSourceException {
             return text;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
index cbea8633d8..399f42f737 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
@@ -59,19 +59,9 @@ abstract class BaseMappedDocument implements TextDocument {
         return base.createLineRange(startLineInclusive, endLineInclusive);
     }
 
-    @Override
-    public int offsetAtLineColumn(int line, int column) {
-      throw new UnsupportedOperationException();
-    }
-
     @Override
     public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isInRange(TextPos2d textPos2d) {
-        return false;
+        return base.lineColumnAtOffset(localOffsetTransform(offset, inclusive));
     }
 
     @Override
@@ -87,8 +77,6 @@ abstract class BaseMappedDocument implements TextDocument {
      */
     protected abstract int localOffsetTransform(int outOffset, boolean inclusive);
 
-    protected abstract int inverseLocalOffsetTransform(int inOffset, boolean inclusive);
-
 
     @Override
     public void close() throws IOException {
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
index 99be79f6df..c3f372892a 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.document;
 
-import java.util.function.ToIntFunction;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.LanguageVersion;
@@ -47,74 +45,47 @@ final class FragmentedTextDocument extends BaseMappedDocument implements TextDoc
         return base.getLanguageVersion();
     }
 
-
     @Override
     protected int localOffsetTransform(int outOffset, boolean inclusive) {
-        return offsetTransform(outOffset, inclusive,
-                               Fragment::outToIn,
-                               Fragment::outEnd,
-                               Fragment::outStart
-        );
-    }
-
-    @Override
-    protected int inverseLocalOffsetTransform(int inOffset, boolean inclusive) {
-        return offsetTransform(inOffset, inclusive,
-                               Fragment::inToOut,
-                               Fragment::inEnd,
-                               Fragment::inStart
-        );
-    }
-
-    interface OffsetMapper {
-
-        int mapOffset(Fragment fragment, int offset);
-    }
-
-    private int offsetTransform(int offset,
-                                boolean inclusive,
-                                OffsetMapper mapOffsetWhenContains,
-                                ToIntFunction<Fragment> end,
-                                ToIntFunction<Fragment> start) {
         // caching the last accessed fragment instead of doing
         // a linear search is critical for performance.
         Fragment f = this.lastAccessedFragment;
         if (f == null) {
-            return offset;
+            return outOffset;
         }
 
         // Whether the fragment contains the offset we're looking for.
         // Will be true most of the time.
         boolean containsOffset =
-            start.applyAsInt(f) >= offset && offset < end.applyAsInt(f);
+            f.outStart() >= outOffset && outOffset < f.outEnd();
 
         if (!containsOffset) {
             // Slow path, we must search for the fragment
             // This optimisation is important, otherwise we have
             // to search for very long times in some files
 
-            if (end.applyAsInt(f) < offset) { // search forward
-                while (f.next != null && end.applyAsInt(f) < offset) {
+            if (f.outEnd() < outOffset) { // search forward
+                while (f.next != null && f.outEnd() < outOffset) {
                     f = f.next;
                 }
             } else { // search backwards
-                while (f.prev != null && offset <= start.applyAsInt(f)) {
+                while (f.prev != null && outOffset <= f.outStart()) {
                     f = f.prev;
                 }
             }
             lastAccessedFragment = f;
         }
 
-        if (!inclusive && end.applyAsInt(f) == offset) {
+        if (!inclusive && f.outEnd() == outOffset) {
             if (f.next != null) {
                 f = f.next;
                 lastAccessedFragment = f;
                 // fallthrough
             } else {
-                return mapOffsetWhenContains.mapOffset(f, offset) + 1;
+                return f.outToIn(outOffset) + 1;
             }
         }
-        return mapOffsetWhenContains.mapOffset(f, offset);
+        return f.outToIn(outOffset);
     }
 
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index b2fe186cff..5003ed6a70 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -180,21 +180,6 @@ public interface TextDocument extends Closeable {
      */
     TextRegion inputRegion(TextRegion outputRegion);
 
-    /**
-     * Translate a 2D range given in the coordinate system of this
-     * document, to the coordinate system of the original document.
-     * This works as if creating a new region with both start and end
-     * offsets translated through {@link #inputOffset(int, boolean)}. The
-     * returned region may have a different length.
-     *
-     * @param outputRange Output region
-     *
-     * @return Input region
-     */
-    default TextRange2d inputRange(TextRange2d outputRange) {
-        return toRange2d(inputRegion(toRegion(outputRange)));
-    }
-
 
     /**
      * Returns a reader over the text of this document.
@@ -218,14 +203,6 @@ public interface TextDocument extends Closeable {
         return TextRegion.fromOffsetLength(0, getLength());
     }
 
-    /**
-     * Returns a 2D text range that corresponds to the entire document,
-     * in the coordinate system of this document.
-     */
-    default TextRange2d getEntireRegion2d() {
-        return toRange2d(getEntireRegion());
-    }
-
     /**
      * Returns a region that spans the text of all the given lines.
      * This is intended to provide a replacement for {@link SourceCode#getSlice(int, int)}.
@@ -257,65 +234,6 @@ public interface TextDocument extends Closeable {
      */
     FileLocation toLocation(TextRegion region);
 
-    /**
-     * Turn a text region into a {@link FileLocation}. The file name is
-     * the display name of this document.
-     *
-     * @return A new file position
-     *
-     * @throws IndexOutOfBoundsException If the argument is not a valid region in this document
-     */
-    default FileLocation toLocation(TextRange2d range) {
-        int startOffset = offsetAtLineColumn(range.getStartPos());
-        if (startOffset < 0) {
-            throw new IndexOutOfBoundsException("Region out of bounds: " + range.displayString());
-        }
-        TextRegion region = TextRegion.caretAt(startOffset);
-        checkInRange(region, this.getLength());
-        return FileLocation.range(getDisplayName(), range);
-    }
-
-    /**
-     * Turn a text region to a {@link TextRange2d}.
-     */
-    default TextRange2d toRange2d(TextRegion region) {
-        TextPos2d start = lineColumnAtOffset(region.getStartOffset(), true);
-        TextPos2d end = lineColumnAtOffset(region.getEndOffset(), false);
-        return TextRange2d.range2d(start, end);
-    }
-
-    /**
-     * Turn a {@link TextRange2d} into a {@link TextRegion}.
-     */
-    default TextRegion toRegion(TextRange2d region) {
-        return TextRegion.fromBothOffsets(
-            offsetAtLineColumn(region.getStartPos()),
-            offsetAtLineColumn(region.getEndPos())
-        );
-    }
-
-
-    /**
-     * Returns the offset at the given line and column number.
-     *
-     * @param line   Line number (1-based)
-     * @param column Column number (1-based)
-     *
-     * @return an offset (0-based)
-     */
-    int offsetAtLineColumn(int line, int column);
-
-    /**
-     * Returns true if the position is valid in this document.
-     */
-    boolean isInRange(TextPos2d textPos2d);
-
-    /**
-     * Returns the offset at the line and number.
-     */
-    default int offsetAtLineColumn(TextPos2d pos2d) {
-        return offsetAtLineColumn(pos2d.getLine(), pos2d.getColumn());
-    }
 
     /**
      * Returns the line and column at the given offset (inclusive).
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
index 3a492f097a..b554cd3eda 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextPos2d.java
@@ -11,11 +11,6 @@ import org.checkerframework.checker.nullness.qual.NonNull;
  */
 public final class TextPos2d implements Comparable<TextPos2d> {
 
-    /**
-     * The position at the start of the document (line 1, column 1).
-     */
-    public static TextPos2d DOCUMENT_START = new TextPos2d(1, 1);
-
     private final int line;
     private final int column;
 
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
index af41bd22e0..0f7d2b9a91 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java
@@ -147,7 +147,7 @@ public class TextDocumentTest {
     }
 
     private void assertPos2dEqualsAt(TextDocument doc, int offset, String c, TextPos2d pos, boolean inclusive) {
-        Chars slicedChar = doc.sliceText(TextRegion.fromOffsetLength(offset, 1));
+        Chars slicedChar = doc.sliceTranslatedText(TextRegion.fromOffsetLength(offset, 1));
         assertEquals(c, slicedChar.toString());
         assertEquals(pos, doc.lineColumnAtOffset(offset, inclusive));
     }
diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
index 0ec6e94d12..dc698ede22 100644
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -2618,14 +2618,14 @@ void AssertStatement() :
 void RUNSIGNEDSHIFT() #void:
 {}
 {
-   LOOKAHEAD({ JavaTokenDocument.getRealKind(getToken(1)) == RUNSIGNEDSHIFT})
+   LOOKAHEAD({ JavaTokenDocumentBehavior.getRealKind(getToken(1)) == RUNSIGNEDSHIFT})
    ">" ">" ">"
 }
 
 void RSIGNEDSHIFT() #void:
 {}
 {
-  LOOKAHEAD({ JavaTokenDocument.getRealKind(getToken(1)) == RSIGNEDSHIFT})
+  LOOKAHEAD({ JavaTokenDocumentBehavior.getRealKind(getToken(1)) == RSIGNEDSHIFT})
   ">" ">"
 }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
index 172be221fc..525d1731b2 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
@@ -15,7 +15,6 @@ import net.sourceforge.pmd.cpd.token.TokenFilter;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
-import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccTokenDocument;
 import net.sourceforge.pmd.lang.java.ast.InternalApiBridge;
 import net.sourceforge.pmd.lang.java.ast.JavaTokenKinds;
@@ -44,7 +43,7 @@ public class JavaTokenizer extends JavaCCTokenizer {
     }
 
     @Override
-    protected JavaccTokenDocument.TokenDocumentBehavior tokenBehavior() throws IOException {
+    protected JavaccTokenDocument.TokenDocumentBehavior tokenBehavior() {
         return InternalApiBridge.javaTokenDoc();
     }
 
diff --git a/pmd-plsql/etc/grammar/PLSQL.jjt b/pmd-plsql/etc/grammar/PLSQL.jjt
index 4688c275fc..41fbefea0c 100644
--- a/pmd-plsql/etc/grammar/PLSQL.jjt
+++ b/pmd-plsql/etc/grammar/PLSQL.jjt
@@ -160,6 +160,7 @@ package net.sourceforge.pmd.lang.plsql.ast;
 import java.util.List;
 import java.util.ArrayList;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
 import net.sourceforge.pmd.lang.plsql.ast.internal.ParsingExclusion;
 import net.sourceforge.pmd.lang.ast.TokenMgrError;
diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
index 06853bbe71..3609cd8efb 100644
--- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
+++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenAdapter.java
@@ -44,7 +44,7 @@ public class ScalaTokenAdapter implements GenericToken<ScalaTokenAdapter> {
 
     @Override
     public Chars getImageCs() {
-        return textDocument.sliceText(getRegion());
+        return textDocument.sliceTranslatedText(getRegion());
     }
 
     @Override

From d797c861e72cca01fd9dd225aa6288d6b2914675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 16:09:31 +0200
Subject: [PATCH 177/180] Fix last psql refs

---
 .../plsql/ast/AllPlsqlAstTreeDumpTest.java    | 19 +++++++++++++++++++
 .../ast/ExecuteImmediateBulkCollect1.txt      |  2 +-
 .../ast/ExecuteImmediateBulkCollect2.txt      |  2 +-
 .../ast/ExecuteImmediateBulkCollect3.txt      |  2 +-
 .../pmd/lang/plsql/ast/ParenthesisGroup0.txt  |  2 +-
 .../pmd/lang/plsql/ast/ParenthesisGroup1.txt  |  2 +-
 .../pmd/lang/plsql/ast/ParenthesisGroup2.txt  |  2 +-
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java

diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java
new file mode 100644
index 0000000000..4b09b78897
--- /dev/null
+++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/AllPlsqlAstTreeDumpTest.java
@@ -0,0 +1,19 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.plsql.ast;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+    PlsqlTreeDumpTest.class,
+    ParenthesisGroupTest.class,
+    ExecuteImmediateBulkCollectTest.class
+})
+public class AllPlsqlAstTreeDumpTest {
+
+}
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
index 66c85d1839..1a37b67ae3 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect1.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data IS TABLE OF dual%ROWTYPE INDEX BY BINARY_INTEGER;\n   --\n   l_data t_data;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT * FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
index 8965dd564c..6864c8b811 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect2.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   p_rownum1 NUMBER(20);\n   p_rownum2 NUMBER(20);\n   --\nBEGIN\n   --\n   p_rownum1 := 10;\n   p_rownum2 := 30;\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\' WHERE ROWNUM <= :p_rownum1 \' ||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\'||\' WHERE ROWNUM <= :p_rownum2 \';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description USING p_rownum1, p_rownum2;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
index 14ea63e5da..2d8a3b127a 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollect3.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0, @Sourcecode = "--\n-- BSD-style license; for more info see http://pmd.sourceforge.net/license.html\n--\n\nCREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS\n   --\n   TYPE t_data_key IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n   TYPE t_data_description IS TABLE OF VARCHAR2(100) INDEX BY BINARY_INTEGER;\n   --\n   l_data_key t_data_key;\n   l_data_description t_data_description;\n   l_sql  VARCHAR2(500);\n   --\nBEGIN\n   --\n   l_sql := \'SELECT 1, \' || CHR(39) || \'First key\' || CHR(39) || \n             \' FROM DUAL \'||\n            \'UNION ALL \'||\n            \'SELECT 2, \' || CHR(39) || \'Second key \' || CHR(39) || \n             \' FROM DUAL\';\n   --\n   EXECUTE IMMEDIATE l_sql BULK COLLECT\n      INTO l_data_key, l_data_description;\n   --\nEND EXAMPLE_PROCEDURE;\n"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
index 70ad135b19..c45893721b 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup0.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
index 3509d8568b..71d9aa3509 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup1.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "EXAMPLE_PROCEDURE", @Name = "EXAMPLE_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "EXAMPLE_PROCEDURE", @Image = "EXAMPLE_PROCEDURE", @ParameterCount = 1]
diff --git a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
index ec719209ce..7880baff0a 100644
--- a/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
+++ b/pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroup2.txt
@@ -1,4 +1,4 @@
-+- Input[@CanonicalImage = null, @ExcludedLinesCount = "0", @ExcludedRangesCount = "0"]
++- Input[@CanonicalImage = null, @ExcludedLinesCount = 0, @ExcludedRangesCount = 0]
    +- Global[@CanonicalImage = null]
       +- ProgramUnit[@CanonicalImage = null, @MethodName = "TEST_PROCEDURE", @Name = "TEST_PROCEDURE", @ObjectName = null]
          +- MethodDeclarator[@CanonicalImage = "TEST_PROCEDURE", @Image = "TEST_PROCEDURE", @ParameterCount = 1]

From 158f0a6ee3731144d29cb976a34dc099a9c2144c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 16:55:34 +0200
Subject: [PATCH 178/180] Fix bug with string literals

---
 .../pmd/lang/ast/TextAvailableNode.java       | 41 ++++++++++-----
 .../ast/impl/javacc/AbstractJjtreeNode.java   |  6 ---
 .../pmd/lang/ast/impl/javacc/JjtreeNode.java  |  4 --
 .../pmd/lang/document/BaseMappedDocument.java | 52 ++++++++++++++-----
 .../sourceforge/pmd/lang/document/Chars.java  | 10 ++++
 .../lang/document/FragmentedTextDocument.java |  2 +-
 .../pmd/lang/document/RootTextDocument.java   | 10 ----
 .../pmd/lang/document/TextDocument.java       | 39 --------------
 .../pmd/lang/document/CharsTest.java          |  8 +++
 .../pmd/lang/java/ast/ASTStringLiteral.java   | 10 ++--
 .../pmd/lang/java/ast/ASTLiteralTest.kt       | 19 ++++++-
 11 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
index 4d9841cb10..8f400cbfb6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/TextAvailableNode.java
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang.ast;
 
+import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
@@ -18,27 +19,39 @@ public interface TextAvailableNode extends Node {
 
 
     /**
-     * Returns the exact region of text delimiting
-     * the node in the underlying text document. Note
-     * that {@link #getReportLocation()} does not need
-     * to match this region. {@link #getReportLocation()}
-     * can be scoped down to a specific token, eg the
-     * class identifier. This region uses the translated
-     * coordinate system, ie the coordinate system
-     * of {@link #getTextDocument()}.
+     * Returns the exact region of text delimiting the node in the underlying
+     * text document. Note that {@link #getReportLocation()} does not need
+     * to match this region. {@link #getReportLocation()} can be scoped down
+     * to a specific token, eg the class identifier. This region uses
+     * the translated coordinate system, ie the coordinate system of
+     * {@link #getTextDocument()}.
      */
     @Override
     TextRegion getTextRegion();
 
     /**
-     * Returns the original source code underlying this node. In particular,
-     * for a {@link RootNode}, returns the whole text of the file. Note the
-     * difference between this method and {@code getTextDocument().getText().slice(getTextRegion())}.
-     * The latter is {@link TextDocument#sliceTranslatedText(TextRegion)},
-     * the former (this method) is {@link TextDocument#sliceOriginalText(TextRegion)}.
+     * Returns the original source code underlying this node, before
+     * any escapes have been translated. In particular, for a {@link RootNode},
+     * returns the whole text of the file.
+     *
+     * @see TextDocument#sliceOriginalText(TextRegion)
      */
     @NoAttribute
-    CharSequence getText();
+    default Chars getOriginalText() {
+        return getTextDocument().sliceOriginalText(getTextRegion());
+    }
+
+    /**
+     * Returns the source code underlying this node, after any escapes
+     * have been translated. In particular, for a {@link RootNode}, returns
+     * the whole text of the file.
+     *
+     * @see TextDocument#sliceTranslatedText(TextRegion)
+     */
+    @NoAttribute
+    default Chars getText() {
+        return getTextDocument().sliceTranslatedText(getTextRegion());
+    }
 
 
 }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
index 4097225d96..bd11611c28 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/AbstractJjtreeNode.java
@@ -7,7 +7,6 @@ package net.sourceforge.pmd.lang.ast.impl.javacc;
 import net.sourceforge.pmd.annotation.Experimental;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.impl.AbstractNode;
-import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.lang.document.TextRegion;
 import net.sourceforge.pmd.util.StringUtil;
@@ -48,11 +47,6 @@ public abstract class AbstractJjtreeNode<B extends AbstractJjtreeNode<B, N>, N e
         this.image = image;
     }
 
-    @Override
-    public final Chars getText() {
-        return getTextDocument().sliceOriginalText(getTextRegion());
-    }
-
     @Override
     public final TextRegion getTextRegion() {
         return TextRegion.fromBothOffsets(getFirstToken().getStartOffset(),
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeNode.java
index f7175cd2b3..0af5cfe313 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeNode.java
@@ -6,7 +6,6 @@ package net.sourceforge.pmd.lang.ast.impl.javacc;
 
 import net.sourceforge.pmd.lang.ast.TextAvailableNode;
 import net.sourceforge.pmd.lang.ast.impl.GenericNode;
-import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.reporting.Reportable;
 
 /**
@@ -18,9 +17,6 @@ import net.sourceforge.pmd.reporting.Reportable;
  */
 public interface JjtreeNode<N extends JjtreeNode<N>> extends GenericNode<N>, TextAvailableNode, Reportable {
 
-    @Override
-    Chars getText();
-
 
     // todo token accessors should most likely be protected in PMD 7.
 
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
index 399f42f737..d6e8fc9e8e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/BaseMappedDocument.java
@@ -45,14 +45,6 @@ abstract class BaseMappedDocument implements TextDocument {
         return base.toLocation(inputRegion(region));
     }
 
-    @Override
-    public @NonNull TextRegion inputRegion(TextRegion outputRegion) {
-        // note that inputOffset already recurses up to the original document,
-        // so that we don't have to call base.inputRegion on the produced region
-        return TextRegion.fromBothOffsets(inputOffset(outputRegion.getStartOffset(), true),
-                                          inputOffset(outputRegion.getEndOffset(), false));
-    }
-
     @Override
     public TextRegion createLineRange(int startLineInclusive, int endLineInclusive) {
         // see the doc, lines do not need to be translated
@@ -61,15 +53,51 @@ abstract class BaseMappedDocument implements TextDocument {
 
     @Override
     public TextPos2d lineColumnAtOffset(int offset, boolean inclusive) {
-        return base.lineColumnAtOffset(localOffsetTransform(offset, inclusive));
+        return base.lineColumnAtOffset(inputOffset(offset, inclusive));
     }
 
-    @Override
-    public int inputOffset(int outOffset, boolean inclusive) {
+    /**
+     * Translate a region given in the coordinate system of this
+     * document, to the coordinate system of the base document.
+     * This works as if creating a new region with both start and end
+     * offsets translated through {@link #inputOffset(int, boolean)}. The
+     * returned region may have a different length.
+     *
+     * @param outputRegion Output region
+     *
+     * @return Input region
+     */
+    protected @NonNull TextRegion inputRegion(TextRegion outputRegion) {
+        return TextRegion.fromBothOffsets(inputOffset(outputRegion.getStartOffset(), true),
+                                          inputOffset(outputRegion.getEndOffset(), false));
+    }
+
+    /**
+     * Returns the input offset for the given output offset. This maps
+     * back an offset in the coordinate system of this document, to the
+     * coordinate system of the base document. This includes the
+     * length of any unicode escapes.
+     *
+     * <pre>
+     * input:      "a\u00a0b"   (original document)
+     * translated: "a b"        (this document)
+     *
+     * translateOffset(0) = 0
+     * translateOffset(1) = 1
+     * translateOffset(2) = 7 // includes the length of the escape
+     * </pre>
+     *
+     * @param outOffset Output offset
+     * @param inclusive Whether the offset is to be interpreted as the index of a character (true),
+     *                  or the position after a character (false)
+     *
+     * @return Input offset
+     */
+    protected final int inputOffset(int outOffset, boolean inclusive) {
         if (outOffset < 0 || outOffset > getLength()) {
             throw new IndexOutOfBoundsException();
         }
-        return base.inputOffset(localOffsetTransform(outOffset, inclusive), inclusive);
+        return localOffsetTransform(outOffset, inclusive);
     }
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 32834826c2..74f42f29c5 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -588,6 +588,16 @@ public final class Chars implements CharSequence {
         return StreamSupport.stream(lines().spliterator(), false);
     }
 
+    /**
+     * Returns a new stringbuilder containing the whole contents of this
+     * char sequence.
+     */
+    public StringBuilder toStringBuilder() {
+        StringBuilder sb = new StringBuilder(length());
+        appendChars(sb);
+        return sb;
+    }
+
 
     /**
      * Returns a new reader for the whole contents of this char sequence.
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
index c3f372892a..009fbbd30b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/FragmentedTextDocument.java
@@ -57,7 +57,7 @@ final class FragmentedTextDocument extends BaseMappedDocument implements TextDoc
         // Whether the fragment contains the offset we're looking for.
         // Will be true most of the time.
         boolean containsOffset =
-            f.outStart() >= outOffset && outOffset < f.outEnd();
+            f.outStart() <= outOffset && outOffset < f.outEnd();
 
         if (!containsOffset) {
             // Slow path, we must search for the fragment
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
index 56ccfcd223..8dc79889ec 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/RootTextDocument.java
@@ -119,16 +119,6 @@ final class RootTextDocument extends BaseCloseable implements TextDocument {
         return content.getCheckSum();
     }
 
-    @Override
-    public int inputOffset(int outOffset, boolean inclusive) {
-        return outOffset;
-    }
-
-    @Override
-    public TextRegion inputRegion(TextRegion outputRegion) {
-        return outputRegion;
-    }
-
     @Override
     public Chars sliceOriginalText(TextRegion region) {
         return getText().subSequence(region.getStartOffset(), region.getEndOffset());
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
index 5003ed6a70..153f43e360 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/TextDocument.java
@@ -144,43 +144,6 @@ public interface TextDocument extends Closeable {
     long getCheckSum();
 
 
-    /**
-     * Returns the input offset for the given output offset. This maps
-     * back an offset in the coordinate system of this document, to the
-     * coordinate system of the original document. This includes the
-     * length of any unicode escapes.
-     *
-     * <pre>
-     * input:      "a\u00a0b"   (original document)
-     * translated: "a b"        (this document)
-     *
-     * translateOffset(0) = 0
-     * translateOffset(1) = 1
-     * translateOffset(2) = 7 // includes the length of the escape
-     * </pre>
-     *
-     * @param outOffset Output offset
-     * @param inclusive Whether the offset is to be interpreted as the index of a character (true),
-     *                  or the position after a character (false)
-     *
-     * @return Input offset
-     */
-    int inputOffset(int outOffset, boolean inclusive);
-
-    /**
-     * Translate a region given in the coordinate system of this
-     * document, to the coordinate system of the original document.
-     * This works as if creating a new region with both start and end
-     * offsets translated through {@link #inputOffset(int, boolean)}. The
-     * returned region may have a different length.
-     *
-     * @param outputRegion Output region
-     *
-     * @return Input region
-     */
-    TextRegion inputRegion(TextRegion outputRegion);
-
-
     /**
      * Returns a reader over the text of this document.
      */
@@ -261,8 +224,6 @@ public interface TextDocument extends Closeable {
      *
      * @return A position, in the coordinate system of the root document
      *
-     * @return A position, in the coordinate system of this document
-     *
      * @throws IndexOutOfBoundsException if the offset is out of bounds
      */
     TextPos2d lineColumnAtOffset(int offset, boolean inclusive);
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
index 9fd02c3620..9365670f3d 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java
@@ -60,6 +60,14 @@ public class CharsTest {
         assertEquals("b", sb.toString());
     }
 
+    @Test
+    public void toStringBuilder() {
+        Chars bc = Chars.wrap("abcd").slice(1, 2);
+        assertEquals("bc", bc.toString());
+
+        assertEquals("bc", bc.toStringBuilder().toString());
+    }
+
     @Test
     public void write() throws IOException {
         StringWriter writer = new StringWriter();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index be73eccec1..6ea1ceb380 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -9,7 +9,6 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.util.CollectionUtil;
@@ -31,6 +30,8 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
     }
 
 
+    // todo deprecate this
+    // it's ambiguous whether it returns getOriginalText or getTranslatedText
     @Override
     public String getImage() {
         return getText().toString();
@@ -72,12 +73,12 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
     }
 
     @Override
-    protected @Nullable Object buildConstValue() {
+    protected @NonNull Object buildConstValue() {
         if (isTextBlock()) {
             return determineTextBlockContent(getText());
         } else {
-            CharSequence image = getText();
-            CharSequence woDelims = image.subSequence(1, image.length() - 1);
+            Chars image = getText();
+            Chars woDelims = image.subSequence(1, image.length() - 1);
             return StringEscapeUtils.UNESCAPE_JAVA.translate(woDelims);
         }
     }
@@ -118,6 +119,7 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
     private static void interpretEscapeSequences(StringBuilder sb) {
         // interpret escape sequences "\<LF>" (line continuation), "n","t","b","r","f", "s", "\"", "\'", "\\"
         // we need to interpret everything in one pass, so regex replacement is inappropriate
+        // todo octal escapes: https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-EscapeSequence
         for (int i = 0; i < sb.length(); i++) {
             char c = sb.charAt(i);
             if (c == '\\' && i < sb.length() - 1) {
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
index c2829ae510..7aec741c03 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
@@ -4,6 +4,7 @@
 
 package net.sourceforge.pmd.lang.java.ast
 
+import io.kotest.matchers.shouldBe
 import net.sourceforge.pmd.lang.ast.test.NodeSpec
 import net.sourceforge.pmd.lang.ast.test.ValuedNodeSpec
 import net.sourceforge.pmd.lang.ast.test.shouldBe
@@ -63,6 +64,7 @@ class ASTLiteralTest : ParserTestSpec({
                     }
                 }
             }
+
             suspend fun String.testTextBlock() {
                 this.testTextBlock(EmptyAssertions)
             }
@@ -166,7 +168,9 @@ $delim
             }
 
             "\"abc\\u1234abc\"" should parseAs {
-                stringLit("\"abc\\u1234abc\"") {
+                stringLit("\"abc\u1234abc\"") {
+                    it.originalText.toString() shouldBe "\"abc\\u1234abc\""
+                    it.text.toString() shouldBe "\"abc\u1234abc\""
                     it::getConstValue shouldBe "abc\u1234abc"
                 }
             }
@@ -179,6 +183,19 @@ $delim
         }
     }
 
+    parserTest("String literal octal escapes") {
+        inContext(ExpressionParsingCtx) {
+
+            "\"\\123\"" should parseAs {
+                stringLit("\"\\123\"") {
+                    val char = "123".toInt(8).toChar()
+                    it::getConstValue shouldBe char.toString()
+                }
+            }
+
+        }
+    }
+
 
 
     parserTest("Char literal") {

From 76fe12d925f896d9b299ed1f386994b446016c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 17:46:08 +0200
Subject: [PATCH 179/180] Recognize octal escapes in strings

---
 .../sourceforge/pmd/lang/document/Chars.java  |  17 +-
 .../net/sourceforge/pmd/util/StringUtil.java  |  15 ++
 .../pmd/lang/java/ast/ASTStringLiteral.java   | 192 +++++++++-----
 .../lang/java/ast/TextBlockEscapeTest.java    | 249 ++++++++++++------
 .../pmd/lang/java/ast/ASTLiteralTest.kt       |  37 ++-
 .../pmd/lang/java/ast/TestExtensions.kt       |   2 +
 6 files changed, 356 insertions(+), 156 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
index 32834826c2..b929a9472c 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/document/Chars.java
@@ -121,26 +121,21 @@ public final class Chars implements CharSequence {
     }
 
     /**
-     * Appends the character range identified by offset and length into
+     * Appends the character range identified by start and end offset into
      * the string builder. This is much more efficient than calling
      * {@link StringBuilder#append(CharSequence)} with this as the
      * parameter, especially on Java 9+.
      *
-     * <p>Be aware that {@link StringBuilder#append(CharSequence, int, int)}
-     * takes a start and <i>end</i> offset, whereas this method (like all
-     * the others in this class) take a start offset and a length.
-     *
-     * @param off Start (inclusive)
-     * @param len Number of characters
+     * @param start Start index (inclusive)
+     * @param end End index (exclusive)
      *
      * @throws IndexOutOfBoundsException See {@link StringBuilder#append(CharSequence, int, int)}
      */
-    public void appendChars(StringBuilder sb, int off, int len) {
-        if (len == 0) {
+    public void appendChars(StringBuilder sb, int start, int end) {
+        if (end == 0) {
             return;
         }
-        int idx = idx(off);
-        sb.append(str, idx, idx + len);
+        sb.append(str, idx(start), idx(end));
     }
 
     /**
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 61e577c175..69215bb591 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -148,6 +148,21 @@ public final class StringUtil {
         return col;
     }
 
+    /**
+     * Like {@link StringBuilder#append(CharSequence)}, but uses an optimized
+     * implementation if the charsequence happens to be a {@link Chars}. {@link StringBuilder}
+     * already optimises the cases where the charseq is a string, a StringBuilder,
+     * or a stringBuffer. This is especially useful in parsers.
+     */
+    public static StringBuilder append(StringBuilder sb, CharSequence charSeq) {
+        if (charSeq instanceof Chars) {
+            ((Chars) charSeq).appendChars(sb);
+            return sb;
+        } else {
+            return sb.append(charSeq);
+        }
+    }
+
     /**
      * Returns the substring following the last occurrence of the
      * given character. If the character doesn't occur, returns
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index be73eccec1..5b49e497d2 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -7,12 +7,9 @@ package net.sourceforge.pmd.lang.java.ast;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.lang.document.Chars;
-import net.sourceforge.pmd.util.CollectionUtil;
 import net.sourceforge.pmd.util.StringUtil;
 
 /**
@@ -72,24 +69,35 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
     }
 
     @Override
-    protected @Nullable Object buildConstValue() {
+    protected @NonNull String buildConstValue() {
         if (isTextBlock()) {
             return determineTextBlockContent(getText());
         } else {
-            CharSequence image = getText();
-            CharSequence woDelims = image.subSequence(1, image.length() - 1);
-            return StringEscapeUtils.UNESCAPE_JAVA.translate(woDelims);
+            return determineStringContent(getText());
         }
     }
 
+    static @NonNull String determineStringContent(Chars image) {
+        Chars woDelims = image.subSequence(1, image.length() - 1);
+        StringBuilder sb = new StringBuilder(woDelims.length());
+        interpretEscapeSequences(woDelims, sb, false);
+        return sb.toString();
+    }
+
     static String determineTextBlockContent(Chars image) {
         List<Chars> lines = getContentLines(image);
         // remove common prefix
         StringUtil.trimIndentInPlace(lines);
-        // join with normalized end of line
-        StringBuilder sb = CollectionUtil.joinCharsIntoStringBuilder(lines, "\n");
-        // interpret escape sequences
-        interpretEscapeSequences(sb);
+        StringBuilder sb = new StringBuilder(image.length());
+        for (int i = 0; i < lines.size(); i++) {
+            Chars line = lines.get(i);
+            boolean isLastLine = i == lines.size() - 1;
+            // this might return false if the line ends with a line continuation.
+            boolean appendNl = interpretEscapeSequences(line, sb, !isLastLine);
+            if (appendNl) {
+                sb.append('\n');
+            }
+        }
         return sb.toString();
     }
 
@@ -115,57 +123,123 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
         return lines;
     }
 
-    private static void interpretEscapeSequences(StringBuilder sb) {
-        // interpret escape sequences "\<LF>" (line continuation), "n","t","b","r","f", "s", "\"", "\'", "\\"
+    /**
+     * Interpret escape sequences. This appends the interpreted contents
+     * of 'line' into the StringBuilder. The line does not contain any
+     * line terminators, instead, an implicit line terminator may be at
+     * the end (parameter {@code isEndANewLine}), to interpret line
+     * continuations.
+     *
+     * @param line          Source line
+     * @param out           Output
+     * @param isEndANewLine Whether the end of the line is a newline,
+     *                      as in text blocks
+     *
+     * @return Whether a newline should be appended at the end. Returns
+     *     false if {@code isEndANewLine} and the line ends with a backslash,
+     *     as this is a line continuation.
+     */
+    // See https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-EscapeSequence
+    private static boolean interpretEscapeSequences(Chars line, StringBuilder out, boolean isEndANewLine) {
         // we need to interpret everything in one pass, so regex replacement is inappropriate
-        for (int i = 0; i < sb.length(); i++) {
-            char c = sb.charAt(i);
-            if (c == '\\' && i < sb.length() - 1) {
-                char cnext = sb.charAt(i + 1);
-                switch (cnext) {
-                case '\n':
-                    // line continuation
-                    sb.delete(i, i + 2);
-                    break;
-                case '\\':
-                    sb.deleteCharAt(i);
-                    break;
-                case 'n':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\n');
-                    break;
-                case 't':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\t');
-                    break;
-                case 'b':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\b');
-                    break;
-                case 'r':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\r');
-                    break;
-                case 'f':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\f');
-                    break;
-                case 's':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, ' ');
-                    break;
-                case '"':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '"');
-                    break;
-                case '\'':
-                    sb.deleteCharAt(i);
-                    sb.setCharAt(i, '\'');
-                    break;
-                default:
-                    // unknown escape - do nothing - it stays
+        int appended = 0;
+        int i = 0;
+        while (i < line.length()) {
+            char c = line.charAt(i);
+            if (c != '\\') {
+                i++;
+                continue;
+            }
+            if (i + 1 == line.length()) {
+                // the last character of the line is a backslash
+                if (isEndANewLine) {
+                    // then this is a line continuation
+                    line.appendChars(out, appended, i);
+                    return false; // shouldn't append newline
                 }
+                // otherwise we'll append the backslash when exiting the loop
+                break;
+            }
+            char cnext = line.charAt(i + 1);
+            switch (cnext) {
+            case '\\':
+            case 'n':
+            case 't':
+            case 'b':
+            case 'r':
+            case 'f':
+            case 's':
+            case '"':
+            case '\'':
+                // append up to and not including backslash
+                line.appendChars(out, appended, i);
+                // append the translation
+                out.append(translateBackslashEscape(cnext));
+                // next time, start appending after the char
+                i += 2;
+                appended = i;
+                continue;
+            // octal digits
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+                // append up to and not including backslash
+                line.appendChars(out, appended, i);
+                i = translateOctalEscape(line, i + 1, out);
+                appended = i;
+                continue;
+            default:
+                // unknown escape - do nothing - it stays
+                i++;
+                break;
             }
         }
+
+        if (appended < line.length()) {
+            // append until the end
+            line.appendChars(out, appended, line.length());
+        }
+        return isEndANewLine;
+    }
+
+    private static char translateBackslashEscape(char c) {
+        switch (c) {
+        case '\\': return '\\';
+        case 'n': return '\n';
+        case 't': return '\t';
+        case 'b': return '\b';
+        case 'r': return '\r';
+        case 'f': return '\f';
+        case 's': return ' ';
+        case '"': return '"';
+        case '\'': return '\'';
+        default:
+            throw new IllegalArgumentException("Not a valid escape \\" + c);
+        }
+    }
+
+    private static int translateOctalEscape(Chars src, final int firstDigitIndex, StringBuilder sb) {
+        int i = firstDigitIndex;
+        int result = src.charAt(i) - '0';
+        i++;
+        if (src.length() > i && isOctalDigit(src.charAt(i))) {
+            result = 8 * result + src.charAt(i) - '0';
+            i++;
+            if (src.length() > i && isOctalDigit(src.charAt(i))) {
+                result = 8 * result + src.charAt(i) - '0';
+                i++;
+            }
+        }
+        sb.append((char) result);
+        return i;
+    }
+
+    private static boolean isOctalDigit(char c) {
+        return c >= '0' && c <= '7';
     }
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
index 63f30f4510..1fb74b3099 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
@@ -4,122 +4,209 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
+import static net.sourceforge.pmd.lang.java.ast.ASTStringLiteral.determineTextBlockContent;
 import static org.junit.Assert.assertEquals;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.Test;
 
+import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.java.BaseParserTest;
 
 public class TextBlockEscapeTest extends BaseParserTest {
 
+    @Test
+    public void testStringEscapes() {
+        testStringEscape("abcd", "abcd");
+        testStringEscape("abcd\\f", "abcd\f");
+        testStringEscape("abcd\\n", "abcd\n");
+        testStringEscape("abcd\\t", "abcd\t");
+        testStringEscape("abcd\\bx", "abcd\bx");
+        testStringEscape("abcd\\'x", "abcd\'x");
+        // note that this one is actually invalid syntax
+        testStringEscape("abcd\\", "abcd\\");
+        testStringEscape("abcd\\\\", "abcd\\");
+    }
+
+    @Test
+    public void testStringOctalEscapes() {
+        testStringEscape("\\0123", "\0123");
+        testStringEscape("\\01ab", "\01ab");
+        testStringEscape("\\0", "\0");
+    }
+
+    @Test
+    public void testStringUnknownEscape() {
+        testStringEscape("\\x", "\\x");
+    }
+
+    // note the argument order
+    private void testStringEscape(String actual, String expected) {
+        actual = inDoubleQuotes(actual);
+        assertEquals(expected,
+                     ASTStringLiteral.determineStringContent(Chars.wrap(actual)));
+    }
+
+    private static @NonNull String inDoubleQuotes(String expected) {
+        return "\"" + expected + "\"";
+    }
+
     @Test
     public void testTextBlockContent() {
-        assertEquals("empty text block", "",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n                       \"\"\""));
         assertEquals("single line text block", "winter",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n                winter\"\"\""));
+                     determineTextBlockContent("\"\"\"\n                winter\"\"\""));
         assertEquals("single line text block with LF", "winter\n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "                        winter\n"
-                                                              + "                        \"\"\""));
-        assertEquals("basic text block example with html",
-                     "<html>\n"
-                         + "    <body>\n"
-                         + "        <p>Hello, world</p>\n"
-                         + "    </body>\n"
-                         + "</html>\n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "                      <html>   \n"
-                                                              + "                          <body>\n"
-                                                              + "                              <p>Hello, world</p>    \n"
-                                                              + "                          </body> \n"
-                                                              + "                      </html>   \n"
-                                                              + "                      \"\"\""));
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "   winter\n"
+                                                   + "   \"\"\""));
+        assertEquals("single line text block with LF, some indent preserved", " winter\n",
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "   winter\n"
+                                                   + "  \"\"\""));
+    }
+
+    @Test
+    public void emptyTextBlock() {
+        assertEquals("empty text block", "",
+                     determineTextBlockContent("\"\"\"\n                       \"\"\""));
+    }
+
+    @Test
+    public void testEscapeBlockDelimiter() {
+        assertEquals("escaped text block in inside text block",
+                     "String text = \"\"\"\n"
+                         + "    A text block inside a text block\n"
+                         + "\"\"\";\n",
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "  String text = \\\"\"\"\n"
+                                                   + "      A text block inside a text block\n"
+                                                   + "  \\\"\"\";\n"
+                                                   + "  \"\"\""));
+    }
+
+    @Test
+    public void testCrEscape() {
         assertEquals("text block with escapes",
                      "<html>\r\n"
                          + "    <body>\r\n"
                          + "        <p>Hello, world</p>\r\n"
                          + "    </body>\r\n"
                          + "</html>\r\n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "                      <html>\\r\n"
-                                                              + "                          <body>\\r\n"
-                                                              + "                              <p>Hello, world</p>\\r\n"
-                                                              + "                          </body>\\r\n"
-                                                              + "                      </html>\\r\n"
-                                                              + "                      \"\"\""));
-        assertEquals("escaped text block in inside text block",
-                     "String text = \"\"\"\n"
-                         + "    A text block inside a text block\n"
-                         + "\"\"\";\n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "            String text = \\\"\"\"\n"
-                                                              + "                A text block inside a text block\n"
-                                                              + "            \\\"\"\";\n"
-                                                              + "            \"\"\""));
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "                      <html>\\r\n"
+                                                   + "                          <body>\\r\n"
+                                                   + "                              <p>Hello, world</p>\\r\n"
+                                                   + "                          </body>\\r\n"
+                                                   + "                      </html>\\r\n"
+                                                   + "                      \"\"\""));
+    }
+
+    @Test
+    public void testBasicHtmlBlock() {
+        assertEquals("basic text block example with html",
+                     "<html>\n"
+                         + "    <body>\n"
+                         + "        <p>Hello, world</p>\n"
+                         + "    </body>\n"
+                         + "</html>\n",
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "                      <html>   \n"
+                                                   + "                          <body>\n"
+                                                   + "                              <p>Hello, world</p>    \n"
+                                                   + "                          </body> \n"
+                                                   + "                      </html>   \n"
+                                                   + "                      \"\"\""));
+    }
+
+    @Test
+    public void testLineContinuation() {
         assertEquals("new escape: line continuation",
                      "Lorem ipsum dolor sit amet, consectetur adipiscing "
                          + "elit, sed do eiusmod tempor incididunt ut labore "
                          + "et dolore magna aliqua.",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "                      Lorem ipsum dolor sit amet, consectetur adipiscing \\\n"
-                                                              + "                      elit, sed do eiusmod tempor incididunt ut labore \\\n"
-                                                              + "                      et dolore magna aliqua.\\\n"
-                                                              + "                      \"\"\""));
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "  Lorem ipsum dolor sit amet, consectetur adipiscing \\\n"
+                                                   + "  elit, sed do eiusmod tempor incididunt ut labore \\\n"
+                                                   + "  et dolore magna aliqua.\\\n"
+                                                   + "  \"\"\""));
+    }
+
+    @Test
+    public void testEscapeSpace() {
+
         assertEquals("new escape: space escape",
                      "red   \n"
                          + "green \n"
                          + "blue  \n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                              + "                        red  \\s\n"
-                                                              + "                        green\\s\n"
-                                                              + "                        blue \\s\n"
-                                                              + "                        \"\"\""));
+                     determineTextBlockContent("\"\"\"\n"
+                                                   + "                        red  \\s\n"
+                                                   + "                        green\\s\n"
+                                                   + "                        blue \\s\n"
+                                                   + "                        \"\"\""));
+
+    }
+
+    @Test
+    public void testLineEndingNormalization() {
         assertEquals("with crlf line endings",
                      "<html>\n"
                          + "    <body>\n"
                          + "        <p>Hello, world</p>\n"
                          + "    </body>\n"
-                         + "</html>\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\r\n"
-                                                                                 + "                      <html>   \r\n"
-                                                                                 + "                          <body>\r\n"
-                                                                                 + "                              <p>Hello, world</p>    \r\n"
-                                                                                 + "                          </body> \r\n"
-                                                                                 + "                      </html>   \r\n"
-                                                                                 + "                      \"\"\""));
+                         + "</html>\n",
+                     determineTextBlockContent("\"\"\"\r\n"
+                                                   + "                      <html>   \r\n"
+                                                   + "                          <body>\r\n"
+                                                   + "                              <p>Hello, world</p>    \r\n"
+                                                   + "                          </body> \r\n"
+                                                   + "                      </html>   \r\n"
+                                                   + "                      \"\"\""));
         assertEquals("with cr line endings",
                      "<html>\n"
                          + "    <body>\n"
                          + "        <p>Hello, world</p>\n"
                          + "    </body>\n"
-                         + "</html>\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\r"
-                                                                                 + "                      <html>   \r"
-                                                                                 + "                          <body>\r"
-                                                                                 + "                              <p>Hello, world</p>    \r"
-                                                                                 + "                          </body> \r"
-                                                                                 + "                      </html>   \r"
-                                                                                 + "                      \"\"\""));
-        assertEquals("empty line directly after opening",
-                     "\ntest\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                                          + "    \n"
-                                                                          + "    test\n"
-                                                                          + "    \"\"\""));
-        assertEquals("empty crlf line directly after opening",
-                     "\ntest\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\r\n"
-                                                                          + "    \r\n"
-                                                                          + "    test\r\n"
-                                                                          + "    \"\"\""));
-        assertEquals("empty line directly after opening without indentation",
-                     "\ntest\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\n"
-                                                                          + "\n"
-                                                                          + "test\n"
-                                                                          + "\"\"\""));
-        assertEquals("empty crlf line directly after opening without indentation",
-                     "\ntest\n", ASTStringLiteral.determineTextBlockContent("\"\"\"\r\n"
-                                                                          + "\r\n"
-                                                                          + "test\r\n"
-                                                                          + "\"\"\""));
-        assertEquals("text block with backslash escape", "\\test\n",
-                     ASTStringLiteral.determineTextBlockContent("\"\"\"\n                \\\\test\n                \"\"\""));
+                         + "</html>\n",
+                     determineTextBlockContent("\"\"\"\r"
+                                                   + "                      <html>   \r"
+                                                   + "                          <body>\r"
+                                                   + "                              <p>Hello, world</p>    \r"
+                                                   + "                          </body> \r"
+                                                   + "                      </html>   \r"
+                                                   + "                      \"\"\""));
+
     }
+
+    @Test
+    public void testEmptyLines() {
+
+        assertEquals("empty line directly after opening",
+                     "\ntest\n", determineTextBlockContent("\"\"\"\n"
+                                                               + "    \n"
+                                                               + "    test\n"
+                                                               + "    \"\"\""));
+        assertEquals("empty crlf line directly after opening",
+                     "\ntest\n", determineTextBlockContent("\"\"\"\r\n"
+                                                               + "    \r\n"
+                                                               + "    test\r\n"
+                                                               + "    \"\"\""));
+        assertEquals("empty line directly after opening without indentation",
+                     "\ntest\n", determineTextBlockContent("\"\"\"\n"
+                                                               + "\n"
+                                                               + "test\n"
+                                                               + "\"\"\""));
+        assertEquals("empty crlf line directly after opening without indentation",
+                     "\ntest\n", determineTextBlockContent("\"\"\"\r\n"
+                                                               + "\r\n"
+                                                               + "test\r\n"
+                                                               + "\"\"\""));
+
+    }
+
+    @Test
+    public void testTextBlockWithBackslashEscape() {
+        assertEquals("text block with backslash escape", "\\test\n",
+                     determineTextBlockContent("\"\"\"\n                \\\\test\n                \"\"\""));
+    }
+
 }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
index c2829ae510..dfe6acc411 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
@@ -63,6 +63,7 @@ class ASTLiteralTest : ParserTestSpec({
                     }
                 }
             }
+
             suspend fun String.testTextBlock() {
                 this.testTextBlock(EmptyAssertions)
             }
@@ -165,11 +166,12 @@ $delim
                 }
             }
 
-            "\"abc\\u1234abc\"" should parseAs {
-                stringLit("\"abc\\u1234abc\"") {
-                    it::getConstValue shouldBe "abc\u1234abc"
-                }
-            }
+            // todo fixed in followup branch
+            // "\"abc\\u1234abc\"" should parseAs {
+            //     stringLit("\"abc\\u1234abc\"") {
+            //         it::getConstValue shouldBe "abc\u1234abc"
+            //     }
+            // }
 
             "\"abcüabc\"" should parseAs {
                 stringLit("\"abcüabc\"") {
@@ -179,6 +181,31 @@ $delim
         }
     }
 
+    parserTest("String literal octal escapes") {
+        inContext(ExpressionParsingCtx) {
+            // (kotlin doesn't have octal escapes)
+            val char = "123".toInt(radix = 8).toChar()
+
+            "\"\\123\"" should parseAs {
+                stringLit("\"\\123\"") {
+                    it::getConstValue shouldBe char.toString()
+                }
+            }
+            val delim = "\"\"\""
+
+            """
+                $delim
+                \123
+                $delim
+            """ should parseAs {
+                textBlock {
+                    it::getConstValue shouldBe char.toString() + "\n"
+                }
+            }
+
+        }
+    }
+
 
 
     parserTest("Char literal") {
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
index 1a6cd74072..ae12f41d99 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/TestExtensions.kt
@@ -437,6 +437,7 @@ fun TreeNodeWrapper<Node, *>.stringLit(image: String, contents: NodeSpec<ASTStri
         child<ASTStringLiteral> {
             it::getImage shouldBe image
             it::isTextBlock shouldBe false
+            it::isEmpty shouldBe it.constValue.isEmpty()
             contents()
         }
 
@@ -468,6 +469,7 @@ fun TreeNodeWrapper<Node, *>.boolean(value: Boolean, contents: NodeSpec<ASTBoole
 fun TreeNodeWrapper<Node, *>.textBlock(contents: NodeSpec<ASTStringLiteral> = EmptyAssertions) =
         child<ASTStringLiteral> {
             it::isTextBlock shouldBe true
+            it::isEmpty shouldBe it.constValue.isEmpty()
             contents()
         }
 

From 87c224feaa504b75433a4a9ee5d704e755e30d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 30 Apr 2022 20:59:55 +0200
Subject: [PATCH 180/180] Fix AvoidDuplicateLiteral

message needs escaping
---
 .../java/net/sourceforge/pmd/util/StringUtil.java    |  4 ++++
 .../pmd/lang/java/ast/ASTStringLiteral.java          | 12 ++++++++++++
 .../rule/errorprone/AvoidDuplicateLiteralsRule.java  |  3 +--
 .../pmd/lang/java/ast/TextBlockEscapeTest.java       |  8 ++------
 .../sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt  |  3 ++-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
index 69215bb591..5e50749cb0 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/util/StringUtil.java
@@ -13,6 +13,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 import net.sourceforge.pmd.annotation.InternalApi;
 import net.sourceforge.pmd.internal.util.AssertionUtil;
@@ -543,6 +544,9 @@ public final class StringUtil {
         return str.replaceAll("'", "''");
     }
 
+    public static @NonNull String inDoubleQuotes(String expected) {
+        return "\"" + expected + "\"";
+    }
 
 
     public enum CaseConvention {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
index dcec3d611a..651eefe415 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStringLiteral.java
@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import net.sourceforge.pmd.lang.document.Chars;
+import net.sourceforge.pmd.lang.rule.xpath.NoAttribute;
 import net.sourceforge.pmd.util.StringUtil;
 
 /**
@@ -58,6 +59,17 @@ public final class ASTStringLiteral extends AbstractLiteral implements ASTLitera
         return getConstValue().length();
     }
 
+    /**
+     * Returns a string where non-printable characters have been escaped
+     * using Java-like escape codes (eg \n, \t, \u005cu00a0).
+     */
+    //                                          ^^^^^^
+    // this is a backslash, it's printed as \u00a0
+    @NoAttribute
+    public @NonNull String toPrintableString() {
+        return StringUtil.inDoubleQuotes(StringUtil.escapeJava(getConstValue()));
+    }
+
     @Override
     protected <P, R> R acceptVisitor(JavaVisitor<? super P, ? extends R> visitor, P data) {
         return visitor.visit(this, data);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsRule.java
index b780b45a4c..3723278ed1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsRule.java
@@ -88,8 +88,7 @@ public class AvoidDuplicateLiteralsRule extends AbstractJavaRulechainRule {
             SortedSet<ASTStringLiteral> occurrences = entry.getValue();
             if (occurrences.size() >= threshold) {
                 ASTStringLiteral first = occurrences.first();
-                String rawImage = first.getImage();
-                Object[] args = {rawImage, occurrences.size(), first.getBeginLine(), };
+                Object[] args = { first.toPrintableString(), occurrences.size(), first.getBeginLine(), };
                 addViolation(data, first, args);
             }
         }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
index 1fb74b3099..1a40b50605 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java
@@ -7,11 +7,11 @@ package net.sourceforge.pmd.lang.java.ast;
 import static net.sourceforge.pmd.lang.java.ast.ASTStringLiteral.determineTextBlockContent;
 import static org.junit.Assert.assertEquals;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.Test;
 
 import net.sourceforge.pmd.lang.document.Chars;
 import net.sourceforge.pmd.lang.java.BaseParserTest;
+import net.sourceforge.pmd.util.StringUtil;
 
 public class TextBlockEscapeTest extends BaseParserTest {
 
@@ -42,15 +42,11 @@ public class TextBlockEscapeTest extends BaseParserTest {
 
     // note the argument order
     private void testStringEscape(String actual, String expected) {
-        actual = inDoubleQuotes(actual);
+        actual = StringUtil.inDoubleQuotes(actual);
         assertEquals(expected,
                      ASTStringLiteral.determineStringContent(Chars.wrap(actual)));
     }
 
-    private static @NonNull String inDoubleQuotes(String expected) {
-        return "\"" + expected + "\"";
-    }
-
     @Test
     public void testTextBlockContent() {
         assertEquals("single line text block", "winter",
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
index 909265b046..cdaae0c7d7 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.kt
@@ -168,8 +168,9 @@ $delim
             }
 
             "\"abc\\u1234abc\"" should parseAs {
-                stringLit("\"abc\\u1234abc\"") {
+                stringLit("\"abc\u1234abc\"") {
                     it::getConstValue shouldBe "abc\u1234abc"
+                    it.originalText.toString() shouldBe "\"abc\\u1234abc\""
                 }
             }