Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed usage of PomDownloader without settings #425

Merged
merged 2 commits into from
Sep 13, 2023
Merged

fixed usage of PomDownloader without settings #425

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8dd672
fixed usage of PomDownloader without settings
Aug 24, 2023
d31b75d
Merge branch 'main' into fix/pom-downloader-without-settings
timtebeek Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 42 additions & 43 deletions src/main/java/org/openrewrite/maven/spring/UpgradeExplicitSpringBootDependencies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.openrewrite.maven.spring;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.EqualsAndHashCode;
import org.openrewrite.*;
Expand All @@ -32,18 +31,17 @@
import org.openrewrite.semver.XRange;
import org.openrewrite.xml.tree.Xml;

import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

import static java.util.Collections.emptyMap;

@EqualsAndHashCode(callSuper = true)
public class UpgradeExplicitSpringBootDependencies extends Recipe {

private static final String SPRINGBOOT_GROUP = "org.springframework.boot";
private static final String SPRING_BOOT_DEPENDENCIES = "spring-boot-dependencies";

@JsonIgnore
private final Map<String, String> springBootDependenciesMap = new ConcurrentHashMap<>();
private transient final Map<String, String> springBootDependenciesMap = new HashMap<>();

@Option(displayName = "From Spring Version",
description = "XRage pattern for spring version used to limit which projects should be updated",
Expand Down Expand Up @@ -71,41 +69,6 @@ public String getDescription() {
return "Upgrades un-managed spring-boot project dependencies according to the specified spring-boot version.";
}

private synchronized void buildDependencyMap() throws MavenDownloadingException {
if (springBootDependenciesMap.isEmpty()) {
Map<Path, Pom> poms = new HashMap<>();
MavenPomDownloader downloader = new MavenPomDownloader(poms, new InMemoryExecutionContext());
GroupArtifactVersion gav = new GroupArtifactVersion(SPRINGBOOT_GROUP, SPRING_BOOT_DEPENDENCIES, toVersion);
String relativePath = "";
List<MavenRepository> repositories = new ArrayList<>();
repositories.add(MavenRepository.builder()
.id("repository.spring.milestone")
.uri("https://repo.spring.io/milestone")
.releases(true)
.snapshots(true)
.build());
repositories.add(MavenRepository.builder()
.id("spring-snapshot")
.uri("https://repo.spring.io/snapshote")
.releases(false)
.snapshots(true)
.build());
repositories.add(MavenRepository.builder()
.id("spring-release")
.uri("https://repo.spring.io/release")
.releases(true)
.snapshots(false)
.build());
Pom pom = downloader.download(gav, relativePath, null, repositories);
ResolvedPom resolvedPom = pom.resolve(Collections.emptyList(), downloader, repositories, new InMemoryExecutionContext());
List<ResolvedManagedDependency> dependencyManagement = resolvedPom.getDependencyManagement();
dependencyManagement
.stream()
.filter(d -> d.getVersion() != null)
.forEach(d -> springBootDependenciesMap.put(d.getGroupId() + ":" + d.getArtifactId().toLowerCase(), d.getVersion()));
}
}

private TreeVisitor<?, ExecutionContext> precondition() {
return new MavenIsoVisitor<ExecutionContext>() {
@Override
Expand All @@ -114,15 +77,15 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
if (isManagedDependencyTag()) {
ResolvedManagedDependency managedDependency = findManagedDependency(resultTag);
if (managedDependency != null && managedDependency.getGroupId().equals(SPRINGBOOT_GROUP)
&& satisfiesOldVersionPattern(managedDependency.getVersion())) {
&& satisfiesOldVersionPattern(managedDependency.getVersion())) {
return applyThisRecipe(resultTag);
}
}

if (isDependencyTag()) {
ResolvedDependency dependency = findDependency(resultTag);
if ((dependency != null) && dependency.getGroupId().equals(SPRINGBOOT_GROUP)
&& satisfiesOldVersionPattern(dependency.getVersion())) {
&& satisfiesOldVersionPattern(dependency.getVersion())) {
return applyThisRecipe(resultTag);
}
}
Expand All @@ -146,7 +109,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
@Override
public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
try {
buildDependencyMap();
buildDependencyMap(ctx);
} catch (MavenDownloadingException e) {
return e.warn(document);
}
Expand Down Expand Up @@ -188,6 +151,42 @@ private void mayBeUpdateVersion(String groupId, String artifactId, Xml.Tag tag)
}
}
}

private void buildDependencyMap(ExecutionContext ctx) throws MavenDownloadingException {
if (springBootDependenciesMap.isEmpty()) {
MavenPomDownloader downloader = new MavenPomDownloader(emptyMap(), ctx,
getResolutionResult().getMavenSettings(), getResolutionResult().getActiveProfiles());
GroupArtifactVersion gav = new GroupArtifactVersion(SPRINGBOOT_GROUP, SPRING_BOOT_DEPENDENCIES, toVersion);
String relativePath = "";
List<MavenRepository> repositories = new ArrayList<>();
repositories.add(MavenRepository.builder()
.id("repository.spring.milestone")
.uri("https://repo.spring.io/milestone")
.releases(true)
.snapshots(true)
.build());
repositories.add(MavenRepository.builder()
.id("spring-snapshot")
.uri("https://repo.spring.io/snapshote")
.releases(false)
.snapshots(true)
.build());
repositories.add(MavenRepository.builder()
.id("spring-release")
.uri("https://repo.spring.io/release")
.releases(true)
.snapshots(false)
.build());
Pom pom = downloader.download(gav, relativePath, null, repositories);
ResolvedPom resolvedPom = pom.resolve(Collections.emptyList(), downloader, repositories, ctx);
List<ResolvedManagedDependency> dependencyManagement = resolvedPom.getDependencyManagement();
dependencyManagement
.stream()
.filter(d -> d.getVersion() != null)
.forEach(d -> springBootDependenciesMap.put(d.getGroupId() + ":" + d.getArtifactId().toLowerCase(), d.getVersion()));
}
}

});
}
}