Merge pull request #3275 from ControlSystemStudio/CSSTUDIO-2947

Support quoted search term in save&restore

Author: georgweiss

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

@@ -29,15 +29,18 @@
 import org.phoebus.security.store.SecureStore;
 import org.phoebus.security.tokens.AuthenticationScope;
 import org.phoebus.security.tokens.ScopedAuthenticationToken;
+import org.phoebus.util.http.QueryParamsHelper;
 
 import javax.ws.rs.core.MultivaluedMap;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Base64;
 import java.util.List;
@@ -461,7 +464,7 @@ public CompositeSnapshot updateCompositeSnapshot(CompositeSnapshot compositeSnap
     public SearchResult search(MultivaluedMap<String, String> searchParams) {
         try {
             HttpRequest request = HttpRequest.newBuilder()
-                    .uri(URI.create(Preferences.jmasarServiceUrl + "/search?" + mapToQueryParams(searchParams)))
+                    .uri(URI.create(Preferences.jmasarServiceUrl + "/search?" + QueryParamsHelper.mapToQueryParams(searchParams)))
                     .header("Content-Type", CONTENT_TYPE_JSON)
                     .GET()
                     .build();
@@ -697,17 +700,4 @@ private HttpResponse<String> getCall(String relativeUrl) {
             throw new RuntimeException(e);
         }
     }
-
-    private String mapToQueryParams(MultivaluedMap<String, String> map) {
-        StringBuilder stringBuilder = new StringBuilder();
-        map.keySet().forEach(k -> {
-            List<String> value = map.get(k);
-            if (value != null && !value.isEmpty()) {
-                stringBuilder.append(k).append("=");
-                stringBuilder.append(String.join(",", value));
-                stringBuilder.append("&");
-            }
-        });
-        return stringBuilder.toString();
-    }
 }

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

@@ -559,13 +559,6 @@ protected void updateItem(Node node, boolean empty) {
                 hitCountProperty, pagination.pageCountProperty()));
         pagination.pageCountProperty().bind(pageCountProperty);
 
-        query.addListener((observable, oldValue, newValue) -> {
-            if (newValue == null || newValue.isEmpty()) {
-                clearSearch();
-            } else {
-                search();
-            }
-        });
 
         resultTableView.setOnDragDetected(e -> {
             List<Node> selectedNodes = resultTableView.getSelectionModel().getSelectedItems();
@@ -728,6 +721,12 @@ private void updateParametersAndSearch() {
             return;
         }
         query.set(buildQueryString());
+        if(query.get().isEmpty()){
+            clearSearch();
+        }
+        else{
+            search();
+        }
     }
 
     /**