From 474d1e2bfa58c6d42263d233cae3459fbab03322 Mon Sep 17 00:00:00 2001 From: Steve Springett Date: Tue, 7 Nov 2023 22:58:18 -0600 Subject: [PATCH] Resolved NPE and updated unit tests --- src/main/java/com/github/packageurl/PackageURL.java | 2 +- src/test/java/com/github/packageurl/PackageURLTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/packageurl/PackageURL.java b/src/main/java/com/github/packageurl/PackageURL.java index d4c05f0..1872e47 100644 --- a/src/main/java/com/github/packageurl/PackageURL.java +++ b/src/main/java/com/github/packageurl/PackageURL.java @@ -211,7 +211,7 @@ public String getVersion() { * @since 1.0.0 */ public Map getQualifiers() { - return Collections.unmodifiableMap(qualifiers); + return (qualifiers != null)? Collections.unmodifiableMap(qualifiers) : null; } /** diff --git a/src/test/java/com/github/packageurl/PackageURLTest.java b/src/test/java/com/github/packageurl/PackageURLTest.java index 4f38b16..51715eb 100644 --- a/src/test/java/com/github/packageurl/PackageURLTest.java +++ b/src/test/java/com/github/packageurl/PackageURLTest.java @@ -92,7 +92,9 @@ public void testConstructorParsing() throws Exception { Assert.assertEquals(name, purl.getName()); Assert.assertEquals(version, purl.getVersion()); Assert.assertEquals(subpath, purl.getSubpath()); - if (qualifiers != null) { + if (qualifiers == null) { + Assert.assertNull(purl.getQualifiers()); + } else { Assert.assertNotNull(purl.getQualifiers()); Assert.assertEquals(qualifiers.length(), purl.getQualifiers().size()); qualifiers.keySet().forEach((key) -> {