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

[tycho-4.0.x] Calculate BOM representation for each IU only once #3920

Merged
merged 1 commit into from
Jun 2, 2024
Merged

[tycho-4.0.x] Calculate BOM representation for each IU only once #3920

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
58 changes: 31 additions & 27 deletions tycho-sbom/src/main/java/org/eclipse/tycho/sbom/TychoProjectDependenciesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
package org.eclipse.tycho.sbom;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;

import javax.inject.Inject;

Expand Down Expand Up @@ -54,6 +56,8 @@ public class TychoProjectDependenciesConverter extends DefaultProjectDependencie
@Inject
private P2DependencyTreeGenerator dependencyGenerator;

private final Map<IInstallableUnit, List<String>> bomRepresentations = new ConcurrentHashMap<>();

@Override
public void cleanupBomDependencies(Metadata metadata, Map<String, Component> components,
Map<String, Dependency> dependencies) {
Expand Down Expand Up @@ -108,38 +112,38 @@ private void convertToDependency(DependencyTreeNode node, Set<Dependency> depend
* empty list is returned.
*
* @param iu The installable unit for which to generate
* @return A {@code mutable} list of all bom representation. matching the given
* IU.
* @return An {@code immutable} list of all bom representations matching the
* given IU.
*/
private List<String> getBomRepresentation(IInstallableUnit iu) {
final MavenSession mavenSession = legacySupport.getSession();
final List<MavenProject> reactorProjects = mavenSession.getAllProjects();
// mutable!
List<String> bomRefs = new ArrayList<>();
// (I) IU describes local reactor project
for (MavenProject project : reactorProjects) {
ReactorProject reactorProject = DefaultReactorProject.adapt(project);
Set<IInstallableUnit> initalUnits = reactorProject.getDependencyMetadata(DependencyMetadataType.INITIAL);
Set<IInstallableUnit> seedUnits = reactorProject.getDependencyMetadata(DependencyMetadataType.SEED);
if (initalUnits.contains(iu) || seedUnits.contains(iu)) {
String bomRef = modelConverter.generatePackageUrl(project.getArtifact());
return bomRepresentations.computeIfAbsent(iu, ignore -> {
final MavenSession mavenSession = legacySupport.getSession();
final List<MavenProject> reactorProjects = mavenSession.getAllProjects();
// (I) IU describes local reactor project
for (MavenProject project : reactorProjects) {
ReactorProject reactorProject = DefaultReactorProject.adapt(project);
Set<IInstallableUnit> initalUnits = reactorProject.getDependencyMetadata(DependencyMetadataType.INITIAL);
Set<IInstallableUnit> seedUnits = reactorProject.getDependencyMetadata(DependencyMetadataType.SEED);
if (initalUnits.contains(iu) || seedUnits.contains(iu)) {
String bomRef = modelConverter.generatePackageUrl(project.getArtifact());
if (bomRef == null) {
LOG.error("Unable to calculate BOM for: " + project);
return Collections.emptyList();
}
return Collections.singletonList(bomRef);
}
}
// (II) IU describes external artifact
final List<String> bomRefs = new ArrayList<>();
for (IArtifactKey p2artifactKey : iu.getArtifacts()) {
String bomRef = modelConverter.generateP2PackageUrl(p2artifactKey, true, true, false);
if (bomRef == null) {
LOG.error("Unable to calculate BOM for: " + project);
return bomRefs;
LOG.error("Unable to calculate BOM for: " + p2artifactKey);
continue;
}
bomRefs.add(bomRef);
return bomRefs;
}
}
// (II) IU describes external artifact
for (IArtifactKey p2artifactKey : iu.getArtifacts()) {
String bomRef = modelConverter.generateP2PackageUrl(p2artifactKey, true, true, false);
if (bomRef == null) {
LOG.error("Unable to calculate BOM for: " + p2artifactKey);
continue;
}
bomRefs.add(bomRef);
}
return bomRefs; // mutable!
return Collections.unmodifiableList(bomRefs);
});
}
}
Loading