Remove unnecessary information field from peer

[Problem] There is unnecessary field for the peer information
[Solution] Delete the service name field

Change-Id: I7146b9df41f6f7320ca079f5ec10ec7233e0f997
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

diff --git a/subprojects/libbeyond-android/src/main/java/com/samsung/android/beyond/inference/Peer.java b/subprojects/libbeyond-android/src/main/java/com/samsung/android/beyond/inference/Peer.java
index e4582ae2746aeee809e66c53c6b2c72a6083de3c..9452c3294a49766e07b8aef2ed0aa790cd6603cf 100644 (file)
--- a/subprojects/libbeyond-android/src/main/java/com/samsung/android/beyond/inference/Peer.java
+++ b/subprojects/libbeyond-android/src/main/java/com/samsung/android/beyond/inference/Peer.java
@@ -28,10 +28,12 @@ public class Peer extends NativeInstance {
     }
 
     public static class Info {
-        public String name;
         public String host;
         public int port;
         public String uuid;
+
+        // TODO:
+        // List of runtimes
     }
 
     public Peer(Context context, String peerType, NodeType nodeType) {

diff --git a/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.cc b/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.cc
index f2593afb6c5e98cef972bf7b0333ecb468dbc4b4..f5527f645c9b85d09dfcb5167b25ffd98f8692a4 100644 (file)
--- a/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.cc
+++ b/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.cc
@@ -27,7 +27,6 @@ static void release_arguments(JNIEnv *env, int argc, const char **argv, jstring
 PeerNativeInterface::Info PeerNativeInterface::infoObject = {
     .klass = nullptr,
     .constructor = nullptr,
-    .name = nullptr,
     .host = nullptr,
     .port = nullptr,
     .uuid = nullptr,
@@ -215,21 +214,6 @@ jobject PeerNativeInterface::Java_com_samsung_android_beyond_InferencePeer_get_i
 
     env->SetObjectField(object, infoObject.uuid, static_cast<jobject>(uuid));
 
-    if (info->name != nullptr) {
-        jstring name = env->NewStringUTF(info->name);
-        if (env->ExceptionCheck() == true) {
-            JNIHelper::PrintException(env, __FUNCTION__, __LINE__);
-            return nullptr;
-        }
-
-        if (name == nullptr) {
-            ErrPrint("_name is not valid");
-            return nullptr;
-        }
-
-        env->SetObjectField(object, infoObject.name, name);
-    }
-
     // TODO:
     // Port array should be changed to a single value
     // No more need to keep the multiple port information
@@ -263,15 +247,10 @@ jboolean PeerNativeInterface::Java_com_samsung_android_beyond_InferencePeer_set_
         .runtimes = nullptr,
     };
 
-    jobject name = env->GetObjectField(info, infoObject.name);
     jobject host = env->GetObjectField(info, infoObject.host);
     jobject uuid = env->GetObjectField(info, infoObject.uuid);
     jint port = env->GetIntField(info, infoObject.port);
 
-    if (name != nullptr) {
-        peerInfo.name = const_cast<char *>(env->GetStringUTFChars(static_cast<jstring>(name), nullptr));
-    }
-
     if (host != nullptr) {
         peerInfo.host = const_cast<char *>(env->GetStringUTFChars(static_cast<jstring>(host), nullptr));
     }
@@ -293,10 +272,6 @@ jboolean PeerNativeInterface::Java_com_samsung_android_beyond_InferencePeer_set_
 
     int ret = peer_handle->peer->SetInfo(&peerInfo);
 
-    if (peerInfo.name != nullptr) {
-        env->ReleaseStringUTFChars(static_cast<jstring>(name), peerInfo.name);
-    }
-
     if (peerInfo.host != nullptr) {
         env->ReleaseStringUTFChars(static_cast<jstring>(host), peerInfo.host);
     }
@@ -411,20 +386,6 @@ void PeerNativeInterface::Java_com_samsung_android_beyond_InferencePeer_initiali
         return;
     }
 
-    infoObject.name = env->GetFieldID(infoObject.klass, "name", "Ljava/lang/String;");
-    if (env->ExceptionCheck() == true) {
-        JNIHelper::PrintException(env, __FUNCTION__, __LINE__);
-        env->DeleteGlobalRef(infoObject.klass);
-        infoObject.klass = nullptr;
-        return;
-    }
-    if (infoObject.name == nullptr) {
-        ErrPrint("Unable to get the name field from info");
-        env->DeleteGlobalRef(infoObject.klass);
-        infoObject.klass = nullptr;
-        return;
-    }
-
     infoObject.host = env->GetFieldID(infoObject.klass, "host", "Ljava/lang/String;");
     if (env->ExceptionCheck() == true) {
         JNIHelper::PrintException(env, __FUNCTION__, __LINE__);

diff --git a/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.h b/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.h
index 86dfea4266d1c034e85a332cef7e748b61bd3028..035d922fb4a5076a10ccb3f77357b832a1ee875b 100644 (file)
--- a/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.h
+++ b/subprojects/libbeyond-android/src/main/jni/inference/beyond-peer_jni.h
@@ -35,7 +35,6 @@ private:
     struct Info {
         jclass klass;
         jmethodID constructor;
-        jfieldID name;
         jfieldID host;
         jfieldID port;
         jfieldID uuid;