[GR-53043] Rename ModuleResourcePair according to its purpose

PullRequest: graal/17430
oracle · Apr 7, 2024 · b69dc4f · b69dc4f
2 parents f4e0d20 + e17793f
commit b69dc4f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
@@ -88,9 +88,9 @@ public static Resources singleton() {
      * com.oracle.svm.hosted.ModuleLayerFeature}.
      */
     private final EconomicMap<Pair<Module, String>, ResourceStorageEntryBase> resources = ImageHeapMap.create();
-    private final EconomicMap<ModuleResourcePair, Boolean> includePatterns = ImageHeapMap.create();
+    private final EconomicMap<RequestedPattern, Boolean> requestedPatterns = ImageHeapMap.create();
 
-    public record ModuleResourcePair(String module, String resource) {
+    public record RequestedPattern(String module, String resource) {
     }
 
     /**
@@ -257,9 +257,9 @@ public void registerIncludePattern(String pattern) {
     @Platforms(Platform.HOSTED_ONLY.class)
     public void registerIncludePattern(String module, String pattern) {
         assert MissingRegistrationUtils.throwMissingRegistrationErrors();
-        synchronized (includePatterns) {
+        synchronized (requestedPatterns) {
             updateTimeStamp();
-            includePatterns.put(new ModuleResourcePair(module, handleEscapedCharacters(pattern)), Boolean.TRUE);
+            requestedPatterns.put(new RequestedPattern(module, handleEscapedCharacters(pattern)), Boolean.TRUE);
         }
     }
 
@@ -318,9 +318,9 @@ public ResourceStorageEntryBase get(Module module, String resourceName, boolean
         ResourceStorageEntryBase entry = resources.get(createStorageKey(module, canonicalResourceName));
         if (entry == null) {
             if (MissingRegistrationUtils.throwMissingRegistrationErrors()) {
-                MapCursor<ModuleResourcePair, Boolean> cursor = includePatterns.getEntries();
+                MapCursor<RequestedPattern, Boolean> cursor = requestedPatterns.getEntries();
                 while (cursor.advance()) {
-                    ModuleResourcePair moduleResourcePair = cursor.getKey();
+                    RequestedPattern moduleResourcePair = cursor.getKey();
                     if (Objects.equals(moduleName, moduleResourcePair.module) &&
                                     (matchResource(moduleResourcePair.resource, resourceName) || matchResource(moduleResourcePair.resource, canonicalResourceName))) {
                         return null;