This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a commit to branch MCHECKSTYLE-385 in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit 1611c07a2c062576390006190a264be7699258cf Author: Benjamin Marwell <bmarw...@gmail.com> AuthorDate: Wed Dec 11 22:51:48 2019 +0100 [MCHECKSTYLE-385] Removing @Nullable annotation. Signed-off-by: Benjamin Marwell <bmarw...@gmail.com> --- .../apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java | 4 ++-- src/main/java/org/apache/maven/plugins/checkstyle/Violation.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java index 4afeea6..531a108 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java @@ -50,7 +50,6 @@ import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutor; import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorException; import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest; import org.apache.maven.project.MavenProject; -import org.checkerframework.checker.nullness.qual.Nullable; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.PathTool; @@ -636,7 +635,8 @@ public class CheckstyleViolationCheckMojo String severity = xpp.getAttributeValue( "", "severity" ); String source = xpp.getAttributeValue( "", "source" ); String line = xpp.getAttributeValue( "", "line" ); - @Nullable String column = xpp.getAttributeValue( "", "column" ); + /* Nullable */ + String column = xpp.getAttributeValue( "", "column" ); String message = xpp.getAttributeValue( "", "message" ); String rule = RuleUtil.getName( source ); String category = RuleUtil.getCategory( source ); diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/Violation.java b/src/main/java/org/apache/maven/plugins/checkstyle/Violation.java index 90d0ed9..ded621e 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/Violation.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/Violation.java @@ -19,8 +19,6 @@ package org.apache.maven.plugins.checkstyle; * under the License. */ -import org.checkerframework.checker.nullness.qual.Nullable; - import java.util.Objects; import java.util.StringJoiner; @@ -105,7 +103,7 @@ public class Violation return column; } - protected void setColumn( @Nullable String column ) + protected void setColumn( /* Nullable */ String column ) { if ( null == column || column.length() < 1 ) {