Add support for both old and new serialization-config formats

Author: dnestoro

metadata/com.sun.mail/jakarta.mail/2.0.1/resource-config.json

@@ -18,9 +18,6 @@
         "pattern": "\\QMETA-INF/javamail.default.providers\\E"
       },
       {
-        "condition": {
-          "typeReachable": "jakarta.mail.Session"
-        },
         "pattern": "\\QMETA-INF/mailcap\\E"
       }
     ]

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

@@ -4,45 +4,27 @@
   "types": [
     {
       "condition": {
-        "typeReachable": "java.lang.Object"
+        "typeReachable": "javax.cache.configuration.FactoryBuilder"
       },
       "name": "javax.cache.configuration.FactoryBuilder$SingletonFactory"
     },
     {
       "condition": {
-        "typeReachable": "java.lang.Object"
+        "typeReachable": "javax.cache.expiry.AccessedExpiryPolicy"
       },
       "name": "javax.cache.expiry.AccessedExpiryPolicy"
     },
     {
       "condition": {
-        "typeReachable": "java.lang.Object"
+        "typeReachable": "javax.cache.expiry.Duration"
       },
       "name": "javax.cache.expiry.Duration"
     },
     {
       "condition": {
-        "typeReachable": "java.lang.Object"
+        "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

@@ -6,7 +6,7 @@
 import org.gradle.api.tasks.options.Option;
 
 import java.io.File;
-import java.nio.file.Path;
+import java.io.FileNotFoundException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -33,7 +33,7 @@ void setCoordinates(String coordinates) {
 
 
     @TaskAction
-    void run() throws IllegalArgumentException {
+    void run() throws IllegalArgumentException, FileNotFoundException {
         Coordinates coordinates = Coordinates.parse(this.coordinates);
         if (coordinates.group().equalsIgnoreCase("org.example") || coordinates.group().equalsIgnoreCase("samples")) {
             return;
@@ -160,8 +160,25 @@ private boolean resourceConfigFilesContainsErrors(File file) {
         return containsErrors;
     }
 
+    private boolean checkOldSerializationConfig(File file) {
+        List<Map<String, Object>> entries = getConfigEntries(file);
+        
+        if (entries.isEmpty()) {
+            System.out.println("ERROR: empty serialization-config detected: " + file.toURI());
+            return true;
+        }
+
+        boolean containsErrors = containsDuplicatedEntries(entries, file);
+        for (var entry : entries) {
+            containsErrors |= checkTypeReachable(entry, file);
+        }
+
+        return containsErrors;
+    }
+
     @SuppressWarnings("unchecked")
-    private boolean serializationConfigFilesContainsErrors(File file) {
+    private boolean checkNewSerializationConfig(File file) {
+        boolean containsErrors = false;
         Map<String, Object> entries = getConfigEntry(file);
 
         List<Map<String, Object>> types = (List<Map<String, Object>>) entries.get("types");
@@ -172,7 +189,6 @@ private boolean serializationConfigFilesContainsErrors(File file) {
             return true;
         }
 
-        boolean containsErrors = false;
         if (types != null) {
             // check include entries
             containsErrors |= containsDuplicatedEntries(types, file);
@@ -194,6 +210,11 @@ private boolean serializationConfigFilesContainsErrors(File file) {
         return containsErrors;
     }
 
+    private boolean serializationConfigFilesContainsErrors(File file) throws FileNotFoundException {
+        Scanner sc = new Scanner(file);
+        return sc.nextLine().contains("[") ? checkOldSerializationConfig(file) : checkNewSerializationConfig(file); 
+    }
+
     private boolean proxyConfigFilesContainsErrors(File file) {
         List<Map<String, Object>> entries = getConfigEntries(file);