Merge pull request #431 from eclipse/python-custom-deserializer

Python custom deserializer

Author: serenaponta

lang-python/src/main/java/org/eclipse/steady/python/sign/PythonConstructDigestDeserializer.java

@@ -0,0 +1,50 @@
+package org.eclipse.steady.python.sign;
+
+import java.io.IOException;
+
+import org.eclipse.steady.python.sign.PythonConstructDigest.ComputedFromType;
+import org.eclipse.steady.shared.enums.DigestAlgorithm;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+/** PythonConstructDigestDeserializer class. */
+public class PythonConstructDigestDeserializer extends StdDeserializer<PythonConstructDigest> {
+
+  /** Constructor for PythonConstructDigestDeserializer. */
+  public PythonConstructDigestDeserializer() {
+    this(null);
+  }
+
+  /**
+   * Constructor for PythonConstructDigestDeserializer.
+   *
+   * @param t a {@link java.lang.Class} object.
+   */
+  public PythonConstructDigestDeserializer(Class<PythonConstructDigest> t) {
+    super(t);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public PythonConstructDigest deserialize(JsonParser p, DeserializationContext ctxt)
+      throws IOException, JsonProcessingException {
+
+    final JsonNode json_root = p.getCodec().readTree(p);
+    String computedFrom = json_root.findValue("computedFrom").asText();
+    ComputedFromType computedFromType =
+        ComputedFromType.valueOf(json_root.findValue("computedFromType").asText());
+    String digest = json_root.findValue("digest").asText();
+    DigestAlgorithm digestAlgorithm =
+        DigestAlgorithm.fromString(json_root.findValue("digestAlgorithm").asText());
+
+    PythonConstructDigest pythonConstructDigest =
+        new PythonConstructDigest(digest, digestAlgorithm);
+    pythonConstructDigest.setComputedFrom(computedFrom);
+    pythonConstructDigest.setComputedFromType(computedFromType);
+    return pythonConstructDigest;
+  }
+}

lang-python/src/main/java/org/eclipse/steady/python/sign/PythonConstructDigestSerializer.java

@@ -56,7 +56,7 @@ public void serialize(
     jgen.writeStringField("computedFrom", value.getComputedFrom());
     jgen.writeStringField("computedFromType", value.getComputedFromType().toString());
     jgen.writeStringField("digest", value.getDigest());
-    jgen.writeStringField("digestAlgorihtm", value.getDigestAlgorithm().toString());
+    jgen.writeStringField("digestAlgorithm", value.getDigestAlgorithm().toString());
     jgen.writeEndObject();
   }
 }

patch-lib-analyzer/src/main/java/org/eclipse/steady/patcheval/ByteCodeComparator.java

@@ -31,6 +31,8 @@
 import org.eclipse.steady.patcheval.representation.ArtifactResult2;
 import org.eclipse.steady.patcheval.representation.ConstructPathAssessment2;
 import org.eclipse.steady.patcheval.utils.CSVHelper2;
+import org.eclipse.steady.python.sign.PythonConstructDigest;
+import org.eclipse.steady.python.sign.PythonConstructDigestDeserializer;
 import org.eclipse.steady.shared.enums.ProgrammingLanguage;
 import org.eclipse.steady.shared.json.JacksonUtil;
 import org.eclipse.steady.shared.json.model.LibraryId;
@@ -60,6 +62,7 @@ public ByteCodeComparator(ArtifactResult2 ar, String _b) {
     this.ar = ar;
     this.bugId = _b;
     custom_deserializers.put(ASTSignatureChange.class, new ASTSignatureChangeDeserializer());
+    custom_deserializers.put(PythonConstructDigest.class, new PythonConstructDigestDeserializer());
   }
 
   /** {@inheritDoc} */

patch-lib-analyzer/src/main/java/org/eclipse/steady/patcheval/LibraryAnalyzerThread2.java

@@ -41,6 +41,7 @@
 import org.eclipse.steady.patcheval.representation.LidResult2;
 import org.eclipse.steady.patcheval.representation.OverallConstructChange;
 import org.eclipse.steady.python.sign.PythonConstructDigest;
+import org.eclipse.steady.python.sign.PythonConstructDigestDeserializer;
 import org.eclipse.steady.shared.enums.ConstructChangeType;
 import org.eclipse.steady.shared.enums.ProgrammingLanguage;
 import org.eclipse.steady.shared.json.JacksonUtil;
@@ -82,6 +83,7 @@ public LibraryAnalyzerThread2(
     this.tid = _id;
 
     custom_deserializers.put(ASTSignatureChange.class, new ASTSignatureChangeDeserializer());
+    custom_deserializers.put(PythonConstructDigest.class, new PythonConstructDigestDeserializer());
 
     this.singleMethsConsCC = methsConsMOD;
     this.addedDelMethsConsCC = methsConsAD;
@@ -303,14 +305,21 @@ public List<ConstructPathLibResult2> call() throws Exception {
                             ProgrammingLanguage.PY);
                 PythonConstructDigest pythonConstructDigest =
                     (PythonConstructDigest)
-                        JacksonUtil.asObject(ast_lid, PythonConstructDigest.class);
+                        JacksonUtil.asObject(
+                            ast_lid, custom_deserializers, PythonConstructDigest.class);
                 if (pythonConstructDigest != null) {
                   PythonConstructDigest vulnConstructDigest =
                       (PythonConstructDigest)
-                          JacksonUtil.asObject(mcCC.getBuggyBody(), PythonConstructDigest.class);
+                          JacksonUtil.asObject(
+                              mcCC.getBuggyBody(),
+                              custom_deserializers,
+                              PythonConstructDigest.class);
                   PythonConstructDigest fixedConstructDigest =
                       (PythonConstructDigest)
-                          JacksonUtil.asObject(mcCC.getFixedBody(), PythonConstructDigest.class);
+                          JacksonUtil.asObject(
+                              mcCC.getFixedBody(),
+                              custom_deserializers,
+                              PythonConstructDigest.class);
                   if (pythonConstructDigest.getDigest() != null
                       && vulnConstructDigest.getDigest() != null
                       && pythonConstructDigest

shared/src/main/java/org/eclipse/steady/shared/enums/DigestAlgorithm.java

@@ -49,4 +49,11 @@ public String toString() {
     else if (this.value == 30) return "MD5";
     else throw new IllegalArgumentException("[" + this.value + "] is not a valid digest algorithm");
   }
+
+  public static DigestAlgorithm fromString(String _s) {
+    if (_s.equals("SHA1")) return DigestAlgorithm.SHA1;
+    if (_s.equals("SHA256")) return DigestAlgorithm.SHA256;
+    if (_s.equals("MD5")) return DigestAlgorithm.MD5;
+    else throw new IllegalArgumentException("[" + _s + "] is not a valid digest algorithm");
+  }
 }