cleanup, make purl sonatype expects

Signed-off-by: djcrabhat <djcrabhat@sosimplerecords.com>

Author: djcrabhat

src/main/java/org/cyclonedx/contrib/com/lmco/efoss/unix/sbom/generator/RedHatSBomGenerator.java

@@ -22,6 +22,7 @@
 
 import com.github.packageurl.MalformedPackageURLException;
 import com.github.packageurl.PackageURL;
+import com.google.common.base.Splitter;
 import org.cyclonedx.model.Bom;
 import org.cyclonedx.model.Component;
 import org.cyclonedx.model.LicenseChoice;
@@ -48,7 +49,7 @@ public class RedHatSBomGenerator extends UnixSBomGenerator
 	private static final String SOFTWARE_DETAIL_CMD = "yum info";
 	private static final String SOFTWARE_LIST_CMD = "yum list installed";
 
-	private String purlNamespace = "rhel";
+	private String purlNamespace = null;
 
 	private ProcessBuilder processBuilder = new ProcessBuilder();
 
@@ -97,10 +98,10 @@ public Bom generateSBom() {
 			try {
 				String downloadUrl = getPackageDownloadUrl(software);
 				if (downloadUrl != null) {
-					detailMap.put("download_url", downloadUrl);
+					detailMap.put("Download-Url", downloadUrl);
 				}
 			} catch(SBomException e){
-				logger.debug("Error getting download_url", e);
+				logger.debug("Error getting Download-Url", e);
 			}
             component = createComponents(software, detailMap, license, group,
                     version, purl, detailMap.get("Priority"));
@@ -144,15 +145,15 @@ public String getLicenseFileName(String software, String version)
 
 
 	public PackageURL getPurl(String software, String version) throws MalformedPackageURLException {
-List<String> parts = Splitter.on('.').splitToList(software);
+		List<String> parts = Splitter.on('.').splitToList(software);
 
-		if (parts.length == 0) {
+		if (parts.size() == 0) {
 			return this.getPurl(software, version, null, null);
 		}
-		if (parts.length == 1) {
-			return this.getPurl(parts[0], version, null, null);
+		if (parts.size() == 1) {
+			return this.getPurl(parts.get(0), version, null, null);
 		} else {
-			return this.getPurl(parts[0], version, parts[1], null);
+			return this.getPurl(parts.get(0), version, parts.get(1), null);
 		}
 	}
 
@@ -166,7 +167,7 @@ public PackageURL getPurl(String software, String version, String arch, String d
 			qualifiers.put("distro", distro);
 		}
 		return new PackageURL(
-				PackageURL.StandardTypes.RPM, purlNamespace.toLowerCase(), software, version, qualifiers, null);
+				PackageURL.StandardTypes.RPM, purlNamespace, software, version, qualifiers, null);
 	}
 
 

src/main/java/org/cyclonedx/contrib/com/lmco/efoss/unix/sbom/generator/UnixSBomGenerator.java

@@ -91,6 +91,12 @@ public List<ExternalReference> buildExternalReferences(Map<String, String> detai
 			bugs.setType(ExternalReference.Type.ISSUE_TRACKER);
 			refs.add(bugs);
 		}
+		if (detailMap.containsKey("Download-Url")){
+			ExternalReference docs = new ExternalReference();
+			docs.setUrl(detailMap.get("Download-Url"));
+			docs.setType(ExternalReference.Type.DISTRIBUTION);
+			refs.add(docs);
+		}
 
 		return refs;
 	}

src/test/java/org/cyclonedx/contrib/com/lmco/efoss/unix/sbom/generator/RedHatSBomGeneratorTest.java

@@ -119,7 +119,7 @@ void getPurlTest()
 		TestUtils.logTestStart(methodName, watcher.getLogger());
 
 		String expectedUrl = "https://rhui3.us-west-2.aws.ce.redhat.com/pulp/repos/content/dist/rhel/rhui/server/7/7Server/x86_64/os/Packages/z/zip-3.0-11.el7.x86_64.rpm";
-		String expected = "pkg:rpm/rhel/zip@3.0-11.el7?arch=x64_86";
+		String expected = "pkg:rpm/zip@3.0-11.el7?arch=x64_86";
 
 		AutoCloseable openMocks = null;