-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move native JNI configuration from Feature to json #31179
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageJNIConfigStep.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package io.quarkus.deployment.steps; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.StringWriter; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import io.quarkus.builder.Json; | ||
| import io.quarkus.builder.Json.JsonArrayBuilder; | ||
| import io.quarkus.builder.Json.JsonObjectBuilder; | ||
| import io.quarkus.deployment.annotations.BuildProducer; | ||
| import io.quarkus.deployment.annotations.BuildStep; | ||
| import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; | ||
| import io.quarkus.deployment.builditem.nativeimage.JniRuntimeAccessBuildItem; | ||
| import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; | ||
|
|
||
| public class NativeImageJNIConfigStep { | ||
|
|
||
| @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) | ||
| void generateJniConfig(BuildProducer<GeneratedResourceBuildItem> jniConfig, | ||
| List<JniRuntimeAccessBuildItem> jniRuntimeAccessibleClasses) { | ||
| final Map<String, JniInfo> jniClasses = new LinkedHashMap<>(); | ||
|
|
||
| for (JniRuntimeAccessBuildItem jniAccessible : jniRuntimeAccessibleClasses) { | ||
| addJniClass(jniClasses, jniAccessible); | ||
| } | ||
|
|
||
| JsonArrayBuilder root = Json.array(); | ||
| for (Map.Entry<String, JniInfo> entry : jniClasses.entrySet()) { | ||
| JsonObjectBuilder json = Json.object(); | ||
|
|
||
| json.put("name", entry.getKey()); | ||
|
|
||
| JniInfo info = entry.getValue(); | ||
| if (info.constructors) { | ||
| json.put("allDeclaredConstructors", true); | ||
| } | ||
| if (info.methods) { | ||
| json.put("allDeclaredMethods", true); | ||
| } | ||
| if (info.fields) { | ||
| json.put("allDeclaredFields", true); | ||
| } | ||
|
|
||
| root.add(json); | ||
| } | ||
|
|
||
| try (StringWriter writer = new StringWriter()) { | ||
| root.appendTo(writer); | ||
| jniConfig.produce(new GeneratedResourceBuildItem("META-INF/native-image/jni-config.json", | ||
| writer.toString().getBytes(StandardCharsets.UTF_8))); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| private void addJniClass(Map<String, JniInfo> jniClasses, JniRuntimeAccessBuildItem jniRuntimeAccessBuildItem) { | ||
| for (String cl : jniRuntimeAccessBuildItem.getClassNames()) { | ||
| JniInfo existing = jniClasses.get(cl); | ||
| if (existing == null) { | ||
| jniClasses.put(cl, new JniInfo(jniRuntimeAccessBuildItem)); | ||
| } else { | ||
| if (jniRuntimeAccessBuildItem.isConstructors()) { | ||
| existing.constructors = true; | ||
| } | ||
| if (jniRuntimeAccessBuildItem.isMethods()) { | ||
| existing.methods = true; | ||
| } | ||
| if (jniRuntimeAccessBuildItem.isFields()) { | ||
| existing.fields = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| static final class JniInfo { | ||
| boolean constructors; | ||
| boolean methods; | ||
| boolean fields; | ||
|
|
||
| private JniInfo(JniRuntimeAccessBuildItem jniRuntimeAccessBuildItem) { | ||
| this.methods = jniRuntimeAccessBuildItem.isMethods(); | ||
| this.fields = jniRuntimeAccessBuildItem.isFields(); | ||
| this.constructors = jniRuntimeAccessBuildItem.isConstructors(); | ||
| } | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My understanding is that this was useful only for GraalVM < 22.3, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost, it was actually useful only for GraalVM < 21.1 :)
https://github.com/oracle/graal/blob/c65bf9a9a936143282435da5be552527154bbdaa/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java#L109-L115