starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-24 01:08:34 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Use case-insensitive comparison for module URI schemes (#688)

Browse Source 
Previously, some factories used case-sensitive comparison, for no apparent reason.
This commit is contained in:
translatenix
2024-10-15 08:26:23 -07:00
committed by GitHub
parent 4854027a1a
commit 7f26592360
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkl-core/src/main/java/org/pkl/core/module/ModuleKeyFactories.java
View File

@@ -87,7 +87,7 @@ public final class ModuleKeyFactories {
@Override @Override
public Optional<ModuleKey> create(URI uri) { public Optional<ModuleKey> 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)); return Optional.of(ModuleKeys.standardLibrary(uri));
} }
} }
@@ -101,10 +101,10 @@ public final class ModuleKeyFactories {
@Override @Override
public Optional<ModuleKey> create(URI uri) { public Optional<ModuleKey> create(URI uri) {
if (uri.getScheme().equals("modulepath")) { if (uri.getScheme().equalsIgnoreCase("modulepath")) {
return Optional.of(ModuleKeys.modulePath(uri, resolver)); return Optional.of(ModuleKeys.modulePath(uri, resolver));
} }
if (uri.getScheme().equals("jar")) { if (uri.getScheme().equalsIgnoreCase("jar")) {
try { try {
// modulepaths that resolve to jar-file URIs will register a FileSystemProvider that // modulepaths that resolve to jar-file URIs will register a FileSystemProvider that
// such that `Paths.get("jar:file")` returns a path. // such that `Paths.get("jar:file")` returns a path.
@@ -133,7 +133,7 @@ public final class ModuleKeyFactories {
@Override @Override
public Optional<ModuleKey> create(URI uri) { public Optional<ModuleKey> 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)); return Optional.of(ModuleKeys.classPath(uri, classLoader));
} }
} }