fix vpp string type api implementation

 - separate static string functions to string_t.h library
 - ignore string limit value for now. We would need to create
   wrapper class for string to support max length in java.
   API example:
   [
       "string",
       "version",
       {
           "limit": 32
       }
   ]

Change-Id: I60a8a2c56397d54d49544551dc91733e12a0a0ea
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

1 files changed, 1 insertions, 28 deletions

diff --git a/java/jvpp-core/jvpp_core.c b/java/jvpp-core/jvpp_core.c
index da8ab09..618793a 100644
--- a/java/jvpp-core/jvpp_core.c
+++ b/java/jvpp-core/jvpp_core.c
@@ -25,6 +25,7 @@
 #include <vlibmemory/api.h>
 #include <jni.h>
 #include <jvpp_core.h>
+#include <jvpp-common/string_t.h>
 
 
 // TODO: generate jvpp_plugin_name.c files (or at least reuse plugin's main structure)
@@ -106,31 +107,3 @@ void JNI_OnUnload(JavaVM *vm, void *reserved) {
     }
     delete_class_references(env);
 }
-
-
-static void _host_to_net_string(JNIEnv * env, jstring javaString, vl_api_string_t * vl_api_string)
-{
-    const char *nativeString;
-    // prevent null, which causes jni to crash
-    if (NULL != javaString) {
-        nativeString = (*env)->GetStringUTFChars(env, javaString, 0);
-    } else{
-        nativeString = "";
-    }
-
-    vl_api_to_api_string(jstr_length(env, javaString) + 1, nativeString, vl_api_string);
-
-    (*env)->ReleaseStringUTFChars(env, javaString, nativeString);
-}
-
-
-static jstring _net_to_host_string(JNIEnv * env, const vl_api_string_t * _net)
-{
-    return (*env)->NewStringUTF(env, (char *)_net->buf);
-}
-
-
-static size_t jstr_length(JNIEnv *env, jstring string)
-{
-    return ((int) (*env)->GetStringUTFLength(env, string));
-}