refactor: Move @Nullable method annotations to the return type

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.NullableOnMethodReturnType?organizationId=T3BlblJld3JpdGU%3D Co-authored-by: Moderne <[email protected]>
openrewrite · Jul 16, 2024 · d950f96 · d950f96
1 parent b8ff785
commit d950f96
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteBaseRunMojo.java
@@ -243,8 +243,7 @@ public ResultsContainer(Path projectRoot, Collection<Result> results) {
             }
         }
 
-        @Nullable
-        public RuntimeException getFirstException() {
+        public @Nullable RuntimeException getFirstException() {
             for (Result result : generated) {
                 for (RuntimeException error : getRecipeErrors(result)) {
                     return error;

diff --git a/src/main/java/org/openrewrite/maven/AbstractRewriteMojo.java b/src/main/java/org/openrewrite/maven/AbstractRewriteMojo.java
@@ -160,8 +160,7 @@ private void collectBasePaths(MavenProject project, Set<Path> paths, Path localR
         }
     }
 
-    @Nullable
-    protected URLClassLoader getRecipeArtifactCoordinatesClassloader() throws MojoExecutionException {
+    protected @Nullable URLClassLoader getRecipeArtifactCoordinatesClassloader() throws MojoExecutionException {
         if (getRecipeArtifactCoordinates().isEmpty()) {
             return null;
         }

diff --git a/src/main/java/org/openrewrite/maven/CycloneDxBomMojo.java b/src/main/java/org/openrewrite/maven/CycloneDxBomMojo.java
@@ -56,8 +56,7 @@ public void execute() throws MojoExecutionException {
         }
     }
 
-    @Nullable
-    private File buildCycloneDxBom(Xml.Document pomAst) {
+    private @Nullable File buildCycloneDxBom(Xml.Document pomAst) {
         try {
             File cycloneDxBom = new File(project.getBuild().getDirectory(),
                     project.getArtifactId() + "-" + project.getVersion() + "-cyclonedx.xml");

diff --git a/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java b/src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java
@@ -485,8 +485,7 @@ private Stream<SourceFile> processTestSources(
                 .map(addProvenance(baseDir, markers, null));
     }
 
-    @Nullable
-    private String getKotlinDirectory(@Nullable String sourceDirectory) {
+    private @Nullable String getKotlinDirectory(@Nullable String sourceDirectory) {
         if (sourceDirectory == null) {
             return null;
         }
@@ -511,8 +510,7 @@ private static JavaSourceSet sourceSet(String name, List<Path> dependencies, Jav
         return JavaSourceSet.build(name, dependencies, typeCache, false);
     }
 
-    @Nullable
-    public Xml.Document parseMaven(MavenProject mavenProject, List<Marker> projectProvenance, ExecutionContext ctx) {
+    public @Nullable Xml.Document parseMaven(MavenProject mavenProject, List<Marker> projectProvenance, ExecutionContext ctx) {
         return parseMaven(singletonList(mavenProject), singletonMap(mavenProject, projectProvenance), ctx).get(mavenProject);
     }
 
@@ -708,8 +706,7 @@ public MavenSettings buildSettings() {
         return new MavenSettings(mer.getLocalRepositoryPath().toString(), profiles, activeProfiles, mirrors, servers);
     }
 
-    @Nullable
-    private static RawRepositories buildRawRepositories(@Nullable List<Repository> repositoriesToMap) {
+    private static @Nullable RawRepositories buildRawRepositories(@Nullable List<Repository> repositoriesToMap) {
         if (repositoriesToMap == null) {
             return null;
         }
@@ -768,8 +765,7 @@ private static List<Path> listSources(Path sourceDirectory, String extension) th
         }
     }
 
-    @Nullable
-    private GitProvenance gitProvenance(Path baseDir, @Nullable BuildEnvironment buildEnvironment) {
+    private @Nullable GitProvenance gitProvenance(Path baseDir, @Nullable BuildEnvironment buildEnvironment) {
         try {
             return GitProvenance.fromProjectDirectory(baseDir, buildEnvironment);
         } catch (Exception e) {

diff --git a/src/main/java/org/openrewrite/maven/MavenPomCacheBuilder.java b/src/main/java/org/openrewrite/maven/MavenPomCacheBuilder.java
@@ -31,8 +31,7 @@ public MavenPomCacheBuilder(Log logger) {
         this.logger = logger;
     }
 
-    @Nullable
-    public MavenPomCache build(@Nullable String pomCacheDirectory) {
+    public @Nullable MavenPomCache build(@Nullable String pomCacheDirectory) {
         if (isJvm64Bit()) {
             try {
                 if (pomCacheDirectory == null) {