xdev-software · AB-xdev · May 7, 2024 · May 6, 2024 · May 6, 2024 · May 7, 2024
diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
@@ -43,7 +43,8 @@ jobs:
         cache: 'maven'
 
     - name: Build with Maven
-      run: ./mvnw -B clean package -P run-integration-tests
+      # Java 17 is required for tests
+      run: ./mvnw -B clean package ${{ matrix.java >=17 && '-P run-integration-tests' || '-Dmaven.test.skip=true' }}
 
     - name: Check for uncommited changes
       run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.3.0
+* Allows creation of mixed charts #128
+  * New chart class: ``MixedChart``
+  * Some classes have been renamed
+    * ``Data`` -> ``HomogeneousData``
+    * ``AbstractChart`` -> ``HomogeneousChart``
+* Slim down test dependencies
+
 ## 1.2.0
 * Add TimeScale and TimeTicks to allow building linear time charts #90
 * Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117

diff --git a/README.md b/README.md
@@ -24,3 +24,5 @@ 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)
+
+<sub>Disclaimer: This is not an official ChartJS product and not associated</sub>
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.2.1-SNAPSHOT</version>
+	<version>1.3.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.2.1-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
@@ -139,6 +139,19 @@
 			<artifactId>testcontainers</artifactId>
 			<version>${testcontainers-version}</version>
 			<scope>test</scope>
+			<exclusions>
+				<!-- No JUnit 4 -->
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-junit4-mock</artifactId>
+			<version>1.0.1</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
@@ -147,9 +160,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>selenium</artifactId>
-			<version>${testcontainers-version}</version>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-selenium</artifactId>
+			<version>1.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -159,6 +172,13 @@
 			<artifactId>selenium-chrome-driver</artifactId>
 			<version>4.20.0</version>
 			<scope>test</scope>
