Skip to content

fix: make private methods static where possible #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremylong merged 1 commit into from
Mar 21, 2025
Merged

fix: make private methods static where possible #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions src/main/java/com/github/packageurl/PackageURL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public PackageURL(
final @Nullable String subpath)
throws MalformedPackageURLException {
this.type = toLowerCase(validateType(requireNonNull(type, "type")));
this.namespace = validateNamespace(namespace);
this.name = validateName(requireNonNull(name, "name"));
this.namespace = validateNamespace(this.type, namespace);
this.name = validateName(this.type, requireNonNull(name, "name"));
this.version = validateVersion(type, version);
this.qualifiers = parseQualifiers(qualifiers);
this.subpath = validateSubpath(subpath);
Expand Down Expand Up @@ -274,7 +274,7 @@ public Map<String, String> getQualifiers() {
return subpath;
}

private void validateScheme(final String value) throws MalformedPackageURLException {
private static void validateScheme(final String value) throws MalformedPackageURLException {
if (!SCHEME.equals(value)) {
throw new MalformedPackageURLException(
"The PackageURL scheme '" + value + "' is invalid. It should be '" + SCHEME + "'");
Expand Down Expand Up @@ -319,14 +319,16 @@ private static void validateChars(String value, IntPredicate predicate, String c
}
}

private @Nullable String validateNamespace(final @Nullable String value) throws MalformedPackageURLException {
private static @Nullable String validateNamespace(final String type, final @Nullable String value)
throws MalformedPackageURLException {
if (isEmpty(value)) {
return null;
}
return validateNamespace(value.split("/"));
return validateNamespace(type, value.split("/"));
}

private @Nullable String validateNamespace(final String[] values) throws MalformedPackageURLException {
private static @Nullable String validateNamespace(final String type, final String[] values)
throws MalformedPackageURLException {
if (values.length == 0) {
return null;
}
Expand Down Expand Up @@ -360,7 +362,7 @@ private static void validateChars(String value, IntPredicate predicate, String c
return retVal;
}

private String validateName(final String value) throws MalformedPackageURLException {
private static String validateName(final String type, final String value) throws MalformedPackageURLException {
if (value.isEmpty()) {
throw new MalformedPackageURLException("The PackageURL name specified is invalid");
}
Expand Down Expand Up @@ -391,7 +393,7 @@ private String validateName(final String value) throws MalformedPackageURLExcept
return temp;
}

private @Nullable String validateVersion(final String type, final @Nullable String value) {
private static @Nullable String validateVersion(final String type, final @Nullable String value) {
if (value == null) {
return null;
}
Expand All @@ -406,7 +408,7 @@ private String validateName(final String value) throws MalformedPackageURLExcept
}
}

private @Nullable Map<String, String> validateQualifiers(final @Nullable Map<String, String> values)
private static @Nullable Map<String, String> validateQualifiers(final @Nullable Map<String, String> values)
throws MalformedPackageURLException {
if (values == null || values.isEmpty()) {
return null;
Expand Down Expand Up @@ -436,7 +438,7 @@ private static void validateValue(final String key, final @Nullable String value
}
}

private @Nullable String validateSubpath(final @Nullable String value) throws MalformedPackageURLException {
private static @Nullable String validateSubpath(final @Nullable String value) throws MalformedPackageURLException {
if (isEmpty(value)) {
return null;
}
Expand Down Expand Up @@ -771,11 +773,11 @@ private void parse(final String purl) throws MalformedPackageURLException {
// The 'remainder' should now consist of an optional namespace and the name
index = remainder.lastIndexOf('/');
if (index <= start) {
this.name = validateName(percentDecode(remainder.substring(start)));
this.name = validateName(this.type, percentDecode(remainder.substring(start)));
} else {
this.name = validateName(percentDecode(remainder.substring(index + 1)));
this.name = validateName(this.type, percentDecode(remainder.substring(index + 1)));
remainder = remainder.substring(0, index);
this.namespace = validateNamespace(parsePath(remainder.substring(start), false));
this.namespace = validateNamespace(this.type, parsePath(remainder.substring(start), false));
}
verifyTypeConstraints(this.type, this.namespace, this.name);
} catch (URISyntaxException e) {
Expand All @@ -789,7 +791,7 @@ private void parse(final String purl) throws MalformedPackageURLException {
* @param namespace the purl namespace
* @throws MalformedPackageURLException if constraints are not met
*/
private void verifyTypeConstraints(String type, @Nullable String namespace, @Nullable String name)
private static void verifyTypeConstraints(String type, @Nullable String namespace, @Nullable String name)
throws MalformedPackageURLException {
if (StandardTypes.MAVEN.equals(type)) {
if (isEmpty(namespace) || isEmpty(name)) {
Expand All @@ -799,7 +801,7 @@ private void verifyTypeConstraints(String type, @Nullable String namespace, @Nul
}
}

private @Nullable Map<String, String> parseQualifiers(final @Nullable Map<String, String> qualifiers)
private static @Nullable Map<String, String> parseQualifiers(final @Nullable Map<String, String> qualifiers)
throws MalformedPackageURLException {
if (qualifiers == null || qualifiers.isEmpty()) {
return null;
Expand All @@ -819,7 +821,7 @@ private void verifyTypeConstraints(String type, @Nullable String namespace, @Nul
}

@SuppressWarnings("StringSplitter") // reason: surprising behavior is okay in this case
private @Nullable Map<String, String> parseQualifiers(final String encodedString)
private static @Nullable Map<String, String> parseQualifiers(final String encodedString)
throws MalformedPackageURLException {
try {
final TreeMap<String, String> results = Arrays.stream(encodedString.split("&"))
Expand All @@ -843,14 +845,14 @@ private void verifyTypeConstraints(String type, @Nullable String namespace, @Nul
}
}

private String[] parsePath(final String path, final boolean isSubpath) {
private static String[] parsePath(final String path, final boolean isSubpath) {
return Arrays.stream(path.split("/"))
.filter(segment -> !segment.isEmpty() && !(isSubpath && (".".equals(segment) || "..".equals(segment))))
.map(PackageURL::percentDecode)
.toArray(String[]::new);
}

private String encodePath(final String path) {
private static String encodePath(final String path) {
return Arrays.stream(path.split("/")).map(PackageURL::percentEncode).collect(Collectors.joining("/"));
}

Expand Down