Jackson upgrade

app/alarm/logging-ui/pom.xml

@@ -39,25 +39,23 @@
       <version>6.0.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
     <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>
+      <version>${tools.jackson.version}</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
+      <version>${tools.jackson.version}</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
     <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.annotations.version}</version>
     </dependency>
   </dependencies>
 </project>

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java

@@ -1,12 +1,13 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
 import org.phoebus.framework.jobs.Job;
 import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.jobs.JobRunnableWithCancel;
 import org.phoebus.util.http.QueryParamsHelper;
+import tools.jackson.databind.json.JsonMapper;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
@@ -51,8 +52,9 @@ private AlarmLogConfigSearchJob(HttpClient httpClient,
         this.pattern = pattern;
         this.alarmMessageHandler = alarmMessageHandler;
         this.errorHandler = errorHandler;
-        this.objectMapper = new ObjectMapper();
-        this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        this.objectMapper = JsonMapper.builder()
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .build();
     }
 
     @Override

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java

@@ -1,8 +1,9 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
 import javafx.collections.ObservableMap;
 import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 import org.phoebus.framework.jobs.Job;
@@ -11,6 +12,7 @@
 import org.phoebus.framework.jobs.JobRunnable;
 import org.phoebus.framework.preferences.PreferencesReader;
 import org.phoebus.util.http.QueryParamsHelper;
+import tools.jackson.databind.json.JsonMapper;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedHashMap;
@@ -63,8 +65,10 @@ private AlarmLogSearchJob(HttpClient httpClient, Boolean isNodeTable, Observable
         this.searchParameters = searchParameters;
         this.alarmMessageHandler = alarmMessageHandler;
         this.errorHandler = errorHandler;
-        this.objectMapper = new ObjectMapper();
-        this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        this.objectMapper = JsonMapper.builder()
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.NON_NULL))
+                .build();
     }
 
     @Override

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java

@@ -1,9 +1,8 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -550,9 +549,6 @@ public void search() {
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    static {
-        objectMapper.registerModule(new JavaTimeModule());
-    }
 
     @FXML
     public void createContextMenu() {
@@ -593,7 +589,7 @@ public void createContextMenu() {
                                 Object jsonObject = objectMapper.readValue(result.getConfig_msg(), Object.class);
                                 sb.append("config_msg: ").append(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject)).append(newLine);
                                 alarmInfo.setContentText(sb.toString());
-                            } catch (JsonProcessingException e) {
+                            } catch (JacksonException e) {
                                 alarmInfo.setContentText(Messages.ConfigurationInfoNotFound);
                             }
                         }

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItem.java

@@ -2,13 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import tools.jackson.core.JsonParser;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.deser.std.StdDeserializer;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
-import java.io.IOException;
 import java.time.Instant;
 
 @JsonInclude(Include.NON_NULL)
@@ -152,13 +151,14 @@ public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
-    public static class AlarmInstantDeserializer extends JsonDeserializer<Instant> {
+    public static class AlarmInstantDeserializer extends StdDeserializer<Instant> {
 
         public AlarmInstantDeserializer() {
+            super(Instant.class);
         }
 
         @Override
-        public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
             return Instant.parse(p.getText());
         }
     }

app/alarm/model/pom.xml

@@ -20,20 +20,17 @@
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
     <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
+      <groupId>tools.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${tools.jackson.version}</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
     <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.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
+      <version>${tools.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmCommandMessage.java

@@ -15,7 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  *
@@ -108,7 +108,7 @@ public Map<String, String> sourceMap() {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm command message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmConfigMessage.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  *
@@ -225,7 +225,7 @@ public boolean isLeaf() {
     public String toString() {
         try {
             return AlarmMessageUtil.objectConfigMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm config message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmDetail.java

@@ -1,12 +1,12 @@
 package org.phoebus.applications.alarm.messages;
 
+import tools.jackson.core.JacksonException;
+
 import static org.phoebus.applications.alarm.AlarmSystem.logger;
 import static org.phoebus.applications.alarm.messages.AlarmMessageUtil.objectMapper;
 
 import java.util.logging.Level;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 /** Alarm detail */
 public class AlarmDetail {
 
@@ -62,7 +62,7 @@ public void setDelay(int delay) {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm detail message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmMessage.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  * A message which describes both state and configuration events
@@ -417,9 +417,9 @@ public void setDelete(String delete) {
     /**
      * @return json string representation of this object
      *
-     * @throws JsonProcessingException on error
+     * @throws JacksonException on error
      */
-    public String toJson() throws JsonProcessingException {
+    public String toJson() throws JacksonException {
         if (isConfig()) {
             return objectConfigMapper.writeValueAsString(this);
         } else if (isState()){
@@ -433,7 +433,7 @@ public String toJson() throws JsonProcessingException {
     public String toString() {
         try {
             return toJson();
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmMessageUtil.java

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.module.SimpleModule;
 import org.phoebus.applications.alarm.model.EnabledState;
 
 import java.io.Serializable;
@@ -23,31 +23,28 @@
 public class AlarmMessageUtil implements Serializable{
 
     // Object mapper for the alarm state messages
-   @JsonIgnore
-    static final ObjectMapper objectStateMapper = new ObjectMapper();
-    static {
-        objectStateMapper.registerModule(new JavaTimeModule());
-        objectStateMapper.addMixIn(AlarmMessageUtil.class, AlarmStateJsonMessage.class);
-    }
+    @JsonIgnore
+    static final ObjectMapper objectStateMapper = JsonMapper.builder()
+            .addMixIn(AlarmMessageUtil.class, AlarmStateJsonMessage.class)
+            .build();
 
     // Object mapper for the alarm config messages
     @JsonIgnore
-    static final ObjectMapper objectConfigMapper = new ObjectMapper();
-    static {
-        SimpleModule simple_module = new SimpleModule();
-        simple_module.addSerializer(new EnabledSerializer());
+    static final ObjectMapper objectConfigMapper = createConfigMapper();
 
-        objectConfigMapper.registerModule(new JavaTimeModule());
-        objectConfigMapper.registerModule(simple_module);
-        objectConfigMapper.addMixIn(AlarmMessageUtil.class, AlarmConfigJsonMessage.class);
+    private static ObjectMapper createConfigMapper() {
+        SimpleModule simpleModule = new SimpleModule();
+        simpleModule.addSerializer(new EnabledSerializer());
+
+        return JsonMapper.builder()
+                .addModule(simpleModule)
+                .addMixIn(AlarmMessageUtil.class, AlarmConfigJsonMessage.class)
+                .build();
     }
 
     // Object mapper for all other alarm messages
     @JsonIgnore
     static final ObjectMapper objectMapper = new ObjectMapper();
-    static {
-        objectMapper.registerModule(new JavaTimeModule());
-    }
 
     private static class AlarmStateJsonMessage {
         @JsonIgnore

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmStateMessage.java

@@ -14,7 +14,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  * A bean representing a alarm state message
@@ -206,7 +206,7 @@ public Map<String, String> sourceMap() {
     public String toString() {
         try {
             return AlarmMessageUtil.objectStateMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm state message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmTalkMessage.java

@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /** Talk message */
 @JsonInclude(Include.NON_NULL)
@@ -56,7 +56,7 @@ public void setTalk(String talk) {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm talk message ", e);
         }
         return "";