Upgrade codebase to Java 17+: Switch to records, use ZonedDateTime, Nullable annotations

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>de.sstoehr</groupId>
     <artifactId>har-reader</artifactId>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>har-reader</name>
@@ -35,6 +35,18 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -56,15 +68,15 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>8</release>
+                    <release>17</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.11.1</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>17</source>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/de/sstoehr/harreader/HarReader.java

@@ -15,7 +15,7 @@ public class HarReader extends AbstractHarIO {
     public HarReader() {
         super();
     }
-    
+
     public HarReader(MapperFactory mapperFactory) {
         super(mapperFactory);
     }

src/main/java/de/sstoehr/harreader/HarWriter.java

@@ -1,10 +1,8 @@
 package de.sstoehr.harreader;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
-import java.util.function.Function;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

src/main/java/de/sstoehr/harreader/jackson/DefaultMapperFactory.java

@@ -1,25 +1,33 @@
 package de.sstoehr.harreader.jackson;
 
+import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import de.sstoehr.harreader.HarReaderMode;
 
 public class DefaultMapperFactory implements MapperFactory {
 
     public ObjectMapper instance(HarReaderMode mode) {
         SimpleModule module = new SimpleModule();
         if (mode == HarReaderMode.LAX) {
-            module.addDeserializer(Date.class, new ExceptionIgnoringDateDeserializer());
+            module.addDeserializer(ZonedDateTime.class, new ExceptionIgnoringZonedDateTimeDeserializer());
             module.addDeserializer(Integer.class, new ExceptionIgnoringIntegerDeserializer());
         }
         return instance().registerModule(module);
     }
 
     public ObjectMapper instance() {
-        return new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JavaTimeModule());
+        mapper.configure(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE, false);
+
+        return mapper;
     }
 
 }

src/main/java/de/sstoehr/harreader/jackson/ExceptionIgnoringZonedDateTimeDeserializer.java

@@ -0,0 +1,25 @@
+package de.sstoehr.harreader.jackson;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class ExceptionIgnoringZonedDateTimeDeserializer extends JsonDeserializer<ZonedDateTime> {
+
+    @Override
+    public ZonedDateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
+        try {
+            return InstantDeserializer.ZONED_DATE_TIME.deserialize(jp, ctxt);
+        } catch (IOException e) {
+            //ignore
+        }
+        return ZonedDateTime.ofInstant(Instant.ofEpochSecond(0L), ZoneId.of("UTC"));
+    }
+
+}

src/main/java/de/sstoehr/harreader/model/Har.java

@@ -3,42 +3,18 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.util.Objects;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Main HTTP Archive Class.
  * @see <a href="http://www.softwareishard.com/blog/har-12-spec/">speicification</a>
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Har {
+public record Har(@Nonnull HarLog log) {
 
-    private HarLog log;
-
-    /**
-     * @return HAR log.
-     */
-    public HarLog getLog() {
-        if (log == null) {
-            log = new HarLog();
-        }
-        return log;
-    }
-
-    public void setLog(HarLog log) {
-        this.log = log;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Har har = (Har) o;
-        return Objects.equals(log, har.log);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(log);
+    public Har(@Nullable HarLog log) {
+        this.log = (log == null) ? new HarLog() : log;
     }
 }