[Java.Base] Bind package java.util.concurrent #1274
Merged
Conversation
This file contains hidden or 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
Context: 0aec86a Commit 0aec86a mentioned: > * Use of `JNIEnv.GetJniName()` > > string __id = "(L" + global::Android.Runtime.JNIEnv.GetJniName (GetType ().DeclaringType) + ";)V"; > > Impacts: NestedTypes.cs This issue also impacts [`java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject`][0]. Update `Java.Base` to bind the `java.util.concurrent` package, which will cause `AbstractQueuedSynchronizer` to be bound, which in turn forces us to update `generator` to not emit `JNIEnv.GetJniName()`. Instead of using `JNIEnv.GetJniName(Type)`, use: JniEnvironment.Runtime.TypeManager.GetTypeSignature (GetType ().DeclaringType).SimpleReference Update NestedTypes.cs to enable `TryJavaInterop1 => true`. Update `Java.Base.csproj` to ignore C# warning [CS0109][1], as [`CompletableFuture.handle()`] is emitted with a `new` which is not required: Java.Util.Concurrent.CompletableFuture.cs(629,76): warning CS0109: The member 'CompletableFuture.Handle(IBiFunction?)' does not hide an accessible member. The new keyword is not required. Add a test to `tests/Java.Base-Tests` which tests nested type support. Update `JavaNativeTypeManager.cs` so that `IsNonStaticInnerClass()` supports JavaInterop1-style attributes, not just XAJavaInterop1. Aside: I updated my local JDK to JDK-17 (from JDK-11), which caused many changes to `src/Java.Base-ref.cs`, particularly parameter names. TODO? Update `Java.Interop.Tools.JavaCallableWrappers` so that non-static inner classes don't have a prefix of their declaring type. This would result in `example/MyQueuedSynchronizer$MyConditionObject` instead of `example/MyQueuedSynchronizer$MyQueuedSynchronizer_MyConditionObject`. [0]: https://developer.android.com/reference/java/util/concurrent/locks/AbstractQueuedSynchronizer.ConditionObject [1]: https://learn.microsoft.com/dotnet/csharp/misc/cs0109 [2]: https://developer.android.com/reference/java/util/concurrent/CompletableFuture#handle(java.util.function.BiFunction%3C?%20super%20T,java.lang.Throwable,?%20extends%20U%3E)
jpobst
reviewed
Oct 25, 2024
| if (!type.HasCustomAttributes) | ||
| return false; | ||
| return type.AnyCustomAttributes (typeof (RegisterAttribute)) || | ||
| type.AnyCustomAttributes ("Java.Interop.JniTypeSignatureAttribute"); |
Contributor
There was a problem hiding this comment.
Is this going to cause any issues for XAJavaInterop1? Do we need to find a way to ensure that this is only used for JavaInterop1?
Contributor
Author
There was a problem hiding this comment.
Is this going to cause any issues for
XAJavaInterop1?
No. JavaNativeTypeManager allows obtaining the Java Callable Wrapper type name from a System.Type or Mono.Cecil.TypeDefinition instance. jcw-gen already uses [JniTypeSignature], as does JavaNativeTypeManager:
The change here is for IsNonStaticInnerClass(), which didn't yet check for [JniTypeSignature].
Do we need to find a way to ensure that this is only used for
JavaInterop1?
No.
jpobst
approved these changes
Oct 28, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Context: 0aec86a
Commit 0aec86a mentioned:
This issue also impacts
java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject.Update
Java.Baseto bind thejava.util.concurrentpackage, which will causeAbstractQueuedSynchronizerto be bound, which in turn forces us to updategeneratorto not emitJNIEnv.GetJniName(). Instead of usingJNIEnv.GetJniName(Type), use:Update NestedTypes.cs to enable
TryJavaInterop1 => true.Update
Java.Base.csprojto ignore C# warning CS0109, asCompletableFuture.handle()is emitted with anewwhich is not required:Add a test to
tests/Java.Base-Testswhich tests nested type support.Update
JavaNativeTypeManager.csso thatIsNonStaticInnerClass()supports JavaInterop1-style attributes, not just XAJavaInterop1.Aside: I updated my local JDK to JDK-17 (from JDK-11), which caused many changes to
src/Java.Base-ref.cs, particularly parameter names.TODO? Update
Java.Interop.Tools.JavaCallableWrappersso that non-static inner classes don't have a prefix of their declaring type. This would result inexample/MyQueuedSynchronizer$MyConditionObjectinstead ofexample/MyQueuedSynchronizer$MyQueuedSynchronizer_MyConditionObject.