From 75beba2ad0831623abae5bb5a243683348123815 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 21 Nov 2018 13:59:05 +0100 Subject: [PATCH] [New] add exactSeverity for operations log search --- .../strolch/rest/endpoint/OperationsLogResource.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java index 1e90d7520..c4213dcb2 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/OperationsLogResource.java @@ -33,7 +33,8 @@ public class OperationsLogResource { @Produces(MediaType.APPLICATION_JSON) public Response getOperationLog(@Context HttpServletRequest request, @PathParam("realm") String realm, @QueryParam("offset") int offset, @QueryParam("limit") int limit, @QueryParam("severity") String severityS, - @QueryParam("from") String fromS, @QueryParam("to") String toS, @QueryParam("query") String query) { + @QueryParam("exactSeverity") Boolean exactSeverity, @QueryParam("from") String fromS, + @QueryParam("to") String toS, @QueryParam("query") String query) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); PrivilegeHandler privilegeHandler = RestfulStrolchComponent.getInstance().getContainer().getPrivilegeHandler(); @@ -45,7 +46,12 @@ public class OperationsLogResource { if (isNotEmpty(severityS)) { LogSeverity severity = LogSeverity.valueOf(severityS); - messages = messages.filter(logMessage -> logMessage.getSeverity().compareTo(severity) >= 0); + messages = messages.filter(logMessage -> { + if (exactSeverity) + return logMessage.getSeverity().equals(severity); + else + return logMessage.getSeverity().compareTo(severity) >= 0; + }); } if (isNotEmpty(query)) {