From 78b0fd0ae0f70458c8451ad45a8dae19fc1723cc Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Fri, 23 Feb 2018 09:30:33 +0100
Subject: [PATCH] Add LogicalOperator for FindQuery
---
.../java/de/thm/arsnova/entities/FindQuery.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/entities/FindQuery.java b/src/main/java/de/thm/arsnova/entities/FindQuery.java
index 73f0cd0d3..0ad160608 100644
--- a/src/main/java/de/thm/arsnova/entities/FindQuery.java
+++ b/src/main/java/de/thm/arsnova/entities/FindQuery.java
@@ -24,9 +24,24 @@ import org.springframework.core.style.ToStringCreator;
import java.util.Map;
public class FindQuery<E extends Entity> {
+ enum LogicalOperator {
+ AND,
+ OR
+ }
+
+ private LogicalOperator operator = LogicalOperator.AND;
private E properties;
private Map<String, Object> externalFilters;
+ public LogicalOperator getOperator() {
+ return operator;
+ }
+
+ @JsonView(View.Public.class)
+ public void setOperator(final LogicalOperator operator) {
+ this.operator = operator;
+ }
+
public E getProperties() {
return properties;
}
@@ -48,6 +63,7 @@ public class FindQuery<E extends Entity> {
@Override
public String toString() {
return new ToStringCreator(getClass())
+ .append("operator", operator)
.append("properties", properties)
.append("externalFilters", externalFilters)
.toString();
--
GitLab