Fix usage post refactoring.

Author: shroffk

app/alarm/logging-ui/pom.xml

@@ -43,5 +43,25 @@
       <artifactId>jersey-client</artifactId>
       <version>1.19</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
   </dependencies>
 </project>

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

@@ -1,16 +1,17 @@
 package org.phoebus.applications.alarm.logging.ui;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.jersey.api.client.WebResource;
-import org.phoebus.applications.alarm.messages.AlarmConfigMessage;
 import org.phoebus.framework.jobs.Job;
 import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.jobs.JobRunnableWithCancel;
 
+import javax.ws.rs.core.MediaType;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -23,23 +24,23 @@ public class AlarmLogConfigSearchJob extends JobRunnableWithCancel {
     private final WebResource client;
     private final String pattern;
 
-    private final Consumer<List<AlarmConfigMessage>> alarmMessageHandler;
+    private final Consumer<AlarmLogTableItem> alarmMessageHandler;
     private final BiConsumer<String, Exception> errorHandler;
 
     private final ObjectMapper objectMapper;
     private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS").withZone(ZoneId.of("UTC"));
 
     public static Job submit(WebResource client,
                              final String pattern,
-                             final Consumer<List<AlarmConfigMessage>> alarmMessageHandler,
+                             final Consumer<AlarmLogTableItem> alarmMessageHandler,
                              final BiConsumer<String, Exception> errorHandler) {
         return JobManager.schedule("searching alarm log messages for : " + pattern,
                 new AlarmLogConfigSearchJob(client, pattern, alarmMessageHandler, errorHandler));
     }
 
     private AlarmLogConfigSearchJob(WebResource client,
                                     String pattern,
-                                    Consumer<List<AlarmConfigMessage>> alarmMessageHandler,
+                                    Consumer<AlarmLogTableItem> alarmMessageHandler,
                                     BiConsumer<String, Exception> errorHandler) {
         super();
         this.client = client;
@@ -58,9 +59,21 @@ public String getName() {
     @Override
     public Runnable getRunnable() {
         return () -> {
-            List<String> result;
-            List<AlarmConfigMessage> cResult = new ArrayList<>();
+            AlarmLogTableApp.logger.info("searching for alarm log entires : " +
+                    "config: " + pattern);
 
+            try {
+                List<AlarmLogTableItem> result = objectMapper
+                        .readValue(client.path("/search/alarm/config/"+pattern)
+                        .accept(MediaType.APPLICATION_JSON).get(String.class),
+                                new TypeReference<List<AlarmLogTableItem>>() {
+                });
+                if (result.size() >= 1) {
+                    alarmMessageHandler.accept(result.get(0));
+                }
+            } catch (JsonProcessingException e) {
+                errorHandler.accept("Failed to search for alarm logs ", e);
+            }
         };
     }
 }

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

@@ -31,7 +31,7 @@
 public class AlarmLogSearchJob implements JobRunnable {
     private final Boolean isNodeTable;
     private final ObservableMap<Keys, String> searchParameters;
-    private final Consumer<List<AlarmLogTableType>> alarmMessageHandler;
+    private final Consumer<List<AlarmLogTableItem>> alarmMessageHandler;
     private final BiConsumer<String, Exception> errorHandler;
 
     private final ObjectMapper objectMapper;
@@ -46,14 +46,14 @@ public static Job submit(WebResource client,
                              final String pattern,
                              Boolean isNodeTable,
                              ObservableMap<Keys, String> searchParameters,
-                             final Consumer<List<AlarmLogTableType>> alarmMessageHandler,
+                             final Consumer<List<AlarmLogTableItem>> alarmMessageHandler,
                              final BiConsumer<String, Exception> errorHandler) {
         return JobManager.schedule("searching alarm log messages for : " + pattern,
                 new AlarmLogSearchJob(client, isNodeTable, searchParameters, alarmMessageHandler, errorHandler));
     }
 
     private AlarmLogSearchJob(WebResource client, Boolean isNodeTable, ObservableMap<Keys, String> searchParameters,
-                              Consumer<List<AlarmLogTableType>> alarmMessageHandler, BiConsumer<String, Exception> errorHandler) {
+                              Consumer<List<AlarmLogTableItem>> alarmMessageHandler, BiConsumer<String, Exception> errorHandler) {
         super();
         this.client = client;
         this.isNodeTable = isNodeTable;
@@ -78,13 +78,13 @@ public void run(JobMonitor monitor) {
         map.putIfAbsent("size", Arrays.asList(String.valueOf(size)));
 
         try {
-            List<AlarmLogTableType> result = objectMapper.readValue(client.path("/search/alarm")
+            List<AlarmLogTableItem> result = objectMapper.readValue(client.path("/search/alarm")
                     .queryParams(map)
-                    .accept(MediaType.APPLICATION_JSON).get(String.class), new TypeReference<List<AlarmLogTableType>>() {
+                    .accept(MediaType.APPLICATION_JSON).get(String.class), new TypeReference<List<AlarmLogTableItem>>() {
             });
             alarmMessageHandler.accept(result);
         } catch (JsonProcessingException e) {
-            e.printStackTrace();
+            errorHandler.accept("Failed to search for alarm logs ", e);
         }
     }
 }