optimize JSON serialization

Author: Override-6

src/main/java/com/alvarium/PublishWrapper.java

@@ -14,14 +14,9 @@
  *******************************************************************************/
 package com.alvarium;
 
-import java.io.Serializable;
-import java.util.Base64;
+import com.alvarium.serializers.AlvariumPersistence;
 
-import com.alvarium.contracts.Annotation;
-import com.alvarium.serializers.AnnotationConverter;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
+import java.io.Serializable;
 
 /**
  * A java bean that encapsulates the content sent through the stream providers
@@ -32,6 +27,7 @@ public class PublishWrapper implements Serializable {
   private final String messageType;
   private final Object content;
 
+
   public PublishWrapper(SdkAction action, String messageType, Object content) {
     this.action = action;
     this.messageType = messageType;
@@ -50,33 +46,12 @@ public Object getContent() {
     return content;
   }
 
+
   /**
-   * The content field in the returned JSON will be Base64 string encoded 
+   * The content field in the returned JSON will be Base64 string encoded
    * @return String representation of the PublishWrapper JSON
    */
   public String toJson() {
-    Gson gson = new GsonBuilder()
-        .registerTypeAdapter(Annotation.class, new AnnotationConverter())
-        .disableHtmlEscaping()
-        .create();
-    
-    // Change the content field to a base64 encoded string before serializing to json
-    final JsonElement decodedContent = gson.toJsonTree(this.content);
-    final String encodedContent;
-    
-    // `toString()` will work if the content is a primitive type, but will add additional 
-    // quotes (e.g. "foo" will be "\"foo\"") but `getAsString()` will produce correct behavior but
-    // using `getAsString()` on a non-primitive type will throw an exception.
-    // This condition ensures that the correct method is called on the correct type
-    if (decodedContent.isJsonPrimitive()) {
-      encodedContent = Base64.getEncoder().encodeToString(decodedContent.getAsString().getBytes());
-    } else {
-      encodedContent = Base64.getEncoder().encodeToString(decodedContent.toString().getBytes());
-    }
-
-    // new publish wrapper returned as JSON string with encoded content 
-    // to prevent setting the object content value
-    final PublishWrapper wrapper = new PublishWrapper(action, messageType, encodedContent);
-    return gson.toJson(wrapper);
+    return AlvariumPersistence.GSON.toJson(this);
   }
 }

src/main/java/com/alvarium/annotators/ChecksumAnnotator.java

@@ -21,6 +21,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 import org.apache.logging.log4j.Logger;
 
@@ -85,7 +86,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
             this.kind, 
             null, 
             isSatisfied, 
-            Instant.now()
+            ZonedDateTime.now()
         );
 
         final String annotationSignature = super.signAnnotation(

src/main/java/com/alvarium/annotators/MockAnnotator.java

@@ -17,6 +17,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 import com.alvarium.contracts.Annotation;
 import com.alvarium.contracts.AnnotationType;
@@ -50,7 +51,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
       final String host = InetAddress.getLocalHost().getHostName();
       final String sig = signature.getPublicKey().getType().toString();
 
-      final Annotation annotation = new Annotation(key, hash, host, layer, kind, sig, cfg.getShouldSatisfy(), Instant.now());
+      final Annotation annotation = new Annotation(key, hash, host, layer, kind, sig, cfg.getShouldSatisfy(), ZonedDateTime.now());
       return annotation;
     } catch (UnknownHostException e) {
       throw new AnnotatorException("Could not get hostname", e);

src/main/java/com/alvarium/annotators/PkiAnnotator.java

@@ -14,18 +14,17 @@
  *******************************************************************************/
 package com.alvarium.annotators;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Instant;
-
-import org.apache.logging.log4j.Logger;
-
 import com.alvarium.contracts.Annotation;
 import com.alvarium.contracts.AnnotationType;
 import com.alvarium.contracts.LayerType;
 import com.alvarium.hash.HashType;
 import com.alvarium.sign.SignatureInfo;
 import com.alvarium.utils.PropertyBag;
+import org.apache.logging.log4j.Logger;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.time.ZonedDateTime;
 
 class PkiAnnotator extends AbstractPkiAnnotator implements Annotator {
   private final HashType hash;
@@ -63,7 +62,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
         kind, 
         null, 
         isSatisfied, 
-        Instant.now());
+        ZonedDateTime.now());
 
     final String annotationSignature = super.signAnnotation(signature.getPrivateKey(), annotation);
     annotation.setSignature(annotationSignature);

