Fix :mongodb-crypt GraalVM metadata (#1508)

stIncMale · web-flow · commit c717171237d5 · 2024-09-23T21:29:22.000-06:00
diff --git a/mongodb-crypt/src/main/resources/META-INF/native-image/jni-config.json b/mongodb-crypt/src/main/resources/META-INF/native-image/jni-config.json
@@ -1,23 +1,23 @@
 [
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_crypto_fn",
-  "methods":[{"name":"crypt","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_crypto_fn",
+  "methods":[{"name":"crypt","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hash_fn",
-  "methods":[{"name":"hash","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hash_fn",
+  "methods":[{"name":"hash","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hmac_fn",
-  "methods":[{"name":"hmac","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hmac_fn",
+  "methods":[{"name":"hmac","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_log_fn_t",
-  "methods":[{"name":"log","parameterTypes":["int","com.mongodb.crypt.capi.CAPI$cstring","int","com.sun.jna.Pointer"] }]
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_log_fn_t",
+  "methods":[{"name":"log","parameterTypes":["int","com.mongodb.internal.crypt.capi.CAPI$cstring","int","com.sun.jna.Pointer"] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_random_fn",
-  "methods":[{"name":"random","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","int","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_random_fn",
+  "methods":[{"name":"random","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","int","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]
 },
 {
   "name":"com.sun.jna.Callback"
diff --git a/mongodb-crypt/src/main/resources/META-INF/native-image/reflect-config.json b/mongodb-crypt/src/main/resources/META-INF/native-image/reflect-config.json
@@ -1,56 +1,56 @@
 [
 {
-  "name":"com.mongodb.crypt.capi.CAPI",
+  "name":"com.mongodb.internal.crypt.capi.CAPI",
   "allPublicFields":true,
   "queryAllDeclaredMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$cstring",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$cstring",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_crypto_fn",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_crypto_fn",
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_ctx_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_ctx_t",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hash_fn",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hash_fn",
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hmac_fn",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hmac_fn",
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_kms_ctx_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_kms_ctx_t",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_log_fn_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_log_fn_t",
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_random_fn",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_random_fn",
   "queryAllDeclaredMethods":true,
   "queryAllPublicMethods":true
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_status_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_t",
+  "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_t",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_crypto_fn",`
`4`		`- "methods":[{"name":"crypt","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]`
	`3`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_crypto_fn",`
	`4`	`+ "methods":[{"name":"crypt","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]`
`5`	`5`	`},`
`6`	`6`	`{`
`7`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hash_fn",`
`8`		`- "methods":[{"name":"hash","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]`
	`7`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hash_fn",`
	`8`	`+ "methods":[{"name":"hash","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hmac_fn",`
`12`		`- "methods":[{"name":"hmac","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]`
	`11`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hmac_fn",`
	`12`	`+ "methods":[{"name":"hmac","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_log_fn_t",`
`16`		`- "methods":[{"name":"log","parameterTypes":["int","com.mongodb.crypt.capi.CAPI$cstring","int","com.sun.jna.Pointer"] }]`
	`15`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_log_fn_t",`
	`16`	`+ "methods":[{"name":"log","parameterTypes":["int","com.mongodb.internal.crypt.capi.CAPI$cstring","int","com.sun.jna.Pointer"] }]`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_random_fn",`
`20`		`- "methods":[{"name":"random","parameterTypes":["com.sun.jna.Pointer","com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t","int","com.mongodb.crypt.capi.CAPI$mongocrypt_status_t"] }]`
	`19`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_random_fn",`
	`20`	`+ "methods":[{"name":"random","parameterTypes":["com.sun.jna.Pointer","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t","int","com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t"] }]`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"name":"com.sun.jna.Callback"`
Original file line number	Diff line number	Diff line change
`@@ -1,56 +1,56 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "name":"com.mongodb.crypt.capi.CAPI",`
	`3`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI",`
`4`	`4`	`"allPublicFields":true,`
`5`	`5`	`"queryAllDeclaredMethods":true`
`6`	`6`	`},`
`7`	`7`	`{`
`8`		`- "name":"com.mongodb.crypt.capi.CAPI$cstring",`
	`8`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$cstring",`
`9`	`9`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`10`	`10`	`},`
`11`	`11`	`{`
`12`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_binary_t",`
	`12`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_binary_t",`
`13`	`13`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`14`	`14`	`},`
`15`	`15`	`{`
`16`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_crypto_fn",`
	`16`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_crypto_fn",`
`17`	`17`	`"queryAllDeclaredMethods":true,`
`18`	`18`	`"queryAllPublicMethods":true`
`19`	`19`	`},`
`20`	`20`	`{`
`21`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_ctx_t",`
	`21`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_ctx_t",`
`22`	`22`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hash_fn",`
	`25`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hash_fn",`
`26`	`26`	`"queryAllDeclaredMethods":true,`
`27`	`27`	`"queryAllPublicMethods":true`
`28`	`28`	`},`
`29`	`29`	`{`
`30`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_hmac_fn",`
	`30`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_hmac_fn",`
`31`	`31`	`"queryAllDeclaredMethods":true,`
`32`	`32`	`"queryAllPublicMethods":true`
`33`	`33`	`},`
`34`	`34`	`{`
`35`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_kms_ctx_t",`
	`35`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_kms_ctx_t",`
`36`	`36`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`37`	`37`	`},`
`38`	`38`	`{`
`39`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_log_fn_t",`
	`39`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_log_fn_t",`
`40`	`40`	`"queryAllDeclaredMethods":true,`
`41`	`41`	`"queryAllPublicMethods":true`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_random_fn",`
	`44`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_random_fn",`
`45`	`45`	`"queryAllDeclaredMethods":true,`
`46`	`46`	`"queryAllPublicMethods":true`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_status_t",`
	`49`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_status_t",`
`50`	`50`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- "name":"com.mongodb.crypt.capi.CAPI$mongocrypt_t",`
	`53`	`+ "name":"com.mongodb.internal.crypt.capi.CAPI$mongocrypt_t",`
`54`	`54`	`"methods":[{"name":"<init>","parameterTypes":[] }]`
`55`	`55`	`},`
`56`	`56`	`{`