Skip to content

Commit 2d130a0

Browse files
committed
rename convert methohds to explicit project vs dependency
Signed-off-by: Hervé Boutemy <hboutemy@apache.org>
1 parent 051be8e commit 2d130a0

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/main/java/org/cyclonedx/maven/BaseCycloneDxMojo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ protected String generatePackageUrl(final Artifact artifact) {
261261
return modelConverter.generatePackageUrl(artifact);
262262
}
263263

264-
protected Component convert(Artifact artifact) {
265-
return modelConverter.convert(artifact, schemaVersion(), includeLicenseText);
264+
protected Component convertMavenDependency(Artifact artifact) {
265+
return modelConverter.convertMavenDependency(artifact, schemaVersion(), includeLicenseText);
266266
}
267267

268268
/**
@@ -306,7 +306,7 @@ public void execute() throws MojoExecutionException {
306306

307307
String analysis = extractComponentsAndDependencies(topLevelComponents, componentMap, dependencyMap);
308308
if (analysis != null) {
309-
final Metadata metadata = modelConverter.convert(project, projectType, schemaVersion(), includeLicenseText, externalReferences);
309+
final Metadata metadata = modelConverter.convertMavenProject(project, projectType, schemaVersion(), includeLicenseText, externalReferences);
310310

311311
if (schemaVersion().getVersion() >= 1.3) {
312312
metadata.addProperty(newProperty("maven.goal", analysis));
@@ -486,7 +486,7 @@ protected void populateComponents(final Set<String> topLevelComponents, final Ma
486486
final Component.Scope artifactScope = getComponentScope(artifact, dependencyAnalysis);
487487
final Component component = components.get(purl);
488488
if (component == null) {
489-
final Component newComponent = convert(artifact);
489+
final Component newComponent = convertMavenDependency(artifact);
490490
newComponent.setScope(artifactScope);
491491
components.put(purl, newComponent);
492492
} else if (!topLevelComponents.contains(purl)) {

src/main/java/org/cyclonedx/maven/CycloneDxAggregateMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected String extractComponentsAndDependencies(final Set<String> topLevelComp
125125
final BomDependencies bomDependencies = extractBOMDependencies(mavenProject);
126126
final Map<String, Dependency> projectDependencies = bomDependencies.getDependencies();
127127

128-
final Component projectBomComponent = convert(mavenProject.getArtifact());
128+
final Component projectBomComponent = convertMavenDependency(mavenProject.getArtifact());
129129
components.put(projectBomComponent.getPurl(), projectBomComponent);
130130
topLevelComponents.add(projectBomComponent.getPurl());
131131

src/main/java/org/cyclonedx/maven/CycloneDxMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ protected String extractComponentsAndDependencies(final Set<String> topLevelComp
122122
final BomDependencies bomDependencies = extractBOMDependencies(getProject());
123123
final Map<String, Dependency> projectDependencies = bomDependencies.getDependencies();
124124

125-
final Component projectBomComponent = convert(getProject().getArtifact());
125+
final Component projectBomComponent = convertMavenDependency(getProject().getArtifact());
126126
components.put(projectBomComponent.getPurl(), projectBomComponent);
127127
topLevelComponents.add(projectBomComponent.getPurl());
128128

src/main/java/org/cyclonedx/maven/CycloneDxPackageMojo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected String extractComponentsAndDependencies(Set<String> topLevelComponents
6565
final BomDependencies bomDependencies = extractBOMDependencies(mavenProject);
6666
final Map<String, Dependency> projectDependencies = bomDependencies.getDependencies();
6767

68-
final Component projectBomComponent = convert(mavenProject.getArtifact());
68+
final Component projectBomComponent = convertMavenDependency(mavenProject.getArtifact());
6969
components.put(projectBomComponent.getPurl(), projectBomComponent);
7070
topLevelComponents.add(projectBomComponent.getPurl());
7171

src/main/java/org/cyclonedx/maven/DefaultModelConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private String generatePackageUrl(String groupId, String artifactId, String vers
153153
}
154154

155155
@Override
156-
public Component convert(Artifact artifact, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText) {
156+
public Component convertMavenDependency(Artifact artifact, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText) {
157157
final Component component = new Component();
158158
component.setGroup(artifact.getGroupId());
159159
component.setName(artifact.getArtifactId());
@@ -339,7 +339,7 @@ else if (licenseChoiceToResolve.getExpression() != null && CycloneDxSchema.Versi
339339
}
340340

341341
@Override
342-
public Metadata convert(final MavenProject project, String projectType, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText, ExternalReference[] externalReferences) {
342+
public Metadata convertMavenProject(final MavenProject project, String projectType, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText, ExternalReference[] externalReferences) {
343343
final Tool tool = new Tool();
344344
final Properties properties = readPluginProperties();
345345
tool.setVendor(properties.getProperty("vendor"));

src/main/java/org/cyclonedx/maven/ModelConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public interface ModelConverter {
4949
* @param includeLicenseText should license text be included in bom?
5050
* @return a CycloneDX component
5151
*/
52-
Component convert(Artifact artifact, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText);
52+
Component convertMavenDependency(Artifact artifact, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText);
5353

5454
/**
55-
* Converts a MavenProject into a Metadata object.
55+
* Converts a MavenProject into a CycloneDX Metadata object.
5656
*
5757
* @param project the MavenProject to convert
5858
* @param projectType the target CycloneDX component type
@@ -61,6 +61,6 @@ public interface ModelConverter {
6161
* @param externalReferences the external references
6262
* @return a CycloneDX Metadata object
6363
*/
64-
Metadata convert(MavenProject project, String projectType, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText, ExternalReference[] externalReferences);
64+
Metadata convertMavenProject(MavenProject project, String projectType, CycloneDxSchema.Version schemaVersion, boolean includeLicenseText, ExternalReference[] externalReferences);
6565

6666
}

0 commit comments

Comments
 (0)