Updates based on peer feedback

Author: georgweiss

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryCalenderViewController.java

@@ -194,7 +194,8 @@ public Void call(Appointment appointment) {
 
         search.disableProperty().bind(searchInProgress);
 
-        determineConnectivity(() -> {
+        determineConnectivity(connectivityMode -> {
+            connectivityModeObjectProperty.set(connectivityMode);
             switch (connectivityModeObjectProperty.get()){
                 case HTTP_ONLY -> search();
                 case WEB_SOCKETS_SUPPORTED -> connectWebSocket();

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java

@@ -332,8 +332,9 @@ public void updateItem(TableViewListItem logEntry, boolean empty) {
                                 Messages.AdvancedSearchHide : Messages.AdvancedSearchOpen,
                         advancedSearchVisible));
 
-        determineConnectivity(() -> {
-            switch (connectivityModeObjectProperty.get()){
+        determineConnectivity(connectivityMode -> {
+            connectivityModeObjectProperty.set(connectivityMode);
+            switch (connectivityMode){
                 case HTTP_ONLY -> search();
                 case WEB_SOCKETS_SUPPORTED -> connectWebSocket();
             }

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookSearchController.java

@@ -88,29 +88,30 @@ public LogbookSearchController() {
      * Determines how the client may connect to the remote service. The service info endpoint is called to establish
      * availability of the service. If available, then a single web socket connection is attempted to determine
      * if the service supports web sockets.
-     * @param completionHandler {@link Runnable} called when connection mode has been determined.
+     * @param consumer {@link Consumer} called when the connectivity mode has been determined.
      */
-    protected void determineConnectivity(Runnable completionHandler){
+    protected void determineConnectivity(Consumer<ConnectivityMode> consumer){
 
         // Try to determine the connection mode: is the remote service available at all?
         // If so, does it accept web socket connections?
         JobManager.schedule("Connection mode probe", monitor -> {
+            ConnectivityMode connectivityMode = ConnectivityMode.NOT_CONNECTED;
             String serviceInfo = client.serviceInfo();
             if (serviceInfo != null && !serviceInfo.isEmpty()) { // service online, check web socket availability
                 if (WebSocketClientService.checkAvailability(this.webSocketConnectUrl)) {
-                    connectivityModeObjectProperty.set(ConnectivityMode.WEB_SOCKETS_SUPPORTED);
+                    connectivityMode = ConnectivityMode.WEB_SOCKETS_SUPPORTED;
                 } else {
-                    connectivityModeObjectProperty.set(ConnectivityMode.HTTP_ONLY);
+                    connectivityMode = ConnectivityMode.HTTP_ONLY;
                 }
             }
             connectivityCheckerCountDownLatch.countDown();
-            if (connectivityModeObjectProperty.get().equals(ConnectivityMode.NOT_CONNECTED)) {
+            consumer.accept(connectivityMode);
+            if (connectivityMode.equals(ConnectivityMode.NOT_CONNECTED)) {
                 Platform.runLater(() -> {
                     errorPane.visibleProperty().set(true);
                     viewSearchPane.visibleProperty().set(false);
                 });
             }
-            completionHandler.run();
         });
     }
 
@@ -180,7 +181,7 @@ public void shutdown() {
             webSocketClientService.removeWebSocketMessageHandler(this);
             webSocketClientService.shutdown();
         }
-        if(connectivityModeObjectProperty.get().equals(ConnectivityMode.HTTP_ONLY)){
+        else if(connectivityModeObjectProperty.get().equals(ConnectivityMode.HTTP_ONLY)){
             cancelPeriodSearch();
         }
     }

core/websocket/src/main/java/org/phoebus/core/websocket/springframework/WebSocketClientService.java

@@ -138,8 +138,8 @@ public void disconnect() {
      * Disconnects the socket if connected and terminates connection thread.
      */
     public void shutdown() {
-        disconnect();
         attemptReconnect.set(false);
+        disconnect();
     }
 
     /**