diff --git a/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobMemberBodyNode.java b/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobMemberBodyNode.java index 1fd89a80..2d67ca61 100644 --- a/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobMemberBodyNode.java +++ b/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ImportGlobMemberBodyNode.java @@ -54,7 +54,7 @@ public final class ImportGlobMemberBodyNode extends ExpressionNode { private VmTyped importModule(VmObjectLike mapping, String path) { @SuppressWarnings("unchecked") var globElements = (Map) mapping.getExtraStorage(); - var importUri = globElements.get(path).getUri(); + var importUri = globElements.get(path).uri(); var context = VmContext.get(this); try { context.getSecurityManager().checkImportModule(currentModule.getUri(), importUri); diff --git a/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobMemberBodyNode.java b/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobMemberBodyNode.java index b4e6edea..6130641d 100644 --- a/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobMemberBodyNode.java +++ b/pkl-core/src/main/java/org/pkl/core/ast/expression/unary/ReadGlobMemberBodyNode.java @@ -41,7 +41,7 @@ public class ReadGlobMemberBodyNode extends ExpressionNode { private Object readResource(VmObjectLike mapping, String path) { @SuppressWarnings("unchecked") var globElements = (Map) mapping.getExtraStorage(); - var resourceUri = VmUtils.getMapValue(globElements, path).getUri(); + var resourceUri = VmUtils.getMapValue(globElements, path).uri(); var resource = VmContext.get(this).getResourceManager().read(resourceUri, this).orElse(null); if (resource == null) { CompilerDirectives.transferToInterpreter(); diff --git a/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java b/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java index b883ba9f..7a239a4a 100644 --- a/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java +++ b/pkl-core/src/main/java/org/pkl/core/runtime/VmImportAnalyzer.java @@ -114,7 +114,7 @@ public class VmImportAnalyzer { entry.stringValue()); var globImports = elements.values().stream() - .map(ResolvedGlobElement::getUri) + .map(ResolvedGlobElement::uri) .map(ImportGraph.Import::new) .toList(); result.addAll(globImports); diff --git a/pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java b/pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java index c14f2779..eca25f35 100644 --- a/pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java +++ b/pkl-core/src/main/java/org/pkl/core/util/GlobResolver.java @@ -45,29 +45,12 @@ public final class GlobResolver { } } - public static final class ResolvedGlobElement { - private final String path; - - private final URI uri; - private final boolean isDirectory; - + public record ResolvedGlobElement(String path, URI uri, boolean isDirectory) { public ResolvedGlobElement(String path, URI uri, boolean isDirectory) { this.path = path; this.uri = uri.normalize(); this.isDirectory = isDirectory; } - - public String getPath() { - return path; - } - - public URI getUri() { - return uri; - } - - public boolean isDirectory() { - return isDirectory; - } } private static final char NULL = 0; @@ -434,15 +417,15 @@ public final class GlobResolver { listElementCallCount); for (var element : matchedElements) { if (isLeaf) { - result.put(element.getPath(), element); + result.put(element.path(), element); } else if (element.isDirectory()) { resolveHierarchicalGlob( securityManager, reader, globPatternParts, idx + 1, - element.getUri(), - element.getPath(), + element.uri(), + element.path(), hasAbsoluteGlob, result, listElementCallCount); diff --git a/pkl-core/src/main/java/org/pkl/core/util/yaml/snake/YamlResolver.java b/pkl-core/src/main/java/org/pkl/core/util/yaml/snake/YamlResolver.java index e66ea519..705c1c96 100644 --- a/pkl-core/src/main/java/org/pkl/core/util/yaml/snake/YamlResolver.java +++ b/pkl-core/src/main/java/org/pkl/core/util/yaml/snake/YamlResolver.java @@ -48,15 +48,7 @@ public abstract class YamlResolver implements ScalarResolver { return Tag.STR; } - private static final class ResolverTuple { - private final Tag tag; - private final Pattern regexp; - - ResolverTuple(Tag tag, Pattern regexp) { - this.tag = tag; - this.regexp = regexp; - } - + private record ResolverTuple(Tag tag, Pattern regexp) { @Override public String toString() { return "Tuple tag=" + tag + " regexp=" + regexp;