This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit 714300f1a829e2b0a9d1a718eaace1dd4cf047cd Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 05:47:57 2026 +0000 Use System.lineSeparator(), @Override and try-with-resources --- src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java | 3 +++ .../plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java | 1 + .../plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java | 2 ++ .../maven/plugins/checkstyle/stubs/MinMavenProjectStub.java | 8 ++++++++ .../maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java | 8 ++++++++ .../maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java | 8 ++++++++ 6 files changed, 30 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java b/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java index 99b4bc0..2ba892e 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java @@ -145,6 +145,7 @@ public final class RuleUtil { this.rule = rule; } + @Override public boolean match(String eventSrcName) { return rule.equals(getName(eventSrcName)); } @@ -157,6 +158,7 @@ public final class RuleUtil { this.packageName = packageName; } + @Override public boolean match(String eventSrcName) { return eventSrcName.startsWith(packageName) && !eventSrcName.substring(packageName.length() + 1).contains("."); @@ -167,6 +169,7 @@ public final class RuleUtil { * An extension does not start with Checkstyle package. */ private static class ExtensionMatcher implements Matcher { + @Override public boolean match(String eventSrcName) { return !eventSrcName.startsWith(CHECKSTYLE_PACKAGE); } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java index 5be94b6..6626ec2 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java @@ -29,6 +29,7 @@ import org.apache.maven.plugin.testing.stubs.ArtifactStub; */ public class MavenProjectWithExceptionsStub extends MinMavenProjectStub { /** {@inheritDoc} */ + @Override public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { throw new DependencyResolutionRequiredException(new ArtifactStub()); } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java index 463c925..1c21f41 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java @@ -29,11 +29,13 @@ import org.apache.maven.model.ReportPlugin; */ public class MavenProjectWithNoJxrPluginStub extends MinMavenProjectStub { /** {@inheritDoc} */ + @Override public String getInceptionYear() { return "2005"; } /** {@inheritDoc} */ + @Override public List<ReportPlugin> getReportPlugins() { return Collections.emptyList(); } diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java index 1dcaa0c..20caf1a 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java @@ -33,11 +33,13 @@ import org.apache.maven.model.ReportPlugin; */ public class MinMavenProjectStub extends CheckstyleProjectStub { /** {@inheritDoc} */ + @Override public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { return getCompileSourceRoots(); } /** {@inheritDoc} */ + @Override public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException { List<String> list = new ArrayList<>(getCompileClasspathElements()); list.add(getBasedir() + "/target/test-classes"); @@ -45,11 +47,13 @@ public class MinMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public List<String> getCompileSourceRoots() { return Collections.singletonList(getBasedir() + "/target/classes"); } /** {@inheritDoc} */ + @Override public List<String> getTestCompileSourceRoots() { List<String> list = new ArrayList<>(getCompileSourceRoots()); list.add(getBasedir() + "/target/test-classes"); @@ -57,6 +61,7 @@ public class MinMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public List<ReportPlugin> getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -66,6 +71,7 @@ public class MinMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public Organization getOrganization() { Organization organization = new Organization(); @@ -75,11 +81,13 @@ public class MinMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public String getInceptionYear() { return "2006"; } /** {@inheritDoc} */ + @Override public Build getBuild() { Build build = new Build(); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java index 4bc3136..e51f354 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java @@ -34,11 +34,13 @@ import org.apache.maven.model.ReportPlugin; public class ModuleMavenProjectStub extends CheckstyleProjectStub { /** {@inheritDoc} */ + @Override public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { return getCompileSourceRoots(); } /** {@inheritDoc} */ + @Override public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException { List<String> list = new ArrayList<>(getCompileClasspathElements()); list.add(getBasedir() + "/target/test-classes"); @@ -46,11 +48,13 @@ public class ModuleMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public List<String> getCompileSourceRoots() { return Collections.singletonList(getBasedir() + "/target/classes"); } /** {@inheritDoc} */ + @Override public List<String> getTestCompileSourceRoots() { List<String> list = new ArrayList<>(getCompileSourceRoots()); list.add(getBasedir() + "/target/test-classes"); @@ -58,6 +62,7 @@ public class ModuleMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public List<ReportPlugin> getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -67,6 +72,7 @@ public class ModuleMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public Organization getOrganization() { Organization organization = new Organization(); @@ -76,11 +82,13 @@ public class ModuleMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public String getInceptionYear() { return "2006"; } /** {@inheritDoc} */ + @Override public Build getBuild() { Build build = new Build(); diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java index 20790ee..d3a06fb 100644 --- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java +++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java @@ -42,26 +42,31 @@ public class MultiMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public List<String> getCompileClasspathElements() throws DependencyResolutionRequiredException { return Collections.emptyList(); } /** {@inheritDoc} */ + @Override public List<String> getTestClasspathElements() throws DependencyResolutionRequiredException { return Collections.emptyList(); } /** {@inheritDoc} */ + @Override public List<String> getCompileSourceRoots() { return Collections.emptyList(); } /** {@inheritDoc} */ + @Override public List<String> getTestCompileSourceRoots() { return Collections.emptyList(); } /** {@inheritDoc} */ + @Override public List<ReportPlugin> getReportPlugins() { ReportPlugin jxrPlugin = new ReportPlugin(); @@ -71,6 +76,7 @@ public class MultiMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public Organization getOrganization() { Organization organization = new Organization(); @@ -80,11 +86,13 @@ public class MultiMavenProjectStub extends CheckstyleProjectStub { } /** {@inheritDoc} */ + @Override public String getInceptionYear() { return "2006"; } /** {@inheritDoc} */ + @Override public Build getBuild() { Build build = new Build();
