From 7f26592360d5e0ed5e2e81c6d62e925f7da8a9c7 Mon Sep 17 00:00:00 2001 From: translatenix <119817707+translatenix@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:26:23 -0700 Subject: [PATCH] Use case-insensitive comparison for module URI schemes (#688) Previously, some factories used case-sensitive comparison, for no apparent reason. --- .../main/java/org/pkl/core/module/ModuleKeyFactories.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkl-core/src/main/java/org/pkl/core/module/ModuleKeyFactories.java b/pkl-core/src/main/java/org/pkl/core/module/ModuleKeyFactories.java index f26816ef..83a3715a 100644 --- a/pkl-core/src/main/java/org/pkl/core/module/ModuleKeyFactories.java +++ b/pkl-core/src/main/java/org/pkl/core/module/ModuleKeyFactories.java @@ -87,7 +87,7 @@ public final class ModuleKeyFactories { @Override public Optional create(URI uri) { - if (!uri.getScheme().equals("pkl")) return Optional.empty(); + if (!uri.getScheme().equalsIgnoreCase("pkl")) return Optional.empty(); return Optional.of(ModuleKeys.standardLibrary(uri)); } } @@ -101,10 +101,10 @@ public final class ModuleKeyFactories { @Override public Optional create(URI uri) { - if (uri.getScheme().equals("modulepath")) { + if (uri.getScheme().equalsIgnoreCase("modulepath")) { return Optional.of(ModuleKeys.modulePath(uri, resolver)); } - if (uri.getScheme().equals("jar")) { + if (uri.getScheme().equalsIgnoreCase("jar")) { try { // modulepaths that resolve to jar-file URIs will register a FileSystemProvider that // such that `Paths.get("jar:file")` returns a path. @@ -133,7 +133,7 @@ public final class ModuleKeyFactories { @Override public Optional create(URI uri) { - if (!uri.getScheme().equals("modulepath")) return Optional.empty(); + if (!uri.getScheme().equalsIgnoreCase("modulepath")) return Optional.empty(); return Optional.of(ModuleKeys.classPath(uri, classLoader)); } }