Skip to content

Commit 979d63b

Browse files
authored
remove NPE preventing check that should be not needed (#7386)
1 parent 1e2467a commit 979d63b

1 file changed

Lines changed: 2 additions & 21 deletions

File tree

rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,6 @@ private Set<String> getSafeVersionPlaceholdersToChange(String groupId, String ar
201201
MavenResolutionResult result = getResolutionResult();
202202
ResolvedPom resolvedPom = result.getPom();
203203
Pom requestedPom = resolvedPom.getRequested();
204-
// Pom fields default to emptyList() via @Builder.Default, but deserialization can leave them null
205-
if (requestedPom.getDependencies() == null) {
206-
return Collections.emptySet();
207-
}
208204
Set<String> relevantProperties = requestedPom.getDependencies().stream()
209205
.filter(d -> isProperty(d.getVersion()) &&
210206
matchesGlob(resolvedPom.getValue(d.getGroupId()), groupId) &&
@@ -429,13 +425,7 @@ private boolean checkIfNewDependencyPresent(@Nullable String groupId, @Nullable
429425

430426
private boolean isDependencyManaged(Scope scope, String groupId, String artifactId) {
431427
MavenResolutionResult result = getResolutionResult();
432-
433-
List<ResolvedManagedDependency> managedDependencies = result.getPom().getDependencyManagement();
434-
if (managedDependencies == null) {
435-
return false;
436-
}
437-
438-
for (ResolvedManagedDependency managedDependency : managedDependencies) {
428+
for (ResolvedManagedDependency managedDependency : result.getPom().getDependencyManagement()) {
439429
if (groupId.equals(managedDependency.getGroupId()) && artifactId.equals(managedDependency.getArtifactId())) {
440430
return scope.isInClasspathOf(managedDependency.getScope());
441431
}
@@ -447,12 +437,7 @@ private boolean canAffectManagedDependency(MavenResolutionResult result, Scope s
447437
// We're only going to be able to effect managed dependencies that are either direct or are brought in as direct via a local parent
448438
// `ChangeManagedDependencyGroupIdAndArtifactId` cannot manipulate BOM imported managed dependencies nor direct dependencies from remote parents
449439
Pom requestedPom = result.getPom().getRequested();
450-
451-
List<ManagedDependency> managedDependencies = requestedPom.getDependencyManagement();
452-
if (managedDependencies == null) {
453-
return false;
454-
}
455-
for (ManagedDependency requestedManagedDependency : managedDependencies) {
440+
for (ManagedDependency requestedManagedDependency : requestedPom.getDependencyManagement()) {
456441
if (matchesGlob(requestedManagedDependency.getGroupId(), groupId) && matchesGlob(requestedManagedDependency.getArtifactId(), artifactId)) {
457442
if (requestedManagedDependency instanceof ManagedDependency.Defined) {
458443
return scope.isInClasspathOf(Scope.fromName(((ManagedDependency.Defined) requestedManagedDependency).getScope()));
@@ -469,10 +454,6 @@ private Set<String> getSafeVersionPlaceholdersToChange(String groupId, String ar
469454
MavenResolutionResult result = getResolutionResult();
470455
ResolvedPom resolvedPom = result.getPom();
471456
Pom requestedPom = resolvedPom.getRequested();
472-
// Pom fields default to emptyList() via @Builder.Default, but deserialization can leave them null
473-
if (requestedPom.getDependencies() == null) {
474-
return Collections.emptySet();
475-
}
476457
Set<String> relevantProperties = requestedPom.getDependencies().stream()
477458
.filter(d -> isProperty(d.getVersion()) &&
478459
matchesGlob(resolvedPom.getValue(d.getGroupId()), groupId) &&

0 commit comments

Comments
 (0)