feat: using hash set

Author: hui19

dart_native/android/src/main/java/com/dartnative/dart_native/ArrayListConverter.java

@@ -1,9 +1,10 @@
 package com.dartnative.dart_native;
 
-import io.flutter.Log;
+import android.util.Log;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -142,54 +143,11 @@ public List arrayToList(Object array) {
 
     /************************set to list***************************************/
 
-    public List setToList(Set set) {
-        Log.d("HUIZZ", "set start");
-        Object ele = set.iterator().next();
-        List arrayList;
-        if (ele instanceof Integer) {
-            arrayList = new ArrayList<Integer>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Short) {
-            arrayList = new ArrayList<Short>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Byte) {
-            arrayList = new ArrayList<Byte>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Long) {
-            arrayList = new ArrayList<Long>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Boolean) {
-            arrayList = new ArrayList<Boolean>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Float) {
-            arrayList = new ArrayList<Float>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Double) {
-            arrayList = new ArrayList<Double>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else if (ele instanceof Character) {
-            arrayList = new ArrayList<Character>();
-            for (Object element : set) {
-                arrayList.add(element);
-            }
-        } else {
-            arrayList = Arrays.asList(set.toArray());
+    public List setToList(HashSet<Object> set) {
+        if (set == null || set.size() == 0) {
+            return new ArrayList();
         }
-        Log.d("HUIZZ", "set success");
-        return arrayList;
+
+        return new ArrayList<Object>(set);
     }
 }

dart_native/android/src/main/jni/dart_native.cpp

@@ -220,6 +220,7 @@ void *invokeNativeMethodNeo(void *classPtr, char *methodName, void **args, char
       fillArgs(args, argTypes, argValues, argCount);
     }
     char *methodSignature = spliceChar(signature, returnType);
+    NSLog("call method %s %s", methodName, methodSignature);
     jmethodID method = getEnv()->GetMethodID(cls, methodName, methodSignature);
 
     if (strlen(returnType) > 1) {

dart_native/example/android/app/src/main/java/com/dartnative/dart_native_example/RuntimeStub.java

@@ -11,6 +11,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.HashSet;
 
 public class RuntimeStub {
   private final String TAG = "dart_java";
@@ -159,7 +160,7 @@ public byte[] getByteArray(byte[] bytes) {
     return new byte[]{1, 2, 10};
   }
 
-  public Set<Integer> getIntSet(Set<Integer> set) {
+  public Set<Integer> getIntSet(HashSet<Integer> set) {
     for(Integer element : set) {
       Log.d(TAG, "Set element is " + element);
     }
@@ -171,7 +172,7 @@ public Set<Integer> getIntSet(Set<Integer> set) {
     return backSet;
   }
 
-  public Set<Float> getFloatSet(Set<Float> set) {
+  public Set<Float> getFloatSet(HashSet<Float> set) {
     for(Float element : set) {
       Log.d(TAG, "Set element is " + element);
     }

dart_native/example/lib/android/unit_test.dart

@@ -86,7 +86,7 @@ testAndroid(RuntimeStub stub) {
   //   print("item $item");
   // }
   //
-  // list = stub.getByteList([byte(1), byte(2), byte(3), byte(4)]);
+  // List list = stub.getByteList([byte(1), byte(2), byte(3), byte(4)]);
   // for (int item in list) {
   //   print("item $item");
   // }

dart_native/lib/src/android/foundation/collection/jset.dart

@@ -5,17 +5,16 @@ import 'package:dart_native/src/android/runtime/jsubclass.dart';
 import 'package:ffi/ffi.dart';
 
 /// Stands for `Set` in Android.
-const String CLS_SET = "java/util/Set";
 const String CLS_HASH_SET = "java/util/HashSet";
 
 class JSet extends JSubclass<Set> {
-  JSet(Set value, {String clsName: CLS_SET, InitSubclass init: _new}) : super(value, _new, clsName) {
+  JSet(Set value, {String clsName: CLS_HASH_SET, InitSubclass init: _new}) : super(value, _new, clsName) {
     value = Set.of(value);
   }
 
-  JSet.fromPointer(Pointer<Void> ptr, {String clsName: CLS_SET}) : super.fromPointer(ptr, clsName) {
+  JSet.fromPointer(Pointer<Void> ptr, {String clsName: CLS_HASH_SET}) : super.fromPointer(ptr, clsName) {
     JObject converter = JObject("com/dartnative/dart_native/ArrayListConverter");
-    List list = JList.fromPointer(converter.invoke("setToList", [JObject("java/util/Set", pointer: ptr)], "Ljava/util/List;")).raw;
+    List list = JList.fromPointer(converter.invoke("setToList", [JObject("java/util/HashSet", pointer: ptr)], "Ljava/util/List;")).raw;
     raw = list.toSet();
   }
 }
@@ -25,9 +24,6 @@ Pointer<Utf8> _argSignature = Utf8.toUtf8("Ljava/lang/Object;");
 /// New native 'Set'.
 Pointer<Void> _new(dynamic value, String clsName) {
   if (value is Set) {
-    ///'Set' default implementation 'HashSet'.
-    if (clsName == CLS_SET) clsName = CLS_HASH_SET;
-
     JObject nativeSet = JObject(clsName);
     if (value == null) {
       return nativeSet.pointer;