Update to Jackson v3

Fixes #477

Author: AB-xdev

chartjs-java-model/pom.xml

@@ -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 -->

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")

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);
 		}

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();
 				}
 			}
 		}