Simplify API by using Number instead of BigDecimal, int and double for Datapoints

AB-xdev · aripddev · AB-xdev · commit 27a9909e1df7 · 2024-05-17T08:56:59.000+02:00
Fixes #154 Co-Authored-By: aripddev <dev@aripd.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.4.0
+* Simplify API by using ``Number`` instead of ``BigDecimal``, ``int`` and ``double`` for ``Datapoints`` #154 (@aripddev)
+
 ## 1.3.1
 * Add subtitle option #141 (@aripddev)
 * Add ``PointStyle#rectRounded`` #143 (@aripddev)
diff --git a/chartjs-java-model-demo/pom.xml b/chartjs-java-model-demo/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
diff --git a/chartjs-java-model/pom.xml b/chartjs-java-model/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/BubbleDataPoint.java
@@ -15,38 +15,29 @@
  */
 package software.xdev.chartjs.model.datapoint;
 
-import java.math.BigDecimal;
-
-
 public class BubbleDataPoint extends XYDataPointBase<BubbleDataPoint>
 {
-	private BigDecimal r;
+	private Number r;
 	
 	public BubbleDataPoint()
 	{
 	}
 	
-	public BubbleDataPoint(final BigDecimal x, final BigDecimal y, final BigDecimal r)
+	public BubbleDataPoint(final Number x, final Number y, final Number r)
 	{
 		super(x, y);
 		this.r = r;
 	}
 	
-	public BigDecimal getR()
+	public Number getR()
 	{
 		return this.r;
 	}
 	
-	public BubbleDataPoint setR(final double r)
-	{
-		this.r = new BigDecimal(String.valueOf(r));
-		return this;
-	}
-	
 	/**
 	 * Radius of bubble
 	 */
-	public BubbleDataPoint setR(final BigDecimal r)
+	public BubbleDataPoint setR(final Number r)
 	{
 		this.r = r;
 		return this;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/ScatterDataPoint.java
@@ -15,26 +15,13 @@
  */
 package software.xdev.chartjs.model.datapoint;
 
-import java.math.BigDecimal;
-
-
 public class ScatterDataPoint extends XYDataPointBase<ScatterDataPoint>
 {
 	public ScatterDataPoint()
 	{
 	}
 	
-	public ScatterDataPoint(final int x, final int y)
-	{
-		super(x, y);
-	}
-	
-	public ScatterDataPoint(final double x, final double y)
-	{
-		super(x, y);
-	}
-	
-	public ScatterDataPoint(final BigDecimal x, final BigDecimal y)
+	public ScatterDataPoint(final Number x, final Number y)
 	{
 		super(x, y);
 	}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPoint.java
@@ -15,26 +15,13 @@
  */
 package software.xdev.chartjs.model.datapoint;
 
-import java.math.BigDecimal;
-
-
 public class XYDataPoint extends XYDataPointBase<XYDataPoint>
 {
 	public XYDataPoint()
 	{
 	}
 	
-	public XYDataPoint(final int x, final int y)
-	{
-		super(x, y);
-	}
-	
-	public XYDataPoint(final double x, final double y)
-	{
-		super(x, y);
-	}
-	
-	public XYDataPoint(final BigDecimal x, final BigDecimal y)
+	public XYDataPoint(final Number x, final Number y)
 	{
 		super(x, y);
 	}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/datapoint/XYDataPointBase.java
@@ -15,78 +15,38 @@
  */
 package software.xdev.chartjs.model.datapoint;
 
-import java.math.BigDecimal;
-
-
 public abstract class XYDataPointBase<S extends XYDataPointBase<S>>
 {
-	private BigDecimal x;
-	
-	private BigDecimal y;
+	private Number x;
+	private Number y;
 	
 	protected XYDataPointBase()
 	{
 	}
 	
-	protected XYDataPointBase(final int x, final int y)
-	{
-		this.setX(x);
-		this.setY(y);
-	}
-	
-	protected XYDataPointBase(final double x, final double y)
+	protected XYDataPointBase(final Number x, final Number y)
 	{
 		this.setX(x);
 		this.setY(y);
 	}
 	
-	protected XYDataPointBase(final BigDecimal x, final BigDecimal y)
-	{
-		this.setX(x);
-		this.setY(y);
-	}
-	
-	public BigDecimal getX()
+	public Number getX()
 	{
 		return this.x;
 	}
 	
-	public S setX(final int x)
-	{
-		this.x = new BigDecimal(x);
-		return this.self();
-	}
-	
-	public S setX(final double x)
-	{
-		this.x = new BigDecimal(String.valueOf(x));
-		return this.self();
-	}
-	
-	public S setX(final BigDecimal x)
+	public S setX(final Number x)
 	{
 		this.x = x;
 		return this.self();
 	}
 	
-	public BigDecimal getY()
+	public Number getY()
 	{
 		return this.y;
 	}
 	
-	public S setY(final int y)
-	{
-		this.y = new BigDecimal(y);
-		return this.self();
-	}
-	
-	public S setY(final double y)
-	{
-		this.y = new BigDecimal(String.valueOf(y));
-		return this.self();
-	}
-	
-	public S setY(final BigDecimal y)
+	public S setY(final Number y)
 	{
 		this.y = y;
 		return this.self();
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BarDataset.java
@@ -15,15 +15,14 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 import software.xdev.chartjs.model.enums.BorderSkipped;
 import software.xdev.chartjs.model.objects.OptionalArray;
 
 
-public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, BigDecimal>
-	implements BigDecimalDataset<BarDataset>
+public class BarDataset extends BackgroundBorderHoverDataset<BarDataset, Number>
+	implements NumberDataset<BarDataset>
 {
 	private String label;
 	private String xAxisID;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/DoughnutDataset.java
@@ -15,11 +15,8 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
-
-
-public class DoughnutDataset extends RoundDataset<DoughnutDataset, BigDecimal>
-	implements BigDecimalDataset<DoughnutDataset>
+public class DoughnutDataset extends RoundDataset<DoughnutDataset, Number>
+	implements NumberDataset<DoughnutDataset>
 {
 	@Override
 	protected String defaultType()
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/LineDataset.java
@@ -15,9 +15,7 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
-
-public class LineDataset extends BaseLineDataset<LineDataset, BigDecimal> implements BigDecimalDataset<LineDataset>
+public class LineDataset extends BaseLineDataset<LineDataset, Number> implements NumberDataset<LineDataset>
 {
 	@Override
 	protected String defaultType()
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/NumberDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/NumberDataset.java
@@ -15,26 +15,15 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
 
 
-public interface BigDecimalDataset<S extends Dataset<?, BigDecimal>>
+public interface NumberDataset<S extends Dataset<?, Number>>
 {
 	S self();
 	
-	default S setData(final int... data)
-	{
-		this.self().clearData();
-		if(data != null)
-		{
-			Arrays.stream(data).forEach(this::addData);
-		}
-		return this.self();
-	}
-	
-	default S setData(final double... data)
+	default S setData(final Number... data)
 	{
 		this.self().clearData();
 		if(data != null)
@@ -49,15 +38,9 @@ default S setData(final double... data)
 	 *
 	 * @see Dataset#setData(Collection)
 	 */
-	default S addData(final int data)
-	{
-		this.self().addData(BigDecimal.valueOf(data));
-		return this.self();
-	}
-	
-	default S addData(final double data)
+	default S addData(final Number data)
 	{
-		this.self().addData(BigDecimal.valueOf(data));
+		this.self().addData(data);
 		return this.self();
 	}
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PieDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PieDataset.java
@@ -15,9 +15,7 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
-
-public class PieDataset extends RoundDataset<PieDataset, BigDecimal> implements BigDecimalDataset<PieDataset>
+public class PieDataset extends RoundDataset<PieDataset, Number> implements NumberDataset<PieDataset>
 {
 	@Override
 	protected String defaultType()
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/PolarDataset.java
@@ -15,9 +15,7 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
-
-public class PolarDataset extends RoundDataset<PolarDataset, BigDecimal> implements BigDecimalDataset<PolarDataset>
+public class PolarDataset extends RoundDataset<PolarDataset, Number> implements NumberDataset<PolarDataset>
 {
 	@Override
 	protected String defaultType()
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/RadarDataset.java
@@ -15,12 +15,11 @@
  */
 package software.xdev.chartjs.model.dataset;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 
-public class RadarDataset extends PointDataset<RadarDataset, BigDecimal> implements BigDecimalDataset<RadarDataset>
+public class RadarDataset extends PointDataset<RadarDataset, Number> implements NumberDataset<RadarDataset>
 {
 	private final List<Integer> hitRadius = new ArrayList<>();
 	
diff --git a/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java b/chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java
@@ -159,7 +159,7 @@ static Stream<Arguments> basicTest()
 				dto.dataSupplier().get()));
 	}
 	
-	private static <D extends HomogeneousData<D, S>, S extends Dataset<S, BigDecimal>> Supplier<D> createData(
+	private static <D extends HomogeneousData<D, S>, S extends Dataset<S, Number>> Supplier<D> createData(
 		final Map<String, BigDecimal> defaultDataMap,
 		final Supplier<D> dataSupplier,
 		final Supplier<S> dataSetSupplier)
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-root</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

Original file line number	Diff line number	Diff line change
`@@ -15,38 +15,29 @@`
`15`	`15`	`*/`
`16`	`16`	`package software.xdev.chartjs.model.datapoint;`
`17`	`17`
`18`		`-import java.math.BigDecimal;`
`19`		`-`
`20`		`-`
`21`	`18`	`public class BubbleDataPoint extends XYDataPointBase<BubbleDataPoint>`
`22`	`19`	`{`
`23`		`- private BigDecimal r;`
	`20`	`+ private Number r;`
`24`	`21`
`25`	`22`	`public BubbleDataPoint()`
`26`	`23`	`{`
`27`	`24`	`}`
`28`	`25`
`29`		`- public BubbleDataPoint(final BigDecimal x, final BigDecimal y, final BigDecimal r)`
	`26`	`+ public BubbleDataPoint(final Number x, final Number y, final Number r)`
`30`	`27`	`{`
`31`	`28`	`super(x, y);`
`32`	`29`	`this.r = r;`
`33`	`30`	`}`
`34`	`31`
`35`		`- public BigDecimal getR()`
	`32`	`+ public Number getR()`
`36`	`33`	`{`
`37`	`34`	`return this.r;`
`38`	`35`	`}`
`39`	`36`
`40`		`- public BubbleDataPoint setR(final double r)`
`41`		`- {`
`42`		`- this.r = new BigDecimal(String.valueOf(r));`
`43`		`- return this;`
`44`		`- }`
`45`		`-`
`46`	`37`	`/**`
`47`	`38`	`* Radius of bubble`
`48`	`39`	`*/`
`49`		`- public BubbleDataPoint setR(final BigDecimal r)`
	`40`	`+ public BubbleDataPoint setR(final Number r)`
`50`	`41`	`{`
`51`	`42`	`this.r = r;`
`52`	`43`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -15,26 +15,13 @@`
`15`	`15`	`*/`
`16`	`16`	`package software.xdev.chartjs.model.datapoint;`
`17`	`17`
`18`		`-import java.math.BigDecimal;`
`19`		`-`
`20`		`-`
`21`	`18`	`public class ScatterDataPoint extends XYDataPointBase<ScatterDataPoint>`
`22`	`19`	`{`
`23`	`20`	`public ScatterDataPoint()`
`24`	`21`	`{`
`25`	`22`	`}`
`26`	`23`
`27`		`- public ScatterDataPoint(final int x, final int y)`
`28`		`- {`
`29`		`- super(x, y);`
`30`		`- }`
`31`		`-`
`32`		`- public ScatterDataPoint(final double x, final double y)`
`33`		`- {`
`34`		`- super(x, y);`
`35`		`- }`
`36`		`-`
`37`		`- public ScatterDataPoint(final BigDecimal x, final BigDecimal y)`
	`24`	`+ public ScatterDataPoint(final Number x, final Number y)`
`38`	`25`	`{`
`39`	`26`	`super(x, y);`
`40`	`27`	`}`