Merge pull request #480 from xdev-software/develop

AB-xdev · web-flow · commit e3edf5bc1747 · 2026-01-20T17:30:22.000+01:00
Release
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -83,31 +83,6 @@ jobs:
         path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/screenshots
         if-no-files-found: ignore
 
-  # Ensure compatibility with Java 11
-  # See https://github.com/xdev-software/chartjs-java-model/issues/14
-  build-java-11:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-    - uses: actions/checkout@v6
-
-    - name: Set up JDK
-      uses: actions/setup-java@v5
-      with:
-        distribution: temurin
-        java-version: 11
-
-    - name: Cache Maven
-      uses: actions/cache@v5
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-mvn-build-java-11-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-mvn-build-java-11-
-
-    - name: Build with Maven
-      run: ./mvnw -B clean package -Dmaven.test.skip=true
-
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.0.0
+_Java 17 is now required_
+* Updated dependencies
+  * Updated to Jackson v3 #477
+
 # 2.9.1
 * Updated dependencies
 
diff --git a/chartjs-java-model-demo/pom.xml b/chartjs-java-model-demo/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>chartjs-java-model-root</artifactId>
-		<version>2.9.2-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>chartjs-java-model-demo</artifactId>
-	<version>2.9.2-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -20,7 +20,7 @@
 	</organization>
 
 	<properties>
-		<javaVersion>11</javaVersion>
+		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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>2.9.2-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>chartjs-java-model</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>11</javaVersion>
+		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -57,9 +57,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
+			<groupId>tools.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.21.0</version>
+			<version>3.0.3</version>
 		</dependency>
 
 		<!-- Tests -->
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
@@ -15,18 +15,14 @@
  */
 package software.xdev.chartjs.model.charts;
 
-import java.io.UncheckedIOException;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
 
 import software.xdev.chartjs.model.data.AbstractData;
 import software.xdev.chartjs.model.options.Options;
+import tools.jackson.databind.ObjectWriter;
+import tools.jackson.databind.json.JsonMapper;
 
 
 public abstract class AbstractChart<T, O extends Options<?, ?>, D extends AbstractData<?, ?>>
@@ -36,13 +32,16 @@ public abstract class AbstractChart<T, O extends Options<?, ?>, D extends Abstra
 	protected O options;
 	
 	@JsonIgnore
-	protected ObjectWriter defaultObjectWriter = new ObjectMapper()
-		.setDefaultPropertyInclusion(JsonInclude.Include.NON_EMPTY)
-		.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
-		.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
-		.setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE)
-		.setVisibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE)
-		.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.NONE)
+	protected ObjectWriter defaultObjectWriter = JsonMapper.builder()
+		.changeDefaultPropertyInclusion(v -> v
+			.withValueInclusion(JsonInclude.Include.NON_EMPTY))
+		.changeDefaultVisibility(vc -> vc
+			.withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+			.withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+			.withIsGetterVisibility(JsonAutoDetect.Visibility.NONE)
+			.withSetterVisibility(JsonAutoDetect.Visibility.NONE)
+			.withCreatorVisibility(JsonAutoDetect.Visibility.NONE))
+		.build()
 		.writer()
 		.forType(this.getClass());
 	
@@ -102,14 +101,7 @@ public T setDefaultObjectWriter(final ObjectWriter defaultObjectWriter)
 	@Override
 	public String toJson()
 	{
-		try
-		{
-			return this.defaultObjectWriter.writeValueAsString(this);
-		}
-		catch(final JsonProcessingException e)
-		{
-			throw new UncheckedIOException("Failed to write json", e);
-		}
+		return this.defaultObjectWriter.writeValueAsString(this);
 	}
 	
 	@SuppressWarnings("unchecked")
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/javascript/JavaScriptFunction.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/javascript/JavaScriptFunction.java
@@ -15,12 +15,10 @@
  */
 package software.xdev.chartjs.model.javascript;
 
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.StdSerializer;
 
 
 @JsonSerialize(using = JavaScriptFunction.Serializer.class)
@@ -38,13 +36,18 @@ public String getFunction()
 		return this.function;
 	}
 	
-	public static class Serializer extends JsonSerializer<JavaScriptFunction>
+	public static class Serializer extends StdSerializer<JavaScriptFunction>
 	{
+		public Serializer()
+		{
+			super(JavaScriptFunction.class);
+		}
+		
 		@Override
 		public void serialize(
 			final JavaScriptFunction value,
 			final JsonGenerator gen,
-			final SerializerProvider serializers) throws IOException
+			final SerializationContext provider)
 		{
 			gen.writeRawValue(value.function);
 		}
diff --git a/chartjs-java-model/src/main/java/software/xdev/chartjs/model/objects/OptionalArray.java b/chartjs-java-model/src/main/java/software/xdev/chartjs/model/objects/OptionalArray.java
@@ -15,13 +15,12 @@
  */
 package software.xdev.chartjs.model.objects;
 
