refactoring

Author: jlangch

src/main/java/com/github/jlangch/venice/util/ipc/TcpClient.java

@@ -200,23 +200,11 @@ public void open() {
 
                 // handle config
                 final VncMap config = (VncMap)((Message)response).getVeniceData();
-                maxMessageSize.set(
-                    Coerce.toVncLong(
-                        config.get(
-                            new VncKeyword("max-msg-size"),
-                            new VncLong(Message.MESSAGE_LIMIT_MAX))).toJavaLong());
-                compressor.set(
-                    new Compressor(
-                        Coerce.toVncLong(
-                            config.get(
-                                new VncKeyword("compress-cutoff-size"),
-                                new VncLong(-1))).toJavaLong()));
+                maxMessageSize.set(getLong(config, "max-msg-size", Message.MESSAGE_LIMIT_MAX));
+                compressor.set(new Compressor(getLong(config, "compress-cutoff-size", -1)));
                 encrypt.set(
-                    encrypt.get()             // client side encrypt request
-                    || VncBoolean.isTrue(     // server side encrypt request
-                        config.get(
-                            new VncKeyword(":encrypt"),
-                            VncBoolean.False)));
+                    encrypt.get()                                // client side encrypt request
+                    || getBoolean(config, "encrypt", false));    // server side encrypt request
             }
             catch(Exception ex) {
                 IO.safeClose(ch);
@@ -1196,6 +1184,22 @@ private static byte[] toBytes(final String s, final String charset) {
         return s.getBytes(Charset.forName(charset));
     }
 
+    private static long getLong(final VncMap map, final String entryName, final long defaulValue) {
+        return Coerce.toVncLong(
+                map.get(
+                   new VncKeyword(entryName),
+                   new VncLong(defaulValue))).toJavaLong();
+    }
+
+    private static boolean getBoolean(final VncMap map, final String entryName, final boolean defaulValue) {
+        return VncBoolean.isTrue(
+                map.get(
+                     new VncKeyword(entryName),
+                     VncBoolean.of(defaulValue)));
+    }
+
+
+
 
     private final Semaphore sendSemaphore = new Semaphore(1);
 

src/test/java/com/github/jlangch/venice/util/ipc/TcpServerTest.java

@@ -34,6 +34,7 @@
 
 import com.github.jlangch.venice.EofException;
 import com.github.jlangch.venice.VncException;
+import com.github.jlangch.venice.util.ipc.impl.Message;
 
 
 public class TcpServerTest {
@@ -234,19 +235,19 @@ public void test_server_threadpool_stats() throws Exception {
     @Test
     public void test_server_max_size() throws Exception {
         try (TcpServer server = new TcpServer(33333)) {
-            assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
+            assertEquals(Message.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
 
             // below minimum
             server.setMaxMessageSize(100L);
-            assertEquals(TcpServer.MESSAGE_LIMIT_MIN, server.getMaxMessageSize());
+            assertEquals(Message.MESSAGE_LIMIT_MIN, server.getMaxMessageSize());
 
             // in range
             server.setMaxMessageSize(100L * 1024L);
             assertEquals(100L * 1024L, server.getMaxMessageSize());
 
             // above maximum
             server.setMaxMessageSize(800L * 1024L * 1024L);
-            assertEquals(TcpServer.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
+            assertEquals(Message.MESSAGE_LIMIT_MAX, server.getMaxMessageSize());
         }
     }