Simplify the Maven implementation in purl2url.py

Author: tdruez

src/packageurl/contrib/purl2url.py

@@ -28,7 +28,8 @@
 from packageurl.contrib.route import NoRouteAvailable
 from packageurl.contrib.route import Router
 
-default_maven_repository = "https://repo.maven.apache.org/maven2"
+DEFAULT_MAVEN_REPOSITORY = "https://repo.maven.apache.org/maven2"
+
 
 def get_repo_download_url_by_package_type(
     type, namespace, name, version, archive_extension="tar.gz"
@@ -324,15 +325,13 @@ def build_maven_repo_url(purl):
     namespace = purl_data.namespace
     name = purl_data.name
     version = purl_data.version
+    qualifiers = purl_data.qualifiers
 
-    base_url = default_maven_repository
-
-    if purl_data.qualifiers and "repository_url" in purl_data.qualifiers:
-        base_url = purl_data.qualifiers["repository_url"]
+    base_url = qualifiers.get("repository_url", DEFAULT_MAVEN_REPOSITORY)
 
     if namespace and name and version:
-        maven_namespace = namespace.replace(".", "/")
-        return f"{base_url}/{maven_namespace}/{name}/{version}"
+        namespace = namespace.replace(".", "/")
+        return f"{base_url}/{namespace}/{name}/{version}"
 
 
 # Download URLs:
@@ -396,25 +395,16 @@ def build_maven_download_url(purl):
     namespace = purl_data.namespace
     name = purl_data.name
     version = purl_data.version
+    qualifiers = purl_data.qualifiers
 
-    base_url = default_maven_repository
-
-    if purl_data.qualifiers and "repository_url" in purl_data.qualifiers:
-       base_url = purl_data.qualifiers["repository_url"]
-
-    maven_type = "jar" # default to jar
-    if purl_data.qualifiers and "type" in purl_data.qualifiers:
-       maven_type = purl_data.qualifiers["type"]
-
-    classifier = None
-    if purl_data.qualifiers and "classifier" in purl_data.qualifiers:
-        classifier = purl_data.qualifiers["classifier"]
+    base_url = qualifiers.get("repository_url", DEFAULT_MAVEN_REPOSITORY)
+    maven_type = qualifiers.get("type", "jar")  # default to "jar"
+    classifier = qualifiers.get("classifier")
 
     if namespace and name and version:
-        maven_namespace = namespace.replace(".", "/")
-        if classifier:
-            return f"{base_url}/{maven_namespace}/{name}/{version}/{name}-{version}-{classifier}.{maven_type}"
-        return f"{base_url}/{maven_namespace}/{name}/{version}/{name}-{version}.{maven_type}"
+        namespace = namespace.replace(".", "/")
+        classifier = f"-{classifier}" if classifier else ""
+        return f"{base_url}/{namespace}/{name}/{version}/{name}-{version}{classifier}.{maven_type}"
 
 
 @download_router.route("pkg:hackage/.*")