Refactors storage API for aggregation

Introduces a new query system and aggregation results.
Removes filter from Aggregation object and adds it to query.
Moves storage implementations to appropriate packages.
Updates storage interface with aggregate, index, and unindex methods.

Author: casperwtf

src/main/java/wtf/casper/storageapi/Aggregation.java

@@ -2,21 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 @Data
+@Accessors(fluent = true)
 @AllArgsConstructor
 public class Aggregation {
     private AggregateFunction function;
     private String field;
     private String alias;
-    private Condition filter;
-    
-    public Aggregation(AggregateFunction fn, String field, String alias) {
-        this(fn, field, alias, null);
-    }
-
-    public Aggregation withFilter(Condition filter) {
-        this.filter = filter;
-        return this;
-    }
 }

src/main/java/wtf/casper/storageapi/AggregationResult.java

@@ -0,0 +1,13 @@
+package wtf.casper.storageapi;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(fluent = true)
+@AllArgsConstructor
+public class AggregationResult {
+    private String alias;
+    private Object value;
+}

src/main/java/wtf/casper/storageapi/FieldStorage.java

@@ -3,81 +3,29 @@
 import wtf.casper.storageapi.utils.StorageAPIConstants;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public interface FieldStorage<K, V> {
 
     /**
-     * @param field the field to search for.
-     * @param value the value to search for.
+     * @param query The query to execute
      * @return a future that will complete with a collection of all values that match the given field and value.
      */
-    default CompletableFuture<Collection<V>> get(final String field, final Object value) {
-        return get(field, value, ConditionType.EQUALS, SortingType.NONE);
-    }
-
-    /**
-     * @param field       the field to search for.
-     * @param value       the value to search for.
-     * @param conditionType  the filter type to use.
-     * @param sortingType the sorting type to use.
-     * @return a future that will complete with a collection of all values that match the given field and value.
-     */
-    default CompletableFuture<Collection<V>> get(final String field, final Object value, final ConditionType conditionType, final SortingType sortingType) {
-        return get(Condition.of(field, value, conditionType, sortingType));
-    }
-
-    /**
-     * @param conditions the filters to use.
-     * @return a future that will complete with a collection of all value that match the given filters.
-     */
-    default CompletableFuture<Collection<V>> get(Condition... conditions) {
-        return get(-1, conditions);
-    };
-
-    /**
-     * @param limit   the limit of values to return.
-     * @param conditions the filters to use.
-     * @return a future that will complete with a collection of all value that match the given filters.
-     */
-    default CompletableFuture<Collection<V>> get(int limit, Condition... conditions) {
-        return get(0, limit, conditions);
-    }
-
-    CompletableFuture<Collection<V>> get(int skip, int limit, Condition... conditions);
+    CompletableFuture<Collection<V>> get(Query query);
 
     /**
-     * @param key the key to search for.
-     * @return a future that will complete with the value that matches the given key.
-     * The value may be null if the key is not found.
+     * @param query The query to remove
      */
-    CompletableFuture<V> get(final K key);
+    CompletableFuture<Void> remove(final Query query);
 
     /**
-     * @param field the field to search for.
-     * @param value the value to search for.
-     * @return a future that will complete with the first value that matches the given field and value.
+     * Executes an aggregation query on the storage and returns the result as a CompletableFuture.
+     *
+     * @param query The query containing aggregation details, such as the fields, functions, and filters to apply.
+     * @return A CompletableFuture that completes with the result of the aggregation query as an AggregationResult object.
      */
-    default CompletableFuture<V> getFirst(final String field, final Object value) {
-        return getFirst(field, value, ConditionType.EQUALS);
-    }
-
-    /**
-     * @param field      the field to search for.
-     * @param value      the value to search for.
-     * @param conditionType the filter type to use.
-     * @return a future that will complete with the first value that matches the given field and value.
-     */
-    default CompletableFuture<V> getFirst(final String field, final Object value, ConditionType conditionType) {
-        return get(1, Condition.of(field, value, conditionType, SortingType.NONE)).thenApply((values) -> {
-            if (values.isEmpty()) {
-                return null;
-            }
-
-            return values.iterator().next();
-        });
-    };
-
+    CompletableFuture<List<AggregationResult>> aggregate(final Query query);
 
     /**
      * @param value the value to save.
@@ -88,14 +36,10 @@ default CompletableFuture<V> getFirst(final String field, final Object value, Co
      * @param values the values to save.
      */
     default CompletableFuture<Void> saveAll(final Collection<V> values) {
+        // designed to be naive approach that is overridden for batched impls
         return CompletableFuture.runAsync(() -> values.forEach(v -> save(v).join()), StorageAPIConstants.DB_THREAD_POOL);
     }
 
-    /**
-     * @param key the key to remove.
-     */
-    CompletableFuture<Void> remove(final V key);
-
     /**
      * Writes the storage to disk.
      */
@@ -113,13 +57,6 @@ default CompletableFuture<Void> close() {
         return CompletableFuture.completedFuture(null);
     }
 
-    /**
-     * @param field the field to search for.
-     * @param value the value to search for.
-     * @return a future that will complete with a boolean that represents whether the storage contains a value that matches the given field and value.
-     */
-    CompletableFuture<Boolean> contains(final String field, final Object value);
-
     /**
      * @param storage the storage to migrate from. The data will be copied from the given storage to this storage.
      * @return a future that will complete with a boolean that represents whether the migration was successful.
@@ -141,12 +78,12 @@ default CompletableFuture<Boolean> migrate(final FieldStorage<K, V> storage) {
      * @param field the field to add an index for.
      * @return a future that will complete when the index has been added.
      */
-    CompletableFuture<Void> addIndex(String field);
+    CompletableFuture<Void> index(String field);
 
     /**
      * Removes an index from the storage.
      * @param field the field to remove the index for.
      * @return a future that will complete when the index has been removed.
      */
-    CompletableFuture<Void> removeIndex(String field);
+    CompletableFuture<Void> unindex(String field);
 }

