21
21
import picocli .CommandLine .Command ;
22
22
import picocli .CommandLine .Option ;
23
23
24
+ import java .net .MalformedURLException ;
24
25
import java .util .concurrent .Callable ;
25
26
26
27
@ Command (name = "lobbyWebsocket" , mixinStandardHelpOptions = true )
@@ -46,30 +47,29 @@ public Integer call() throws InterruptedException {
46
47
47
48
// create listener object
48
49
Listener listener = new Listener ();
49
-
50
+ WebSocketClient ws = null ;
51
+ if (!unitTest ) {
52
+ message = message + "\n " + Helper .generateUUID ();
53
+ }
50
54
// create websocket object
51
- WebSocketClient ws = WebSocketClient .create (
55
+ ws = WebSocketClient .create (
52
56
new DefaultConfigRepository (),
53
57
CLITokenRepositoryImpl .getInstance (),
54
58
listener
55
59
);
56
-
57
- String fullMessage = message + "\n " + Helper .generateUUID ();
58
- String requestType = CLIHelper .getLobbyWsMessageType (fullMessage );
59
-
60
- // send message asynchronously
61
- ws .sendMessage (fullMessage );
62
-
60
+ String requestType = CLIHelper .getLobbyWsMessageType (message );
63
61
long startTime = System .currentTimeMillis ();
62
+ ws .sendMessage (message );
64
63
while ((System .currentTimeMillis () - startTime ) < timeOut ) {
65
64
if (listener .getMessage () != null ) {
65
+ log .info (listener .getMessage ());
66
66
String response = listener .getMessage ();
67
67
String responseType = listener .getResponseType ();
68
68
if (!unitTest && responseType .equals (CLIHelper .getResponseTypeOf (requestType ))) {
69
69
log .info ("Operation successful with response below:\n {}" , response );
70
70
ws .close (1000 , "normal close" );
71
71
return 0 ;
72
- } else if (unitTest && response .equals (fullMessage )) {
72
+ } else if (unitTest && response .equals (message )) {
73
73
log .info ("Operation successful with response below:\n {}" , response );
74
74
ws .close (1000 , "normal close" );
75
75
return 0 ;
@@ -88,7 +88,6 @@ public Integer call() throws InterruptedException {
88
88
}
89
89
90
90
public static class Listener extends WebSocketListener {
91
-
92
91
private String message ;
93
92
private String responseType ;
94
93
0 commit comments