+			<exclusions>
+				<!-- Tracing is not needed -->
+				<exclusion>
+					<groupId>io.opentelemetry</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 

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
@@ -24,11 +24,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.AbstractData;
 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<?, ?>, D extends AbstractData<?, ?>>
 	implements Chart<T, O, D>
 {
 	protected D data;

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java
@@ -16,13 +16,13 @@
 package software.xdev.chartjs.model.charts;
 
 import software.xdev.chartjs.model.data.BarData;
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.dataset.BarDataset;
 import software.xdev.chartjs.model.options.BarOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class BarChart extends AbstractChart<BarChart, BarOptions, BarData>
+public class BarChart extends HomogeneousChart<BarChart, BarOptions, BarData>
 {
 	public BarChart()
 	{
@@ -39,7 +39,7 @@ public BarChart(final BarData data, final BarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link BarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BarChart}.
 	 *
 	 * @return a new {@link BarData} instance
 	 */

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java
@@ -16,12 +16,12 @@
 package software.xdev.chartjs.model.charts;
 
 import software.xdev.chartjs.model.data.BubbleData;
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.options.BubbleOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class BubbleChart extends AbstractChart<BubbleChart, BubbleOptions, BubbleData>
+public class BubbleChart extends HomogeneousChart<BubbleChart, BubbleOptions, BubbleData>
 {
 	public BubbleChart()
 	{
@@ -38,7 +38,7 @@ public BubbleChart(final BubbleData data, final BubbleOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link BubbleChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BubbleChart}.
 	 *
 	 * @return a new {@link BubbleData} instance
 	 */

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
@@ -17,12 +17,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.AbstractData;
 import software.xdev.chartjs.model.options.Options;
 
 
 @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<?, ?>, D extends AbstractData<?, ?>>
 {
 	/**
 	 * @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/charts/DoughnutChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java
@@ -15,13 +15,13 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
 import software.xdev.chartjs.model.data.DoughnutData;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.options.DoughnutOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class DoughnutChart extends AbstractChart<DoughnutChart, DoughnutOptions, DoughnutData>
+public class DoughnutChart extends HomogeneousChart<DoughnutChart, DoughnutOptions, DoughnutData>
 {
 	public DoughnutChart()
 	{
@@ -38,7 +38,7 @@ public DoughnutChart(final DoughnutData data, final DoughnutOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link DoughnutChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link DoughnutChart}.
 	 *
 	 * @return a new {@link DoughnutData} instance
 	 */

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.HomogeneousData;
+import software.xdev.chartjs.model.options.Options;
+
+
+public abstract class HomogeneousChart<T, O extends Options<O, ?>, D extends HomogeneousData<D, ?>>
+	extends AbstractChart<T, O, D>
+{
+	protected HomogeneousChart()
+	{
+	}
+
+	protected HomogeneousChart(final D data)
+	{
+		super(data);
+	}
+
+	protected HomogeneousChart(final D data, final O options)
+	{
+		super(data, options);
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java
@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.LineData;
 import software.xdev.chartjs.model.dataset.LineDataset;
 import software.xdev.chartjs.model.options.LineOptions;
 import software.xdev.chartjs.model.options.Options;
 
 
-public class LineChart extends AbstractChart<LineChart, LineOptions, LineData>
+public class LineChart extends HomogeneousChart<LineChart, LineOptions, LineData>
 {
 	public LineChart()
 	{
@@ -39,7 +39,7 @@ public LineChart(final LineData data, final LineOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link LineChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link LineChart}.
 	 *
 	 * @return a new {@link LineData} instance
 	 */

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/MixedChart.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.chartjs.model.charts;
+
+import software.xdev.chartjs.model.data.MixedData;
+import software.xdev.chartjs.model.options.Options;
+
+
+/**
+ * Allows creation of <a href="https://www.chartjs.org/docs/latest/charts/mixed.html">mixed chart types</a>
+ */
+public class MixedChart extends AbstractChart<MixedChart, Options<?, ?>, MixedData>
+{
+	protected String type;
+
+	public MixedChart setType(final String type)
+	{
+		this.type = type;
+		return this.self();
+	}
+
+	@Override
+	public String getType()
+	{
+		return this.type;
+	}
+
+	@Override
+	public boolean isDrawable()
+	{
+		// Warning: Unchecked
+		return true;
+	}
+}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java
@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.PieData;
 import software.xdev.chartjs.model.dataset.PieDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.PieOptions;
 
 
-public class PieChart extends AbstractChart<PieChart, PieOptions, PieData>
+public class PieChart extends HomogeneousChart<PieChart, PieOptions, PieData>
 {
 	public PieChart()
 	{
@@ -39,7 +39,7 @@ public PieChart(final PieData data, final PieOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link PieChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PieChart}.
 	 *
 	 * @return a new {@link PieData} instance
 	 */

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java
@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.PolarData;
 import software.xdev.chartjs.model.dataset.PolarDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.PolarOptions;
 
 
-public class PolarChart extends AbstractChart<PolarChart, PolarOptions, PolarData>
+public class PolarChart extends HomogeneousChart<PolarChart, PolarOptions, PolarData>
 {
 	public PolarChart()
 	{
@@ -39,7 +39,7 @@ public PolarChart(final PolarData data, final PolarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link PolarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link PolarChart}.
 	 *
 	 * @return a new {@link PolarData} instance
 	 */

diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/RadarChart.java
@@ -15,14 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.HomogeneousData;
 import software.xdev.chartjs.model.data.RadarData;
 import software.xdev.chartjs.model.dataset.RadarDataset;
 import software.xdev.chartjs.model.options.Options;
 import software.xdev.chartjs.model.options.RadarOptions;
 
 
-public class RadarChart extends AbstractChart<RadarChart, RadarOptions, RadarData>
+public class RadarChart extends HomogeneousChart<RadarChart, RadarOptions, RadarData>
 {
 	public RadarChart()
 	{
@@ -39,7 +39,7 @@ public RadarChart(final RadarData data, final RadarOptions options)
 	}
 
 	/**
-	 * Static factory, constructs an {@link Data} implementation appropriate for a {@link RadarChart}.
+	 * Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link RadarChart}.
 	 *
 	 * @return a new {@link RadarData} instance
 	 */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,5 @@ 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)

		<sub>Disclaimer: This is not an official ChartJS product and not associated</sub>