unify sessions and connections results

Author: wkgcass

app/src/main/java/vproxyapp/app/cmd/Command.java

@@ -797,7 +797,11 @@ private CmdResult runThrow() throws Exception {
                         return new CmdResult(sessCount, sessCount, "" + sessCount);
                     case L:
                         List<Session> sessList = SessionHandle.list(targetResource);
-                        List<List<String>> sessTupleList = sessList.stream().map(sess -> Arrays.asList(sess.active.id(), sess.passive.id())).collect(Collectors.toList());
+                        List<List<String>> sessTupleList = sessList.stream().map(sess ->
+                            Arrays.asList(
+                                new ConnectionHandle.Conn(sess.active, true).toString(),
+                                new ConnectionHandle.Conn(sess.passive, false).toString()
+                            )).collect(Collectors.toList());
                         return new CmdResult(sessList, sessTupleList, utilJoinList(sessList));
                     case R:
                         SessionHandle.close(this);

test/src/test/java/vproxy/ci/CI.java

@@ -1306,13 +1306,7 @@ public void channelAndStateAndStatistics() throws Exception {
             assertTrue(connections.contains("127.0.0.1:" + port + "/127.0.0.1:" + sock3.localAddress().port() + "[ESTABLISHED]"));
             assertEquals(3, querySessions(createReq(list_detail, "session", "in", "tcp-lb", lbName)).size());
             var sessionsResult = querySessions(createReq(list_detail, "session", "in", "tcp-lb", lbName));
-            var connectionsResult = connections.stream().map(s -> s.substring(0, s.length() - "[ESTABLISHED]".length()))
-                .map(s -> {
-                    var split = s.split("/");
-                    return split[1] + "/" + split[0];
-                })
-                .collect(Collectors.toList());
-            assertTrue(sessionsResult.stream().flatMap(Collection::stream).collect(Collectors.toSet()).containsAll(connectionsResult));
+            assertTrue(sessionsResult.stream().flatMap(Collection::stream).collect(Collectors.toSet()).containsAll(connections));
 
             // server
             assertEquals(2, count(createReq(list, "connection", "in", "server", "sg7771", "in", "server-group", sg0)));