From 5d7cf8469f1bdb16ad09800af71ceccbf5228014 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 4 Apr 2015 18:05:39 +0200 Subject: [PATCH] [New] added elementSubType to REST API for querying Audits --- .../main/java/li/strolch/rest/model/AuditQuery.java | 12 +++++++++++- .../rest/model/visitor/ToAuditQueryVisitor.java | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQuery.java b/li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQuery.java index df2e62152..8b9be3b52 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQuery.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/model/AuditQuery.java @@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; - /** * @author Robert von Burg */ @@ -32,6 +31,9 @@ public class AuditQuery { @XmlAttribute(name = "elementType") private String elementType; + @XmlAttribute(name = "elementSubType") + private String elementSubType; + @XmlAttribute(name = "elementId") private String elementId; @@ -52,6 +54,14 @@ public class AuditQuery { this.elementType = elementType; } + public String getElementSubType() { + return elementSubType; + } + + public void setElementSubType(String elementSubType) { + this.elementSubType = elementSubType; + } + public String getElementId() { return elementId; } diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/model/visitor/ToAuditQueryVisitor.java b/li.strolch.rest/src/main/java/li/strolch/rest/model/visitor/ToAuditQueryVisitor.java index 324e306e9..ac16979c2 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/model/visitor/ToAuditQueryVisitor.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/model/visitor/ToAuditQueryVisitor.java @@ -32,7 +32,11 @@ public class ToAuditQueryVisitor { // create query li.strolch.model.audit.AuditQuery auditQuery = new li.strolch.model.audit.AuditQuery(elementType, dr); - // element Id + // element + String elementSubType = query.getElementSubType(); + if (StringHelper.isNotEmpty(elementSubType)) { + auditQuery.element().elementSubTypes(StringMatchMode.ci(), elementSubType); + } String elementId = query.getElementId(); if (StringHelper.isNotEmpty(elementId)) { auditQuery.element().elementAccessed(StringMatchMode.ci(), elementId);