Skip to content

Commit f78e2bc

Browse files
AB-xdevAB-xdev
authored
Merge pull request #136 from xdev-software/develop
Release
2 parents 33e3d7d + 320db9c commit f78e2bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+323
-72
lines changed

‎.github/workflows/checkBuild.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
cache: 'maven'
4444

4545
- name: Build with Maven
46-
run: ./mvnw -B clean package -P run-integration-tests
46+
# Java 17 is required for tests
47+
run: ./mvnw -B clean package ${{ matrix.java >=17 && '-P run-integration-tests' || '-Dmaven.test.skip=true' }}
4748

4849
- name: Check for uncommited changes
4950
run: |

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 1.3.0
2+
* Allows creation of mixed charts #128
3+
* New chart class: ``MixedChart``
4+
* Some classes have been renamed
5+
* ``Data`` -> ``HomogeneousData``
6+
* ``AbstractChart`` -> ``HomogeneousChart``
7+
* Slim down test dependencies
8+
19
## 1.2.0
210
* Add TimeScale and TimeTicks to allow building linear time charts #90
311
* Add options for the [Zoom plugin](https://www.chartjs.org/chartjs-plugin-zoom/latest/) #117

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how
2424

2525
## Dependencies and Licenses
2626
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/chartjs-java-model/dependencies)
27+
28+
<sub>Disclaimer: This is not an official ChartJS product and not associated</sub>

‎chartjs-java-model-demo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>chartjs-java-model-demo</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<organization>

‎chartjs-java-model/pom.xml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>chartjs-java-model</artifactId>
9-
<version>1.2.1-SNAPSHOT</version>
9+
<version>1.3.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>chartjs-java-model</name>
@@ -139,6 +139,19 @@
139139
<artifactId>testcontainers</artifactId>
140140
<version>${testcontainers-version}</version>
141141
<scope>test</scope>
142+
<exclusions>
143+
<!-- No JUnit 4 -->
144+
<exclusion>
145+
<groupId>junit</groupId>
146+
<artifactId>junit</artifactId>
147+
</exclusion>
148+
</exclusions>
149+
</dependency>
150+
<dependency>
151+
<groupId>software.xdev</groupId>
152+
<artifactId>testcontainers-junit4-mock</artifactId>
153+
<version>1.0.1</version>
154+
<scope>test</scope>
142155
</dependency>
143156
<dependency>
144157
<groupId>org.testcontainers</groupId>
@@ -147,9 +160,9 @@
147160
<scope>test</scope>
148161
</dependency>
149162
<dependency>
150-
<groupId>org.testcontainers</groupId>
151-
<artifactId>selenium</artifactId>
152-
<version>${testcontainers-version}</version>
163+
<groupId>software.xdev</groupId>
164+
<artifactId>testcontainers-selenium</artifactId>
165+
<version>1.0.1</version>
153166
<scope>test</scope>
154167
</dependency>
155168

@@ -159,6 +172,13 @@
159172
<artifactId>selenium-chrome-driver</artifactId>
160173
<version>4.20.0</version>
161174
<scope>test</scope>
175+
<exclusions>
176+
<!-- Tracing is not needed -->
177+
<exclusion>
178+
<groupId>io.opentelemetry</groupId>
179+
<artifactId>*</artifactId>
180+
</exclusion>
181+
</exclusions>
162182
</dependency>
163183
</dependencies>
164184

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import com.fasterxml.jackson.databind.ObjectMapper;
2525
import com.fasterxml.jackson.databind.ObjectWriter;
2626

27-
import software.xdev.chartjs.model.data.Data;
27+
import software.xdev.chartjs.model.data.AbstractData;
2828
import software.xdev.chartjs.model.options.Options;
2929

3030

31-
public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?>>
31+
public abstract class AbstractChart<T, O extends Options<?, ?>, D extends AbstractData<?, ?>>
3232
implements Chart<T, O, D>
3333
{
3434
protected D data;

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package software.xdev.chartjs.model.charts;
1717

1818
import software.xdev.chartjs.model.data.BarData;
19-
import software.xdev.chartjs.model.data.Data;
19+
import software.xdev.chartjs.model.data.HomogeneousData;
2020
import software.xdev.chartjs.model.dataset.BarDataset;
2121
import software.xdev.chartjs.model.options.BarOptions;
2222
import software.xdev.chartjs.model.options.Options;
2323

2424

25-
public class BarChart extends AbstractChart<BarChart, BarOptions, BarData>
25+
public class BarChart extends HomogeneousChart<BarChart, BarOptions, BarData>
2626
{
2727
public BarChart()
2828
{
@@ -39,7 +39,7 @@ public BarChart(final BarData data, final BarOptions options)
3939
}
4040

4141
/**
42-
* Static factory, constructs an {@link Data} implementation appropriate for a {@link BarChart}.
42+
* Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BarChart}.
4343
*
4444
* @return a new {@link BarData} instance
4545
*/

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BubbleChart.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package software.xdev.chartjs.model.charts;
1717

1818
import software.xdev.chartjs.model.data.BubbleData;
19-
import software.xdev.chartjs.model.data.Data;
19+
import software.xdev.chartjs.model.data.HomogeneousData;
2020
import software.xdev.chartjs.model.options.BubbleOptions;
2121
import software.xdev.chartjs.model.options.Options;
2222

2323

24-
public class BubbleChart extends AbstractChart<BubbleChart, BubbleOptions, BubbleData>
24+
public class BubbleChart extends HomogeneousChart<BubbleChart, BubbleOptions, BubbleData>
2525
{
2626
public BubbleChart()
2727
{
@@ -38,7 +38,7 @@ public BubbleChart(final BubbleData data, final BubbleOptions options)
3838
}
3939

4040
/**
41-
* Static factory, constructs an {@link Data} implementation appropriate for a {@link BubbleChart}.
41+
* Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link BubbleChart}.
4242
*
4343
* @return a new {@link BubbleData} instance
4444
*/

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import com.fasterxml.jackson.annotation.JsonProperty;
1919

20-
import software.xdev.chartjs.model.data.Data;
20+
import software.xdev.chartjs.model.data.AbstractData;
2121
import software.xdev.chartjs.model.options.Options;
2222

2323

2424
@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<?, ?>, D extends AbstractData<?, ?>>
2626
{
2727
/**
2828
* @return type of this {@link Chart} implementation for proper drawing in JavaScript.

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/DoughnutChart.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package software.xdev.chartjs.model.charts;
1717

18-
import software.xdev.chartjs.model.data.Data;
1918
import software.xdev.chartjs.model.data.DoughnutData;
19+
import software.xdev.chartjs.model.data.HomogeneousData;
2020
import software.xdev.chartjs.model.options.DoughnutOptions;
2121
import software.xdev.chartjs.model.options.Options;
2222

2323

24-
public class DoughnutChart extends AbstractChart<DoughnutChart, DoughnutOptions, DoughnutData>
24+
public class DoughnutChart extends HomogeneousChart<DoughnutChart, DoughnutOptions, DoughnutData>
2525
{
2626
public DoughnutChart()
2727
{
@@ -38,7 +38,7 @@ public DoughnutChart(final DoughnutData data, final DoughnutOptions options)
3838
}
3939

4040
/**
41-
* Static factory, constructs an {@link Data} implementation appropriate for a {@link DoughnutChart}.
41+
* Static factory, constructs an {@link HomogeneousData} implementation appropriate for a {@link DoughnutChart}.
4242
*
4343
* @return a new {@link DoughnutData} instance
4444
*/

0 commit comments

Comments
 (0)