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,8 +1,8 @@
 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;

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

@@ -1,8 +1,8 @@
 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 javafx.collections.ObservableMap;
 import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 import org.phoebus.framework.jobs.Job;

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.JsonProcessingException;
+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() {

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

@@ -2,10 +2,10 @@
 
 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 tools.jackson.core.JsonParser;
+import tools.jackson.core.JsonProcessingException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import java.io.IOException;

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,8 @@
 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.module.SimpleModule;
 import org.phoebus.applications.alarm.model.EnabledState;
 
 import java.io.Serializable;
@@ -26,7 +25,6 @@ public class AlarmMessageUtil implements Serializable{
    @JsonIgnore
     static final ObjectMapper objectStateMapper = new ObjectMapper();
     static {
-        objectStateMapper.registerModule(new JavaTimeModule());
         objectStateMapper.addMixIn(AlarmMessageUtil.class, AlarmStateJsonMessage.class);
     }
 
@@ -37,17 +35,13 @@ public class AlarmMessageUtil implements Serializable{
         SimpleModule simple_module = new SimpleModule();
         simple_module.addSerializer(new EnabledSerializer());
 
-        objectConfigMapper.registerModule(new JavaTimeModule());
         objectConfigMapper.registerModule(simple_module);
         objectConfigMapper.addMixIn(AlarmMessageUtil.class, AlarmConfigJsonMessage.class);
     }
 
     // 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 "";

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

@@ -2,12 +2,12 @@
 
 import static org.phoebus.applications.alarm.AlarmSystem.logger;
 
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.databind.deser.std.StdDeserializer;
+import tools.jackson.core.JsonParser;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.core.ObjectCodec;
+import tools.jackson.databind.JsonNode;
 
 import java.time.format.DateTimeFormatter;
 import java.io.IOException;
@@ -39,7 +39,7 @@ public EnabledDeserializer(Class<EnabledState> t) {
     }
 
     @Override
-    public EnabledState deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+    public EnabledState deserialize(JsonParser jp, DeserializationContext ctxt) throws JacksonException {
         ObjectCodec oc = jp.getCodec();
         JsonNode jn = oc.readTree(jp);
 

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

@@ -3,9 +3,9 @@
 
 import org.phoebus.applications.alarm.model.EnabledState;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.databind.SerializerProvider;
+import tools.jackson.databind.ser.std.StdSerializer;
 
 /**
  * Serializer used for writing varied date string/boolean enabled values
@@ -27,10 +27,10 @@ public void serialize(
 
         jgen.writeStartObject();
         if (enabled_state.enabled_date != null) {
-            jgen.writeStringField("enabled", enabled_state.getDateString());
+            jgen.writeStringProperty("enabled", enabled_state.getDateString());
         }
         else {
-            jgen.writeBooleanField("enabled", enabled_state.enabled);
+            jgen.writeBooleanProperty("enabled", enabled_state.enabled);
         }
         jgen.writeEndObject();
     }

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

@@ -7,8 +7,8 @@
 import org.apache.kafka.common.serialization.Serializer;
 import org.phoebus.applications.alarm.model.EnabledState;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.module.SimpleModule;
 
 /** XML Message parser */
 public class MessageParser<T> implements Serializer<T>, Deserializer<T> {
@@ -42,7 +42,7 @@ public void configure(Map arg0, boolean arg1) {
     @Override
     public byte[] serialize(String topic, T message) {
         if (message == null)
-            return null;
+            return null;s
 
         try {
             return objectMapper.writeValueAsBytes(message);

app/alarm/model/src/main/java/org/phoebus/applications/alarm/model/json/JsonModelReader.java

@@ -29,8 +29,8 @@
 import org.phoebus.applications.alarm.model.TitleDetail;
 import org.phoebus.applications.alarm.model.TitleDetailDelay;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.JsonNode;
 
 /** Read alarm model from JSON
  *  @author Kay Kasemir