Make IndexAxis available in all options

supersedes #210

Ref:
* https://www.chartjs.org/docs/latest/charts/line.html#general
* https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L1588

Co-Authored-By: Taras <[email protected]>

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.2
+* Make ``IndexAxis`` available in all options
+
 ## 2.0.1
 * Restored ``DisplayFormats`` #186
 

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

@@ -15,17 +15,12 @@
  */
 package software.xdev.chartjs.model.options;
 
-import java.util.Locale;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-
 import software.xdev.chartjs.model.options.animation.DefaultAnimation;
 import software.xdev.chartjs.model.options.elements.BarElements;
 
 
 public class BarOptions extends Options<BarOptions, DefaultAnimation>
 {
-	protected IndexAxis indexAxis = IndexAxis.X;
 	protected BarElements elements;
 
 	/**
@@ -36,48 +31,9 @@ public BarElements getElements()
 		return this.elements;
 	}
 
-	/**
-	 * @param elements an {@link BarElements} instance, or {@code null}
-	 * @return this instance for method chaining
-	 */
 	public BarOptions setElements(final BarElements elements)
 	{
 		this.elements = elements;
 		return this;
 	}
-	
-	/**
-	 * @return the orientation of the bars
-	 */
-	public IndexAxis getIndexAxis()
-	{
-		return this.indexAxis;
-	}
-	
-	/**
-	 * <p>
-	 * Sets the orientation of the bars. {@code "y"} results in horizontal bars.
-	 * </p>
-	 * <p>
-	 * Default {@code "x"}
-	 * </p>
-	 */
-	public BarOptions setIndexAxis(final IndexAxis indexAxis)
-	{
-		this.indexAxis = indexAxis;
-		return this;
-	}
-	
-	public enum IndexAxis
-	{
-		X,
-		Y;
-		
-		@JsonValue
-		@Override
-		public String toString()
-		{
-			return super.toString().toLowerCase(Locale.ENGLISH);
-		}
-	}
 }

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

@@ -0,0 +1,19 @@
+package software.xdev.chartjs.model.options;
+
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+
+public enum IndexAxis
+{
+	X,
+	Y;
+	
+	@JsonValue
+	@Override
+	public String toString()
+	{
+		return super.toString().toLowerCase(Locale.ENGLISH);
+	}
+}

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

@@ -26,9 +26,13 @@
 import software.xdev.chartjs.model.options.scale.Scales;
 
 
+/**
+ * @see <a href="https://github.com/chartjs/Chart.js/blob/v4.4.3/src/types/index.d.ts#L1588">ChartJS Source</a>
+ */
 public class Options<T extends Options<T, A>, A extends Animation<A>>
 {
 	protected final Set<String> events = new HashSet<>();
+	protected IndexAxis indexAxis;
 	protected Boolean responsive;
 	protected Integer responsiveAnimationDuration;
 	protected Boolean maintainAspectRatio;
@@ -55,6 +59,17 @@ public T setScales(final Scales scales)
 		return this.self();
 	}
 
+	public IndexAxis getIndexAxis()
+	{
+		return this.indexAxis;
+	}
+	
+	public T setIndexAxis(final IndexAxis indexAxis)
+	{
+		this.indexAxis = indexAxis;
+		return this.self();
+	}
+	
 	/**
 	 * @see #setResponsive(Boolean)
 	 */

chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java

@@ -29,6 +29,7 @@
 import software.xdev.chartjs.model.datapoint.XYDataPoint;
 import software.xdev.chartjs.model.dataset.BarDataset;
 import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.IndexAxis;
 import software.xdev.chartjs.model.options.scale.Scales;
 import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
 import software.xdev.chartjs.model.options.scale.cartesian.CartesianScaleOptions;
@@ -134,7 +135,7 @@ void testStackedHorizontal()
 	{
 		final BarOptions options = new BarOptions()
 			.setAnimation(false)
-			.setIndexAxis(BarOptions.IndexAxis.Y);
+			.setIndexAxis(IndexAxis.Y);
 		options
 			.getScales()
 			.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
@@ -177,7 +178,7 @@ void testStackedWithGroups()
 
 		final BarOptions options = new BarOptions()
 			.setAnimation(false)
-			.setIndexAxis(BarOptions.IndexAxis.Y);
+			.setIndexAxis(IndexAxis.Y);
 		options
 			.getScales()
 			.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))