PointStyle can also contain non-string constants

Fixes #280

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.4.0
+* PointStyle can also contain non-string constants #280
+
 ## 2.3.1
 * Synced ``LineOptions/DataSet`` ``stepped`` and ``tension`` with ChartJS source #262
 * Updated dependencies

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

@@ -18,7 +18,6 @@
 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;
 
 
@@ -35,7 +34,7 @@ public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, Number>
 	protected Object barThickness;
 	protected Number maxBarThickness;
 	protected Number minBarLength;
-	protected PointStyle pointStyle;
+	protected Object pointStyle;
 	protected Boolean grouped;
 
 	protected final List<BorderSkipped> borderSkipped = new OptionalArray<>();
@@ -123,12 +122,12 @@ public BarDataset setMinBarLength(final Number minBarLength)
 		return this;
 	}
 
-	public PointStyle getPointStyle()
+	public Object getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
-	public BarDataset setPointStyle(final PointStyle pointStyle)
+	public BarDataset setPointStyle(final Object pointStyle)
 	{
 		this.pointStyle = pointStyle;
 		return this;

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

@@ -18,7 +18,6 @@
 import java.util.List;
 
 import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
-import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
@@ -32,7 +31,7 @@ public class BubbleDataset extends BackgroundBorderHoverDataset<BubbleDataset, B
 
 	protected final List<Integer> hoverRadius = new OptionalArray<>();
 
-	protected PointStyle pointStyle;
+	protected Object pointStyle;
 
 	@Override
 	protected String defaultType()
@@ -95,12 +94,12 @@ public List<Integer> getHoverRadius()
 		return this.hoverRadius;
 	}
 
-	public PointStyle getPointStyle()
+	public Object getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
-	public BubbleDataset setPointStyle(final PointStyle pointStyle)
+	public BubbleDataset setPointStyle(final Object pointStyle)
 	{
 		this.pointStyle = pointStyle;
 		return this;

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

@@ -20,7 +20,6 @@
 
 import software.xdev.chartjs.model.enums.BorderCapStyle;
 import software.xdev.chartjs.model.enums.BorderJoinStyle;
-import software.xdev.chartjs.model.enums.PointStyle;
 import software.xdev.chartjs.model.objects.OptionalArray;
 import software.xdev.chartjs.model.options.elements.Fill;
 
@@ -63,7 +62,7 @@ public abstract class PointDataset<T extends Dataset<T, O>, O> extends Dataset<T
 
 	private final List<Integer> pointHoverBorderWidth = new OptionalArray<>();
 
-	private final List<PointStyle> pointStyle = new OptionalArray<>();
+	private final List<Object> pointStyle = new OptionalArray<>();
 
 	/**
 	 * @see #setFill(Fill)
@@ -528,15 +527,15 @@ public T setPointHoverBorderWidth(final List<Integer> pointHoverBorderWidth)
 	/**
 	 * @see #setPointStyle(List)
 	 */
-	public List<PointStyle> getPointStyle()
+	public List<Object> getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
 	/**
 	 * @see #setPointStyle(List)
 	 */
-	public T addPointStyle(final PointStyle pointStyle)
+	public T addPointStyle(final Object pointStyle)
 	{
 		this.pointStyle.add(pointStyle);
 		return this.self();
@@ -547,7 +546,7 @@ public T addPointStyle(final PointStyle pointStyle)
 	 * and
 	 * 'dash'. If the option is an image, that image is drawn on the canvas using drawImage.
 	 */
-	public T setPointStyle(final List<PointStyle> pointStyle)
+	public T setPointStyle(final List<Object> pointStyle)
 	{
 		this.pointStyle.clear();
 		if(pointStyle != null)

chartjs-java-model/src/main/java/software/xdev/chartjs/model/enums/PointStyle.java

@@ -20,18 +20,23 @@
 import software.xdev.chartjs.model.EnumNameToCamelCase;
 
 
+/**
+ * @apiNote Only contains the (string) constants. Other valid values are e.g. <code>false</code>, an image element or a
+ * canvas element.
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L1968">ChartJS Source</a>
+ */
 public enum PointStyle
 {
 	CIRCLE,
-	TRIANGLE,
+	CROSS,
+	CROSS_ROT,
+	DASH,
+	LINE,
 	RECT,
 	RECT_ROUNDED,
 	RECT_ROT,
-	CROSS,
-	CROSS_ROT,
 	STAR,
-	LINE,
-	DASH;
+	TRIANGLE;
 
 	@JsonValue
 	@Override

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/elements/Point.java

@@ -15,9 +15,6 @@
  */
 package software.xdev.chartjs.model.options.elements;
 
-import software.xdev.chartjs.model.enums.PointStyle;
-
-
 /**
  * <p>
  * Point elements are used to represent the points in a line chart or a bubble chart.
@@ -26,12 +23,13 @@
  * When set, these options apply to all objects of that type unless specifically overridden by the configuration
  * attached to a dataset.
  * </p>
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.4/src/types/index.d.ts#L1983">ChartJS Source</a>
  */
 public class Point
 {
 	protected Integer radius;
 
-	protected PointStyle pointStyle;
+	protected Object pointStyle;
 
 	protected Object backgroundColor;
 
@@ -68,24 +66,17 @@ public Point setRadius(final Integer radius)
 		return this;
 	}
 
-	/**
-	 * @see #setPointStyle(PointStyle)
-	 */
-	public PointStyle getPointStyle()
+	public Object getPointStyle()
 	{
 		return this.pointStyle;
 	}
 
 	/**
-	 * <p>
-	 * Default point style
-	 * </p>
-	 *
 	 * <p>
 	 * Default {@code 'circle'}
 	 * </p>
 	 */
-	public Point setPointStyle(final PointStyle pointStyle)
+	public Point setPointStyle(final Object pointStyle)
 	{
 		this.pointStyle = pointStyle;
 		return this;