[New] added elementSubType to REST API for querying Audits

This commit is contained in:
Robert von Burg 2015-04-04 18:05:39 +02:00
parent aa11f8098a
commit 5d7cf8469f
2 changed files with 16 additions and 2 deletions

View File

@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
/** /**
* @author Robert von Burg <eitch@eitchnet.ch> * @author Robert von Burg <eitch@eitchnet.ch>
*/ */
@ -32,6 +31,9 @@ public class AuditQuery {
@XmlAttribute(name = "elementType") @XmlAttribute(name = "elementType")
private String elementType; private String elementType;
@XmlAttribute(name = "elementSubType")
private String elementSubType;
@XmlAttribute(name = "elementId") @XmlAttribute(name = "elementId")
private String elementId; private String elementId;
@ -52,6 +54,14 @@ public class AuditQuery {
this.elementType = elementType; this.elementType = elementType;
} }
public String getElementSubType() {
return elementSubType;
}
public void setElementSubType(String elementSubType) {
this.elementSubType = elementSubType;
}
public String getElementId() { public String getElementId() {
return elementId; return elementId;
} }

View File

@ -32,7 +32,11 @@ public class ToAuditQueryVisitor {
// create query // create query
li.strolch.model.audit.AuditQuery auditQuery = new li.strolch.model.audit.AuditQuery(elementType, dr); 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(); String elementId = query.getElementId();
if (StringHelper.isNotEmpty(elementId)) { if (StringHelper.isNotEmpty(elementId)) {
auditQuery.element().elementAccessed(StringMatchMode.ci(), elementId); auditQuery.element().elementAccessed(StringMatchMode.ci(), elementId);