100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Fix hibernate syslog query date type issue (#2510)
Eric Bariaux084ba5264424
diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.javaindex f68c9be40..aefeb2807 100644--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java@@ -211,9 +211,9 @@ public class SyslogService extends Handler implements ContainerService {from = to.minus(1, ChronoUnit.HOURS);}- Date fromDate = Date.from(from);- Date toDate = Date.from(to);AtomicLong count = new AtomicLong();+ final Instant fromInstant = from;+ final Instant toInstant = to;List<SyslogEvent> events = persistenceService.doReturningTransaction(em -> {StringBuilder sb = new StringBuilder("from SyslogEvent e where e.timestamp >= :from and e.timestamp <= :to");@@ -228,8 +228,8 @@ public class SyslogService extends Handler implements ContainerService {}TypedQuery<Long> countQuery = em.createQuery("select count(e.id) " + sb.toString(), Long.class);- countQuery.setParameter("from", fromDate);- countQuery.setParameter("to", toDate);+ countQuery.setParameter("from", fromInstant);+ countQuery.setParameter("to", toInstant);if (level != null) {countQuery.setParameter("level", level);}@@ -248,8 +248,8 @@ public class SyslogService extends Handler implements ContainerService {sb.append(" order by e.timestamp desc");TypedQuery<SyslogEvent> query = em.createQuery("select e " + sb.toString(), SyslogEvent.class);- query.setParameter("from", fromDate);- query.setParameter("to", toDate);+ query.setParameter("from", fromInstant);+ query.setParameter("to", toInstant);if (level != null) {query.setParameter("level", level);}diff --git a/test/src/test/groovy/org/openremote/test/syslog/SysLogServiceTest.groovy b/test/src/test/groovy/org/openremote/test/syslog/SysLogServiceTest.groovynew file mode 100644index 000000000..283eb02cc--- /dev/null+++ b/test/src/test/groovy/org/openremote/test/syslog/SysLogServiceTest.groovy@@ -0,0 +1,68 @@+package org.openremote.test.syslog++import org.openremote.container.persistence.PersistenceService+import org.openremote.manager.syslog.SyslogService+import org.openremote.model.syslog.SyslogCategory+import org.openremote.model.syslog.SyslogEvent+import org.openremote.model.syslog.SyslogLevel+import org.openremote.test.ManagerContainerTrait+import spock.lang.Shared+import spock.lang.Specification++import java.time.Instant++class SysLogServiceTest extends Specification implements ManagerContainerTrait {++ @Shared+ static SyslogService syslogService+ @Shared+ static PersistenceService persistenceService++ def setupSpec() {+ syslogService = new SyslogService()+ def container = startContainer(defaultConfig(), defaultServices(syslogService))+ persistenceService = container.getService(PersistenceService.class)+ syslogService.clearStoredEvents()+ }++ def cleanupSpec() {+ if (syslogService != null) {+ syslogService.clearStoredEvents()+ }+ }++ def "Get events applies filters and pagination"() {+ given: "syslog events are stored with distinct level/category combinations"+ Instant now = getInstantTimeOf(container)+ String subCategory = "SysLogServiceTest-" + UUID.randomUUID()+ Instant from = now.minusSeconds(600)+ Instant to = now.plusSeconds(600)++ persistenceService.doTransaction { em ->+ em.persist(new SyslogEvent(now.minusSeconds(300).toEpochMilli(), SyslogLevel.INFO, SyslogCategory.API, subCategory, "info"))+ em.persist(new SyslogEvent(now.minusSeconds(200).toEpochMilli(), SyslogLevel.WARN, SyslogCategory.API, subCategory, "warn"))+ em.persist(new SyslogEvent(now.minusSeconds(100).toEpochMilli(), SyslogLevel.ERROR, SyslogCategory.API, subCategory, "error"))+ em.persist(new SyslogEvent(now.minusSeconds(50).toEpochMilli(), SyslogLevel.ERROR, SyslogCategory.DATA, subCategory, "other"))+ }++ when: "requesting events for WARN+ API category with a subcategory filter"+ def result = syslogService.getEvents(SyslogLevel.WARN, 2, 1, from, to, [SyslogCategory.API], [subCategory])++ then: "only matching events are returned in descending timestamp order"+ result != null+ result.key == 2+ result.value.size() == 2+ result.value[0].message == "error"+ result.value[1].message == "warn"+ result.value.every { it.category == SyslogCategory.API }+ result.value.every { it.level.ordinal() >= SyslogLevel.WARN.ordinal() }++ when: "requesting a limited page size"+ def limited = syslogService.getEvents(SyslogLevel.WARN, 1, 1, from, to, [SyslogCategory.API], [subCategory])++ then: "pagination respects the per-page limit"+ limited.key == 2+ limited.value.size() == 1+ limited.value[0].message == "error"+ }+}