graalvm: Update json configs

This was missing from 2.9.0, but the changes seem benign (the native selftest still passes)
kohlschutter · Feb 14, 2024 · 96481e3 · 96481e3
1 parent 44faddf
commit 96481e3
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 7 deletions.
diff --git a/...ces/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/jni-config.json b/...ces/META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/jni-config.json
@@ -93,6 +93,9 @@
   "name":"java.nio.channels.spi.AbstractSelectableChannel",
   "methods":[{"name":"removeKey","parameterTypes":["java.nio.channels.SelectionKey"] }]
 },
+{
+  "name":"org.newsclub.net.unix.AFGenericServerSocket"
+},
 {
   "name":"org.newsclub.net.unix.AFSelector$PollFd",
   "fields":[
@@ -141,6 +144,14 @@
     {"name":"setTipcErrorInfo","parameterTypes":["int","int"] }
   ]
 },
+{
+  "name":"org.newsclub.net.unix.BrokenPipeSocketException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.newsclub.net.unix.ConnectionResetSocketException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.newsclub.net.unix.InvalidArgumentSocketException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -157,6 +168,10 @@
   "name":"org.newsclub.net.unix.OperationNotSupportedSocketException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.newsclub.net.unix.SocketClosedException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "condition" : { "typeReachable" : "org.newsclub.net.unix.tipc.AFTIPCDatagramSocket" },
   "name":"org.newsclub.net.unix.tipc.AFTIPCDatagramSocket"

diff --git a/...META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/reflect-config.json b/...META-INF/native-image/com.kohlschutter.junixsocket/junixsocket-common/reflect-config.json
@@ -10,6 +10,10 @@
   "condition" : { "typeReachable" : "org.newsclub.lib.junixsocket.custom.NarMetadata" },
   "name":"org.newsclub.lib.junixsocket.custom.NarMetadata"
 },
+{
+  "name":"org.newsclub.net.unix.AFGenericSocketAddress",
+  "methods":[{"name":"addressFamily","parameterTypes":[] }]
+},
 {
   "name":"org.newsclub.net.unix.AFTIPCSocketAddress",
   "methods":[{"name":"addressFamily","parameterTypes":[] }]
@@ -79,13 +83,22 @@
 {
   "name":"org.newsclub.net.unix.AddressUnavailableSocketException"
 },
+{
+  "name":"org.newsclub.net.unix.BrokenPipeSocketException"
+},
+{
+  "name":"org.newsclub.net.unix.ConnectionResetSocketException"
+},
 {
   "name":"java.util.function.Consumer",
   "queryAllPublicMethods":true
 },
 {
   "name":"[J"
 },
+{
+  "name":"org.newsclub.net.unix.SocketClosedException"
+},
 {
   "name":"[Ljava.lang.StackTraceElement;"
 },
@@ -110,6 +123,9 @@
 {
   "name":"java.util.UUID"
 },
+{
+  "name":"org.newsclub.net.unix.generic.AFGenericSelectorProvider"
+},
 {
   "name":"java.util.concurrent.atomic.AtomicInteger"
 },

diff --git a/...-INF/native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/jni-config.json b/...-INF/native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/jni-config.json
@@ -88,6 +88,9 @@
   "name":"java.nio.channels.spi.AbstractSelectableChannel",
   "methods":[{"name":"removeKey","parameterTypes":["java.nio.channels.SelectionKey"] }]
 },
+{
+  "name":"org.newsclub.net.unix.AFGenericServerSocket"
+},
 {
   "name":"org.newsclub.net.unix.AFSelector$PollFd",
   "fields":[{"name":"fds"}, {"name":"ops"}, {"name":"rops"}]
@@ -118,6 +121,14 @@
   "fields":[{"name":"ancillaryReceiveBuffer"}, {"name":"pendingFileDescriptors"}],
   "methods":[{"name":"receiveFileDescriptors","parameterTypes":["int[]"] }, {"name":"setTipcDestName","parameterTypes":["int","int","int"] }, {"name":"setTipcErrorInfo","parameterTypes":["int","int"] }]
 },