src/main/java/com/alvarium/annotators/PkiHttpAnnotator.java

@@ -21,6 +21,7 @@
 import java.nio.file.Paths;
 import java.time.Instant;
 import java.nio.file.Path;
+import java.time.ZonedDateTime;
 
 import com.alvarium.annotators.http.ParseResult;
 import com.alvarium.annotators.http.ParseResultException;
@@ -101,7 +102,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
         kind,
         null,
         isSatisfied,
-        Instant.now());
+        ZonedDateTime.now());
 
     final String annotationSignature = super.signAnnotation(sig.getPrivateKey(), annotation);
     annotation.setSignature(annotationSignature);

src/main/java/com/alvarium/annotators/SbomAnnotator.java

@@ -16,6 +16,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 import org.apache.logging.log4j.Logger;
 
@@ -76,7 +77,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
         kind, 
         null, 
         isSatisfied, 
-        Instant.now()
+        ZonedDateTime.now()
     );
 
     final String annotationSignature = super.signAnnotation(

src/main/java/com/alvarium/annotators/SourceAnnotator.java

@@ -17,6 +17,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 import org.apache.logging.log4j.Logger;
 
@@ -60,7 +61,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
 
     // create an annotation without signature
     final Annotation annotation = new Annotation(key, this.hash, host, layer, this.kind, null, isSatisfied,
-        Instant.now());
+        ZonedDateTime.now());
 
     final String signature = super.signAnnotation(signatureInfo.getPrivateKey(), annotation);
     annotation.setSignature(signature);

src/main/java/com/alvarium/annotators/SourceCodeAnnotator.java

@@ -25,6 +25,7 @@
 import java.nio.file.Paths;
 import java.text.Collator;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -88,7 +89,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
                 kind,
                 null,
                 isSatisfied,
-                Instant.now());
+                ZonedDateTime.now());
 
         final String annotationSignature = super.signAnnotation(signature.getPrivateKey(), annotation);
         annotation.setSignature(annotationSignature);

src/main/java/com/alvarium/annotators/TlsAnnotator.java

@@ -21,6 +21,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 import com.alvarium.contracts.Annotation;
 import com.alvarium.contracts.AnnotationType;
@@ -68,7 +69,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
 
     // create an annotation without signature
     final Annotation annotation = new Annotation(key, hash, host, layer, kind, null, isSatisfied, 
-        Instant.now());
+        ZonedDateTime.now());
 
     // sign annotation
     final String signature = super.signAnnotation(signatureInfo.getPrivateKey(),

src/main/java/com/alvarium/annotators/TpmAnnotator.java

@@ -29,6 +29,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Instant;
+import java.time.ZonedDateTime;
 
 class TpmAnnotator extends AbstractAnnotator implements Annotator {
   private final HashType hash;
@@ -68,7 +69,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
           kind,
           null,
           isSatisfied,
-          Instant.now());
+          ZonedDateTime.now());
 
     final String annotationSignature = super.signAnnotation(signature.getPrivateKey(), annotation);
     annotation.setSignature(annotationSignature);

src/main/java/com/alvarium/annotators/VulnerabilityAnnotator.java

@@ -13,26 +13,20 @@
  *******************************************************************************/
 package com.alvarium.annotators;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.logging.log4j.Logger;
-
-import com.alvarium.annotators.vulnerability.PackageFileHandler;
-import com.alvarium.annotators.vulnerability.PackageFileHandlerFactory;
-import com.alvarium.annotators.vulnerability.VulnerabilityAnnotatorConfig;
-import com.alvarium.annotators.vulnerability.VulnerabilityApiHandler;
-import com.alvarium.annotators.vulnerability.VulnerabilityApiHandlerFactory;
-import com.alvarium.annotators.vulnerability.VulnerabilityException;
+import com.alvarium.annotators.vulnerability.*;
 import com.alvarium.contracts.Annotation;
 import com.alvarium.contracts.AnnotationType;
 import com.alvarium.contracts.LayerType;
 import com.alvarium.hash.HashType;
 import com.alvarium.sign.SignatureInfo;
 import com.alvarium.utils.PropertyBag;
+import org.apache.logging.log4j.Logger;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Map;
 
 
 
@@ -86,7 +80,7 @@ public Annotation execute(PropertyBag ctx, byte[] data, String key) throws Annot
             this.kind, 
             null, 
             isSatisfied, 
-            Instant.now()
+            ZonedDateTime.now()
         );
 
         final String annotationSignature = super.signAnnotation(