Merge pull request kroxylicious#2019 from robobario/instant-module

refactor: use jackson java8 date module

Author: robobario

kroxylicious-operator/pom.xml

@@ -126,6 +126,11 @@
             <artifactId>jackson-databind</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>

kroxylicious-operator/src/main/java/io/kroxylicious/kubernetes/api/common/Condition.java

@@ -6,9 +6,6 @@
 
 package io.kroxylicious.kubernetes.api.common;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
 /**
  * A common Condition type, used in CR statuses.
  */
@@ -42,17 +39,13 @@ public ConditionBuilder edit() {
     @com.fasterxml.jackson.annotation.JsonProperty("lastTransitionTime")
     @com.fasterxml.jackson.annotation.JsonPropertyDescription("lastTransitionTime is the last time the condition transitioned from one status to another. \nThis should be when the underlying condition changed. \nIf that is not known, then using the time when the API field changed is acceptable.\n")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    @JsonDeserialize(using = InstantDeserializer.class)
-    @JsonSerialize(using = InstantSerializer.class)
+    @com.fasterxml.jackson.annotation.JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING)
     private java.time.Instant lastTransitionTime;
 
-    @JsonDeserialize(using = InstantDeserializer.class)
-    @JsonSerialize(using = InstantSerializer.class)
     public java.time.Instant getLastTransitionTime() {
         return lastTransitionTime;
     }
 
-    @com.fasterxml.jackson.annotation.JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss[XXX][VV]")
     public void setLastTransitionTime(java.time.Instant lastTransitionTime) {
         this.lastTransitionTime = lastTransitionTime;
     }

kroxylicious-operator/src/main/java/io/kroxylicious/kubernetes/api/common/InstantDeserializer.java

@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.kroxylicious.kubernetes.api.common.Condition;
 import io.kroxylicious.proxy.config.ConfigParser;
@@ -30,11 +31,12 @@ public class ProxyConfigData {
 
     public static final String CONFIG_YAML_KEY = "proxy-config.yaml";
     public static final String CLUSTER_KEY_PREFIX = "cluster-";
-    static final ObjectMapper OBJECT_MAPPER = ConfigParser.createObjectMapper();
+    static final ObjectMapper CONFIG_OBJECT_MAPPER = ConfigParser.createObjectMapper()
+            .registerModule(new JavaTimeModule());
 
     private static String toYaml(Object filterDefs) {
         try {
-            return OBJECT_MAPPER.writeValueAsString(filterDefs);
+            return CONFIG_OBJECT_MAPPER.writeValueAsString(filterDefs);
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -79,7 +81,7 @@ public boolean hasConditionsForCluster(String clusterName) {
             return null;
         }
         try {
-            return OBJECT_MAPPER.readValue(str, new TypeReference<List<Condition>>() {
+            return CONFIG_OBJECT_MAPPER.readValue(str, new TypeReference<List<Condition>>() {
             });
         }
         catch (JsonProcessingException e) {

kroxylicious-operator/src/main/java/io/kroxylicious/kubernetes/api/common/InstantSerializer.java

@@ -12,6 +12,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,16 +23,16 @@ void serializedFormShouldUseIso8601() throws JsonProcessingException {
         // Given
         Condition build = new ConditionBuilder().withLastTransitionTime(Instant.EPOCH).build();
         // When
-        var conditionWithEpoch = new ObjectMapper().writeValueAsString(build);
+        var conditionWithEpoch = new ObjectMapper().registerModule(new JavaTimeModule()).writeValueAsString(build);
         // Then
         assertThat(conditionWithEpoch).isEqualTo("{\"lastTransitionTime\":\"1970-01-01T00:00:00Z\"}");
     }
 
     @Test
     void roundTrip() throws JsonProcessingException {
         // Given
-        ObjectMapper objectMapper = new ObjectMapper();
-        Condition wroteCondition = new ConditionBuilder().withLastTransitionTime(Instant.EPOCH).build();
+        ObjectMapper objectMapper = new ObjectMapper().registerModule(new JavaTimeModule());
+        Condition wroteCondition = new ConditionBuilder().withLastTransitionTime(Instant.now()).build();
         // When
         var conditionString = objectMapper.writeValueAsString(wroteCondition);
         var readCondition = objectMapper.readValue(conditionString, Condition.class);

kroxylicious-operator/src/main/java/io/kroxylicious/kubernetes/operator/ProxyConfigData.java

@@ -33,8 +33,10 @@
 import org.mockito.stubbing.Answer;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -63,9 +65,10 @@
 
 class DerivedResourcesTest {
 
-    static final YAMLMapper YAML_MAPPER = new YAMLMapper()
+    static final ObjectMapper YAML_MAPPER = new YAMLMapper()
             .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
-            .enable(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE);
+            .enable(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE)
+            .registerModule(new JavaTimeModule());
 
     public static KafkaProxy kafkaProxyFromFile(Path path) {
         // TODO should validate against the CRD schema, because the DependentResource