You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/02/27 08:55:57 UTC
[maven-checkstyle-plugin] 03/08: [MCHECKSTYLE-385] Removing
@Nullable annotation.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHECKSTYLE-385
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit df693701084738ba1abd33429329f4fcdb339864
Author: Benjamin Marwell <bm...@gmail.com>
AuthorDate: Wed Dec 11 22:51:48 2019 +0100
[MCHECKSTYLE-385] Removing @Nullable annotation.
Signed-off-by: Benjamin Marwell <bm...@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 5ee8b4e..d1a1ba2 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;
@@ -652,7 +651,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 )
{