Skip to content

Update MavenResolver #575

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

Closed
mohamed-abead wants to merge 1 commit into from
+12 −9
Closed

Update MavenResolver #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions ...ces/src/main/java/org/finos/legend/depot/services/projects/ManageProjectsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -40,9 +41,9 @@ public class ManageProjectsServiceImpl extends ProjectsServiceImpl implements Ma
private final UpdateProjects projects;

@Inject
public ManageProjectsServiceImpl(UpdateProjectsVersions projectsVersions, UpdateProjects projects, @Named("queryMetricsRegistry") QueryMetricsRegistry metricsRegistry, Queue queue, ProjectsConfiguration configuration, @Named("dependencyOverride") DependencyOverride dependencyUtil, MavenDependencyResolver mavenDependencyResolver)
public ManageProjectsServiceImpl(UpdateProjectsVersions projectsVersions, UpdateProjects projects, @Named("queryMetricsRegistry") QueryMetricsRegistry metricsRegistry, Queue queue, ProjectsConfiguration configuration, @Named("dependencyOverride") DependencyOverride dependencyUtil, Provider<MavenDependencyResolver> mavenDependencyResolverProvider)
{
super(projectsVersions,projects, metricsRegistry, queue, configuration, dependencyUtil, mavenDependencyResolver);
super(projectsVersions,projects, metricsRegistry, queue, configuration, dependencyUtil, mavenDependencyResolverProvider);
this.projects = projects;
this.projectsVersions = projectsVersions;
}
Expand Down
16 changes: 9 additions & 7 deletions ...-services/src/main/java/org/finos/legend/depot/services/projects/ProjectsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;
Expand Down Expand Up @@ -87,7 +88,7 @@ public class ProjectsServiceImpl implements ProjectsService

private final DependencyOverride dependencyOverride;

private final MavenDependencyResolver mavenDependencyResolver;
private final Provider<MavenDependencyResolver> mavenDependencyResolverProvider;

private final Map<ProjectVersion, Set<ProjectVersion>> transitiveDependenciesMap = new HashMap<>();

Expand All @@ -96,15 +97,15 @@ public class ProjectsServiceImpl implements ProjectsService
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(ProjectsServiceImpl.class);

@Inject
public ProjectsServiceImpl(ProjectsVersions projectsVersions, Projects projects, @Named("queryMetricsRegistry") QueryMetricsRegistry metricsRegistry, Queue queue, ProjectsConfiguration configuration, @Named("dependencyOverride") DependencyOverride dependencyOverride, MavenDependencyResolver mavenDependencyResolver)
public ProjectsServiceImpl(ProjectsVersions projectsVersions, Projects projects, @Named("queryMetricsRegistry") QueryMetricsRegistry metricsRegistry, Queue queue, ProjectsConfiguration configuration, @Named("dependencyOverride") DependencyOverride dependencyOverride, Provider<MavenDependencyResolver> mavenDependencyResolverProvider)
{
this.projectsVersions = projectsVersions;
this.projects = projects;
this.metricsRegistry = metricsRegistry;
this.queue = queue;
this.configuration = configuration;
this.dependencyOverride = dependencyOverride;
this.mavenDependencyResolver = mavenDependencyResolver;
this.mavenDependencyResolverProvider = mavenDependencyResolverProvider;
}

public ProjectsServiceImpl(UpdateProjectsVersions projectsVersions, UpdateProjects projects, QueryMetricsRegistry metricsRegistry, Queue queue, ProjectsConfiguration configuration)
Expand All @@ -115,7 +116,8 @@ public ProjectsServiceImpl(UpdateProjectsVersions projectsVersions, UpdateProjec
this.queue = queue;
this.configuration = configuration;
this.dependencyOverride = new DependencyUtil();
this.mavenDependencyResolver = new MavenDependencyResolverImpl(this);
MavenDependencyResolverImpl resolver = new MavenDependencyResolverImpl(this);
this.mavenDependencyResolverProvider = () -> resolver;
}

@Override
Expand Down Expand Up @@ -321,7 +323,7 @@ public Set<ProjectVersion> getDependenciesMaven(List<ProjectVersion> projectVers
// Aether resolves the full transitive tree via InMemoryArtifactDescriptorReader,
// so no manual transitive expansion is needed. The 'transitive' flag controls
// whether we return only direct deps or the full tree.
Set<ProjectVersion> dependencies = mavenDependencyResolver.collectDependencies(resolvedVersions, exclusionsMap);
Set<ProjectVersion> dependencies = mavenDependencyResolverProvider.get().collectDependencies(resolvedVersions, exclusionsMap);

if (!transitive)
{
Expand Down Expand Up @@ -362,13 +364,13 @@ public void buildDependencyGraph(ProjectDependencyGraph graph, ProjectVersion pa
public ProjectDependencyReport getProjectDependencyReportFromProjectVersionList(List<ProjectVersion> projectDependencyVersions)
{
List<ArtifactDependency> artifactDependencies = projectDependencyVersions.stream().map(pv -> new ArtifactDependency(pv.getGroupId(), pv.getArtifactId(), pv.getVersionId())).collect(Collectors.toList());
return getProjectDependencyReport(artifactDependencies);
return getProjectDependencyReportMaven(artifactDependencies);
}


public ProjectDependencyReport getProjectDependencyReportMaven(List<ArtifactDependency> projectDependencyVersions)
{
return mavenDependencyResolver.collectDependencyReport(projectDependencyVersions);
return mavenDependencyResolverProvider.get().collectDependencyReport(projectDependencyVersions);
}


Expand Down
Loading