src/main/java/wtf/casper/storageapi/Query.java

@@ -1,16 +1,55 @@
 package wtf.casper.storageapi;
 
-import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.Accessors;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Builder
+@Getter
+@Accessors(fluent = true)
 public class Query {
-    private final List<Condition> conditions;
-    private final List<Sort> sorts;
-    private final boolean distinct;
-    private final int limit;
-    private final int offset;
+    private List<Condition> conditions = List.of();
+    private List<Sort> sorts = List.of();
+    private List<Aggregation> aggregations = List.of();
+    private boolean distinct = false;
+    private int limit = -1;
+    private int offset = 0;
 
+    public static Query of() {
+        return new Query();
+    }
+
+    public Query condition(Condition... conditions) {
+        conditions = conditions == null ? new Condition[0] : conditions;
+        this.conditions = new ArrayList<>(List.of(conditions));
+        return this;
+    }
+
+    public Query sort(Sort... sorts) {
+        sorts = sorts == null ? new Sort[0] : sorts;
+        this.sorts = new ArrayList<>(List.of(sorts));
+        return this;
+    }
+
+    public Query aggregation(Aggregation... aggregations) {
+        aggregations = aggregations == null ? new Aggregation[0] : aggregations;
+        this.aggregations = new ArrayList<>(List.of(aggregations));
+        return this;
+    }
+
+    public Query distinct(boolean distinct) {
+        this.distinct = distinct;
+        return this;
+    }
+
+    public Query limit(int limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    public Query offset(int offset) {
+        this.offset = offset;
+        return this;
+    }
 }

src/main/java/wtf/casper/storageapi/Sort.java

@@ -1,8 +1,10 @@
 package wtf.casper.storageapi;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 @Data
+@Accessors(fluent = true)
 public class Sort {
     private final String field;
     private final SortingType sortingType;

src/main/java/wtf/casper/storageapi/impl/direct/statelessfstorage/DirectMariaDBFStorage.java

@@ -1,7 +1,7 @@
 package wtf.casper.storageapi.impl.direct.statelessfstorage;
 
 import wtf.casper.storageapi.Credentials;
-import wtf.casper.storageapi.impl.statelessfstorage.MariaDBFStorage;
+import wtf.casper.storageapi.impl.fstorage.MariaDBFStorage;
 import wtf.casper.storageapi.misc.ConstructableValue;
 
 import java.util.function.Function;

src/main/java/wtf/casper/storageapi/impl/direct/statelessfstorage/DirectMongoFStorage.java

@@ -1,7 +1,7 @@
 package wtf.casper.storageapi.impl.direct.statelessfstorage;
 
 import wtf.casper.storageapi.Credentials;
-import wtf.casper.storageapi.impl.statelessfstorage.MongoFStorage;
+import wtf.casper.storageapi.impl.fstorage.MongoFStorage;
 import wtf.casper.storageapi.misc.ConstructableValue;
 
 import java.util.function.Function;

src/main/java/wtf/casper/storageapi/impl/direct/statelesskvstorage/DirectMongoKVStorage.java

@@ -1,7 +1,7 @@
 package wtf.casper.storageapi.impl.direct.statelesskvstorage;
 
 import wtf.casper.storageapi.Credentials;
-import wtf.casper.storageapi.impl.statelesskvstorage.MongoKVStorage;
+import wtf.casper.storageapi.impl.kvstorage.MongoKVStorage;
 import wtf.casper.storageapi.misc.ConstructableValue;
 
 import java.util.function.Function;

src/main/java/wtf/casper/storageapi/impl/direct/statelesskvstorage/DirectStatelessMariaDBKVStorage.java

@@ -1,8 +1,7 @@
 package wtf.casper.storageapi.impl.direct.statelesskvstorage;
 
 import wtf.casper.storageapi.Credentials;
-import wtf.casper.storageapi.impl.kvstorage.MariaDBKVStorage;
-import wtf.casper.storageapi.impl.statelesskvstorage.SqlKVStorage;
+import wtf.casper.storageapi.impl.kvstorage.SqlKVStorage;
 import wtf.casper.storageapi.misc.ConstructableValue;
 
 import java.util.function.Function;