chore: Upgrade to Jackson 3

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.hisp</groupId>
   <artifactId>dhis2-java-client</artifactId>
-  <version>2.5.7</version>
+  <version>2.6.0</version>
   <packaging>jar</packaging>
 
   <name>DHIS 2 API client for Java</name>
@@ -47,13 +47,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.release>17</maven.compiler.release>
-    <jackson.version>2.19.0</jackson.version>
+    <jackson.version>3.1.3</jackson.version>
     <jts.version>1.20.0</jts.version>
     <slf4j.version>2.0.17</slf4j.version>
     <lombok.version>1.18.36</lombok.version>
     <maven-artifact.version>3.9.9</maven-artifact.version>
     <httpclient5.version>5.3.1</httpclient5.version>
-    <jackson-datatype-jts.version>2.14</jackson-datatype-jts.version>
     <junit-jupiter.version>5.12.1</junit-jupiter.version>
     <maven-artifact.version>3.9.4</maven-artifact.version>
     <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
@@ -89,35 +88,25 @@
     </dependency>
     <!-- Jackson -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <groupId>tools.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
       <version>${jackson.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.graphhopper.external</groupId>
-      <artifactId>jackson-datatype-jts</artifactId>
-      <version>${jackson-datatype-jts.version}</version>
-    </dependency>
     <!-- SLF4J -->
     <dependency>
       <groupId>org.slf4j</groupId>

src/main/java/org/hisp/dhis/BaseDhis2.java

@@ -38,7 +38,6 @@
 import static org.hisp.dhis.util.CollectionUtils.toCommaSeparated;
 import static org.hisp.dhis.util.HttpUtils.getUriAsString;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -118,6 +117,7 @@
 import org.hisp.dhis.util.DateTimeUtils;
 import org.hisp.dhis.util.HttpUtils;
 import org.hisp.dhis.util.JacksonUtils;
+import tools.jackson.databind.ObjectMapper;
 
 /**
  * @author Lars Helge Overland
@@ -1188,12 +1188,7 @@ private void handleErrorsForGet(ClassicHttpResponse response, String url)
    * @throws IOException if reading failed.
    */
   protected <T> T readValue(String content, Class<T> type) throws IOException {
-    try {
-      return objectMapper.readValue(content, type);
-    } catch (IOException ex) {
-      log.error("JSON deserialization error for content: {}", content);
-      throw ex;
-    }
+    return objectMapper.readValue(content, type);
   }
 
   /**
@@ -1289,15 +1284,11 @@ protected <T extends HttpUriRequestBase> T withAuth(T request) {
    * @throws Dhis2ClientException if the serialization failed.
    */
   protected String toJsonString(Object object) {
-    try {
-      String json = objectMapper.writeValueAsString(object);
+    String json = objectMapper.writeValueAsString(object);
 
-      log("Object JSON: '{}'", json);
+    log("Object JSON: '{}'", json);
 
-      return json;
-    } catch (IOException ex) {
-      throw new Dhis2ClientException("Failed to deserialize JSON", ex);
-    }
+    return json;
   }
 
   /**

src/main/java/org/hisp/dhis/Dhis2AsyncRequest.java

@@ -27,7 +27,6 @@
  */
 package org.hisp.dhis;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -47,6 +46,7 @@
 import org.hisp.dhis.response.job.JobInfoResponse;
 import org.hisp.dhis.response.job.JobNotification;
 import org.hisp.dhis.util.HttpUtils;
+import tools.jackson.databind.ObjectMapper;
 
 @Slf4j
 public class Dhis2AsyncRequest {
@@ -223,11 +223,7 @@ private <T> T getSummary(JobInfo jobInfo, Class<T> klass) {
 
     String summary = getForBody(summaryUrl);
 
-    try {
-      return objectMapper.readValue(summary, klass);
-    } catch (IOException ex) {
-      throw new Dhis2ClientException("Failed to parse task summaries", ex);
-    }
+    return objectMapper.readValue(summary, klass);
   }
 
   /**
@@ -237,18 +233,13 @@ private <T> T getSummary(JobInfo jobInfo, Class<T> klass) {
    * @return a {@link JobNotification}.
    */
   private JobNotification getLastNotification(URI url) {
-    try {
-      String response = getForBody(url);
+    String response = getForBody(url);
 
-      JobNotification[] notificationArray =
-          objectMapper.readValue(response, JobNotification[].class);
+    JobNotification[] notificationArray = objectMapper.readValue(response, JobNotification[].class);
 
-      List<JobNotification> notifications = new ArrayList<>(Arrays.asList(notificationArray));
+    List<JobNotification> notifications = new ArrayList<>(Arrays.asList(notificationArray));
 
-      return !notifications.isEmpty() ? notifications.get(0) : new JobNotification();
-    } catch (IOException ex) {
-      throw new Dhis2ClientException("Failed to parse job notifications", ex);
-    }
+    return !notifications.isEmpty() ? notifications.get(0) : new JobNotification();
   }
 
   /**

src/main/java/org/hisp/dhis/model/IdentifiableObject.java

@@ -28,6 +28,7 @@
 package org.hisp.dhis.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
@@ -46,6 +47,20 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@JsonPropertyOrder(
+    value = {
+      "id",
+      "code",
+      "name",
+      "created",
+      "createdBy",
+      "lastUpdated",
+      "lastUpdatedBy",
+      "attributeValues",
+      "translations",
+      "sharing",
+      "access"
+    })
 public class IdentifiableObject implements Serializable {
   @JsonProperty protected String id;
 

src/main/java/org/hisp/dhis/model/event/Event.java

@@ -29,6 +29,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -47,6 +48,23 @@
 @NoArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @ToString(onlyExplicitlyIncluded = true)
+@JsonPropertyOrder({
+  "event",
+  "program",
+  "trackedEntity",
+  "programStage",
+  "enrollment",
+  "orgUnit",
+  "attributeOptionCombo",
+  "status",
+  "createdAt",
+  "createdAtClient",
+  "updatedAt",
+  "updatedAtClient",
+  "scheduledAt",
+  "occurredAt",
+  "completedAt"
+})
 public class Event implements Serializable {
   @EqualsAndHashCode.Include
   @ToString.Include

src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntity.java

@@ -32,6 +32,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,6 +50,15 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@JsonPropertyOrder({
+  "trackedEntity",
+  "trackedEntityType",
+  "createdAt",
+  "createdAtClient",
+  "updatedAt",
+  "updatedAtClient",
+  "orgUnit"
+})
 public class TrackedEntity implements Serializable {
   @JsonProperty private String trackedEntity;
 

src/main/java/org/hisp/dhis/query/analytics/AnalyticsQuery.java

@@ -35,6 +35,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hisp.dhis.model.AggregationType;
 import org.hisp.dhis.model.IdScheme;
@@ -53,6 +54,7 @@
 @Getter
 @Setter
 @Accessors(chain = true)
+@ToString
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class AnalyticsQuery {
   private final List<QueryDimension> dimensions = new ArrayList<>();