mirror of
https://github.com/apple/pkl.git
synced 2026-03-24 18:11:27 +01:00
Use case-insensitive comparison for module URI schemes (#688)
Previously, some factories used case-sensitive comparison, for no apparent reason.
This commit is contained in:
@@ -87,7 +87,7 @@ public final class ModuleKeyFactories {
|
||||
|
||||
@Override
|
||||
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));
|
||||
}
|
||||
}
|
||||
@@ -101,10 +101,10 @@ public final class ModuleKeyFactories {
|
||||
|
||||
@Override
|
||||
public Optional<ModuleKey> 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<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));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user