support diff id as param - fix revision id parsing when null revision (…

…#338)
uber-archive · Mar 4, 2020 · c9818e6 · c9818e6
1 parent 80b996f
commit c9818e6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapper.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapper.java
@@ -173,7 +173,8 @@ public Environment setUp(
         Differential diff;
         try {
             diff = new Differential(diffClient.fetchDiff());
-            diff.setCommitMessage(diffClient.getCommitMessage(diff.getRevisionID(false)));
+            String revisionID = diff.getRevisionID(false);
+            diff.setCommitMessage(diffClient.getCommitMessage(revisionID));
             diff.decorate(build, this.getPhabricatorURL(build.getParent()));
 
             logger.info(CONDUIT_TAG, "Fetching differential from Conduit API");

diff --git a/src/main/java/com/uber/jenkins/phabricator/conduit/Differential.java b/src/main/java/com/uber/jenkins/phabricator/conduit/Differential.java
@@ -55,7 +55,8 @@ public String getDiffID() {
     }
 
     public String getRevisionID(boolean formatted) {
-        String rawRevisionId = (String) rawJSON.get("revisionID");
+        Object rawRevisionIdObj = rawJSON.get("revisionID");
+        String rawRevisionId = rawRevisionIdObj != null && !(rawRevisionIdObj instanceof net.sf.json.JSONNull) ? (String) rawRevisionIdObj : null;
         if (rawRevisionId == null || rawRevisionId.equals("")) {
             return null;
         }

diff --git a/src/main/java/com/uber/jenkins/phabricator/conduit/DifferentialClient.java b/src/main/java/com/uber/jenkins/phabricator/conduit/DifferentialClient.java
@@ -148,6 +148,10 @@ public JSONObject postComment(String revisionID, String message) throws ConduitA
      * @throws IOException
      */
     public String getCommitMessage(String revisionID) throws ConduitAPIException, IOException {
+        // if no revision ID return null
+        if (revisionID == null) {
+            return "";
+        }
         JSONObject params = new JSONObject().element("revision_id", revisionID);
         JSONObject query = callConduit("differential.getcommitmessage", params);