Sync datasets with ChartJS source

Fixes #244

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.3.0
+* Update available datasets fields from ChartJS source code #244
+
 ## 2.2.0
 * Improve color handling #238
   * Change ``Color`` to ``RGBAColor`` as it only handles RGBA

chartjs-java-model-demo/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>chartjs-java-model-root</artifactId>
-		<version>2.2.1-SNAPSHOT</version>
+		<version>2.3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>2.2.1-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

chartjs-java-model/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>2.2.1-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BackgroundBorderHoverDataset.java

@@ -25,15 +25,10 @@ public abstract class BackgroundBorderHoverDataset<T extends BackgroundBorderHov
 	extends Dataset<T, O>
 {
 	protected final List<Object> backgroundColor = new OptionalArray<>();
-	
 	protected final List<Object> borderColor = new OptionalArray<>();
-	
 	protected final List<Integer> borderWidth = new OptionalArray<>();
-	
 	protected final List<Object> hoverBackgroundColor = new OptionalArray<>();
-	
 	protected final List<Object> hoverBorderColor = new OptionalArray<>();
-	
 	protected final List<Integer> hoverBorderWidth = new OptionalArray<>();
 
 	public List<Object> getBackgroundColor()

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java

@@ -18,35 +18,34 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.enums.BorderSkipped;
+import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L114">ChartJS Source</a>
+ */
 public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, Number>
 	implements NumberDataset<BarDataset>
 {
-	private String label;
-	private String xAxisID;
-	private String yAxisID;
-	private final List<BorderSkipped> borderSkipped = new OptionalArray<>();
-	private String stack;
+	protected String xAxisID;
+	protected String yAxisID;
+	protected Number barPercentage;
+	protected Number categoryPercentage;
+	protected Object barThickness;
+	protected Number maxBarThickness;
+	protected Number minBarLength;
+	protected PointStyle pointStyle;
+	protected Boolean grouped;
+	
+	protected final List<BorderSkipped> borderSkipped = new OptionalArray<>();
 
 	@Override
 	protected String defaultType()
 	{
 		return "bar";
 	}
 
-	public String getLabel()
-	{
-		return this.label;
-	}
-	
-	public BarDataset setLabel(final String label)
-	{
-		this.label = label;
-		return this;
-	}
-	
 	public String getXAxisID()
 	{
 		return this.xAxisID;
@@ -69,6 +68,83 @@ public BarDataset setYAxisID(final String yAxisID)
 		return this;
 	}
 
+	public Number getBarPercentage()
+	{
+		return this.barPercentage;
+	}
+	
+	public BarDataset setBarPercentage(final Number barPercentage)
+	{
+		this.barPercentage = barPercentage;
+		return this;
+	}
+	
+	public Number getCategoryPercentage()
+	{
+		return this.categoryPercentage;
+	}
+	
+	public BarDataset setCategoryPercentage(final Number categoryPercentage)
+	{
+		this.categoryPercentage = categoryPercentage;
+		return this;
+	}
+	
+	public Object getBarThickness()
+	{
+		return this.barThickness;
+	}
+	
+	public BarDataset setBarThickness(final Object barThickness)
+	{
+		this.barThickness = barThickness;
+		return this;
+	}
+	
+	public Number getMaxBarThickness()
+	{
+		return this.maxBarThickness;
+	}
+	
+	public BarDataset setMaxBarThickness(final Number maxBarThickness)
+	{
+		this.maxBarThickness = maxBarThickness;
+		return this;
+	}
+	
+	public Number getMinBarLength()
+	{
+		return this.minBarLength;
+	}
+	
+	public BarDataset setMinBarLength(final Number minBarLength)
+	{
+		this.minBarLength = minBarLength;
+		return this;
+	}
+	
+	public PointStyle getPointStyle()
+	{
+		return this.pointStyle;
+	}
+	
+	public BarDataset setPointStyle(final PointStyle pointStyle)
+	{
+		this.pointStyle = pointStyle;
+		return this;
+	}
+	
+	public Boolean getGrouped()
+	{
+		return this.grouped;
+	}
+	
+	public BarDataset setGrouped(final Boolean grouped)
+	{
+		this.grouped = grouped;
+		return this;
+	}
+	
 	public List<BorderSkipped> getBorderSkipped()
 	{
 		return this.borderSkipped;
@@ -89,15 +165,4 @@ public BarDataset setBorderSkipped(final List<BorderSkipped> borderSkipped)
 		}
 		return this;
 	}
-	
-	public String getStack()
-	{
-		return this.stack;
-	}
-	
-	public BarDataset setStack(final String stack)
-	{
-		this.stack = stack;
-		return this;
-	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BubbleDataset.java

@@ -23,26 +23,45 @@
 
 
 /**
- * <p>
- * A collection of data points for a bubble chart.
- * </p>
- *
- * <p>
- * For best results, ensure that each property is set with a list of equal length.
- * </p>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L165">ChartJS Source</a>
  */
-public class BubbleDataset extends RoundDataset<BubbleDataset, BubbleDataPoint>
+public class BubbleDataset extends BackgroundBorderHoverDataset<BubbleDataset, BubbleDataPoint>
 {
-	private final List<Integer> hoverRadius = new OptionalArray<>();
+	protected String xAxisID;
+	protected String yAxisID;
+	
+	protected final List<Integer> hoverRadius = new OptionalArray<>();
 
-	private PointStyle pointStyle;
+	protected PointStyle pointStyle;
 
 	@Override
 	protected String defaultType()
 	{
 		return "bubble";
 	}
 
+	public String getXAxisID()
+	{
+		return this.xAxisID;
+	}
+	
+	public BubbleDataset setXAxisID(final String xAxisID)
+	{
+		this.xAxisID = xAxisID;
+		return this;
+	}
+	
+	public String getYAxisID()
+	{
+		return this.yAxisID;
+	}
+	
+	public BubbleDataset setYAxisID(final String yAxisID)
+	{
+		this.yAxisID = yAxisID;
+		return this;
+	}
+	
 	/**
 	 * <p>
 	 * Additional radius to add to data radius on hover.

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/Dataset.java

@@ -22,12 +22,24 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import software.xdev.chartjs.model.enums.IndexAxis;
 
+
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L66">ChartJS Source</a>
+ */
 public abstract class Dataset<T extends Dataset<T, O>, O>
 {
 	protected String type;
 	protected final List<Object> data = new ArrayList<>();
 
+	protected IndexAxis indexAxis;
+	protected Object clip;
+	protected String label;
+	protected Number order;
+	protected String stack;
+	protected Boolean hidden;
+	
 	protected abstract String defaultType();
 
 	/**
@@ -145,6 +157,72 @@ public T addData(final O data)
 		return this.addDataUnchecked(data);
 	}
 
+	public IndexAxis getIndexAxis()
+	{
+		return this.indexAxis;
+	}
+	
+	public T setIndexAxis(final IndexAxis indexAxis)
+	{
+		this.indexAxis = indexAxis;
+		return this.self();
+	}
+	
+	public Object getClip()
+	{
+		return this.clip;
+	}
+	
+	public T setClip(final Object clip)
+	{
+		this.clip = clip;
+		return this.self();
+	}
+	
+	public String getLabel()
+	{
+		return this.label;
+	}
+	
+	public T setLabel(final String label)
+	{
+		this.label = label;
+		return this.self();
+	}
+	
+	public Number getOrder()
+	{
+		return this.order;
+	}
+	
+	public T setOrder(final Number order)
+	{
+		this.order = order;
+		return this.self();
+	}
+	
+	public String getStack()
+	{
+		return this.stack;
+	}
+	
+	public T setStack(final String stack)
+	{
+		this.stack = stack;
+		return this.self();
+	}
+	
+	public Boolean getHidden()
+	{
+		return this.hidden;
+	}
+	
+	public T setHidden(final Boolean hidden)
+	{
+		this.hidden = hidden;
+		return this.self();
+	}
+	
 	@SuppressWarnings("unchecked")
 	public T self()
 	{

chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java

@@ -15,7 +15,7 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-public class DoughnutDataset extends RoundDataset<DoughnutDataset, Number>
+public class DoughnutDataset extends DoughnutDatasetBase<DoughnutDataset>
 	implements NumberDataset<DoughnutDataset>
 {
 	@Override