Remove not required generic

AB-xdev · AB-xdev · commit 064576e772e3 · 2023-10-26T11:19:24.000+02:00
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java
@@ -28,7 +28,7 @@
 import software.xdev.chartjs.model.options.Options;
 
 
-public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?, ?>>
+public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?>>
 	implements Chart<T, O, D>
 {
 	protected D data;
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java
@@ -22,7 +22,7 @@
 
 
 @SuppressWarnings("java:S119") // SELF means the Chart itself... Not a problem
-public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?, ?>>
+public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?>>
 {
 	/**
 	 * @return type of this {@link Chart} implementation for proper drawing in JavaScript.
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BarData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.BarDataset;
 
 
-public class BarData extends Data<BarData, BarDataset, BigDecimal>
+public class BarData extends Data<BarData, BarDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/BubbleData.java
@@ -15,11 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
 import software.xdev.chartjs.model.dataset.BubbleDataset;
 
 
-public class BubbleData extends Data<BubbleData, BubbleDataset, BubbleDataPoint>
+public class BubbleData extends Data<BubbleData, BubbleDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/Data.java
@@ -24,7 +24,7 @@
 import software.xdev.chartjs.model.dataset.Dataset;
 
 
-public class Data<D extends Data<D, T, O>, T extends Dataset<T, O>, O>
+public class Data<D extends Data<D, T>, T extends Dataset<T, ?>>
 {
 
 	private final List<String> labels = new ArrayList<>();
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/DoughnutData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.DoughnutDataset;
 
 
-public class DoughnutData extends Data<DoughnutData, DoughnutDataset, BigDecimal>
+public class DoughnutData extends Data<DoughnutData, DoughnutDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/LineData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.LineDataset;
 
 
-public class LineData extends Data<LineData, LineDataset, BigDecimal>
+public class LineData extends Data<LineData, LineDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PieData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.PieDataset;
 
 
-public class PieData extends Data<PieData, PieDataset, BigDecimal>
+public class PieData extends Data<PieData, PieDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/PolarData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.PolarDataset;
 
 
-public class PolarData extends Data<PolarData, PolarDataset, BigDecimal>
+public class PolarData extends Data<PolarData, PolarDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/RadarData.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import java.math.BigDecimal;
-
 import software.xdev.chartjs.model.dataset.RadarDataset;
 
 
-public class RadarData extends Data<RadarData, RadarDataset, BigDecimal>
+public class RadarData extends Data<RadarData, RadarDataset>
 {
 
 }
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/data/ScatterData.java
@@ -15,11 +15,10 @@
  */
 package software.xdev.chartjs.model.data;
 
-import software.xdev.chartjs.model.datapoint.ScatterDataPoint;
 import software.xdev.chartjs.model.dataset.ScatterDataset;
 
 
-public class ScatterData extends Data<ScatterData, ScatterDataset, ScatterDataPoint>
+public class ScatterData extends Data<ScatterData, ScatterDataset>
 {
 
 }
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
@@ -70,7 +70,7 @@ class BasicChartTest extends AbstractChartTest
 {
 	@ParameterizedTest(name = "Check if basic {0} is displayed correctly")
 	@MethodSource
-	<O extends Options<O, ?>, D extends Data<D, ?, ?>> void basicTest(
+	<O extends Options<O, ?>, D extends Data<D, ?>> void basicTest(
 		final String chartName,
 		final Chart<?, O, D> chart,
 		final O options,
@@ -219,7 +219,7 @@ static Stream<Arguments> basicTest()
 				dto.dataSupplier().get()));
 	}
 	
-	public static class ArgumentDTO<O extends Options<O, ?>, D extends Data<D, ?, ?>>
+	public static class ArgumentDTO<O extends Options<O, ?>, D extends Data<D, ?>>
 	{
 		private final Supplier<Chart<?, O, D>> chartSupplier;
 		private final Supplier<O> optionsSupplier;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`import software.xdev.chartjs.model.options.Options;`
`29`	`29`
`30`	`30`
`31`		`-public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?, ?>>`
	`31`	`+public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?>>`
`32`	`32`	`implements Chart<T, O, D>`
`33`	`33`	`{`
`34`	`34`	`protected D data;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`
`24`	`24`	`@SuppressWarnings("java:S119") // SELF means the Chart itself... Not a problem`
`25`		`-public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?, ?>>`
	`25`	`+public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?>>`
`26`	`26`	`{`
`27`	`27`	`/**`
`28`	`28`	`* @return type of this {@link Chart} implementation for proper drawing in JavaScript.`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,10 @@`
`15`	`15`	`*/`
`16`	`16`	`package software.xdev.chartjs.model.data;`
`17`	`17`
`18`		`-import java.math.BigDecimal;`
`19`		`-`
`20`	`18`	`import software.xdev.chartjs.model.dataset.BarDataset;`
`21`	`19`
`22`	`20`
`23`		`-public class BarData extends Data<BarData, BarDataset, BigDecimal>`
	`21`	`+public class BarData extends Data<BarData, BarDataset>`
`24`	`22`	`{`
`25`	`23`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@`
`15`	`15`	`*/`
`16`	`16`	`package software.xdev.chartjs.model.data;`
`17`	`17`
`18`		`-import software.xdev.chartjs.model.datapoint.BubbleDataPoint;`
`19`	`18`	`import software.xdev.chartjs.model.dataset.BubbleDataset;`
`20`	`19`
`21`	`20`
`22`		`-public class BubbleData extends Data<BubbleData, BubbleDataset, BubbleDataPoint>`
	`21`	`+public class BubbleData extends Data<BubbleData, BubbleDataset>`
`23`	`22`	`{`
`24`	`23`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`import software.xdev.chartjs.model.dataset.Dataset;`
`25`	`25`
`26`	`26`
`27`		`-public class Data<D extends Data<D, T, O>, T extends Dataset<T, O>, O>`
	`27`	`+public class Data<D extends Data<D, T>, T extends Dataset<T, ?>>`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`private final List<String> labels = new ArrayList<>();`