Skip to content

Commit 3bc66d2

Browse files
stIncMalestIncMale
committed
Properly rearrange metadata based on the metadata origins
Goes to mongodb-crypt from driver-core/src/main/resources/META-INF/native-image/reflect-config.json: { "name":"boolean", "fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}] }, { "name":"com.sun.crypto.provider.AESCipher$General", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"com.sun.crypto.provider.HmacCore$HmacSHA256", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"com.sun.crypto.provider.HmacCore$HmacSHA512", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"int", "fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}] }, { "name":"java.lang.Throwable", "methods":[{"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }] }, { "name":"java.lang.reflect.Method", "methods":[{"name":"isVarArgs","parameterTypes":[] }] }, { "name":"java.nio.Buffer" }, { "name":"long", "fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}] }, // NativePRNG also stays in driver-core { "name":"sun.security.provider.NativePRNG", "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }] }, { "name":"sun.security.provider.SHA2$SHA256", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"sun.security.provider.SHA5$SHA512", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"void", "fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}] }, Goes to mongodb-crypt from graalvm-native-image-app/src/main/resources/META-INF/native-image/reflect-config.json { "name":"org.slf4j.Logger" }, Goes to graalvm-native-image-app/build/native/agent-output/run/reflect-config.json from driver-core/src/main/resources/META-INF/native-image/reflect-config.json { "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", "methods":[{"name":"<init>","parameterTypes":[] }] }, { "name":"java.io.FilePermission" }, { "name":"java.lang.RuntimePermission" }, { "name":"java.net.NetPermission" }, { "name":"java.net.SocketPermission" }, { "name":"java.net.URLPermission", "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }] }, { "name":"java.security.AllPermission" }, { "name":"java.security.SecurityPermission" }, { "name":"java.util.PropertyPermission" }, { "name":"java.util.concurrent.atomic.AtomicBoolean", "fields":[{"name":"value"}] }, { "name":"java.util.concurrent.atomic.AtomicReference", "fields":[{"name":"value"}] }, { "name":"javax.smartcardio.CardPermission" }, Goes to bson/src/main/resources/META-INF/native-image/reflect-config.json from driver-core/src/main/resources/META-INF/native-image/reflect-config.json { "name":"java.lang.Object", "queryAllDeclaredMethods":true }, Goes to bson/src/main/resources/META-INF/native-image/reflect-config.json from graalvm-native-image-app/src/main/resources/META-INF/native-image/reflect-config.json { "name":"org.slf4j.Logger" }, Goes to driver-core/src/main/resources/META-INF/native-image/reflect-config.json from graalvm-native-image-app/src/main/resources/META-INF/native-image/reflect-config.json { "name":"org.slf4j.Logger" }, JAVA-5219
1 parent a244a63 commit 3bc66d2

File tree

6 files changed

+59
-60
lines changed

6 files changed

+59
-60
lines changed

‎bson-kotlin/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎bson-kotlinx/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎bson-record-codec/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎bson/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[
2+
{
3+
"name":"java.lang.Object",
4+
"queryAllDeclaredMethods":true
5+
},
6+
{
7+
"name":"org.slf4j.Logger"
8+
}
9+
]

