Add pref for max search size, remove unused pattern

Author: shroffk

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java

@@ -6,35 +6,29 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.jersey.api.client.WebResource;
 import javafx.collections.ObservableMap;
-import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 import org.phoebus.framework.jobs.Job;
 import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.jobs.JobMonitor;
 import org.phoebus.framework.jobs.JobRunnable;
 import org.phoebus.framework.preferences.PreferencesReader;
-import org.phoebus.util.time.TimeParser;
+import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
-import java.io.IOException;
-import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAmount;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * A Job to search for alarm messages logged by the alarm logging service
  * @author Kunal Shroff
  */
 public class AlarmLogSearchJob implements JobRunnable {
-    private final String pattern;
     private final Boolean isNodeTable;
     private final ObservableMap<Keys, String> searchParameters;
     private final Consumer<List<AlarmLogTableType>> alarmMessageHandler;
@@ -55,14 +49,13 @@ public static Job submit(WebResource client,
                              final Consumer<List<AlarmLogTableType>> alarmMessageHandler,
                              final BiConsumer<String, Exception> errorHandler) {
         return JobManager.schedule("searching alarm log messages for : " + pattern,
-                new AlarmLogSearchJob(client, pattern, isNodeTable, searchParameters, alarmMessageHandler, errorHandler));
+                new AlarmLogSearchJob(client, isNodeTable, searchParameters, alarmMessageHandler, errorHandler));
     }
 
-    private AlarmLogSearchJob(WebResource client, String pattern, Boolean isNodeTable, ObservableMap<Keys, String> searchParameters,
-            Consumer<List<AlarmLogTableType>> alarmMessageHandler, BiConsumer<String, Exception> errorHandler) {
+    private AlarmLogSearchJob(WebResource client, Boolean isNodeTable, ObservableMap<Keys, String> searchParameters,
+                              Consumer<List<AlarmLogTableType>> alarmMessageHandler, BiConsumer<String, Exception> errorHandler) {
         super();
         this.client = client;
-        this.pattern = pattern;
         this.isNodeTable = isNodeTable;
         this.searchParameters = searchParameters;
         this.alarmMessageHandler = alarmMessageHandler;
@@ -73,29 +66,25 @@ private AlarmLogSearchJob(WebResource client, String pattern, Boolean isNodeTabl
 
     @Override
     public void run(JobMonitor monitor) {
-        monitor.beginTask("searching for alarm log entires : " + pattern);
-        String searchPattern = "*".concat(pattern).concat("*");
-        int size = prefs.getInt("es_max_size");
-        Boolean configSet = false;
+        monitor.beginTask("searching for alarm log entires : " +
+                searchParameters.entrySet().stream().map(e-> e.getKey() + ":" + e.getValue()).collect(Collectors.joining()));
+        int size = prefs.getInt("results_max_size");
 
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
-        map.addFirst("pv", "*");
-        //final List<AlarmLogTableType> result = new ArrayList<>();
+        searchParameters.entrySet().forEach(e -> {
+                    map.add(e.getKey().getName(), e.getValue());
+                }
+        );
+        map.putIfAbsent("size", Arrays.asList(String.valueOf(size)));
+
         try {
             List<AlarmLogTableType> result = objectMapper.readValue(client.path("/search/alarm")
                     .queryParams(map)
                     .accept(MediaType.APPLICATION_JSON).get(String.class), new TypeReference<List<AlarmLogTableType>>() {
             });
+            alarmMessageHandler.accept(result);
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
-
-//        try {
-//            SearchResponse<AlarmLogTableType> response = client.search(searchRequest, AlarmLogTableType.class);
-//            response.hits().hits().forEach(hit->result.add(hit.source()));
-//            alarmMessageHandler.accept(result);
-//        } catch (IOException e) {
-//            errorHandler.accept("Failed to search for alarm logs ", e);
-//        }
     }
 }

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java

@@ -11,13 +11,21 @@
 import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableMap;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableColumn.CellDataFeatures;
 import javafx.scene.control.TableColumn.SortType;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
 import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.GridPane;
 import javafx.scene.paint.Color;
 import javafx.util.Callback;
@@ -39,14 +47,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.stream.Collectors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static org.phoebus.applications.alarm.logging.ui.AlarmLogTableApp.logger;
 
@@ -316,12 +323,9 @@ public ObservableValue<String> call(CellDataFeatures<AlarmLogTableType, String>
                 .map((e) -> e.getKey().getName().trim() + "=" + e.getValue().trim())
                 .collect(Collectors.joining("&"))));
 
-        query.setOnKeyPressed(new EventHandler<KeyEvent>() {
-            @Override
-            public void handle(KeyEvent keyEvent) {
-                if (keyEvent.getCode() == KeyCode.ENTER) {
-                    search();
-                }
+        query.setOnKeyPressed(keyEvent -> {
+            if (keyEvent.getCode() == KeyCode.ENTER) {
+                search();
             }
         });
 

app/alarm/logging-ui/src/main/resources/alarm_logging_preferences.properties

@@ -3,3 +3,4 @@
 # -------------------------------------------------
 
 service_uri = http://localhost:9000
+results_max_size = 10000