Merge pull request #164 from xdev-software/develop

Release

Author: AB-xdev

.mvn/wrapper/maven-wrapper.properties

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.4.1
+* Use ``Number`` instead of ``BigDecimal`` in some additional places #159 (@aripddev)
+
 ## 1.4.0
 * Simplify API by using ``Number`` instead of ``BigDecimal``, ``int`` and ``double`` for ``Datapoints`` #154 (@aripddev)
 

CONTRIBUTING.md

@@ -10,7 +10,7 @@ We would absolutely love to get the community involved, and we welcome any form
 ### Ways to help
 * **Report bugs**<br/>Create an issue or send a pull request
 * **Send pull requests**<br/>If you want to contribute code, check out the development instructions below.
-  * However when contributing new features, please first discuss the change you wish to make via issue with the owners of this repository before making a change. Otherwise your work might be rejected and your effort was pointless.
+  * However when contributing larger new features, please first discuss the change you wish to make via issue with the owners of this repository before making it.<br/>Otherwise your work might be rejected and your effort was pointless.
 
 We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects).
 

README.md

@@ -25,4 +25,8 @@ See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how
 ## Dependencies and Licenses
 View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/chartjs-java-model/dependencies)
 
+## Acknowledgment
+* To all [contributors](https://github.com/xdev-software/chartjs-java-model/graphs/contributors) that helped to improve this library
+  * Especially to the devs at [PrimeTek/PrimeFaces](https://www.primefaces.org/) that regularly provide feedback and PRs
+
 <sub>Disclaimer: This is not an official ChartJS product and not associated</sub>

chartjs-java-model-demo/pom.xml

@@ -90,7 +90,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.16.0</version>
+								<version>10.17.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

chartjs-java-model/pom.xml

@@ -343,7 +343,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.16.0</version>
+								<version>10.17.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/DoughnutOptions.java

@@ -15,8 +15,6 @@
  */
 package software.xdev.chartjs.model.options;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.options.animation.DoughnutAnimation;
 import software.xdev.chartjs.model.options.elements.ArcElements;
 
@@ -26,72 +24,72 @@ public class DoughnutOptions extends Options<DoughnutOptions, DoughnutAnimation>
 	/**
 	 * Default {@code 50}
 	 *
-	 * @see #setCutout(BigDecimal cutout)
+	 * @see #setCutout(Number cutout)
 	 */
-	protected BigDecimal cutout;
+	protected Number cutout;
 
 	/**
 	 * Rotation in degrees. Default {@code 0}. {@code 0} is at the top.
 	 *
-	 * @see #setRotation(BigDecimal rotation)
+	 * @see #setRotation(Number rotation)
 	 */
-	protected BigDecimal rotation;
+	protected Number rotation;
 
 	/**
 	 * Circumference in degrees. Default {@code 360}.
 	 *
-	 * @see #setCircumference(BigDecimal circumference)
+	 * @see #setCircumference(Number circumference)
 	 */
-	protected BigDecimal circumference;
+	protected Number circumference;
 
 	protected ArcElements elements;
 
 	/**
-	 * @see #setCutout(BigDecimal cutoutPercentage)
+	 * @see #setCutout(Number cutoutPercentage)
 	 */
-	public BigDecimal getCutout()
+	public Number getCutout()
 	{
 		return this.cutout;
 	}
 
 	/**
 	 * The pixels as number of the chart that is cut out of the middle.
 	 */
-	public DoughnutOptions setCutout(final BigDecimal cutout)
+	public DoughnutOptions setCutout(final Number cutout)
 	{
 		this.cutout = cutout;
 		return this;
 	}
 
 	/**
-	 * @see #setRotation(BigDecimal rotation)
+	 * @see #setRotation(Number rotation)
 	 */
-	public BigDecimal getRotation()
+	public Number getRotation()
 	{
 		return this.rotation;
 	}
 
 	/**
 	 * Starting angle to draw arcs from in degrees
 	 */
-	public DoughnutOptions setRotation(final BigDecimal rotation)
+	public DoughnutOptions setRotation(final Number rotation)
 	{
 		this.rotation = rotation;
 		return this;
 	}
 
 	/**
-	 * @see #setCircumference(BigDecimal circumference)
+	 * @see #setCircumference(Number circumference)
 	 */
-	public BigDecimal getCircumference()
+	public Number getCircumference()
 	{
 		return this.circumference;
 	}
 
 	/**
 	 * Sweep to allow arcs to cover in degrees
 	 */
-	public DoughnutOptions setCircumference(final BigDecimal circumference)
+	public DoughnutOptions setCircumference(final Number circumference)
 	{
 		this.circumference = circumference;
 		return this;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/PieOptions.java

@@ -15,8 +15,6 @@
  */
 package software.xdev.chartjs.model.options;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.options.animation.PieAnimation;
 import software.xdev.chartjs.model.options.elements.ArcElements;
 
@@ -27,72 +25,72 @@ public class PieOptions extends Options<PieOptions, PieAnimation>
 	/**
 	 * Default {@code 50 - for doughnut, 0 - for pie}
 	 *
-	 * @see #setCutoutPercentage(BigDecimal cutoutPercentage)
+	 * @see #setCutoutPercentage(Number cutoutPercentage)
 	 */
-	protected BigDecimal cutoutPercentage;
+	protected Number cutoutPercentage;
 
 	/**
 	 * Default {@code -0.5 * Math.PI}
 	 *
-	 * @see #setRotation(BigDecimal rotation)
+	 * @see #setRotation(Number rotation)
 	 */
-	protected BigDecimal rotation;
+	protected Number rotation;
 
 	/**
 	 * Default {@code 2 * Math.PI}
 	 *
-	 * @see #setCircumference(BigDecimal circumference)
+	 * @see #setCircumference(Number circumference)
 	 */
-	protected BigDecimal circumference;
+	protected Number circumference;
 
 	protected ArcElements elements;
 
 	/**
-	 * @see #setCutoutPercentage(BigDecimal cutoutPercentage)
+	 * @see #setCutoutPercentage(Number cutoutPercentage)
 	 */
-	public BigDecimal getCutoutPercentage()
+	public Number getCutoutPercentage()
 	{
 		return this.cutoutPercentage;
 	}
 
 	/**
 	 * The percentage of the chart that is cut out of the middle.
 	 */
-	public PieOptions setCutoutPercentage(final BigDecimal cutoutPercentage)
+	public PieOptions setCutoutPercentage(final Number cutoutPercentage)
 	{
 		this.cutoutPercentage = cutoutPercentage;
 		return this;
 	}
 
 	/**
-	 * @see #setRotation(BigDecimal rotation)
+	 * @see #setRotation(Number rotation)
 	 */
-	public BigDecimal getRotation()
+	public Number getRotation()
 	{
 		return this.rotation;
 	}
 
 	/**
 	 * Starting angle to draw arcs from
 	 */
-	public PieOptions setRotation(final BigDecimal rotation)
+	public PieOptions setRotation(final Number rotation)
 	{
 		this.rotation = rotation;
 		return this;
 	}
 
 	/**
-	 * @see #setCircumference(BigDecimal circumference)
+	 * @see #setCircumference(Number circumference)
 	 */
-	public BigDecimal getCircumference()
+	public Number getCircumference()
 	{
 		return this.circumference;
 	}
 
 	/**
 	 * Sweep to allow arcs to cover
 	 */
-	public PieOptions setCircumference(final BigDecimal circumference)
+	public PieOptions setCircumference(final Number circumference)
 	{
 		this.circumference = circumference;
 		return this;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/plugins/zoom/limits/ScaleLimits.java

@@ -15,8 +15,6 @@
  */
 package software.xdev.chartjs.model.options.plugins.zoom.limits;
 
-import java.math.BigDecimal;
-
 
 /**
  * <a href="https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#scale-limits">ChartJS docs</a>
@@ -25,7 +23,7 @@ public class ScaleLimits
 {
 	protected Object min;
 	protected Object max;
-	protected BigDecimal minRange;
+	protected Number minRange;
 
 	public Object getMin()
 	{
@@ -49,12 +47,12 @@ public ScaleLimits setMax(final Object max)
 		return this;
 	}
 
-	public BigDecimal getMinRange()
+	public Number getMinRange()
 	{
 		return this.minRange;
 	}
 
-	public ScaleLimits setMinRange(final BigDecimal minRange)
+	public ScaleLimits setMinRange(final Number minRange)
 	{
 		this.minRange = minRange;
 		return this;

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scales/AngleLines.java

@@ -15,8 +15,6 @@
  */
 package software.xdev.chartjs.model.options.scales;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.color.Color;
 
 
@@ -27,7 +25,7 @@ public class AngleLines
 {
 	protected Boolean display;
 	protected Color color;
-	protected BigDecimal lineWidth;
+	protected Number lineWidth;
 
 	/**
 	 * @see #setDisplay(Boolean)
@@ -76,9 +74,9 @@ public AngleLines setColor(final Color color)
 	}
 
 	/**
-	 * @see #setLineWidth(BigDecimal)
+	 * @see #setLineWidth(Number)
 	 */
-	public BigDecimal getLineWidth()
+	public Number getLineWidth()
 	{
 		return this.lineWidth;
 	}
@@ -92,7 +90,7 @@ public BigDecimal getLineWidth()
 	 * Default {@code 1}
 	 * </p>
 	 */
-	public AngleLines setLineWidth(final BigDecimal lineWidth)
+	public AngleLines setLineWidth(final Number lineWidth)
 	{
 		this.lineWidth = lineWidth;
 		return this;