fix native image json

ArcadeData · Jan 28, 2024 · fb0ed9c · fb0ed9c
1 parent 36ca477
commit fb0ed9c
Show file tree

Hide file tree

Showing 7 changed files with 1,889 additions and 1,187 deletions.
diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml
@@ -43,18 +43,18 @@ jobs:
       - name: Set up GraalVM 21
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
-          distribution: 'graalvm-community'
+          java-version: "21"
+          distribution: "graalvm-community"
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-#        uses: graalvm/setup-graalvm@v1
-#        with:
-#          version: '22.3.2'
-#          gds-token: ${{ secrets.GDS_TOKEN }}
-#          java-version: '21'
-#          cache: 'maven'
-#          components: 'native-image,js'
-#          github-token: ${{ secrets.GITHUB_TOKEN }}
+      #        uses: graalvm/setup-graalvm@v1
+      #        with:
+      #          version: '22.3.2'
+      #          gds-token: ${{ secrets.GDS_TOKEN }}
+      #          java-version: '21'
+      #          cache: 'maven'
+      #          components: 'native-image,js'
+      #          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install jars
         continue-on-error: ${{ matrix.continue-on-error }}

diff --git a/server/src/main/resources/META-INF/native-image/jni-config.json b/server/src/main/resources/META-INF/native-image/jni-config.json
@@ -1,51 +1,85 @@
 [
-{
-  "name":"[Lcom.sun.management.internal.DiagnosticCommandArgumentInfo;"
-},
-{
-  "name":"[Lcom.sun.management.internal.DiagnosticCommandInfo;"
-},
-{
-  "name":"com.arcadedb.server.ArcadeDBServer",
-  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
-},
-{
-  "name":"com.sun.management.internal.DiagnosticCommandArgumentInfo",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","boolean","boolean","boolean","int"] }]
-},
-{
-  "name":"com.sun.management.internal.DiagnosticCommandInfo",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","boolean","java.util.List"] }]
-},
-{
-  "name":"java.lang.Boolean",
-  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.Class",
-  "methods":[{"name":"getClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"loadClass","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.String",
-  "methods":[{"name":"lastIndexOf","parameterTypes":["int"] }, {"name":"substring","parameterTypes":["int"] }]
-},
-{
-  "name":"java.lang.System",
-  "methods":[{"name":"getProperty","parameterTypes":["java.lang.String"] }, {"name":"setProperty","parameterTypes":["java.lang.String","java.lang.String"] }]
-},
-{
-  "name":"java.util.Arrays",
-  "methods":[{"name":"asList","parameterTypes":["java.lang.Object[]"] }]
-},
-{
-  "name":"jdk.internal.loader.Loader"
-},
-{
-  "name":"sun.management.VMManagementImpl",
-  "fields":[{"name":"compTimeMonitoringSupport"}, {"name":"currentThreadCpuTimeSupport"}, {"name":"objectMonitorUsageSupport"}, {"name":"otherThreadCpuTimeSupport"}, {"name":"remoteDiagnosticCommandsSupport"}, {"name":"synchronizerUsageSupport"}, {"name":"threadAllocatedMemorySupport"}, {"name":"threadContentionMonitoringSupport"}]
-}
+  {
+    "name": "[Lcom.sun.management.internal.DiagnosticCommandArgumentInfo;"
+  },
+  {
+    "name": "[Lcom.sun.management.internal.DiagnosticCommandInfo;"
+  },
+  {
+    "name": "com.arcadedb.server.ArcadeDBServer",
+    "methods": [{ "name": "main", "parameterTypes": ["java.lang.String[]"] }]
+  },
+  {
+    "name": "com.sun.management.internal.DiagnosticCommandArgumentInfo",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": ["java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "int"]
+      }
+    ]
+  },
+  {
+    "name": "com.sun.management.internal.DiagnosticCommandInfo",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.String",
+          "java.lang.String",
+          "java.lang.String",
+          "java.lang.String",
+          "java.lang.String",
+          "boolean",
+          "java.util.List"
+        ]
+      }
+    ]
+  },
+  {
+    "name": "java.lang.Boolean",
+    "methods": [{ "name": "getBoolean", "parameterTypes": ["java.lang.String"] }]
+  },
+  {
+    "name": "java.lang.Class",
+    "methods": [{ "name": "getClassLoader", "parameterTypes": [] }]
+  },
+  {
+    "name": "java.lang.ClassLoader",
+    "methods": [{ "name": "loadClass", "parameterTypes": ["java.lang.String"] }]
+  },
+  {
+    "name": "java.lang.String",
+    "methods": [
+      { "name": "lastIndexOf", "parameterTypes": ["int"] },
+      { "name": "substring", "parameterTypes": ["int"] }
+    ]
+  },
+  {
+    "name": "java.lang.System",
+    "methods": [
+      { "name": "getProperty", "parameterTypes": ["java.lang.String"] },
+      { "name": "setProperty", "parameterTypes": ["java.lang.String", "java.lang.String"] }
+    ]
+  },
+  {
+    "name": "java.util.Arrays",
+    "methods": [{ "name": "asList", "parameterTypes": ["java.lang.Object[]"] }]
+  },
+  {
+    "name": "jdk.internal.loader.Loader"
+  },
+  {
+    "name": "sun.management.VMManagementImpl",
+    "fields": [
+      { "name": "compTimeMonitoringSupport" },
+      { "name": "currentThreadCpuTimeSupport" },
+      { "name": "objectMonitorUsageSupport" },
+      { "name": "otherThreadCpuTimeSupport" },
+      { "name": "remoteDiagnosticCommandsSupport" },
+      { "name": "synchronizerUsageSupport" },
+      { "name": "threadAllocatedMemorySupport" },
+      { "name": "threadContentionMonitoringSupport" }
+    ]
+  }
 ]
diff --git a/server/src/main/resources/META-INF/native-image/predefined-classes-config.json b/server/src/main/resources/META-INF/native-image/predefined-classes-config.json
@@ -1,7 +1,6 @@
 [
   {
-    "type":"agent-extracted",
-    "classes":[
-    ]
+    "type": "agent-extracted",
+    "classes": []
   }
 ]
diff --git a/server/src/main/resources/META-INF/native-image/proxy-config.json b/server/src/main/resources/META-INF/native-image/proxy-config.json
@@ -1,2 +1 @@
-[
-]
+[]