From 0f60c9cba7b3ebf322a4aa5428db60a16ec6f515 Mon Sep 17 00:00:00 2001 From: Jason Dillon Date: Mon, 11 Oct 2021 13:58:56 -0700 Subject: [PATCH 1/3] explicit split(s, 0) this is the behavior we want here --- .../org/sonatype/goodies/packageurl/PackageUrlParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/sonatype/goodies/packageurl/PackageUrlParser.java b/src/main/java/org/sonatype/goodies/packageurl/PackageUrlParser.java index 57bd87e..439be70 100644 --- a/src/main/java/org/sonatype/goodies/packageurl/PackageUrlParser.java +++ b/src/main/java/org/sonatype/goodies/packageurl/PackageUrlParser.java @@ -160,7 +160,7 @@ static Map parseQualifiers(@Nullable final String value) { return null; } - String[] pairs = value.split("&"); + String[] pairs = value.split("&", 0); Map result = new LinkedHashMap<>(pairs.length); for (String pair : pairs) { String[] split = pair.split("=", 2); // Splits the pair into either one or two pieces @@ -189,7 +189,7 @@ static List parseSegments(@Nullable final String value, final String... return null; } - String[] parts = stripSlashes(value).split("/"); + String[] parts = stripSlashes(value).split("/", 0); List result = new ArrayList<>(); for (String part : parts) { if (part.isEmpty()) { From 653ae0955b4c0bb3310258a0f8b8e077b3fbaf25 Mon Sep 17 00:00:00 2001 From: Jason Dillon Date: Mon, 11 Oct 2021 14:10:30 -0700 Subject: [PATCH 2/3] Ignore dionysus/hugo generated theme files from Lift scanning --- .lift.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .lift.toml diff --git a/.lift.toml b/.lift.toml new file mode 100644 index 0000000..c84c0a0 --- /dev/null +++ b/.lift.toml @@ -0,0 +1,3 @@ +ignoreFiles = """ +src/site/hugo/ +""" From 69e3d66a0def255d61f396be7c95c40b308e9158 Mon Sep 17 00:00:00 2001 From: Jason Dillon Date: Mon, 11 Oct 2021 14:11:41 -0700 Subject: [PATCH 3/3] Accept sub-class in equals() --- src/main/java/org/sonatype/goodies/packageurl/PackageUrl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/sonatype/goodies/packageurl/PackageUrl.java b/src/main/java/org/sonatype/goodies/packageurl/PackageUrl.java index 7023e90..1c565d3 100644 --- a/src/main/java/org/sonatype/goodies/packageurl/PackageUrl.java +++ b/src/main/java/org/sonatype/goodies/packageurl/PackageUrl.java @@ -144,7 +144,7 @@ public boolean equals(final Object o) { if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof PackageUrl)) { return false; } PackageUrl that = (PackageUrl) o;