Allow creation of mixed charts

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java

@@ -24,11 +24,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.AbstractData;
 import software.xdev.chartjs.model.options.Options;
 
 
-public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?>>
+public abstract class AbstractChart<T, O extends Options<?, ?>, D extends AbstractData<?, ?>>
 	implements Chart<T, O, D>
 {
 	protected D data;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java

@@ -16,13 +16,13 @@
 package software.xdev.chartjs.model.charts;
 
 import software.xdev.chartjs.model.data.BarData;
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.dataset.BarDataset;
 import software.xdev.chartjs.model.options.BarOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class BarChart extends AbstractChart<BarChart, BarOptions, BarData>
+public class BarChart extends HomogeneousChart<BarChart, BarOptions, BarData>
 {
 	public BarChart()
 	{
@@ -39,7 +39,7 @@ public BarChart(final BarData data, final BarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link BarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BarChart}.
 	 *
 	 * @return a new {@link BarData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java

@@ -16,12 +16,12 @@
 package software.xdev.chartjs.model.charts;
 
 import software.xdev.chartjs.model.data.BubbleData;
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.options.BubbleOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class BubbleChart extends AbstractChart<BubbleChart, BubbleOptions, BubbleData>
+public class BubbleChart extends HomogeneousChart<BubbleChart, BubbleOptions, BubbleData>
 {
 	public BubbleChart()
 	{
@@ -38,7 +38,7 @@ public BubbleChart(final BubbleData data, final BubbleOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link BubbleChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BubbleChart}.
 	 *
 	 * @return a new {@link BubbleData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java

@@ -17,12 +17,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.AbstractData;
 import software.xdev.chartjs.model.options.Options;
 
 
 @SuppressWarnings("java:S119") // SELF means the Chart itself... Not a problem
-public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?>>
+public interface Chart<SELF, O extends Options<?, ?>, D extends AbstractData<?, ?>>
 {
 	/**
 	 * @return type of this {@link Chart} implementation for proper drawing in JavaScript.

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java

@@ -15,13 +15,13 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
 import software.xdev.chartjs.model.data.DoughnutData;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.options.DoughnutOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class DoughnutChart extends AbstractChart<DoughnutChart, DoughnutOptions, DoughnutData>
+public class DoughnutChart extends HomogeneousChart<DoughnutChart, DoughnutOptions, DoughnutData>
 {
 	public DoughnutChart()
 	{
@@ -38,7 +38,7 @@ public DoughnutChart(final DoughnutData data, final DoughnutOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link DoughnutChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link DoughnutChart}.
 	 *
 	 * @return a new {@link DoughnutData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java

@@ -0,0 +1,23 @@
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.Options;
+
+
+public abstract class HomogeneousChart<T, O extends Options<O, ?>, D extends HomogeneousData<D, ?>>
+	extends AbstractChart<T, O, D>
+{
+	protected HomogeneousChart()
+	{
+	}
+
+	protected HomogeneousChart(final D data)
+	{
+		super(data);
+	}
+
+	protected HomogeneousChart(final D data, final O options)
+	{
+		super(data, options);
+	}
+}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java

@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.LineData;
 import software.xdev.chartjs.model.dataset.LineDataset;
 import software.xdev.chartjs.model.options.LineOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class LineChart extends AbstractChart<LineChart, LineOptions, LineData>
+public class LineChart extends HomogeneousChart<LineChart, LineOptions, LineData>
 {
 	public LineChart()
 	{
@@ -39,7 +39,7 @@ public LineChart(final LineData data, final LineOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link LineChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link LineChart}.
 	 *
 	 * @return a new {@link LineData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java

@@ -0,0 +1,32 @@
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.MixedData;
+import software.xdev.chartjs.model.options.Options;
+
+
+/**
+ * Allows creation of <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed chart types</a>
+ */
+public class MixedChart extends AbstractChart<MixedChart, Options<?, ?>, MixedData>
+{
+	protected String type;
+
+	public MixedChart setType(final String type)
+	{
+		this.type = type;
+		return this.self();
+	}
+
+	@Override
+	public String getType()
+	{
+		return this.type;
+	}
+
+	@Override
+	public boolean isDrawable()
+	{
+		// Warning: Unchecked
+		return true;
+	}
+}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java

@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.PieData;
 import software.xdev.chartjs.model.dataset.PieDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.PieOptions;
 
 
-public class PieChart extends AbstractChart<PieChart, PieOptions, PieData>
+public class PieChart extends HomogeneousChart<PieChart, PieOptions, PieData>
 {
 	public PieChart()
 	{
@@ -39,7 +39,7 @@ public PieChart(final PieData data, final PieOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link PieChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PieChart}.
 	 *
 	 * @return a new {@link PieData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java

@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.PolarData;
 import software.xdev.chartjs.model.dataset.PolarDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.PolarOptions;
 
 
-public class PolarChart extends AbstractChart<PolarChart, PolarOptions, PolarData>
+public class PolarChart extends HomogeneousChart<PolarChart, PolarOptions, PolarData>
 {
 	public PolarChart()
 	{
@@ -39,7 +39,7 @@ public PolarChart(final PolarData data, final PolarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link PolarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PolarChart}.
 	 *
 	 * @return a new {@link PolarData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java

@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.RadarData;
 import software.xdev.chartjs.model.dataset.RadarDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.RadarOptions;
 
 
-public class RadarChart extends AbstractChart<RadarChart, RadarOptions, RadarData>
+public class RadarChart extends HomogeneousChart<RadarChart, RadarOptions, RadarData>
 {
 	public RadarChart()
 	{
@@ -39,7 +39,7 @@ public RadarChart(final RadarData data, final RadarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link RadarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link RadarChart}.
 	 *
 	 * @return a new {@link RadarData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/ScatterChart.java

@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.ScatterData;
 import software.xdev.chartjs.model.dataset.ScatterDataset;
 import software.xdev.chartjs.model.options.LineOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class ScatterChart extends AbstractChart<ScatterChart, LineOptions, ScatterData>
+public class ScatterChart extends HomogeneousChart<ScatterChart, LineOptions, ScatterData>
 {
 
 	public ScatterChart()
@@ -40,7 +40,7 @@ public ScatterChart(final ScatterData data, final LineOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link ScatterChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link ScatterChart}.
 	 *
 	 * @return a new {@link ScatterData} instance
 	 */

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java → chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/AbstractData.java

@@ -24,7 +24,7 @@
 import software.xdev.chartjs.model.dataset.Dataset;
 
 
-public class Data<D extends Data<D, T>, T extends Dataset<T, ?>>
+public abstract class AbstractData<D extends AbstractData<D, T>, T extends Dataset<?, ?>>
 {
 	private final List<String> labels = new ArrayList<>();
 	private final List<T> datasets = new ArrayList<>();

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.BarDataset;
 
 
-public class BarData extends Data<BarData, BarDataset>
+public class BarData extends HomogeneousData<BarData, BarDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.BubbleDataset;
 
 
-public class BubbleData extends Data<BubbleData, BubbleDataset>
+public class BubbleData extends HomogeneousData<BubbleData, BubbleDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.DoughnutDataset;
 
 
-public class DoughnutData extends Data<DoughnutData, DoughnutDataset>
+public class DoughnutData extends HomogeneousData<DoughnutData, DoughnutDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/HomogeneousData.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.Dataset;
+
+
+public class HomogeneousData<D extends HomogeneousData<D, T>, T extends Dataset<T, ?>> extends AbstractData<D, T>
+{
+}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.LineDataset;
 
 
-public class LineData extends Data<LineData, LineDataset>
+public class LineData extends HomogeneousData<LineData, LineDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/MixedData.java

@@ -0,0 +1,11 @@
+package software.xdev.chartjs.model.data;
+
+import software.xdev.chartjs.model.dataset.Dataset;
+
+
+/**
+ * Allows creation of <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed chart types</a>
+ */
+public class MixedData extends AbstractData<MixedData, Dataset<?, ?>>
+{
+}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.PieDataset;
 
 
-public class PieData extends Data<PieData, PieDataset>
+public class PieData extends HomogeneousData<PieData, PieDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.PolarDataset;
 
 
-public class PolarData extends Data<PolarData, PolarDataset>
+public class PolarData extends HomogeneousData<PolarData, PolarDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.RadarDataset;
 
 
-public class RadarData extends Data<RadarData, RadarDataset>
+public class RadarData extends HomogeneousData<RadarData, RadarDataset>
 {
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java

@@ -18,6 +18,6 @@
 import software.xdev.chartjs.model.dataset.ScatterDataset;
 
 
-public class ScatterData extends Data<ScatterData, ScatterDataset>
+public class ScatterData extends HomogeneousData<ScatterData, ScatterDataset>
 {
 }