Finalize web socket messages related to filters

Author: georgweiss

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/FilterViewInstance.java

@@ -54,6 +54,8 @@ public FilterViewInstance(AppDescriptor appDescriptor) {
             return CompletableFuture.completedFuture(true);
         });
 
+        dockItem.setOnCloseRequest(e -> searchResultTableViewController.handleTabClosed());
+
         DockPane.getActiveDockPane().addTab(dockItem);
     }
 

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/FilterChangeListener.java

@@ -751,7 +751,7 @@ private void renameNode() {
         if (result.isPresent()) {
             node.getValue().setName(result.get());
             try {
-                saveAndRestoreService.updateNode(node.getValue());
+                saveAndRestoreService.updateNode(node.getValue(), false);
             } catch (Exception e) {
                 Alert alert = new Alert(AlertType.ERROR);
                 alert.setTitle(Messages.errorActionFailed);
@@ -1422,8 +1422,8 @@ private void openNode(String nodeId) {
                 return;
             }
             Stack<Node> copiedStack = new Stack<>();
-            DirectoryUtilities.CreateLocationStringAndNodeStack(node, false).getValue().forEach(copiedStack::push);
             Platform.runLater(() -> {
+                DirectoryUtilities.CreateLocationStringAndNodeStack(node, false).getValue().forEach(copiedStack::push);
                 locateNode(copiedStack);
                 nodeDoubleClicked(node);
             });
@@ -1491,7 +1491,7 @@ private void addOptionalLoggingMenuItem() {
     }
 
     @Override
-    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage saveAndRestoreWebSocketMessage){
+    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage<?> saveAndRestoreWebSocketMessage){
         switch (saveAndRestoreWebSocketMessage.messageType()){
             case NODE_ADDED -> nodeAdded((String)saveAndRestoreWebSocketMessage.payload());
             case NODE_REMOVED -> nodeRemoved((String)saveAndRestoreWebSocketMessage.payload());

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java

@@ -71,7 +71,6 @@ public class SaveAndRestoreService {
 
     private final ExecutorService executor;
 
-    private final List<DataChangeListener> dataChangeListeners = Collections.synchronizedList(new ArrayList<>());
     private final List<WebSocketMessageHandler> webSocketMessageHandlers = Collections.synchronizedList(new ArrayList<>());
     private static final Logger LOG = Logger.getLogger(SaveAndRestoreService.class.getName());
 
@@ -138,10 +137,6 @@ public List<Node> getChildNodes(Node node) {
         return null;
     }
 
-    public Node updateNode(Node nodeToUpdate) throws Exception {
-        return updateNode(nodeToUpdate, false);
-    }
-
     public Node updateNode(Node nodeToUpdate, boolean customTimeForMigration) throws Exception {
         Future<Node> future = executor.submit(() -> saveAndRestoreClient.updateNode(nodeToUpdate, customTimeForMigration));
         return future.get();
@@ -166,32 +161,18 @@ public Node getParentNode(String uniqueNodeId) throws Exception {
 
     public Configuration createConfiguration(final Node parentNode, final Configuration configuration) throws Exception {
         Future<Configuration> future = executor.submit(() -> saveAndRestoreClient.createConfiguration(parentNode.getUniqueId(), configuration));
-        Configuration newConfiguration = future.get();
-        dataChangeListeners.forEach(l -> l.nodeAddedOrRemoved(parentNode.getUniqueId()));
-        return newConfiguration;
+        return future.get();
     }
 
     public Configuration updateConfiguration(Configuration configuration) throws Exception {
         Future<Configuration> future = executor.submit(() -> saveAndRestoreClient.updateConfiguration(configuration));
-        Configuration updatedConfiguration = future.get();
-        // Associated configuration Node may have a new name
-        dataChangeListeners.forEach(l -> l.nodeChanged(updatedConfiguration.getConfigurationNode()));
-        return updatedConfiguration;
+        return future.get();
     }
 
     public List<Tag> getAllTags() throws Exception {
         Future<List<Tag>> future = executor.submit(saveAndRestoreClient::getAllTags);
         return future.get();
     }
-
-    public void addDataChangeListener(DataChangeListener dataChangeListener){
-        dataChangeListeners.add(dataChangeListener);
-    }
-
-    public void removeDataChangeListener(DataChangeListener dataChangeListener){
-        dataChangeListeners.remove(dataChangeListener);
-    }
-
     /**
      * Moves the <code>sourceNode</code> to the <code>targetNode</code>. The target {@link Node} may not contain
      * any {@link Node} of same name and type as the source {@link Node}.
@@ -256,10 +237,7 @@ public Snapshot saveSnapshot(Node configurationNode, Snapshot snapshot) throws E
                 return saveAndRestoreClient.updateSnapshot(snapshot);
             }
         });
-        Snapshot updatedSnapshot = future.get();
-        // Notify listeners as the configuration node has a new child node.
-        dataChangeListeners.forEach(l -> l.nodeChanged(configurationNode));
-        return updatedSnapshot;
+        return future.get();
     }
 
     public List<Node> getCompositeSnapshotNodes(String compositeSnapshotNodeUniqueId) throws Exception {
@@ -277,17 +255,12 @@ public List<SnapshotItem> getCompositeSnapshotItems(String compositeSnapshotNode
     public CompositeSnapshot saveCompositeSnapshot(Node parentNode, CompositeSnapshot compositeSnapshot) throws Exception {
         Future<CompositeSnapshot> future =
                 executor.submit(() -> saveAndRestoreClient.createCompositeSnapshot(parentNode.getUniqueId(), compositeSnapshot));
-        CompositeSnapshot newCompositeSnapshot = future.get();
-        dataChangeListeners.forEach(l -> l.nodeAddedOrRemoved(parentNode.getUniqueId()));
-        return newCompositeSnapshot;
+        return future.get();
     }
 
     public CompositeSnapshot updateCompositeSnapshot(final CompositeSnapshot compositeSnapshot) throws Exception {
         Future<CompositeSnapshot> future = executor.submit(() -> saveAndRestoreClient.updateCompositeSnapshot(compositeSnapshot));
-        CompositeSnapshot updatedCompositeSnapshot = future.get();
-        // Associated composite snapshot Node may have a new name
-        dataChangeListeners.forEach(l -> l.nodeChanged(updatedCompositeSnapshot.getCompositeSnapshotNode()));
-        return updatedCompositeSnapshot;
+        return future.get();
     }
 
     /**
@@ -323,9 +296,7 @@ public SearchResult search(MultivaluedMap<String, String> searchParams) throws E
     public Filter saveFilter(Filter filter) throws Exception {
         Future<Filter> future =
                 executor.submit(() -> saveAndRestoreClient.saveFilter(filter));
-        Filter addedOrUpdatedFilter = future.get();
-        dataChangeListeners.forEach(l -> l.filterAddedOrUpdated(filter));
-        return addedOrUpdatedFilter;
+        return future.get();
     }
 
     /**
@@ -344,7 +315,6 @@ public List<Filter> getAllFilters() throws Exception {
      */
     public void deleteFilter(final Filter filter) throws Exception {
         executor.submit(() -> saveAndRestoreClient.deleteFilter(filter.getName())).get();
-        dataChangeListeners.forEach(l -> l.filterRemoved(filter.getName()));
     }
 
     /**
@@ -357,9 +327,7 @@ public void deleteFilter(final Filter filter) throws Exception {
     public List<Node> addTag(TagData tagData) throws Exception {
         Future<List<Node>> future =
                 executor.submit(() -> saveAndRestoreClient.addTag(tagData));
-        List<Node> updatedNodes = future.get();
-        updatedNodes.forEach(n -> dataChangeListeners.forEach(l -> l.nodeChanged(n)));
-        return updatedNodes;
+        return future.get();
     }
 
     /**
@@ -372,9 +340,7 @@ public List<Node> addTag(TagData tagData) throws Exception {
     public List<Node> deleteTag(TagData tagData) throws Exception {
         Future<List<Node>> future =
                 executor.submit(() -> saveAndRestoreClient.deleteTag(tagData));
-        List<Node> updatedNodes = future.get();
-        updatedNodes.forEach(n -> dataChangeListeners.forEach(l -> l.nodeChanged(n)));
-        return updatedNodes;
+        return future.get();
     }
 
     /**

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreService.java

@@ -8,5 +8,5 @@
 
 public interface WebSocketMessageHandler {
 
-    void handleWebSocketMessage(SaveAndRestoreWebSocketMessage saveAndRestoreWebSocketMessage);
+    void handleWebSocketMessage(SaveAndRestoreWebSocketMessage<?> saveAndRestoreWebSocketMessage);
 }

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/WebSocketMessageHandler.java

@@ -77,7 +77,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -538,7 +537,7 @@ public boolean handleConfigurationTabClosed() {
     }
 
     @Override
-    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage saveAndRestoreWebSocketMessage) {
+    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage<?> saveAndRestoreWebSocketMessage) {
         if (saveAndRestoreWebSocketMessage.messageType().equals(MessageType.NODE_UPDATED)) {
             Node node = (Node) saveAndRestoreWebSocketMessage.payload();
             if (tabIdProperty.get() != null && node.getUniqueId().equals(tabIdProperty.get())) {

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigurationController.java

@@ -99,7 +99,7 @@ public void configureForNewConfiguration(Node parentNode) {
     }
 
     @Override
-    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage saveAndRestoreWebSocketMessage) {
+    public void handleWebSocketMessage(SaveAndRestoreWebSocketMessage<?> saveAndRestoreWebSocketMessage) {
         if (saveAndRestoreWebSocketMessage.messageType().equals(MessageType.NODE_REMOVED)) {
             String nodeId = (String) saveAndRestoreWebSocketMessage.payload();
             if (getId() != null && nodeId.equals(getId())) {

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigurationTab.java

@@ -19,43 +19,30 @@
 
 package org.phoebus.applications.saveandrestore.ui.search;
 
-import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
-import javafx.scene.control.Alert;
 import javafx.scene.image.ImageView;
 import org.phoebus.applications.saveandrestore.Messages;
 import org.phoebus.applications.saveandrestore.SaveAndRestoreApplication;
-import org.phoebus.applications.saveandrestore.model.search.Filter;
-import org.phoebus.applications.saveandrestore.ui.DataChangeListener;
 import org.phoebus.applications.saveandrestore.ui.SaveAndRestoreController;
 import org.phoebus.applications.saveandrestore.ui.SaveAndRestoreService;
 import org.phoebus.applications.saveandrestore.ui.SaveAndRestoreTab;
-import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.nls.NLS;
-import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
 import org.phoebus.ui.javafx.ImageCache;
 
 import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class SearchAndFilterTab extends SaveAndRestoreTab implements DataChangeListener {
+public class SearchAndFilterTab extends SaveAndRestoreTab {
     public static final String SEARCH_AND_FILTER_TAB_ID = "SearchAndFilterTab";
 
     private SearchAndFilterViewController searchAndFilterViewController;
-    private final SaveAndRestoreService saveAndRestoreService;
 
     public SearchAndFilterTab(SaveAndRestoreController saveAndRestoreController) {
 
         setId(SEARCH_AND_FILTER_TAB_ID);
-
-        saveAndRestoreService = SaveAndRestoreService.getInstance();
-
         final ResourceBundle bundle = NLS.getMessages(SaveAndRestoreApplication.class);
 
         FXMLLoader loader = new FXMLLoader();
@@ -66,8 +53,7 @@ public SearchAndFilterTab(SaveAndRestoreController saveAndRestoreController) {
                 if (clazz.isAssignableFrom(SearchAndFilterViewController.class)) {
                     return clazz.getConstructor(SaveAndRestoreController.class)
                             .newInstance(saveAndRestoreController);
-                }
-                else if(clazz.isAssignableFrom(SearchResultTableViewController.class)){
+                } else if (clazz.isAssignableFrom(SearchResultTableViewController.class)) {
                     return clazz.getConstructor()
                             .newInstance();
                 }
@@ -91,45 +77,5 @@ else if(clazz.isAssignableFrom(SearchResultTableViewController.class)){
 
         setText(Messages.search);
         setGraphic(new ImageView(ImageCache.getImage(ImageCache.class, "/icons/sar-search_18x18.png")));
-
-        setOnCloseRequest(event -> SaveAndRestoreService.getInstance().removeDataChangeListener(this));
-
-        saveAndRestoreService.addDataChangeListener(this);
-    }
-
-
-    @Override
-    public void nodeChanged(org.phoebus.applications.saveandrestore.model.Node updatedNode) {
-        searchAndFilterViewController.nodeChanged(updatedNode);
-    }
-
-    /**
-     * Shows a {@link Filter} in the view. If the filter identified through the specified (unique) id does not
-     * exist, an error message is show.
-     *
-     * @param filterId Unique, case-sensitive name of a persisted {@link Filter}.
-     */
-    public void showFilter(String filterId) {
-        JobManager.schedule("Show Filter", monitor -> {
-            List<Filter> allFilters;
-            try {
-                allFilters = saveAndRestoreService.getAllFilters();
-            } catch (Exception e) {
-                Platform.runLater(() -> ExceptionDetailsErrorDialog.openError(Messages.failedGetFilters, e));
-                return;
-            }
-            Optional<Filter> filterOptional = allFilters.stream().filter(f -> f.getName().equalsIgnoreCase(filterId)).findFirst();
-            if (filterOptional.isEmpty()) {
-                Platform.runLater(() -> {
-                    Alert alert = new Alert(Alert.AlertType.ERROR);
-                    alert.setContentText(MessageFormat.format(Messages.filterNotFound, filterId));
-                    alert.show();
-                });
-            } else {
-                Filter filter = filterOptional.get();
-                Platform.runLater(() ->
-                    searchAndFilterViewController.setFilter(filter));
-            }
-        });
     }
 }