query fix

Author: Romeh

src/main/java/com/romeh/ignitemanager/entities/AlertConfigEntry.java

@@ -1,11 +1,13 @@
 package com.romeh.ignitemanager.entities;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -17,9 +19,13 @@
 @Setter
 @ToString
 public class AlertConfigEntry implements Serializable {
+    @ApiModelProperty(notes = "alert service code required to be entered by user into REST API ", required = true)
     @QuerySqlField(index = true)
+    @NotNull
     String serviceCode;
+    @ApiModelProperty(notes = "alert error code required to be entered by user into REST API ", required = true)
     @QuerySqlField(index = true)
+    @NotNull
     String errorCode;
     List<String> emails;
     int maxCount;

src/main/java/com/romeh/ignitemanager/entities/AlertEntry.java

@@ -1,8 +1,10 @@
 package com.romeh.ignitemanager.entities;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.apache.ignite.cache.query.annotations.QuerySqlField;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -15,11 +17,18 @@
 @ToString
 @EqualsAndHashCode
 public class AlertEntry implements Serializable {
+    @ApiModelProperty(notes = "the key value alert content for error description required to be entered by user into REST API ")
     private Map<String,String> alertContent;
+    @ApiModelProperty(notes = "alert error code required to be entered by user into REST API ", required = true)
     @QuerySqlField(index = true)
+    @NotNull
     private String errorCode;
+    @ApiModelProperty(notes = "alert service code required to be entered by user into REST API ", required = true)
     @QuerySqlField(index = true)
+    @NotNull
     private String serviceId;
+    @ApiModelProperty(notes = "alert severity required to be entered by user into REST API ", required = true)
+    @NotNull
     private String severity;
     @QuerySqlField(index = true)
     private Long timestamp;

src/main/java/com/romeh/ignitemanager/repositories/impl/IgniteAlertsStore.java

@@ -17,6 +17,7 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import javax.cache.Cache;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -112,18 +113,19 @@ protected void sendMail(AlertEntry alertEntry, List<String> emails, String mailT
     }
     // clean all alerts for that service code and service id
     private void cleanAllAlertEntriesForThatErrorCodeAndServiceCode(String serviceId, String errorId) {
-        // query the matching records first
+
+        // commenting it out for testing without clean-up
+     /*   // query the matching records first
         final String sql = "serviceId = ? and errorCode= ?";
-        SqlFieldsQuery query = new SqlFieldsQuery(sql);
+        SqlQuery<String,AlertEntry> query = new SqlQuery(AlertEntry.class,sql);
         query.setArgs(serviceId, errorId);
-        final List<List<?>> to_Delete_Alerts = getAlertsCache().query(query).getAll();
+        final List<Cache.Entry<String, AlertEntry>> to_Delete_Alerts = getAlertsCache().query(query).getAll();
         // then call remove all as this will remove the records from the cache and the persistent file system
         // as sql delete will just delete it from the cache layer not the file system
         // or the persistent store
         if(to_Delete_Alerts!=null && !to_Delete_Alerts.isEmpty()){
-            List<AlertEntry> alertEntryListToDelete=(List<AlertEntry>)to_Delete_Alerts.get(0).get(0);
-            getAlertsCache().removeAll(new HashSet(alertEntryListToDelete));
-        }
+            getAlertsCache().removeAll(new HashSet(to_Delete_Alerts.stream().map(stringAlertEntryEntry -> stringAlertEntryEntry.getKey()).collect(Collectors.toList())));
+        }*/
 
     }
 

src/main/java/com/romeh/ignitemanager/services/CleanExpiredAlertsService.java

@@ -5,14 +5,17 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cache.query.SqlQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import javax.cache.Cache;
 import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by romeh on 22/08/2017.
@@ -32,15 +35,14 @@ public void cleanExpiredRecords(){
         long towMinutesRange = System.currentTimeMillis()-900000;
         final IgniteCache<String, List<AlertEntry>> alertsCache = getAlertsCache();
         final String sql = "select * from AlertEntry where timestamp <= ?";
-        SqlFieldsQuery query = new SqlFieldsQuery(sql);
+        SqlQuery<String,AlertEntry> query = new SqlQuery(AlertEntry.class,sql);
         query.setArgs(towMinutesRange);
-        final List<List<?>> to_Delete_Alerts = alertsCache.query(query).getAll();
+        final List<Cache.Entry<String, AlertEntry>> to_Delete_Alerts = alertsCache.query(query).getAll();
         // then call remove all as this will remove the records from the cache and the persistent file system as sql delete will just delete it from the cache layer not the file system
         // or the persistent store
         if(to_Delete_Alerts!=null && !to_Delete_Alerts.isEmpty()){
-            List<AlertEntry> toDelete=(List<AlertEntry>) to_Delete_Alerts.get(0).get(0);
-            logger.debug("Finished cleaning out {} records",toDelete.size());
-            alertsCache.removeAll(new HashSet(toDelete));
+            logger.debug("Finished cleaning out {} records",to_Delete_Alerts.size());
+            alertsCache.removeAll(new HashSet(to_Delete_Alerts.stream().map(stringAlertEntryEntry -> stringAlertEntryEntry.getKey()).collect(Collectors.toList())));
 
         }