‎driver-core/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 12 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -133,27 +133,13 @@
133133
"fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}],
134134
"methods":[{"name":"<init>","parameterTypes":[] }]
135135
},
136-
{
137-
"name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
138-
"methods":[{"name":"<init>","parameterTypes":[] }]
139-
},
140136
{
141137
"name":"int",
142138
"fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}]
143139
},
144-
{
145-
"name":"java.io.FilePermission"
146-
},
147-
{
148-
"name":"java.lang.Object",
149-
"queryAllDeclaredMethods":true
150-
},
151140
{
152141
"name":"java.lang.Record"
153142
},
154-
{
155-
"name":"java.lang.RuntimePermission"
156-
},
157143
{
158144
"name":"java.lang.Thread",
159145
"fields":[{"name":"threadLocalRandomProbe"}]
@@ -166,54 +152,24 @@
166152
"name":"java.lang.reflect.Method",
167153
"methods":[{"name":"isVarArgs","parameterTypes":[] }]
168154
},
169-
{
170-
"name":"java.net.NetPermission"
171-
},
172155
{
173156
"name":"java.net.Socket",
174157
"methods":[{"name":"setOption","parameterTypes":["java.net.SocketOption","java.lang.Object"] }]
175158
},
176-
{
177-
"name":"java.net.SocketPermission"
178-
},
179-
{
180-
"name":"java.net.URLPermission",
181-
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
182-
},
183159
{
184160
"name":"java.nio.Buffer"
185161
},
186-
{
187-
"name":"java.security.AllPermission"
188-
},
189162
{
190163
"name":"java.security.SecureRandomParameters"
191164
},
192-
{
193-
"name":"java.security.SecurityPermission"
194-
},
195-
{
196-
"name":"java.util.PropertyPermission"
197-
},
198165
{
199166
"name":"java.util.concurrent.ForkJoinTask",
200167
"fields":[{"name":"aux"}, {"name":"status"}]
201168
},
202-
{
203-
"name":"java.util.concurrent.atomic.AtomicBoolean",
204-
"fields":[{"name":"value"}]
205-
},
206-
{
207-
"name":"java.util.concurrent.atomic.AtomicReference",
208-
"fields":[{"name":"value"}]
209-
},
210169
{
211170
"name":"java.util.concurrent.atomic.Striped64",
212171
"fields":[{"name":"base"}, {"name":"cellsBusy"}]
213172
},
214-
{
215-
"name":"javax.smartcardio.CardPermission"
216-
},
217173
{
218174
"name":"jdk.internal.misc.Unsafe"
219175
},
@@ -244,5 +200,17 @@
244200
{
245201
"name":"void",
246202
"fields":[{"name":"OPTIONS"}, {"name":"STRING_ENCODING"}, {"name":"STRUCTURE_ALIGNMENT"}, {"name":"TYPE_MAPPER"}]
203+
},
204+
{
205+
"name":"org.bson.codecs.kotlin.DataClassCodecProvider"
206+
},
207+
{
208+
"name":"org.bson.codecs.kotlinx.KotlinSerializerCodecProvider"
209+
},
210+
{
211+
"name":"org.bson.codecs.record.RecordCodecProvider"
212+
},
213+
{
214+
"name":"org.slf4j.Logger"
247215
}
248216
]

‎graalvm-native-image-app/src/main/resources/META-INF/native-image/reflect-config.json

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,44 @@
6262
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
6363
},
6464
{
65-
"name":"org.slf4j.Logger"
65+
"name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
66+
"methods":[{"name":"<init>","parameterTypes":[] }]
67+
},
68+
{
69+
"name":"java.io.FilePermission"
70+
},
71+
{
72+
"name":"java.lang.RuntimePermission"
73+
},
74+
{
75+
"name":"java.net.NetPermission"
76+
},
77+
{
78+
"name":"java.net.SocketPermission"
79+
},
80+
{
81+
"name":"java.net.URLPermission",
82+
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
83+
},
84+
{
85+
"name":"java.security.AllPermission"
86+
},
87+
{
88+
"name":"java.security.SecurityPermission"
89+
},
90+
{
91+
"name":"java.util.PropertyPermission"
92+
},
93+
{
94+
"name":"java.util.concurrent.atomic.AtomicBoolean",
95+
"fields":[{"name":"value"}]
96+
},
97+
{
98+
"name":"java.util.concurrent.atomic.AtomicReference",
99+
"fields":[{"name":"value"}]
100+
},
101+
{
102+
"name":"javax.smartcardio.CardPermission"
66103
},
67104
{
68105
"name":"reactivestreams.tour.Address",

0 commit comments

Comments
 (0)