Skip to content

Commit d64818d

Browse files
AB-xdevAB-xdev
authored
Merge pull request #43 from xdev-software/develop
1.0.2
2 parents 7042773 + 8635873 commit d64818d

File tree

21 files changed

+58
-29
lines changed

21 files changed

+58
-29
lines changed

‎.github/workflows/checkBuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
java: [17]
24+
java: [11, 17, 21]
2525
distribution: [temurin]
2626

2727
steps:

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.2
2+
* Support Java 11
3+
* Updated dependencies
4+
15
## 1.0.1
26
* Added support for [stacked bar chart with groups](https://www.chartjs.org/docs/latest/samples/bar/stacked-groups.html)
37

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</organization>
1818

1919
<properties>
20-
<javaVersion>17</javaVersion>
20+
<javaVersion>11</javaVersion>
2121
<maven.compiler.release>${javaVersion}</maven.compiler.release>
2222

2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎chartjs-java-model-demo/src/main/java/software/xdev/Application.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ private static void createAndOpenTestFile(final Chart<?, ?, ?> chart)
4141

4242
Files.writeString(
4343
tmp,
44-
"""
45-
<!DOCTYPE html>
46-
<html lang='en'>
47-
\t<head>
48-
\t\t<meta charset='UTF-8'>
49-
\t\t<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.3.0/chart.umd.js"></script>
50-
\t</head>
51-
\t<body>
52-
\t\t<canvas id='c' style='border:1px solid #555;'></canvas>
53-
\t\t<script>
54-
\t\t\tnew Chart(document.getElementById('c').getContext('2d'), %s);
55-
\t\t</script>
56-
\t</body>
57-
</html>
58-
""".formatted(chart.toJson()));
44+
String.format("<!DOCTYPE html>\n"
45+
+ "<html lang='en'>\n"
46+
+ "\t<head>\n"
47+
+ "\t\t<meta charset='UTF-8'>\n"
48+
+ "\t\t<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.3.0/chart.umd"
49+
+ ".js\"></script>\n"
50+
+ "\t</head>\n"
51+
+ "\t<body>\n"
52+
+ "\t\t<canvas id='c' style='border:1px solid #555;'></canvas>\n"
53+
+ "\t\t<script>\n"
54+
+ "\t\t\tnew Chart(document.getElementById('c').getContext('2d'), %s);\n"
55+
+ "\t\t</script>\n"
56+
+ "\t</body>\n"
57+
+ "</html>", chart.toJson())
58+
);
5959

6060
Desktop.getDesktop().browse(tmp.toUri());
6161
}

‎chartjs-java-model/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
</licenses>
4343

4444
<properties>
45-
<javaVersion>17</javaVersion>
45+
<javaVersion>11</javaVersion>
4646
<maven.compiler.release>${javaVersion}</maven.compiler.release>
4747

4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<slf4j-version>2.0.9</slf4j-version>
52-
<log4j-version>2.20.0</log4j-version>
52+
<log4j-version>2.21.0</log4j-version>
5353
<testcontainers-version>1.19.1</testcontainers-version>
5454

5555
<!-- by default run no tests as Docker is required -->
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>com.fasterxml.jackson.core</groupId>
9797
<artifactId>jackson-databind</artifactId>
98-
<version>2.15.2</version>
98+
<version>2.15.3</version>
9999
</dependency>
100100

101101
<!-- Tests -->
@@ -157,7 +157,7 @@
157157
<dependency>
158158
<groupId>org.seleniumhq.selenium</groupId>
159159
<artifactId>selenium-chrome-driver</artifactId>
160-
<version>4.10.0</version>
160+
<version>4.14.1</version>
161161
<scope>test</scope>
162162
</dependency>
163163
</dependencies>

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/color/Color.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,13 @@ public boolean equals(final Object o)
262262
{
263263
return true;
264264
}
265-
if(!(o instanceof final Color color))
265+
if(!(o instanceof Color))
266266
{
267267
return false;
268268
}
269+
final Color color = (Color)o;
269270
return this.getR() == color.getR() && this.getG() == color.getG() && this.getB() == color.getB()
270-
&& Double.compare(color.getAlpha(), this.getAlpha()) == 0;
271+
&& Double.compare(this.getAlpha(), color.getAlpha()) == 0;
271272
}
272273

273274
@Override

‎chartjs-java-model/src/main/java/software/xdev/chartjs/model/dataset/BigDecimalDataset.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ default S setData(final double... data)
4747
/**
4848
* Add the data point to this {@code Dataset}
4949
*
50-
* @see #setData(Collection)
50+
* @see Dataset#setData(Collection)
5151
*/
5252
default S addData(final int data)
5353
{

‎chartjs-java-model/src/test/java/software/xdev/chartjs/model/BasicChartTest.java‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,35 @@ static Stream<Arguments> basicTest()
219219
dto.dataSupplier().get()));
220220
}
221221

222-
record ArgumentDTO<O extends Options<O, ?>, D extends Data<D, ?, ?>>(
223-
Supplier<Chart<?, O, D>> chartSupplier,
224-
Supplier<O> optionsSupplier,
225-
Supplier<D> dataSupplier
226-
)
222+
public static class ArgumentDTO<O extends Options<O, ?>, D extends Data<D, ?, ?>>
227223
{
224+
private final Supplier<Chart<?, O, D>> chartSupplier;
225+
private final Supplier<O> optionsSupplier;
226+
private final Supplier<D> dataSupplier;
227+
228+
public ArgumentDTO(
229+
final Supplier<Chart<?, O, D>> chartSupplier,
230+
final Supplier<O> optionsSupplier,
231+
final Supplier<D> dataSupplier)
232+
{
233+
this.chartSupplier = chartSupplier;
234+
this.optionsSupplier = optionsSupplier;
235+
this.dataSupplier = dataSupplier;
236+
}
237+
238+
public Supplier<Chart<?, O, D>> chartSupplier()
239+
{
240+
return this.chartSupplier;
241+
}
242+
243+
public Supplier<O> optionsSupplier()
244+
{
245+
return this.optionsSupplier;
246+
}
247+
248+
public Supplier<D> dataSupplier()
249+
{
250+
return this.dataSupplier;
251+
}
228252
}
229253
}

‎chartjs-java-model/src/test/resources/screenshotReferences/BarChartBasic.png‎

-18 Bytes
Loading

‎chartjs-java-model/src/test/resources/screenshotReferences/BarChartScale.png‎

-19 Bytes
Loading

0 commit comments

Comments
 (0)