New storage implementation

4 files changed, 88 insertions, 13 deletions

diff --git a/src/main/java/org/traccar/storage/query/Columns.java b/src/main/java/org/traccar/storage/query/Columns.java
index 1a13665ee..196d2281c 100644
--- a/src/main/java/org/traccar/storage/query/Columns.java
+++ b/src/main/java/org/traccar/storage/query/Columns.java
@@ -1,5 +1,6 @@
 package org.traccar.storage.query;
 
+import org.traccar.storage.QueryExtended;
 import org.traccar.storage.QueryIgnore;
 
 import java.lang.reflect.Method;
@@ -11,14 +12,17 @@ import java.util.stream.Collectors;
 
 public abstract class Columns {
 
-    public abstract List<String> getColumns(Class<?> clazz);
+    public abstract List<String> getColumns(Class<?> clazz, String type);
 
-    protected List<String> getAllColumns(Class<?> clazz) {
+    protected List<String> getAllColumns(Class<?> clazz, String type) {
         List<String> columns = new LinkedList<>();
         Method[] methods = clazz.getMethods();
         for (Method method : methods) {
-            if (method.getName().startsWith("set") && method.getParameterTypes().length == 1
-                    && !method.isAnnotationPresent(QueryIgnore.class)) {
+            int parameterCount = type.equals("set") ? 1 : 0;
+            if (method.getName().startsWith(type) && method.getParameterTypes().length == parameterCount
+                    && !method.isAnnotationPresent(QueryIgnore.class)
+                    && !method.isAnnotationPresent(QueryExtended.class)
+                    && !method.getName().equals("getClass")) {
                 columns.add(method.getName().substring(3).toLowerCase());
             }
         }
@@ -27,8 +31,8 @@ public abstract class Columns {
 
     public static class All extends Columns {
         @Override
-        public List<String> getColumns(Class<?> clazz) {
-            return getAllColumns(clazz);
+        public List<String> getColumns(Class<?> clazz, String type) {
+            return getAllColumns(clazz, type);
         }
     }
 
@@ -40,7 +44,7 @@ public abstract class Columns {
         }
 
         @Override
-        public List<String> getColumns(Class<?> clazz) {
+        public List<String> getColumns(Class<?> clazz, String type) {
             return columns;
         }
     }
@@ -53,8 +57,8 @@ public abstract class Columns {
         }
 
         @Override
-        public List<String> getColumns(Class<?> clazz) {
-            return getAllColumns(clazz).stream()
+        public List<String> getColumns(Class<?> clazz, String type) {
+            return getAllColumns(clazz, type).stream()
                     .filter(column -> !columns.contains(column))
                     .collect(Collectors.toList());
         }
diff --git a/src/main/java/org/traccar/storage/query/Condition.java b/src/main/java/org/traccar/storage/query/Condition.java
index 50d520bc7..82c8e8479 100644
--- a/src/main/java/org/traccar/storage/query/Condition.java
+++ b/src/main/java/org/traccar/storage/query/Condition.java
@@ -2,13 +2,25 @@ package org.traccar.storage.query;
 
 public interface Condition {
 
-    class Equals implements Condition {
+    class Equals extends Compare {
+        public Equals(String column, String variable) {
+            this(column, variable, null);
+        }
+
+        public Equals(String column, String variable, Object value) {
+            super(column, "=", variable, value);
+        }
+    }
+
+    class Compare implements Condition {
         private final String column;
+        private final String operator;
         private final String variable;
         private final Object value;
 
-        public Equals(String column, String variable, Object value) {
+        public Compare(String column, String operator, String variable, Object value) {
             this.column = column;
+            this.operator = operator;
             this.variable = variable;
             this.value = value;
         }
@@ -17,6 +29,10 @@ public interface Condition {
             return column;
         }
 
+        public String getOperator() {
+            return operator;
+        }
+
         public String getVariable() {
             return variable;
         }
@@ -62,13 +78,27 @@ public interface Condition {
         }
     }
 
-    class And implements Condition {
+    class Or extends Binary {
+        public Or(Condition first, Condition second) {
+            super(first, second, "OR");
+        }
+    }
+
+    class And extends Binary {
+        public And(Condition first, Condition second) {
+            super(first, second, "AND");
+        }
+    }
+
+    class Binary implements Condition {
         private final Condition first;
         private final Condition second;
+        private final String operator;
 
-        public And(Condition first, Condition second) {
+        public Binary(Condition first, Condition second, String operator) {
             this.first = first;
             this.second = second;
+            this.operator = operator;
         }
 
         public Condition getFirst() {
@@ -78,6 +108,10 @@ public interface Condition {
         public Condition getSecond() {
             return second;
         }
+
+        public String getOperator() {
+            return operator;
+        }
     }
 
 }
diff --git a/src/main/java/org/traccar/storage/query/Limit.java b/src/main/java/org/traccar/storage/query/Limit.java
new file mode 100644
index 000000000..4a20f0ce2
--- /dev/null
+++ b/src/main/java/org/traccar/storage/query/Limit.java
@@ -0,0 +1,15 @@
+package org.traccar.storage.query;
+
+public class Limit {
+
+    private final int value;
+
+    public Limit(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+}
diff --git a/src/main/java/org/traccar/storage/query/Request.java b/src/main/java/org/traccar/storage/query/Request.java
index 8536cafd0..a98dd48f7 100644
--- a/src/main/java/org/traccar/storage/query/Request.java
+++ b/src/main/java/org/traccar/storage/query/Request.java
@@ -5,11 +5,29 @@ public class Request {
     private final Columns columns;
     private final Condition condition;
     private final Order order;
+    private final Limit limit;
+
+    public Request(Columns columns) {
+        this(columns, null, null);
+    }
+
+    public Request(Condition condition) {
+        this(null, condition, null);
+    }
+
+    public Request(Columns columns, Condition condition) {
+        this(columns, condition, null);
+    }
 
     public Request(Columns columns, Condition condition, Order order) {
+        this(columns, condition, order, null);
+    }
+
+    public Request(Columns columns, Condition condition, Order order, Limit limit) {
         this.columns = columns;
         this.condition = condition;
         this.order = order;
+        this.limit = limit;
     }
 
     public Columns getColumns() {
@@ -24,4 +42,8 @@ public class Request {
         return order;
     }
 
+    public Limit getLimit() {
+        return limit;
+    }
+
 }