-import java.io.IOException;
 import java.util.ArrayList;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.annotation.JsonSerialize;
+import tools.jackson.databind.ser.std.StdSerializer;
 
 
 /**
@@ -31,35 +30,39 @@
 @JsonSerialize(using = OptionalArray.Serializer.class)
 public class OptionalArray<E> extends ArrayList<E>
 {
-	public static class Serializer<T> extends JsonSerializer<OptionalArray<T>>
+	public static class Serializer<T> extends StdSerializer<OptionalArray<T>>
 	{
+		public Serializer()
+		{
+			super(OptionalArray.class);
+		}
+		
 		@Override
-		public boolean isEmpty(final SerializerProvider provider, final OptionalArray<T> value)
+		public boolean isEmpty(final SerializationContext ctxt, final OptionalArray<T> value)
 		{
 			return value == null || value.isEmpty();
 		}
 		
 		@Override
 		public void serialize(
 			final OptionalArray<T> value,
-			final JsonGenerator jgen,
-			final SerializerProvider provider)
-			throws IOException
+			final JsonGenerator gen,
+			final SerializationContext provider)
 		{
 			if(value != null && !value.isEmpty())
 			{
 				if(value.size() == 1)
 				{
-					jgen.writeObject(value.get(0));
+					gen.writePOJO(value.get(0));
 				}
 				else
 				{
-					jgen.writeStartArray();
+					gen.writeStartArray();
 					for(final T t : value)
 					{
-						jgen.writeObject(t);
+						gen.writePOJO(t);
 					}
-					jgen.writeEndArray();
+					gen.writeEndArray();
 				}
 			}
 		}
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>chartjs-java-model-root</artifactId>
-	<version>2.9.2-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,12 @@`
`15`	`15`	`*/`
`16`	`16`	`package software.xdev.chartjs.model.objects;`
`17`	`17`
`18`		`-import java.io.IOException;`
`19`	`18`	`import java.util.ArrayList;`
`20`	`19`
`21`		`-import com.fasterxml.jackson.core.JsonGenerator;`
`22`		`-import com.fasterxml.jackson.databind.JsonSerializer;`
`23`		`-import com.fasterxml.jackson.databind.SerializerProvider;`
`24`		`-import com.fasterxml.jackson.databind.annotation.JsonSerialize;`
	`20`	`+import tools.jackson.core.JsonGenerator;`
	`21`	`+import tools.jackson.databind.SerializationContext;`
	`22`	`+import tools.jackson.databind.annotation.JsonSerialize;`
	`23`	`+import tools.jackson.databind.ser.std.StdSerializer;`
`25`	`24`
`26`	`25`
`27`	`26`	`/**`
`@@ -31,35 +30,39 @@`
`31`	`30`	`@JsonSerialize(using = OptionalArray.Serializer.class)`
`32`	`31`	`public class OptionalArray<E> extends ArrayList<E>`
`33`	`32`	`{`
`34`		`- public static class Serializer<T> extends JsonSerializer<OptionalArray<T>>`
	`33`	`+ public static class Serializer<T> extends StdSerializer<OptionalArray<T>>`
`35`	`34`	`{`
	`35`	`+ public Serializer()`
	`36`	`+ {`
	`37`	`+ super(OptionalArray.class);`
	`38`	`+ }`
	`39`	`+`
`36`	`40`	`@Override`
`37`		`- public boolean isEmpty(final SerializerProvider provider, final OptionalArray<T> value)`
	`41`	`+ public boolean isEmpty(final SerializationContext ctxt, final OptionalArray<T> value)`
`38`	`42`	`{`
`39`	`43`	`return value == null \|\| value.isEmpty();`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`@Override`
`43`	`47`	`public void serialize(`
`44`	`48`	`final OptionalArray<T> value,`
`45`		`- final JsonGenerator jgen,`
`46`		`- final SerializerProvider provider)`
`47`		`- throws IOException`
	`49`	`+ final JsonGenerator gen,`
	`50`	`+ final SerializationContext provider)`
`48`	`51`	`{`
`49`	`52`	`if(value != null && !value.isEmpty())`
`50`	`53`	`{`
`51`	`54`	`if(value.size() == 1)`
`52`	`55`	`{`
`53`		`- jgen.writeObject(value.get(0));`
	`56`	`+ gen.writePOJO(value.get(0));`
`54`	`57`	`}`
`55`	`58`	`else`
`56`	`59`	`{`
`57`		`- jgen.writeStartArray();`
	`60`	`+ gen.writeStartArray();`
`58`	`61`	`for(final T t : value)`
`59`	`62`	`{`
`60`		`- jgen.writeObject(t);`
	`63`	`+ gen.writePOJO(t);`
`61`	`64`	`}`
`62`		`- jgen.writeEndArray();`
	`65`	`+ gen.writeEndArray();`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`}`