Allow type reachable from java.lang if the name is also from java.lang

Author: dnestoro

.github/workflows/test-changed-metadata.yml

@@ -67,12 +67,12 @@ jobs:
           sudo bash -c "cat ./.github/workflows/dockerd.service > /etc/systemd/system/docker.service.d/http-proxy.conf"
           sudo systemctl daemon-reload
           sudo systemctl restart docker
-      - name: "🧪 Run '${{ matrix.coordinates }}' tests"
-        run: |
-          ./gradlew test -Pcoordinates=${{ matrix.coordinates }}
       - name: "🔎 Check metadata config files content"
         run: |
           ./gradlew checkConfigFiles --coordinates=${{ matrix.coordinates }}
+      - name: "🧪 Run '${{ matrix.coordinates }}' tests"
+        run: |
+          ./gradlew test -Pcoordinates=${{ matrix.coordinates }}
 
   all-metadata-passed:
     name: "🧪 All metadata tests have passed"

metadata/javax.cache/cache-api/1.1.1/serialization-config.json

@@ -25,6 +25,24 @@
         "typeReachable": "javax.cache.expiry.EternalExpiryPolicy"
       },
       "name": "javax.cache.expiry.EternalExpiryPolicy"
+    },
+    {
+      "condition": {
+        "typeReachable": "java.lang.Object"
+      },
+      "name": "java.lang.String"
+    },
+    {
+      "condition": {
+        "typeReachable": "java.lang.Object"
+      },
+      "name": "java.lang.Number"
+    },
+    {
+      "condition": {
+        "typeReachable": "java.lang.Object"
+      },
+      "name": "java.lang.Integer"
     }
   ]
 }

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ConfigFilesChecker.java

@@ -264,18 +264,25 @@ private boolean containsDuplicatedEntries(List<Map<String, Object>> entries, Fil
 
     @SuppressWarnings("unchecked")
     private boolean checkTypeReachable(Map<String, Object> entry, File file) {
-        // check if condition entry exists
         Map<String, Object> condition = (Map<String, Object>) entry.get("condition");
+        String entryName = (String) entry.get("name");
+
+        // check if condition entry exists
         if (condition == null) {
             System.out.println("ERROR: In file " + file.toURI() + " there is an entry " + entry + " with missing condition field.");
             return true;
         }
 
-        // check if typeReachable exists inside condition entry
         String typeReachable = (String) condition.get("typeReachable");
+
+        // check if both entry name and typeReachable are from java.lang since there are some cases where this is allowed
+        if (entryName != null && entryName.startsWith("java.lang") && typeReachable.startsWith("java.lang")) {
+            return false;
+        }
+
+        // check if typeReachable exists inside condition entry
         if (ILLEGAL_TYPE_VALUES.stream().anyMatch(typeReachable::startsWith)) {
             // get name of entry that misses typeReachable. If name cannot be determinate, write whole entry
-            String entryName = (String) entry.get("name");
             if (entryName == null) {
                 entryName = entry.toString();
             }