Merge pull request #42 from faststats-dev/feat/array-charts

Add array charts

Author: NonSwag

core/src/main/java/dev/faststats/core/chart/ArrayChart.java

@@ -0,0 +1,29 @@
+package dev.faststats.core.chart;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+final class ArrayChart<T> extends SimpleChart<T[]> {
+    public ArrayChart(@ChartId String id, Callable<T @Nullable []> callable) throws IllegalArgumentException {
+        super(id, callable);
+    }
+
+    @Override
+    public Optional<JsonElement> getData() throws Exception {
+        return compute().map(data -> {
+            var elements = new JsonArray(data.length);
+            for (var d : data) {
+                switch (d) {
+                    case Boolean b -> elements.add(b);
+                    case Number n -> elements.add(n);
+                    default -> elements.add(d.toString());
+                }
+            }
+            return elements;
+        });
+    }
+}

core/src/main/java/dev/faststats/core/chart/Chart.java

@@ -4,7 +4,6 @@
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.Nullable;
 
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
@@ -50,21 +49,51 @@ public interface Chart<T> {
     Optional<JsonElement> getData() throws Exception;
 
     /**
-     * Create a bar chart.
+     * Create a string array chart.
      *
      * @param id       the chart id
      * @param callable the chart data callable
-     * @return the bar chart
+     * @return the string array chart
      * @throws IllegalArgumentException if the chart id is invalid
      * @apiNote The callable must be thread-safe and pure (i.e. not modify any shared state).
      * @see #compute()
-     * @since 0.1.0
+     * @since 0.5.0
+     */
+    @Contract(value = "_, _ -> new", pure = true)
+    static Chart<String[]> stringArray(@ChartId String id, Callable<String @Nullable []> callable) throws IllegalArgumentException {
+        return new ArrayChart<>(id, callable);
+    }
+
+    /**
+     * Create a boolean array chart.
+     *
+     * @param id       the chart id
+     * @param callable the chart data callable
+     * @return the boolean array chart
+     * @throws IllegalArgumentException if the chart id is invalid
+     * @apiNote The callable must be thread-safe and pure (i.e. not modify any shared state).
+     * @see #compute()
+     * @since 0.5.0
+     */
+    @Contract(value = "_, _ -> new", pure = true)
+    static Chart<Boolean[]> booleanArray(@ChartId String id, Callable<Boolean @Nullable []> callable) throws IllegalArgumentException {
+        return new ArrayChart<>(id, callable);
+    }
+
+    /**
+     * Create a number array chart.
+     *
+     * @param id       the chart id
+     * @param callable the chart data callable
+     * @return the number array chart
+     * @throws IllegalArgumentException if the chart id is invalid
+     * @apiNote The callable must be thread-safe and pure (i.e. not modify any shared state).
+     * @see #compute()
+     * @since 0.5.0
      */
-    // todo: introduce a better way to transmit multiple values
-    @Deprecated
     @Contract(value = "_, _ -> new", pure = true)
-    static Chart<Map<String, Number>> bar(@ChartId String id, Callable<@Nullable Map<String, Number>> callable) throws IllegalArgumentException {
-        return new SimpleBarChart(id, callable);
+    static Chart<Number[]> numberArray(@ChartId String id, Callable<Number @Nullable []> callable) throws IllegalArgumentException {
+        return new ArrayChart<>(id, callable);
     }
 
     /**

core/src/main/java/dev/faststats/core/chart/SimpleBarChart.java

@@ -1 +1 @@
-version=0.4.2
+version=0.5.0