Merge pull request #37 from rpavlik/methods-returning-array

Methods returning array

Author: rpavlik

jnipp.cpp

@@ -465,6 +465,13 @@ namespace jni
         return Object(result, DeleteLocalInput);
     }
 
+    jarray Object::callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<jarray> const&) const
+    {
+        auto result = env()->CallObjectMethodA(_handle, method, (jvalue*) args);
+        handleJavaExceptions();
+        return (jarray)result;
+    }
+
     byte_t Object::getFieldValue(field_t field, internal::ReturnTypeWrapper<byte_t> const&) const
     {
         return env()->GetByteField(_handle, field);

jnipp.h

@@ -73,6 +73,7 @@ namespace jni
 
     // Foward Declarations
     class Object;
+    template <class TElement> class Array;
 
     /**
         This namespace is for messy implementation details only. It is not a part
@@ -103,6 +104,9 @@ namespace jni
         std::string valueSig(const Object* obj);
         inline std::string valueSig(const Object* const* obj) { return valueSig(obj ? *obj : nullptr); }
 
+        template <class TArg>
+        inline std::string valueSig(const Array<TArg>*) { return "[" + valueSig((TArg*) nullptr); }
+
         template <int n, class TArg>
         inline std::string valueSig(const TArg(*arg)[n]) { return valueSig((const TArg* const*)arg); }
 
@@ -452,7 +456,10 @@ namespace jni
         std::string callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<std::string> const&) const;
         std::wstring callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<std::wstring> const&) const;
         jni::Object callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<jni::Object> const&) const;
+        jarray callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<jarray> const&) const;
 
+        template<typename T>
+        jni::Array<T> callMethod(method_t method, internal::value_t* args, internal::ReturnTypeWrapper<jni::Array<T>> const&) const;
 
         void getFieldValue(field_t field, internal::ReturnTypeWrapper<void> const&) const;
         bool getFieldValue(field_t field, internal::ReturnTypeWrapper<bool> const&) const;
@@ -1025,6 +1032,17 @@ namespace jni
         InitializationException(const char* msg) : Exception(msg) {}
     };
 
+    /*
+        Call method returning array: implementation
+    */
+    template <typename T>
+    inline jni::Array<T> Object::callMethod(method_t method, internal::value_t* args,
+                                            internal::ReturnTypeWrapper<jni::Array<T>> const&) const
+    {
+        jarray result = callMethod(method, args, internal::ReturnTypeWrapper<jarray>{});
+        return jni::Array<T>(result, DeleteLocalInput);
+    }
+
     /*
         Array Implementation
      */

tests/main.cpp

@@ -304,6 +304,21 @@ TEST(Object_call_byNameWithArgs)
     ASSERT(str2.call<wchar_t>("charAt", 1) == L'e');
 }
 
+TEST(Object_call_returningArray) {
+    jni::Object str = jni::Class("java/lang/String").newInstance("Testing");
+
+    {
+        auto getBytes =
+            jni::Class("java/lang/String").getMethod("getBytes", "()[B");
+        auto bytes = str.call<jni::Array<jni::byte_t>>(getBytes);
+        ASSERT(bytes.getLength() == 7);
+    }
+    {
+        auto bytes = str.call<jni::Array<jni::byte_t>>("getBytes");
+        ASSERT(bytes.getLength() == 7);
+    }
+}
+
 TEST(Object_makeLocalReference)
 {
     jni::Object str = jni::Class("java/lang/String").newInstance("Testing");
@@ -593,6 +608,7 @@ int main()
         RUN_TEST(Object_call_byName);
         RUN_TEST(Object_call_withArgs);
         RUN_TEST(Object_call_byNameWithArgs);
+        RUN_TEST(Object_call_returningArray);
         RUN_TEST(Object_makeLocalReference);
 
         // jni::Enum Tests