diff --git a/.ci/files/project-list.xml b/.ci/files/project-list.xml
index 98c2bf1c167..ce32708a358 100644
--- a/.ci/files/project-list.xml
+++ b/.ci/files/project-list.xml
@@ -4,33 +4,6 @@
xsi:noNamespaceSchemaLocation="projectlist_1_1_0.xsd">
Standard Projects
-
- checkstyle
- git
- https://github.com/checkstyle/checkstyle
- checkstyle-9.1
-
- .*/target/test-classes/com/puppycrawl/tools/checkstyle/.*
- .*/target/generated-sources/.*
- .*/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/javaparser/InputJavaParserNoFreezeOnDeeplyNestedLambdas.java
-
-
- echo -n "$(pwd)/target/classes:$(pwd)/target/test-classes:"; cat classpath.txt
-
-
spring-framework
git
diff --git a/.gitignore b/.gitignore
index 95978b24728..6e834a5dc79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ target/
bin/
.project
.classpath
-.checkstyle
.pmd
.pmdruleset.xml
.ruleset
diff --git a/docs/pages/pmd/devdocs/contributing/contributing.md b/docs/pages/pmd/devdocs/contributing/contributing.md
index 881b5fd40f0..71a8e1cb322 100644
--- a/docs/pages/pmd/devdocs/contributing/contributing.md
+++ b/docs/pages/pmd/devdocs/contributing/contributing.md
@@ -83,11 +83,7 @@ There are various channels, on which you can ask questions:
## Code Style
-PMD uses [Checkstyle](https://checkstyle.org/) to enforce a common code style.
-
-See [pmd-checkstyle-config.xml](https://github.com/pmd/build-tools/blob/main/src/main/resources/net/sourceforge/pmd/pmd-checkstyle-config.xml) for the configuration and
-[the eclipse configuration files](https://github.com/pmd/build-tools/tree/main/eclipse) that can
-be imported into a fresh workspace.
+PMD uses Rewrite.
## Add yourself as contributor
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/CPDTask.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/CPDTask.java
index 86558b60480..3756bf54f82 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/CPDTask.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/CPDTask.java
@@ -67,8 +67,7 @@ public class CPDTask extends Task {
private static final String TEXT_FORMAT = "text";
private static final String XML_FORMAT = "xml";
- @Deprecated
- private static final String XMLOLD_FORMAT = "xmlold";
+ @Deprecated private static final String XMLOLD_FORMAT = "xmlold";
private static final String CSV_FORMAT = "csv";
private String format = TEXT_FORMAT;
@@ -78,8 +77,7 @@ public class CPDTask extends Task {
private boolean ignoreIdentifiers;
private boolean ignoreAnnotations;
private boolean ignoreUsings;
- @Deprecated
- private boolean skipLexicalErrors;
+ @Deprecated private boolean skipLexicalErrors;
private boolean skipDuplicateFiles;
private boolean skipBlocks = true;
private String skipBlocksPattern;
@@ -88,8 +86,7 @@ public class CPDTask extends Task {
private List filesets = new ArrayList<>();
private boolean failOnError = true;
- @Override
- public void execute() throws BuildException {
+ @Override public void execute() throws BuildException {
ClassLoader oldClassloader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(CPDTask.class.getClassLoader());
@@ -243,8 +240,7 @@ public void setIgnoreUsings(boolean value) {
/**
* @deprecated Use {@link #setFailOnError(boolean)} instead.
*/
- @Deprecated
- public void setSkipLexicalErrors(boolean skipLexicalErrors) {
+ @Deprecated public void setSkipLexicalErrors(boolean skipLexicalErrors) {
this.skipLexicalErrors = skipLexicalErrors;
}
@@ -286,10 +282,9 @@ public void setFailOnError(boolean failOnError) {
}
public static class FormatAttribute extends EnumeratedAttribute {
- private static final String[] FORMATS = new String[] { XML_FORMAT, TEXT_FORMAT, CSV_FORMAT, XMLOLD_FORMAT };
+ private static final String[] FORMATS = new String[]{XML_FORMAT, TEXT_FORMAT, CSV_FORMAT, XMLOLD_FORMAT};
- @Override
- public String[] getValues() {
+ @Override public String[] getValues() {
return FORMATS;
}
}
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/Formatter.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/Formatter.java
index 159f19d7e1a..547ec8301a0 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/Formatter.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/Formatter.java
@@ -130,8 +130,7 @@ boolean isNoOutputSupplied() {
return toFile == null && !toConsole;
}
- @Override
- public String toString() {
+ @Override public String toString() {
return "file = " + toFile + "; renderer = " + type;
}
@@ -272,23 +271,19 @@ GlobalAnalysisListener newListener(Project project) throws IOException {
return new GlobalAnalysisListener() {
final GlobalAnalysisListener listener = renderer.newListener();
- @Override
- public ListenerInitializer initializer() {
+ @Override public ListenerInitializer initializer() {
return new ListenerInitializer() {
- @Override
- public void setFileNameRenderer(FileNameRenderer fileNameRenderer) {
+ @Override public void setFileNameRenderer(FileNameRenderer fileNameRenderer) {
renderer.setFileNameRenderer(fileNameRenderer);
}
};
}
- @Override
- public FileAnalysisListener startFileAnalysis(TextFile file) {
+ @Override public FileAnalysisListener startFileAnalysis(TextFile file) {
return listener.startFileAnalysis(file);
}
- @Override
- public void close() throws Exception {
+ @Override public void close() throws Exception {
listener.close();
if (!toConsole) {
writer.close();
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/InternalApiBridge.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/InternalApiBridge.java
index 604e9c39971..89f18a1d439 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/InternalApiBridge.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/InternalApiBridge.java
@@ -24,7 +24,8 @@
*/
@InternalApi
public final class InternalApiBridge {
- private InternalApiBridge() {}
+ private InternalApiBridge() {
+ }
public static GlobalAnalysisListener newListener(Formatter formatter, Project project) throws IOException {
return formatter.newListener(project);
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/PMDTask.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
index a59a4c88359..f8dd634097e 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/PMDTask.java
@@ -68,8 +68,7 @@ public class PMDTask extends Task {
private boolean noCache;
private final Collection nestedRules = new ArrayList<>();
- @Override
- public void execute() throws BuildException {
+ @Override public void execute() throws BuildException {
validate();
ClassLoader oldClassloader = Thread.currentThread().getContextClassLoader();
@@ -108,7 +107,7 @@ private void validate() throws BuildException {
private String getNestedRuleSetFiles() {
final StringBuilder sb = new StringBuilder();
- for (Iterator it = nestedRules.iterator(); it.hasNext();) {
+ for (Iterator it = nestedRules.iterator(); it.hasNext(); ) {
RuleSetWrapper rs = it.next();
sb.append(rs.getFile());
if (it.hasNext()) {
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java
index c1c81aa12a8..480130b801c 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/SourceLanguage.java
@@ -43,8 +43,7 @@ public void setName(String name) {
this.name = name;
}
- @Override
- public String toString() {
+ @Override public String toString() {
return "";
}
}
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java
index 5f5e1f9bd91..9a2e14dc037 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/PMDTaskImpl.java
@@ -126,7 +126,7 @@ private void doTask() {
ReportStats stats;
try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
RuleSetLoader rulesetLoader =
- pmd.newRuleSetLoader().loadResourcesWith(setupResourceLoader());
+ pmd.newRuleSetLoader().loadResourcesWith(setupResourceLoader());
pmd.addRuleSets(loadRuleSetsWithoutException(rulesetLoader, ruleSetPaths));
for (FileSet fileset : filesets) {
@@ -137,8 +137,7 @@ private void doTask() {
}
- @SuppressWarnings("PMD.CloseResource")
- ReportStatsListener reportStatsListener = new ReportStatsListener();
+ @SuppressWarnings("PMD.CloseResource") ReportStatsListener reportStatsListener = new ReportStatsListener();
pmd.addListener(getListener(reportStatsListener));
pmd.performAnalysis();
@@ -192,15 +191,13 @@ private List expandRuleSetPaths(List ruleSetPaths) {
private GlobalAnalysisListener makeLogListener() {
return new GlobalAnalysisListener() {
- @Override
- public FileAnalysisListener startFileAnalysis(TextFile dataSource) {
+ @Override public FileAnalysisListener startFileAnalysis(TextFile dataSource) {
String name = dataSource.getFileId().getUriString();
project.log("Processing file " + name, Project.MSG_VERBOSE);
return FileAnalysisListener.noop();
}
- @Override
- public void close() {
+ @Override public void close() {
// nothing to do
}
};
@@ -224,7 +221,7 @@ private ClassLoader setupResourceLoader() {
// and exist in multiple class loaders
final boolean parentFirst = true;
return new AntClassLoader(Thread.currentThread().getContextClassLoader(),
- project, classpath, parentFirst);
+ project, classpath, parentFirst);
}
private void setupClassLoader() {
diff --git a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/Slf4jSimpleConfigurationForAnt.java b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/Slf4jSimpleConfigurationForAnt.java
index d32579c64e1..3a52cec1397 100644
--- a/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/Slf4jSimpleConfigurationForAnt.java
+++ b/pmd-ant/src/main/java/net/sourceforge/pmd/ant/internal/Slf4jSimpleConfigurationForAnt.java
@@ -20,21 +20,21 @@
import net.sourceforge.pmd.internal.Slf4jSimpleConfiguration;
public final class Slf4jSimpleConfigurationForAnt {
- private Slf4jSimpleConfigurationForAnt() { }
+ private Slf4jSimpleConfigurationForAnt() {
+ }
private static final Level DEFAULT_LEVEL = Level.INFO;
// Maps from ant's Project.MSG_* to org.slf4j.event.Level
private static final Level[] LOG_LEVELS = {
- Level.ERROR, // Project.MSG_ERR=0
- Level.WARN, // Project.MSG_WARN=1
- Level.INFO, // Project.MSG_INFO=2
- Level.DEBUG, // Project.MSG_VERBOSE=3
- Level.TRACE, // Project.MSG_DEBUG=4
+ Level.ERROR, // Project.MSG_ERR=0
+ Level.WARN, // Project.MSG_WARN=1
+ Level.INFO, // Project.MSG_INFO=2
+ Level.DEBUG, // Project.MSG_VERBOSE=3
+ Level.TRACE, // Project.MSG_DEBUG=4
};
- @SuppressWarnings("PMD.CloseResource")
- public static Level reconfigureLoggingForAnt(Project antProject) {
+ @SuppressWarnings("PMD.CloseResource") public static Level reconfigureLoggingForAnt(Project antProject) {
if (!Slf4jSimpleConfiguration.isSimpleLogger()) {
// do nothing, not even set system properties, if not Simple Logger is in use
return DEFAULT_LEVEL;
@@ -83,13 +83,11 @@ private static final class SimpleLoggerToAntBridge extends PrintStream {
this.antProject = antProject;
}
- @Override
- public void println(String x) {
+ @Override public void println(String x) {
buffer.append(x).append(System.lineSeparator());
}
- @Override
- public void flush() {
+ @Override public void flush() {
String logLevel = determineLogLevel();
int antLogLevel = ANT_LOG_LEVELS.getOrDefault(logLevel, Project.MSG_INFO);
antProject.log(buffer.toString(), antLogLevel);
@@ -162,13 +160,13 @@ private static Level determineGradleLogLevel(Project project, BuildListener l) {
Object[] logLevels = gradleLogLevel.getEnumConstants();
// the log levels in gradle are declared in the order DEBUG, INFO, LIFECYCLE, WARN, QUIET, ERROR
- Level[] mapping = new Level[] {
- Level.TRACE, // DEBUG
- Level.DEBUG, // INFO
- Level.INFO, // LIFECYCLE
- Level.WARN, // WARN
- Level.ERROR, // QUIET
- Level.ERROR, // ERROR
+ Level[] mapping = new Level[]{
+ Level.TRACE, // DEBUG
+ Level.DEBUG, // INFO
+ Level.INFO, // LIFECYCLE
+ Level.WARN, // WARN
+ Level.ERROR, // QUIET
+ Level.ERROR, // ERROR
};
for (int i = 0; i < Math.min(logLevels.length, mapping.length); i++) {
diff --git a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/AbstractAntTest.java b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/AbstractAntTest.java
index 1a671f4fcd7..6293fc82ed7 100644
--- a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/AbstractAntTest.java
+++ b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/AbstractAntTest.java
@@ -38,8 +38,7 @@ protected void configureProject(String filename) {
ProjectHelper.configureProject(project, antFile);
}
- @AfterAll
- static void resetLogging() {
+ @AfterAll static void resetLogging() {
Slf4jSimpleConfiguration.reconfigureDefaultLogLevel(null);
}
@@ -87,32 +86,25 @@ private AntBuildListener(int logLevel) {
}
- @Override
- public void buildStarted(BuildEvent event) {
+ @Override public void buildStarted(BuildEvent event) {
}
- @Override
- public void buildFinished(BuildEvent event) {
+ @Override public void buildFinished(BuildEvent event) {
}
- @Override
- public void targetStarted(BuildEvent event) {
+ @Override public void targetStarted(BuildEvent event) {
}
- @Override
- public void targetFinished(BuildEvent event) {
+ @Override public void targetFinished(BuildEvent event) {
}
- @Override
- public void taskStarted(BuildEvent event) {
+ @Override public void taskStarted(BuildEvent event) {
}
- @Override
- public void taskFinished(BuildEvent event) {
+ @Override public void taskFinished(BuildEvent event) {
}
- @Override
- public void messageLogged(BuildEvent event) {
+ @Override public void messageLogged(BuildEvent event) {
if (event.getPriority() > logLevel) {
return;
}
diff --git a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java
index 83b56f8781c..5899eab7809 100644
--- a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java
+++ b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java
@@ -28,26 +28,22 @@
*/
class CPDTaskTest extends AbstractAntTest {
- @BeforeEach
- void setUp() {
+ @BeforeEach void setUp() {
configureProject("src/test/resources/net/sourceforge/pmd/ant/xml/cpdtasktest.xml");
}
- @Test
- void testBasic() throws IOException {
+ @Test void testBasic() throws IOException {
executeTarget("testBasic");
assertReport("target/cpd.ant.tests");
}
- @Test
- void failOnErrorDefault() throws IOException {
+ @Test void failOnErrorDefault() throws IOException {
BuildException buildException = assertThrows(BuildException.class, () -> executeTarget("failOnErrorDefault"));
assertThat(buildException.getMessage(), containsString("There were 1 recovered errors during analysis."));
assertReport("target/cpd.ant.tests");
}
- @Test
- void failOnErrorIgnore() throws IOException {
+ @Test void failOnErrorIgnore() throws IOException {
executeTarget("failOnErrorIgnore");
assertReport("target/cpd.ant.tests");
assertThat(log.toString(), containsString("There were 1 recovered errors during analysis."));
diff --git a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java
index 0bb8b1f4f68..82505aabbf8 100644
--- a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java
+++ b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/FormatterTest.java
@@ -19,8 +19,7 @@
class FormatterTest {
- @Test
- void testType() {
+ @Test void testType() {
Formatter f = new Formatter();
f.setType("xml");
assertTrue(f.createRenderer() instanceof XMLRenderer);
@@ -39,8 +38,7 @@ void testType() {
}
}
- @Test
- void testNull() {
+ @Test void testNull() {
Formatter f = new Formatter();
assertTrue(f.isNoOutputSupplied(), "Formatter toFile should start off null!");
f.setToFile(new File("foo"));
diff --git a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index 78217c1a17a..52105c03b88 100644
--- a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -25,13 +25,11 @@
class PMDTaskTest extends AbstractAntTest {
- @BeforeEach
- void setUp() {
+ @BeforeEach void setUp() {
configureProject("src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml");
}
- @Test
- void testFormatterWithNoToFileAttribute() {
+ @Test void testFormatterWithNoToFileAttribute() {
try {
executeTarget("testFormatterWithNoToFileAttribute");
fail("This should throw an exception");
@@ -40,8 +38,7 @@ void testFormatterWithNoToFileAttribute() {
}
}
- @Test
- void testNoRuleSets() {
+ @Test void testNoRuleSets() {
try {
executeTarget("testNoRuleSets");
fail("This should throw an exception");
@@ -50,13 +47,11 @@ void testNoRuleSets() {
}
}
- @Test
- void testBasic() {
+ @Test void testBasic() {
executeTarget("testBasic");
}
- @Test
- void testInvalidLanguageVersion() {
+ @Test void testInvalidLanguageVersion() {
try {
executeTarget("testInvalidLanguageVersion");
assertEquals(
@@ -70,8 +65,7 @@ void testInvalidLanguageVersion() {
}
}
- @Test
- void testRelativizeWith() throws IOException {
+ @Test void testRelativizeWith() throws IOException {
executeTarget("testRelativizeWith");
try (InputStream in = Files.newInputStream(Paths.get("target/pmd-ant-test.txt"))) {
@@ -82,8 +76,7 @@ void testRelativizeWith() throws IOException {
}
}
- @Test
- void testXmlFormatter() throws IOException {
+ @Test void testXmlFormatter() throws IOException {
executeTarget("testXmlFormatter");
try (InputStream in = Files.newInputStream(Paths.get("target/pmd-ant-xml.xml"));
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexAnnotationSuppressor.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexAnnotationSuppressor.java
index ec727c48b10..c9f3cd477ac 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexAnnotationSuppressor.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexAnnotationSuppressor.java
@@ -28,13 +28,11 @@ private ApexAnnotationSuppressor() {
}
- @Override
- protected NodeStream getAnnotations(Node node) {
+ @Override protected NodeStream getAnnotations(Node node) {
return node.children(ASTModifierNode.class).children(ASTAnnotation.class);
}
- @Override
- protected boolean walkAnnotation(ASTAnnotation annot, AnnotationWalkCallbacks callbacks) {
+ @Override protected boolean walkAnnotation(ASTAnnotation annot, AnnotationWalkCallbacks callbacks) {
if ("SuppressWarnings".equalsIgnoreCase(annot.getName())) {
for (ASTAnnotationParameter param : annot.children(ASTAnnotationParameter.class)) {
String image = param.getValue();
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageHandler.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageHandler.java
index f2a3be5e5ae..4e7f9796941 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageHandler.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageHandler.java
@@ -23,36 +23,31 @@ class ApexLanguageHandler implements LanguageVersionHandler {
private final ApexMetricsProvider myMetricsProvider = new ApexMetricsProvider();
- @Override
- public Parser getParser() {
+ @Override public Parser getParser() {
return new ApexParser();
}
- @Override
- public List getExtraViolationSuppressors() {
+ @Override public List getExtraViolationSuppressors() {
return ApexAnnotationSuppressor.ALL_APEX_SUPPRESSORS;
}
- @Override
- public LanguageMetricsProvider getLanguageMetricsProvider() {
+ @Override public LanguageMetricsProvider getLanguageMetricsProvider() {
return myMetricsProvider;
}
- @Override
- public DesignerBindings getDesignerBindings() {
+ @Override public DesignerBindings getDesignerBindings() {
return ApexDesignerBindings.INSTANCE;
}
private static final class ApexMetricsProvider implements LanguageMetricsProvider {
private final Set> metrics = setOf(
- ApexMetrics.COGNITIVE_COMPLEXITY,
- ApexMetrics.CYCLO,
- ApexMetrics.WEIGHED_METHOD_COUNT
+ ApexMetrics.COGNITIVE_COMPLEXITY,
+ ApexMetrics.CYCLO,
+ ApexMetrics.WEIGHED_METHOD_COUNT
);
- @Override
- public Set> getMetrics() {
+ @Override public Set> getMetrics() {
return metrics;
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java
index 66bb88c9340..9d71fe83b03 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageModule.java
@@ -19,16 +19,16 @@ public class ApexLanguageModule extends LanguageModuleBase implements PmdCapable
public ApexLanguageModule() {
super(LanguageMetadata.withId(ID).name("Apex")
- .extensions("cls", "trigger")
- .addVersion("52")
- .addVersion("53")
- .addVersion("54")
- .addVersion("55")
- .addVersion("56")
- .addVersion("57")
- .addVersion("58")
- .addVersion("59")
- .addDefaultVersion("60"));
+ .extensions("cls", "trigger")
+ .addVersion("52")
+ .addVersion("53")
+ .addVersion("54")
+ .addVersion("55")
+ .addVersion("56")
+ .addVersion("57")
+ .addVersion("58")
+ .addVersion("59")
+ .addDefaultVersion("60"));
}
public static ApexLanguageModule getInstance() {
@@ -37,18 +37,15 @@ public static ApexLanguageModule getInstance() {
return INSTANCE;
}
- @Override
- public ApexLanguageProperties newPropertyBundle() {
+ @Override public ApexLanguageProperties newPropertyBundle() {
return new ApexLanguageProperties();
}
- @Override
- public LanguageProcessor createProcessor(LanguagePropertyBundle bundle) {
+ @Override public LanguageProcessor createProcessor(LanguagePropertyBundle bundle) {
return new ApexLanguageProcessor((ApexLanguageProperties) bundle);
}
- @Override
- public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
+ @Override public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
return new ApexCpdLexer();
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProcessor.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProcessor.java
index ca626f0976f..ba119226c05 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProcessor.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProcessor.java
@@ -12,7 +12,7 @@
import net.sourceforge.pmd.lang.impl.BatchLanguageProcessor;
public class ApexLanguageProcessor
- extends BatchLanguageProcessor {
+ extends BatchLanguageProcessor {
private final ApexMultifileAnalysis multifileAnalysis;
private final ApexLanguageHandler services;
@@ -23,8 +23,7 @@ public class ApexLanguageProcessor
this.services = new ApexLanguageHandler();
}
- @Override
- public @NonNull LanguageVersionHandler services() {
+ @Override public @NonNull LanguageVersionHandler services() {
return services;
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProperties.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProperties.java
index 0ff84da9dcf..4e7bf4126dc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProperties.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexLanguageProperties.java
@@ -16,11 +16,11 @@
public class ApexLanguageProperties extends LanguagePropertyBundle {
public static final PropertyDescriptor> MULTIFILE_DIRECTORY =
- PropertyFactory.stringProperty("rootDirectory")
- .desc("The root directory of the Salesforce metadata, where `sfdx-project.json` resides.")
- .defaultValue("") // is this ok?
- .toOptional("")
- .build();
+ PropertyFactory.stringProperty("rootDirectory")
+ .desc("The root directory of the Salesforce metadata, where `sfdx-project.json` resides.")
+ .defaultValue("") // is this ok?
+ .toOptional("")
+ .build();
public ApexLanguageProperties() {
super(ApexLanguageModule.getInstance());
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
index 1828d56495d..53235ff0acc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
@@ -30,44 +30,43 @@ public final class ASTAnnotation extends AbstractApexNode.Single NORMALIZED_ANNOTATION_NAMES =
- ImmutableSortedSet.orderedBy(String.CASE_INSENSITIVE_ORDER).add(
- "AllowCertifiedApex",
- "AuraEnabled",
- "Deprecated",
- "Future",
- "HiddenFromDoc",
- "HttpDelete",
- "HttpGet",
- "HttpPatch",
- "HttpPost",
- "HttpPut",
- "InvocableMethod",
- "InvocableVariable",
- "IsTest",
- "JsonAccess",
- "NamespaceAccessible",
- "NamespaceGuard",
- "PermGuard",
- "PrivateApi",
- "ReadOnly",
- "RemoteAction",
- "RestResource",
- "SfdcOnly",
- "SuppressWarnings",
- "TestSetup",
- "TestVisible",
- "UseConnectDeserializer",
- "UseConnectSerializer",
- "VisibleApiVersion"
- ).build();
+ ImmutableSortedSet.orderedBy(String.CASE_INSENSITIVE_ORDER).add(
+ "AllowCertifiedApex",
+ "AuraEnabled",
+ "Deprecated",
+ "Future",
+ "HiddenFromDoc",
+ "HttpDelete",
+ "HttpGet",
+ "HttpPatch",
+ "HttpPost",
+ "HttpPut",
+ "InvocableMethod",
+ "InvocableVariable",
+ "IsTest",
+ "JsonAccess",
+ "NamespaceAccessible",
+ "NamespaceGuard",
+ "PermGuard",
+ "PrivateApi",
+ "ReadOnly",
+ "RemoteAction",
+ "RestResource",
+ "SfdcOnly",
+ "SuppressWarnings",
+ "TestSetup",
+ "TestVisible",
+ "UseConnectDeserializer",
+ "UseConnectSerializer",
+ "VisibleApiVersion"
+ ).build();
ASTAnnotation(AnnotationModifier annotationModifier) {
super(annotationModifier);
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -97,8 +96,7 @@ public String getRawName() {
return node.getName().getString();
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return getName();
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
index 3782b2946ad..aca1c060a63 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
@@ -19,8 +19,7 @@ public final class ASTAnnotationParameter extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -48,8 +47,7 @@ public Boolean getBooleanValue() {
return false;
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return getValue();
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
index e00149198ed..794eb4b1153 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
@@ -12,13 +12,11 @@ public final class ASTAnonymousClass extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return node.getClass().getName();
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTApexFile.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTApexFile.java
index a95d4d9b7a9..ac356f020d4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTApexFile.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTApexFile.java
@@ -27,17 +27,16 @@ public final class ASTApexFile extends AbstractApexNode.Single
private final @NonNull ApexMultifileAnalysis multifileAnalysis;
ASTApexFile(ParserTask task,
- CompilationUnit compilationUnit,
- Collection suppressMap,
- @NonNull ApexLanguageProcessor apexLang) {
+ CompilationUnit compilationUnit,
+ Collection suppressMap,
+ @NonNull ApexLanguageProcessor apexLang) {
super(compilationUnit);
this.astInfo = new AstInfo<>(task, this).withSuppressionComments(suppressMap);
this.multifileAnalysis = apexLang.getMultiFileState();
this.setRegion(TextRegion.fromOffsetLength(0, task.getTextDocument().getLength()));
}
- @Override
- public AstInfo getAstInfo() {
+ @Override public AstInfo getAstInfo() {
return astInfo;
}
@@ -45,14 +44,12 @@ public ASTUserClassOrInterface getMainNode() {
return (ASTUserClassOrInterface) getChild(0);
}
- @Override
- public @NonNull ASTApexFile getRoot() {
+ @Override public @NonNull ASTApexFile getRoot() {
return this;
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -61,8 +58,7 @@ public List getGlobalIssues() {
return multifileAnalysis.getFileIssues(fileId.getAbsolutePath());
}
- @Override
- public String getDefiningType() {
+ @Override public String getDefiningType() {
// an apex file can contain only one top level type
BaseApexClass baseApexClass = firstChild(BaseApexClass.class);
if (baseApexClass != null) {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
index 3dd7d1bf0ac..d4543c260c5 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
@@ -13,8 +13,7 @@ public final class ASTArrayLoadExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
index 12f41f961a6..1398eca6777 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
@@ -13,8 +13,7 @@ public final class ASTArrayStoreExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
index ecb7936f284..9964e2485e3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
@@ -13,8 +13,7 @@ public final class ASTAssignmentExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
index 4fb307fa963..2b8b165d4d1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
@@ -13,8 +13,7 @@ public final class ASTBinaryExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
index 1660bde57f2..cae182d6d99 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
@@ -13,8 +13,7 @@ public final class ASTBindExpressions extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
index 8a1747dd160..052802a9591 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
@@ -16,8 +16,7 @@ public final class ASTBlockStatement extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -25,8 +24,7 @@ public boolean hasCurlyBrace() {
return curlyBrace;
}
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
super.calculateTextRegion(sourceCode);
if (!hasRealLoc()) {
return;
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
index 2a18867572d..a7a69669237 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
@@ -12,8 +12,7 @@ public final class ASTBooleanExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
index 71194f5eb04..19dcd79b562 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
@@ -13,8 +13,7 @@ public final class ASTBreakStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
index 4c706169518..c4ee1578110 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
@@ -13,8 +13,7 @@ public final class ASTCastExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
index d051b1743b1..c208700c045 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
@@ -13,8 +13,7 @@ public final class ASTCatchBlockStatement extends AbstractApexCommentContainerNo
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
index 3379b2200f5..faa5377ef19 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
@@ -13,8 +13,7 @@ public final class ASTClassRefExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
index c694646b9da..afe49e2f66a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
@@ -13,8 +13,7 @@ public final class ASTConstructorPreamble extends AbstractApexNode.Single
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
index 7721d68bdb5..270603ea19d 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
@@ -13,8 +13,7 @@ public class ASTConstructorPreambleStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
index 7e5b010dff4..6f2bd3a730c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
@@ -13,8 +13,7 @@ public final class ASTContinueStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
index 78fc81ac1d0..bbea3c1f5be 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlDeleteStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
index a4db16a355a..d8fbc8653a6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlInsertStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
index 9d8f0e38064..fe62b689bf4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlMergeStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
index f02742e51f9..84b43b9e9c3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlUndeleteStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
index 14870926814..42fbce6660f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlUpdateStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
index 5fbfc0dc3b8..5f08fb4dd66 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
@@ -13,8 +13,7 @@ public final class ASTDmlUpsertStatement extends AbstractDmlStatement {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
index 0426a29e406..54c69ebc494 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
@@ -13,8 +13,7 @@ public final class ASTDoLoopStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTElseWhenBlock.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTElseWhenBlock.java
index 8e639fb84ea..8e8e3b22dd0 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTElseWhenBlock.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTElseWhenBlock.java
@@ -13,8 +13,7 @@ public final class ASTElseWhenBlock extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTEmptyReferenceExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTEmptyReferenceExpression.java
index 25c3514e899..d1d0a2b1eca 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTEmptyReferenceExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTEmptyReferenceExpression.java
@@ -7,13 +7,11 @@
public final class ASTEmptyReferenceExpression extends AbstractApexNode.Empty {
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getDefiningType() {
+ @Override public String getDefiningType() {
return null;
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
index 22f64ed7298..1e729845298 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
@@ -13,8 +13,7 @@ public final class ASTExpression extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
index 70641433b85..9369d261668 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
@@ -13,8 +13,7 @@ public final class ASTExpressionStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
index 1198b3bf070..fa21f6df231 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
@@ -27,8 +27,8 @@ public final class ASTField extends AbstractApexNode.Many {
ASTField(TypeRef typeRef, Identifier name, Optional value) {
super(value.isPresent()
- ? Arrays.asList(typeRef, name, value.get())
- : Arrays.asList(typeRef, name));
+ ? Arrays.asList(typeRef, name, value.get())
+ : Arrays.asList(typeRef, name));
this.name = name;
this.value = value;
this.typeName = caseNormalizedTypeIfPrimitive(typeRef.asCodeString());
@@ -42,13 +42,11 @@ public final class ASTField extends AbstractApexNode.Many {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return getName();
}
@@ -80,8 +78,7 @@ public String getValue() {
return null;
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
if (!(nodes.get(0) instanceof TypeRef)) {
return super.hasRealLoc();
}
@@ -97,8 +94,7 @@ public boolean hasRealLoc() {
return allHaveRealLoc;
}
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
if (nodes.get(0) instanceof TypeRef) {
super.calculateTextRegion(sourceCode);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
index 295658ce4ba..39d16fdc239 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
@@ -13,13 +13,11 @@ public final class ASTFieldDeclaration extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return getName();
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
index 89862a631d8..cff784bbef1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
@@ -18,8 +18,7 @@ public final class ASTFieldDeclarationStatements extends AbstractApexNode.Single
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
index 5c4d43ed55a..feb386ada87 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
@@ -13,8 +13,7 @@ public final class ASTForEachStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
index 36e98c10da8..c2a1f359e76 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
@@ -13,8 +13,7 @@ public final class ASTForLoopStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFormalComment.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFormalComment.java
index 3243bf3d883..8b9461d6974 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFormalComment.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFormalComment.java
@@ -17,19 +17,16 @@ public final class ASTFormalComment extends AbstractApexNode.Empty {
this.token = token;
}
-
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return token.getText();
}
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
setRegion(TextRegion.fromBothOffsets(token.getStartIndex(), token.getStopIndex() + 1));
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIdentifierCase.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIdentifierCase.java
index 6fd84c17a63..08426a4a53c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIdentifierCase.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIdentifierCase.java
@@ -13,8 +13,7 @@ public final class ASTIdentifierCase extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
index 8f1243c5271..44bb2ba572c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
@@ -13,8 +13,7 @@ public final class ASTIfBlockStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
index 6bd5d46e511..949367b12c5 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
@@ -16,8 +16,7 @@ public final class ASTIfElseBlockStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
index 3509e6f607b..6a2c97cb07f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
@@ -13,8 +13,7 @@ public final class ASTIllegalStoreExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
index e27dda72e93..3501f6bf7cc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
@@ -13,8 +13,7 @@ public final class ASTInstanceOfExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInvalidDependentCompilation.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInvalidDependentCompilation.java
index 1cf9540287b..4a24fd674e4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInvalidDependentCompilation.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInvalidDependentCompilation.java
@@ -13,14 +13,12 @@ public final class ASTInvalidDependentCompilation extends AbstractApexNode.Singl
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
String apexName = getDefiningType();
return apexName.substring(apexName.lastIndexOf('.') + 1);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
index a7bc0b9100e..d7cfa9031fe 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
@@ -13,8 +13,7 @@ public final class ASTJavaMethodCallExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
index 9927a3b0d7b..76961fb55e3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
@@ -13,8 +13,7 @@ public final class ASTJavaVariableExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralCase.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralCase.java
index 33d6a246cb7..ea54e55bd36 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralCase.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralCase.java
@@ -13,8 +13,7 @@ public final class ASTLiteralCase extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
index 2be11d18274..ba469a48092 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
@@ -14,8 +14,7 @@ public final class ASTLiteralExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -78,8 +77,7 @@ public boolean isNull() {
return getLiteralType() == LiteralType.NULL;
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return literalToString(node);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
index 6b5c2cb94f1..ce8f590fccf 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
@@ -20,13 +20,11 @@ public final class ASTMapEntryNode extends AbstractApexNode.Many {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return String.format("%s: %s", key, value);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
index 3f44ef54307..800e916139c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
@@ -44,11 +44,11 @@ public final class ASTMethod extends AbstractApexNode implements ApexQualifiable
private final SourceLocation sourceLocation;
ASTMethod(
- String name,
- String internalName,
- List parameterTypes,
- String returnType,
- SourceLocation sourceLocation) {
+ String name,
+ String internalName,
+ List parameterTypes,
+ String returnType,
+ SourceLocation sourceLocation) {
this.name = name;
this.internalName = internalName;
@@ -68,23 +68,21 @@ static ASTMethod fromNode(MethodDeclaration node) {
}
return new ASTMethod(
- name,
- internalName,
- node.getParameterDeclarations().stream()
- .map(p -> caseNormalizedTypeIfPrimitive(p.getType().asCodeString()))
- .collect(Collectors.toList()),
- caseNormalizedTypeIfPrimitive(node.getReturnType().asCodeString()),
- node.getSourceLocation());
+ name,
+ internalName,
+ node.getParameterDeclarations().stream()
+ .map(p -> caseNormalizedTypeIfPrimitive(p.getType().asCodeString()))
+ .collect(Collectors.toList()),
+ caseNormalizedTypeIfPrimitive(node.getReturnType().asCodeString()),
+ node.getSourceLocation());
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- void calculateTextRegion(TextDocument sourceCode) {
+ @Override void calculateTextRegion(TextDocument sourceCode) {
if (sourceLocation.isUnknown()) {
return;
}
@@ -97,13 +95,11 @@ void calculateTextRegion(TextDocument sourceCode) {
));
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
return !sourceLocation.isUnknown();
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
if (isConstructor()) {
BaseApexClass baseClassNode = ancestors(BaseApexClass.class).first();
if (baseClassNode != null) {
@@ -127,8 +123,7 @@ public String getCanonicalName() {
return name;
}
- @Override
- public ApexQualifiedName getQualifiedName() {
+ @Override public ApexQualifiedName getQualifiedName() {
return ApexQualifiedName.ofMethod(this);
}
@@ -163,8 +158,7 @@ public int getArity() {
* @return true if this method is the synthetic trigger method
* @since 7.5.0
*/
- @NoAttribute
- public boolean isTriggerBlock() {
+ @NoAttribute public boolean isTriggerBlock() {
return TRIGGER_INVOKE_ID.equals(internalName);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
index d3256d2bfea..568a29ca595 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
@@ -13,8 +13,7 @@ public final class ASTMethodBlockStatement extends AbstractApexNode.Single
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
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 b58b5bf6f69..6c60507b23f 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
@@ -25,8 +25,7 @@ public final class ASTMethodCallExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
index 5f811c84a34..875618e090a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
@@ -13,8 +13,7 @@ public final class ASTModifier extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
index 2a95b5ca506..5ae397d254b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
@@ -30,13 +30,11 @@ public final class ASTModifierNode extends AbstractApexNode.Many imple
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public int getModifiers() {
+ @Override public int getModifiers() {
int modifiers = nodes
.stream()
.filter(mod -> mod instanceof KeywordModifier)
@@ -63,38 +61,31 @@ public int getModifiers() {
return modifiers;
}
- @Override
- public boolean isPublic() {
+ @Override public boolean isPublic() {
return (getModifiers() & PUBLIC) == PUBLIC;
}
- @Override
- public boolean isProtected() {
+ @Override public boolean isProtected() {
return (getModifiers() & PROTECTED) == PROTECTED;
}
- @Override
- public boolean isPrivate() {
+ @Override public boolean isPrivate() {
return (getModifiers() & PRIVATE) == PRIVATE;
}
- @Override
- public boolean isAbstract() {
+ @Override public boolean isAbstract() {
return (getModifiers() & ABSTRACT) == ABSTRACT;
}
- @Override
- public boolean isStatic() {
+ @Override public boolean isStatic() {
return (getModifiers() & STATIC) == STATIC;
}
- @Override
- public boolean isFinal() {
+ @Override public boolean isFinal() {
return (getModifiers() & FINAL) == FINAL;
}
- @Override
- public boolean isTransient() {
+ @Override public boolean isTransient() {
return (getModifiers() & TRANSIENT) == TRANSIENT;
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
index bbe4d273cb5..f5f17cedd81 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
@@ -13,8 +13,7 @@ public final class ASTModifierOrAnnotation extends AbstractApexNode.Single
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
index 608d790f94c..4baf0960762 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
@@ -13,8 +13,7 @@ public final class ASTMultiStatement extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
index b9e50e0facc..8d4ec26a905 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
@@ -13,8 +13,7 @@ public final class ASTNestedExpression extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
index 69267154fd7..2b3db5238c1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
@@ -13,8 +13,7 @@ public final class ASTNestedStoreExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
index b298a048dc4..4fe95772fd8 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewKeyValueObjectExpression extends AbstractApexNode.Singl
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
index f1fcf5f59b7..7936469e4d9 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewListInitExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
index 5963f2869c1..fd23bcbff50 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewListLiteralExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
index 1fb62440be8..d99c8ed8b37 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewMapInitExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
index ad0a775a613..788db4524eb 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewMapLiteralExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
index 686f11f79c8..150b77b53ad 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewObjectExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
index b2619789e52..094086153f9 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewSetInitExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
index 7418d03b4c3..b46c8984cbc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
@@ -13,8 +13,7 @@ public final class ASTNewSetLiteralExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
index ef2705f85e9..dba82996ebe 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
@@ -13,8 +13,7 @@ public final class ASTPackageVersionExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
index b5a24279a84..548f96860cd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
@@ -13,13 +13,11 @@ public final class ASTParameter extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return node.getId().getString();
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
index 08296a6944b..0caff1bf870 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
@@ -13,8 +13,7 @@ public final class ASTPostfixExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
index 604afc32e7b..773f9110302 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
@@ -12,8 +12,7 @@ public final class ASTPrefixExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
index 15e8bddba65..087a6f0c709 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
@@ -18,8 +18,7 @@ public final class ASTProperty extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
index 22378be9853..89de6c69972 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
@@ -23,8 +23,7 @@ public final class ASTReferenceExpression extends AbstractApexNode.Many R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -32,16 +31,14 @@ public ReferenceType getReferenceType() {
return referenceType;
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
if (!nodes.isEmpty()) {
return nodes.get(0).getString();
}
return "";
}
- @NoAttribute
- public List getNames() {
+ @NoAttribute public List getNames() {
return nodes.stream().map(Identifier::getString).collect(Collectors.toList());
}
@@ -53,8 +50,7 @@ public boolean isSObjectType() {
return nodes.stream().anyMatch(id -> "sobjecttype".equalsIgnoreCase(id.getString()));
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
return !nodes.isEmpty();
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
index 5aa54fd9833..836cc063574 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
@@ -13,8 +13,7 @@ public final class ASTReturnStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
index e508ff78ad9..c654e94fdcd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
@@ -13,8 +13,7 @@ public final class ASTRunAsBlockStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
index 3b08de7d9bb..13a8724df47 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
@@ -18,8 +18,7 @@ public final class ASTSoqlExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
index 8e7a4e33dbe..c9ee84a05a4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
@@ -17,8 +17,7 @@ public final class ASTSoslExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
index 6742140aaea..3604649a44a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
@@ -13,8 +13,7 @@ public final class ASTStandardCondition extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
index d0c7f78cbef..3089c60adcd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
@@ -13,8 +13,7 @@ public final class ASTStatement extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
index 8fb82e4edbe..5fc3003e96e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
@@ -13,8 +13,7 @@ public final class ASTStatementExecuted extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
index 00749591ffd..ecd93e5f661 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
@@ -13,8 +13,7 @@ public final class ASTSuperMethodCallExpression extends AbstractApexNode.Single<
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
index a30c4180d27..8b11dc28e23 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
@@ -13,8 +13,7 @@ public final class ASTSuperVariableExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatement.java
index 3c18e4f88b4..ae0cb37d0e7 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatement.java
@@ -13,8 +13,7 @@ public final class ASTSwitchStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
index fcfc3ff3e61..ccd5a7a500d 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
@@ -13,8 +13,7 @@ public final class ASTTernaryExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
index 245db61e42c..35fcb7302d3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
@@ -13,8 +13,7 @@ public final class ASTThisMethodCallExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
index 474eda0c0ac..9f04a3722c8 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
@@ -13,8 +13,7 @@ public final class ASTThisVariableExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
index 2710750279a..4f8755e836e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
@@ -13,8 +13,7 @@ public class ASTThrowStatement extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
index 215d15f42a5..82128d727fd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
@@ -13,8 +13,7 @@ public final class ASTTriggerVariableExpression extends AbstractApexNode.Single<
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
index 7ca5e80248a..3f10b00fc9b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
@@ -15,8 +15,7 @@ public final class ASTTryCatchFinallyBlockStatement extends AbstractApexNode.Sin
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTypeWhenBlock.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTypeWhenBlock.java
index 3772aaae00d..33496abcad1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTypeWhenBlock.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTypeWhenBlock.java
@@ -27,8 +27,7 @@ public String getName() {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
index 15801c78753..4732fff7189 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
@@ -16,8 +16,7 @@ public final class ASTUserClass extends BaseApexClass implemen
super(userClass);
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
@@ -42,7 +41,7 @@ public String getSuperClassName() {
*/
public List getInterfaceNames() {
return node.getImplementsTypes().stream()
- .map(TypeRef::asTypeErasedString)
- .collect(Collectors.toList());
+ .map(TypeRef::asTypeErasedString)
+ .collect(Collectors.toList());
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
index 424aef3776d..fba2b3fa5e4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
@@ -13,8 +13,7 @@ public final class ASTUserClassMethods extends AbstractApexNode.Single {
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
index f8b5ebcf405..ee684b26d1f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
@@ -13,13 +13,11 @@ public final class ASTUserEnum extends BaseApexClass {
super(enumDeclaration);
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public ApexQualifiedName getQualifiedName() {
+ @Override public ApexQualifiedName getQualifiedName() {
if (qname == null) {
ASTUserClass parent = ancestors(ASTUserClass.class).first();
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
index 931351c1d2d..ffbcb40dad8 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
@@ -13,8 +13,7 @@ public final class ASTUserExceptionMethods extends AbstractApexNode.Single
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
index 4618221aba8..173895f101a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
@@ -13,8 +13,7 @@ public final class ASTUserInterface extends BaseApexClass
super(userInterface);
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
index 59855e084e2..6545b46054a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
@@ -15,8 +15,7 @@ public final class ASTUserTrigger extends BaseApexClass {
super(triggerDeclaration);
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTValueWhenBlock.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTValueWhenBlock.java
index e30774d5371..0d74ae809a2 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTValueWhenBlock.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTValueWhenBlock.java
@@ -13,8 +13,7 @@ public final class ASTValueWhenBlock extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
index 869eed545e5..9dc9e1baa00 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
@@ -13,13 +13,11 @@ public final class ASTVariableDeclaration extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return node.getId().getString();
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
index c96acdf94b4..100435548a0 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
@@ -13,8 +13,7 @@ public final class ASTVariableDeclarationStatements extends AbstractApexNode.Sin
}
- @Override
- protected R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
index 2af69232289..98acc43618a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
@@ -13,13 +13,11 @@ public final class ASTVariableExpression extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
- @Override
- public String getImage() {
+ @Override public String getImage() {
return node.getString();
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
index 57b2d4e95cd..bd9c5aa2b78 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
@@ -13,8 +13,7 @@ public final class ASTWhileLoopStatement extends AbstractApexNode.Single R acceptApexVisitor(ApexVisitor visitor, P data) {
+ @Override protected R acceptApexVisitor(ApexVisitor visitor, P data) {
return visitor.visit(this, data);
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexCommentContainerNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexCommentContainerNode.java
index 594d2f72443..4e7cfd05f84 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexCommentContainerNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexCommentContainerNode.java
@@ -23,8 +23,7 @@ void setContainsComment(boolean containsComment) {
this.containsComment = containsComment;
}
- @Override
- public boolean getContainsComment() {
+ @Override public boolean getContainsComment() {
return containsComment;
}
}
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 a86b7b0d34d..75faf78f710 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
@@ -37,21 +37,19 @@ protected Single(T node) {
this.node = node;
}
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
SourceLocation loc = node.getSourceLocation();
if (loc.isUnknown()) {
return;
}
// Column+1 because Summit columns are 0-based and PMD are 1-based
setRegion(TextRegion.fromBothOffsets(
- sourceCode.offsetAtLineColumn(TextPos2d.pos2d(loc.getStartLine(), loc.getStartColumn() + 1)),
- sourceCode.offsetAtLineColumn(TextPos2d.pos2d(loc.getEndLine(), loc.getEndColumn() + 1))
+ sourceCode.offsetAtLineColumn(TextPos2d.pos2d(loc.getStartLine(), loc.getStartColumn() + 1)),
+ sourceCode.offsetAtLineColumn(TextPos2d.pos2d(loc.getEndLine(), loc.getEndColumn() + 1))
));
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
return !node.getSourceLocation().isUnknown();
}
}
@@ -67,8 +65,7 @@ protected Many(List nodes) {
this.nodes = nodes;
}
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
// from all nodes, use the earliest location and the latest location.
// this assumes, that these nodes form a contiguous code snippet.
@@ -92,14 +89,13 @@ protected void calculateTextRegion(TextDocument sourceCode) {
if (!union.isUnknown()) {
// Column+1 because Summit columns are 0-based and PMD are 1-based
setRegion(TextRegion.fromBothOffsets(
- sourceCode.offsetAtLineColumn(TextPos2d.pos2d(union.getStartLine(), union.getStartColumn() + 1)),
- sourceCode.offsetAtLineColumn(TextPos2d.pos2d(union.getEndLine(), union.getEndColumn() + 1))
+ sourceCode.offsetAtLineColumn(TextPos2d.pos2d(union.getStartLine(), union.getStartColumn() + 1)),
+ sourceCode.offsetAtLineColumn(TextPos2d.pos2d(union.getEndLine(), union.getEndColumn() + 1))
));
}
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
return !nodes.isEmpty() && nodes.stream().noneMatch(n -> n.getSourceLocation().isUnknown());
}
}
@@ -109,36 +105,29 @@ public boolean hasRealLoc() {
*/
abstract static class Empty extends AbstractApexNode {
- @Override
- protected void calculateTextRegion(TextDocument sourceCode) {
+ @Override protected void calculateTextRegion(TextDocument sourceCode) {
// no location
}
- @Override
- public boolean hasRealLoc() {
+ @Override public boolean hasRealLoc() {
return false;
}
}
// overridden to make them visible
- @Override
- protected void addChild(AbstractApexNode child, int index) {
+ @Override protected void addChild(AbstractApexNode child, int index) {
super.addChild(child, index);
}
- @Override
- protected void insertChild(AbstractApexNode child, int index) {
+ @Override protected void insertChild(AbstractApexNode child, int index) {
super.insertChild(child, index);
}
- @Override
- protected void setChild(AbstractApexNode child, int index) {
+ @Override protected void setChild(AbstractApexNode child, int index) {
super.setChild(child, index);
}
- @Override
- @SuppressWarnings("unchecked")
- public final R acceptVisitor(AstVisitor visitor, P data) {
+ @Override @SuppressWarnings("unchecked") public final R acceptVisitor(AstVisitor visitor, P data) {
if (visitor instanceof ApexVisitor) {
return this.acceptApexVisitor((ApexVisitor) visitor, data);
}
@@ -147,15 +136,13 @@ public final R acceptVisitor(AstVisitor visitor,
protected abstract R acceptApexVisitor(ApexVisitor visitor, P data);
- @Override
- public @NonNull ASTApexFile getRoot() {
+ @Override public @NonNull ASTApexFile getRoot() {
return getParent().getRoot();
}
abstract void calculateTextRegion(TextDocument sourceCode);
- @Override
- public @NonNull TextRegion getTextRegion() {
+ @Override public @NonNull TextRegion getTextRegion() {
if (region == null) {
if (!hasRealLoc()) {
AbstractApexNode parent = (AbstractApexNode) getParent();
@@ -170,20 +157,17 @@ public final R acceptVisitor(AstVisitor visitor,
return region;
}
- @Override
- public final String getXPathNodeName() {
+ @Override public final String getXPathNodeName() {
return this.getClass().getSimpleName().replaceFirst("^AST", "");
}
protected void setRegion(TextRegion region) {
this.region = region;
}
-
- @Override
- public abstract boolean hasRealLoc();
- @Override
- public String getDefiningType() {
+ @Override public abstract boolean hasRealLoc();
+
+ @Override public String getDefiningType() {
BaseApexClass baseNode = this instanceof BaseApexClass ? (BaseApexClass) this : ancestors(BaseApexClass.class).first();
if (baseNode != null) {
return baseNode.getQualifiedName().toString();
@@ -214,23 +198,23 @@ static String caseNormalizedTypeIfPrimitive(String name) {
}
private static NavigableSet caseNormalizedTypeNames =
- new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+ new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
static {
caseNormalizedTypeNames.addAll(Arrays.asList(
- "Blob",
- "Boolean",
- "Currency",
- "Date",
- "Datetime",
- "Decimal",
- "Double",
- "Id",
- "Integer",
- "Long",
- "Object",
- "String",
- "Time"
+ "Blob",
+ "Boolean",
+ "Currency",
+ "Date",
+ "Datetime",
+ "Decimal",
+ "Double",
+ "Id",
+ "Integer",
+ "Long",
+ "Object",
+ "String",
+ "Time"
));
}
}
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentBuilder.java
index 38e4cac5ac1..f43b7023f46 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentBuilder.java
@@ -102,7 +102,7 @@ public void buildFormalComment(AbstractApexNode node) {
}
if (docToken.nearestNode == null
- || nodeRegion.compareTo(docToken.nearestNode.getTextRegion()) < 0) {
+ || nodeRegion.compareTo(docToken.nearestNode.getTextRegion()) < 0) {
docToken.nearestNode = node;
}
@@ -114,8 +114,7 @@ private static CommentInformation extractInformationFromComments(TextDocument so
ApexLexer lexer = new ApexLexer(new CaseInsensitiveInputStream(CharStreams.fromString(source)));
lexer.removeErrorListeners();
lexer.addErrorListener(new BaseErrorListener() {
- @Override
- public void syntaxError(Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
+ @Override public void syntaxError(Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
throw new LexException(line, charPositionInLine, sourceCode.getFileId(), msg, e);
}
});
@@ -131,7 +130,7 @@ public void syntaxError(Recognizer recognizer, Object offendingSymbol, int
// Keep track of all comment tokens
if (token.getChannel() == ApexLexer.COMMENT_CHANNEL) {
assert lastStartIndex < token.getStartIndex()
- : "Comments should be sorted";
+ : "Comments should be sorted";
allCommentTokens.add(token);
}
@@ -142,9 +141,9 @@ public void syntaxError(Recognizer recognizer, Object offendingSymbol, int
if (trimmedCommentText.startsWith(suppressMarker)) {
String userMessage = trimmedCommentText.substring(suppressMarker.length()).trim();
FileLocation loc = FileLocation.caret(
- sourceCode.getFileId(),
- token.getLine(),
- token.getCharPositionInLine() + 1
+ sourceCode.getFileId(),
+ token.getLine(),
+ token.getCharPositionInLine() + 1
);
suppressionComments.add(new SuppressionCommentImpl<>(() -> loc, userMessage));
}
@@ -166,9 +165,9 @@ private static class CommentInformation {
CommentInformation(Collection