Merge pull request #245 from xdev-software/develop

Release

Author: AB-xdev

Diff for: .github/workflows/sonar.yml

@@ -11,7 +11,7 @@ on:
       - '.idea/**'
       - 'assets/**'
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ develop ]
     paths-ignore: 
       - '**.md'
       - '.config/**'

Diff for: CHANGELOG.md

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

Diff for: LICENSE

@@ -187,6 +187,7 @@
       identification within third-party archives.
 
    Copyright 2024 XDEV Software
+   Copyright 2020 Marceau Dewilde
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Diff for: 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>

Diff for: 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>
@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<slf4j-version>2.0.16</slf4j-version>
-		<log4j-version>2.23.1</log4j-version>
+		<log4j-version>2.24.0</log4j-version>
 		<testcontainers-version>1.20.1</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->

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

@@ -30,15 +30,6 @@ public interface Chart<SELF, O extends Options<?, ?>, D extends AbstractData<?,
 	@JsonProperty("type")
 	String getType();
 
-	/**
-	 * @deprecated As of 2.1.0 {@link #toJson()} has the same functionality and should be used instead
-	 */
-	@Deprecated(since = "2.1.0", forRemoval = true)
-	default String toJsonNative()
-	{
-		return this.toJson();
-	}
-	
 	/**
 	 * <p>
 	 * Convert {@code this} instance to Json for use with Chart.js library.
@@ -48,15 +39,6 @@ default String toJsonNative()
 	 */
 	String toJson();
 
-	/**
-	 * @deprecated No functionality implemented as of 2.1.0
-	 */
-	@Deprecated(since = "2.1.0", forRemoval = true)
-	default boolean isDrawable()
-	{
-		return true;
-	}
-	
 	SELF setOptions(final O options);
 
 	SELF setData(final D data);

Diff for: 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()

Diff for: 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;
-	}
 }

Diff for: 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.