+{
+  "name":"org.newsclub.net.unix.BrokenPipeSocketException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.newsclub.net.unix.ConnectionResetSocketException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.newsclub.net.unix.InvalidArgumentSocketException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -130,6 +141,10 @@
   "name":"org.newsclub.net.unix.OperationNotSupportedSocketException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.newsclub.net.unix.SocketClosedException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.newsclub.net.unix.StdinSocketApp",
   "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]

diff --git a/.../native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/reflect-config.json b/.../native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/reflect-config.json
@@ -333,6 +333,10 @@
 {
   "name":"org.newsclub.lib.junixsocket.custom.NarMetadata"
 },
+{
+  "name":"org.newsclub.net.unix.AFGenericSocketAddress",
+  "methods":[{"name":"addressFamily","parameterTypes":[] }]
+},
 {
   "name":"org.newsclub.net.unix.AFSYSTEMSocketAddress",
   "methods":[{"name":"addressFamily","parameterTypes":[] }]
@@ -384,7 +388,7 @@
   "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true,
-  "methods":[{"name":"testAcceptWithoutBindToService","parameterTypes":[] }, {"name":"testCatchTimeout","parameterTypes":[] }, {"name":"testTimeoutAfterDelay","parameterTypes":[] }]
+  "methods":[{"name":"testAcceptWithoutBindToService","parameterTypes":[] }, {"name":"testCatchTimeout","parameterTypes":[] }, {"name":"testPendingAcceptCloseServerSocketDelayed","parameterTypes":[] }, {"name":"testPendingAcceptCloseServerSocketImmediately","parameterTypes":[] }, {"name":"testTimeoutAfterDelay","parameterTypes":[] }]
 },
 {
   "name":"org.newsclub.net.unix.AddressUnavailableSocketException"
@@ -404,6 +408,9 @@
   "queryAllPublicMethods":true,
   "methods":[{"name":"testAvailableAtClient","parameterTypes":[] }, {"name":"testAvailableAtServer","parameterTypes":[] }]
 },
+{
+  "name":"org.newsclub.net.unix.BrokenPipeSocketException"
+},
 {
   "name":"org.newsclub.net.unix.BufferOverflowTest",
   "allDeclaredFields":true,
@@ -429,6 +436,9 @@
   "queryAllPublicMethods":true,
   "methods":[{"name":"issue6test1","parameterTypes":[] }]
 },
+{
+  "name":"org.newsclub.net.unix.ConnectionResetSocketException"
+},
 {
   "name":"org.newsclub.net.unix.DatagramSocketTest",
   "allDeclaredFields":true,
@@ -452,7 +462,7 @@
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testAvailableTypes","parameterTypes":[] }, {"name":"testCastAsInteger","parameterTypes":[] }, {"name":"testInvalidFileDescriptor","parameterTypes":[] }, {"name":"testPipe","parameterTypes":[] }, {"name":"testRandomAccessFile","parameterTypes":[] }, {"name":"testStdout","parameterTypes":[] }, {"name":"testUnsafeCast","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testAvailableTypes","parameterTypes":[] }, {"name":"testCastAsInteger","parameterTypes":[] }, {"name":"testCastGeneric","parameterTypes":[] }, {"name":"testCastGenericDuplicating","parameterTypes":[] }, {"name":"testCastToServerSocketIsSameType","parameterTypes":[] }, {"name":"testInvalidFileDescriptor","parameterTypes":[] }, {"name":"testPipe","parameterTypes":[] }, {"name":"testRandomAccessFile","parameterTypes":[] }, {"name":"testStdout","parameterTypes":[] }, {"name":"testUnsafeCast","parameterTypes":[] }]
 },
 {
   "name":"org.newsclub.net.unix.InetAddressTest",
@@ -533,6 +543,9 @@
   "queryAllPublicMethods":true,
   "methods":[{"name":"testByteBufferWithPositionOffset","parameterTypes":[] }, {"name":"testDoubleBindAddressNotReusable","parameterTypes":[] }, {"name":"testDoubleBindAddressReusable","parameterTypes":[] }, {"name":"testNonBlockingConnect","parameterTypes":[] }]
 },
+{
+  "name":"org.newsclub.net.unix.SocketClosedException"
+},
 {
   "name":"org.newsclub.net.unix.SocketOptionsTest",
   "allDeclaredFields":true,
@@ -660,7 +673,7 @@
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testSeqPacket","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testSeqPacket","parameterTypes":[] }, {"name":"testSeqPacketPair","parameterTypes":[] }]
 },
 {
   "name":"org.newsclub.net.unix.domain.EndOfFileTest",
@@ -832,6 +845,9 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"testConvertUnixDomainSocketAddress","parameterTypes":[] }]
 },
+{
+  "name":"org.newsclub.net.unix.generic.AFGenericSelectorProvider"
+},
 {
   "name":"org.newsclub.net.unix.rmi.AFRMIService",
   "queryAllPublicMethods":true

diff --git a/...native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/resource-config.json b/...native-image/com.kohlschutter.junixsocket/junixsocket-native-graalvm/resource-config.json
@@ -31,13 +31,13 @@
   }, {
     "pattern":"\\Qjunit-platform.properties\\E"
   }, {
-    "pattern":"\\Qlib/aarch64-MacOSX-clang/jni/libjunixsocket-native-2.8.0.dylib\\E"
+    "pattern":"\\Qlib/aarch64-MacOSX-clang/jni/libjunixsocket-native-2.9.0.dylib\\E"
   }, {
-    "pattern":"\\Qlib/aarch64-MacOSX-clang/jni/libjunixsocket-native-2.8.0.nodeps.dylib\\E"
+    "pattern":"\\Qlib/aarch64-MacOSX-clang/jni/libjunixsocket-native-2.9.0.nodeps.dylib\\E"
   }, {
-    "pattern":"\\Qlib/aarch64-MacOSX-gcc/jni/libjunixsocket-native-2.8.0.dylib\\E"
+    "pattern":"\\Qlib/aarch64-MacOSX-gcc/jni/libjunixsocket-native-2.9.0.dylib\\E"
   }, {
-    "pattern":"\\Qlib/aarch64-MacOSX-gcc/jni/libjunixsocket-native-2.8.0.nodeps.dylib\\E"
+    "pattern":"\\Qlib/aarch64-MacOSX-gcc/jni/libjunixsocket-native-2.9.0.nodeps.dylib\\E"
   }, {
     "pattern":"\\Qorg/newsclub/net/unix/ssl/juxclient.p12\\E"
   }, {