Remove isNull from JObject

dart-lang · Nov 8, 2024 · 53ed33f · 53ed33f
1 parent 80693da
commit 53ed33f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/pkgs/jni/lib/src/jarray.dart b/pkgs/jni/lib/src/jarray.dart
@@ -409,7 +409,7 @@ extension DoubleArray on JArray<jdouble> {
   }
 }
 
-extension ObjectArray<T extends JObject> on JArray<T> {
+extension ObjectArray<T extends JObject?> on JArray<T> {
   T operator [](int index) {
     RangeError.checkValidIndex(index, this);
     return (elementType as JObjType<T>).fromReference(JGlobalReference(
@@ -418,7 +418,7 @@ extension ObjectArray<T extends JObject> on JArray<T> {
 
   void operator []=(int index, T value) {
     RangeError.checkValidIndex(index, this);
-    final valueRef = value.reference;
+    final valueRef = value?.reference ?? jNullReference;
     Jni.env.SetObjectArrayElement(reference.pointer, index, valueRef.pointer);
   }
 

diff --git a/pkgs/jni/lib/src/lang/jstring.dart b/pkgs/jni/lib/src/lang/jstring.dart
@@ -87,6 +87,9 @@ class JString extends JObject {
   /// The type which includes information such as the signature of this class.
   static const JObjType<JString> type = JStringType();
 
+  /// The type which includes information such as the signature of this class.
+  static const JObjType<JString?> nullableType = JStringNullableType();
+
   /// Construct a new [JString] with [reference] as its underlying reference.
   JString.fromReference(super.reference) : super.fromReference();
 

diff --git a/pkgs/jni/lib/src/util/jlist.dart b/pkgs/jni/lib/src/util/jlist.dart
@@ -311,7 +311,7 @@ class JList<$E extends JObject?> extends JObject with ListMixin<$E> {
   }
 }
 
-extension ToJavaList<E extends JObject> on Iterable<E> {
+extension ToJavaList<E extends JObject?> on Iterable<E> {
   JList<E> toJList(JObjType<E> type) {
     final list = JList.array(type);
     list.addAll(this);

diff --git a/pkgs/jni/test/jarray_test.dart b/pkgs/jni/test/jarray_test.dart
@@ -389,75 +389,75 @@ void run({required TestRunnerCallback testRunner}) {
   });
   testRunner('JArray of JByte', () {
     using((arena) {
-      final arr = JArray(JByte.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      final arr = JArray(JByte.nullableType, 1)..releasedBy(arena);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JShort', () {
     using((arena) {
       final arr = JArray(JShort.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JInteger', () {
     using((arena) {
       final arr = JArray(JInteger.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JCharacter', () {
     using((arena) {
       final arr = JArray(JCharacter.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JLong', () {
     using((arena) {
       final arr = JArray(JLong.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JFloat', () {
     using((arena) {
       final arr = JArray(JFloat.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JDouble', () {
     using((arena) {
       final arr = JArray(JDouble.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JBoolean', () {
     using((arena) {
       final arr = JArray(JBoolean.type, 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JSet', () {
     using((arena) {
       final arr = JArray(JSet.type(JString.type), 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JList', () {
     using((arena) {
       final arr = JArray(JList.type(JString.type), 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JMap', () {
     using((arena) {
       final arr = JArray(JMap.type(JString.type, JString.type), 1)
         ..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
   testRunner('JArray of JIterator', () {
     using((arena) {
       final arr = JArray(JIterator.type(JString.type), 1)..releasedBy(arena);
-      expect((arr[0]..releasedBy(arena)).isNull, true);
+      expect(arr[0], isNull);
     });
   });
 }
diff --git a/pkgs/jni/test/jlist_test.dart b/pkgs/jni/test/jlist_test.dart
@@ -36,12 +36,17 @@ void run({required TestRunnerCallback testRunner}) {
   });
   testRunner('length set', () {
     using((arena) {
-      final list = testDataList(arena);
+      final list = <JString?>[
+        '1'.toJString()..releasedBy(arena),
+        '2'.toJString()..releasedBy(arena),
+        '3'.toJString()..releasedBy(arena),
+      ].toJList(JString.nullableType)
+        ..releasedBy(arena);
       list.length = 2;
       expect(list.length, 2);
       list.length = 3;
       expect(list.length, 3);
-      expect(list.last.isNull, true);
+      expect(list.last, isNull);
     });
   });
   testRunner('[]', () {