refactor Protocol enum

Author: ortex

roc_jni/src/main/impl/protocol.c

@@ -11,19 +11,19 @@ roc_protocol get_protocol(JNIEnv* env, jobject jprotocol) {
 }
 
 jobject get_protocol_enum(JNIEnv* env, roc_protocol protocol) {
-    jclass protocolClass = NULL;
+    jclass protocolUtilsClass = NULL;
     jobject jprotocol = NULL;
     jmethodID getProtocolMethodID = NULL;
 
-    protocolClass = (*env)->FindClass(env, PROTOCOL_CLASS);
-    assert(protocolClass != NULL);
+    protocolUtilsClass = (*env)->FindClass(env, PROTOCOL_UTILS_CLASS);
+    assert(protocolUtilsClass != NULL);
 
     getProtocolMethodID
-        = (*env)->GetStaticMethodID(env, protocolClass, "getByValue", "(I)L" PROTOCOL_CLASS ";");
+        = (*env)->GetStaticMethodID(env, protocolUtilsClass, "getByValue", "(I)L" PROTOCOL_CLASS ";");
     assert(getProtocolMethodID != NULL);
 
     jprotocol = (jobject) (*env)->CallStaticObjectMethod(
-        env, protocolClass, getProtocolMethodID, (jint) protocol);
+        env, protocolUtilsClass, getProtocolMethodID, (jint) protocol);
     assert(jprotocol != NULL);
     return jprotocol;
 }

roc_jni/src/main/impl/protocol.h

@@ -7,6 +7,7 @@
 #include <roc/config.h>
 
 #define PROTOCOL_CLASS PACKAGE_BASE_NAME "/Protocol"
+#define PROTOCOL_UTILS_CLASS PACKAGE_BASE_NAME "/ProtocolUtils"
 
 roc_protocol get_protocol(JNIEnv* env, jobject jprotocol);
 

src/main/java/org/rocstreaming/roctoolkit/Protocol.java

@@ -113,13 +113,4 @@ public enum Protocol {
         this.value = value;
     }
 
-    @SuppressWarnings("unused") // used by JNI
-    private static Protocol getByValue(int value) {
-        for (Protocol protocol : values()) {
-            if (value == protocol.value) {
-                return protocol;
-            }
-        }
-        return null;
-    }
 }

src/main/java/org/rocstreaming/roctoolkit/ProtocolUtils.java

@@ -0,0 +1,17 @@
+package org.rocstreaming.roctoolkit;
+
+import lombok.NoArgsConstructor;
+
+@SuppressWarnings("unused") // used by JNI
+@NoArgsConstructor
+class ProtocolUtils {
+
+    private static Protocol getByValue(int value) {
+        for (Protocol protocol : Protocol.values()) {
+            if (value == protocol.value) {
+                return protocol;
+            }
+        }
+        return null;
+    }
+}