Prevent NPE on older LSTs not yet containing ResolvedPom.subprojects (#…

…4630) * Prevent NPE on older LSTs not yet containing ResolvedPom.subprojects * Pom.subprojects might also not have been serialized before
openrewrite · Oct 30, 2024 · 7d70216 · 7d70216
1 parent d030c63
commit 7d70216
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/AddDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/AddDependency.java
@@ -257,7 +257,7 @@ private boolean isSubprojectOfParentInRepository(Scanned acc) {
 
             private boolean isAggregatorNotUsedAsParent() {
                 List<String> subprojects = getResolutionResult().getPom().getSubprojects();
-                if (subprojects.isEmpty()) {
+                if (subprojects == null || subprojects.isEmpty()) {
                     return false;
                 }
                 List<MavenResolutionResult> modules = getResolutionResult().getModules();

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java
@@ -210,7 +210,7 @@ public boolean parentPomIsProjectPom() {
     }
 
     public boolean isMultiModulePom() {
-        return !getPom().getSubprojects().isEmpty();
+        return getPom().getSubprojects() == null || !getPom().getSubprojects().isEmpty();
     }
 
     private Map<Path, Pom> getProjectPomsRecursive(Map<Path, Pom> projectPoms) {

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java
@@ -116,6 +116,7 @@ public static int getModelVersion() {
     List<Plugin> pluginManagement = emptyList();
 
     @Builder.Default
+    @Nullable
     List<String> subprojects = emptyList();
 
     public String getGroupId() {

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
@@ -116,9 +116,9 @@ public ResolvedPom(Pom requested, Iterable<String> activeProfiles) {
 
     @NonFinal
     @Builder.Default
+    @Nullable // on older LSTs, this field is not yet present
     List<String> subprojects = emptyList();
 
-
     /**
      * Deduplicate dependencies and dependency management dependencies
      *