Remove superfluous state reasons and events

Also removed the state reason field from issue data

Signed-off-by: Leo Sendelbach <[email protected]>

Author: Leo-Send

src/de/uni_passau/fim/gitwrapper/EventData.java

@@ -202,8 +202,17 @@ public UserData getAssigner() {
      */
     public class StateChangedEventData extends EventData {
 
+        @Expose(deserialize = false)
+        Commit commit;
         StateReason state_reason;
 
+        /**
+         * The commit references.
+         */
+        public Commit getCommit() {
+            return commit;
+        }
+
         /**
          * The reason for the state change.
          */
@@ -215,17 +224,7 @@ public StateReason getStateReason() {
     /**
      * An Event generated by changing the type of an issue.
      */
-    public class IssueTypeChangedEventData extends EventData { 
-
-        @Expose(serialize = false)
-        IssueTypeChangeEvent change_type;
-
-        /**
-         * The type of change that occurred to the issue type.
-         */
-        public IssueTypeChangeEvent getChangeType() {
-            return change_type;
-        }
+    public class IssueTypeChangedEventData extends EventData {
     }
 
     /**

src/de/uni_passau/fim/gitwrapper/EventDataProcessor.java

@@ -46,17 +46,15 @@ class EventDataProcessor implements JsonDeserializer<EventData>, JsonSerializer<
         map.put("referenced", EventData.ReferencedEventData.class);
         map.put("merged", EventData.ReferencedEventData.class);
         map.put("closed", EventData.StateChangedEventData.class);
-        map.put("connected", EventData.ConnectedEventData.class);
         map.put("reopened", EventData.StateChangedEventData.class);
+        map.put("connected", EventData.ConnectedEventData.class);
         map.put("issue_type_added", EventData.IssueTypeChangedEventData.class);
         map.put("issue_type_changed", EventData.IssueTypeChangedEventData.class);
         map.put("issue_type_removed", EventData.IssueTypeChangedEventData.class);
         map.put("parent_issue_added", EventData.ParentIssueChangedEventData.class);
         map.put("parent_issue_removed", EventData.ParentIssueChangedEventData.class);
-        map.put("parent_issue_changed", EventData.ParentIssueChangedEventData.class);
         map.put("sub_issue_added", EventData.SubIssueChangedEventData.class);
         map.put("sub_issue_removed", EventData.SubIssueChangedEventData.class);
-        map.put("sub_issue_changed", EventData.SubIssueChangedEventData.class);
         map.put("review_requested", EventData.RequestedReviewEventData.class);
         map.put("review_request_removed", EventData.RequestedReviewEventData.class);
         map.put("review_dismissed", EventData.DismissedReviewEventData.class);
@@ -181,13 +179,39 @@ public void postSerialize(JsonElement result, EventData.AssignedEventData src, G
      */
     static class StateChangedEventProcessor implements PostProcessor<EventData.StateChangedEventData> {
 
+        private GitHubRepository repo;
+
+        /**
+         * Creates a new EventDataProcessor for the given repo.
+         *
+         * @param repo
+         *         the repo
+         */
+        StateChangedEventProcessor(GitHubRepository repo) {
+            this.repo = repo;
+        }
+
         @Override
         public void postDeserialize(EventData.StateChangedEventData result, JsonElement src, Gson gson) {
             JsonElement stateReasonElement = src.getAsJsonObject().get("state_reason");
             String stateReasonValue = (stateReasonElement != null && !stateReasonElement.isJsonNull()) 
             ? stateReasonElement.getAsString() 
             : null;
             result.state_reason = StateReason.getFromString(stateReasonValue);
+
+            JsonElement hash = src.getAsJsonObject().get("commit_id");
+            if (hash.isJsonNull()) {
+                return;
+            }
+
+            result.commit = repo.getGithubCommit(hash.getAsString()).orElseGet(() -> {
+                LOG.warning("Found commit unknown to GitHub and local git repo: " + hash + " Retry using url...");
+                JsonElement url = src.getAsJsonObject().get("commit_url");
+                return repo.getGithubCommitUrl(hash.getAsString(), url.getAsString()).orElseGet(() -> {
+                    LOG.warning("Could not find commit: " + hash);
+                    return null;
+                });
+            });
         }
 
         @Override
@@ -208,34 +232,6 @@ public void postSerialize(JsonElement result, EventData.IssueTypeChangedEventDat
         }
     }
 
-    /**
-     * Processor for parent issue change events.
-     */
-    static class ParentIssueChangedEventProcessor implements PostProcessor<EventData.ParentIssueChangedEventData> {
-
-        @Override
-        public void postDeserialize(EventData.ParentIssueChangedEventData result, JsonElement src, Gson gson) {
-        }
-
-        @Override
-        public void postSerialize(JsonElement result, EventData.ParentIssueChangedEventData src, Gson gson) {
-        }
-    }
-
-    /**
-     * Processor for sub-issue change events.
-     */
-    static class SubIssueChangedEventProcessor implements PostProcessor<EventData.SubIssueChangedEventData> {
-
-        @Override
-        public void postDeserialize(EventData.SubIssueChangedEventData result, JsonElement src, Gson gson) {
-        }
-
-        @Override
-        public void postSerialize(JsonElement result, EventData.SubIssueChangedEventData src, Gson gson) {
-        }
-    }
-
     /**
      * Processor for connected events.
      */

src/de/uni_passau/fim/gitwrapper/GitHubRepository.java

@@ -243,10 +243,8 @@ public GitHubRepository(String url, File dir, GitWrapper git, List<String> oauth
         gfb.registerPostProcessor(EventData.LabeledEventData.class, new EventDataProcessor.LabeledEventProcessor());
         gfb.registerPostProcessor(EventData.DismissedReviewEventData.class, new EventDataProcessor.DismissedReviewEventProcessor());
         gfb.registerPostProcessor(EventData.AssignedEventData.class, new EventDataProcessor.AssignedEventProcessor());
-        gfb.registerPostProcessor(EventData.StateChangedEventData.class, new EventDataProcessor.StateChangedEventProcessor());
+        gfb.registerPostProcessor(EventData.StateChangedEventData.class, new EventDataProcessor.StateChangedEventProcessor(this));
         gfb.registerPostProcessor(EventData.IssueTypeChangedEventData.class, new EventDataProcessor.IssueTypeChangedEventProcessor());
-        gfb.registerPostProcessor(EventData.ParentIssueChangedEventData.class, new EventDataProcessor.ParentIssueChangedEventProcessor());
-        gfb.registerPostProcessor(EventData.SubIssueChangedEventData.class, new EventDataProcessor.SubIssueChangedEventProcessor());
         gfb.registerPostProcessor(EventData.ConnectedEventData.class, new EventDataProcessor.ConnectedEventProcessor());
         gfb.registerPostProcessor(ReviewData.ReviewInitialCommentData.class, new ReviewDataProcessor.ReviewInitialCommentDataProcessor(this));
         GsonBuilder gb = gfb.createGsonBuilder();

src/de/uni_passau/fim/gitwrapper/IssueData.java

@@ -41,7 +41,6 @@ public class IssueData implements GitHubRepository.IssueDataCached {
     UserData user;
 
     @Expose(deserialize = false) State state;
-    @Expose(deserialize = false) StateReason state_reason;
     @Expose(deserialize = false) TypeData type;
     OffsetDateTime created_at;
     @Nullable OffsetDateTime closed_at;
@@ -197,15 +196,6 @@ public State getState() {
         return state;
     }
 
-    /**
-     * Gets the reason for the current state of the issue.
-     *
-     * @return the state reason
-     */
-    public StateReason getStateReason() {
-        return state_reason;
-    }
-
     /**
      * Gets the date and time the issue was created.
      *

src/de/uni_passau/fim/gitwrapper/IssueDataProcessor.java

@@ -428,7 +428,6 @@ public void postDeserialize(IssueData result, JsonElement src, Gson gson) {
         String stateReasonValue = (stateReasonElement != null && !stateReasonElement.isJsonNull()) 
             ? stateReasonElement.getAsString() 
             : null;
-        result.state_reason = StateReason.getFromString(stateReasonValue);
 
         JsonElement typeElement = src.getAsJsonObject().get("type");
         if (typeElement != null && !typeElement.isJsonNull()) {

src/de/uni_passau/fim/gitwrapper/IssueTypeChangeEvent.java

@@ -40,28 +40,17 @@ public enum StateReason {
     /**
      * Denotes that the Issue or PullRequest was a duplicate.
      */
-    DUPLICATE,
-
-    /**
-     * Denotes that the state reason is not known or not specified.
-     * This can be used when the state reason is not applicable or not provided.
-     */
-    NONE,
-
-    /**
-     * Any state reason is included (can be used for unknown reasons).
-     */
-    ANY;
+    DUPLICATE;
 
     /**
      * Gets the StateReason from a string.
      *
      * @param string the string to convert
-     * @return the corresponding StateReason, or ANY if no match is found
+     * @return the corresponding StateReason, the default case being 'COMPLETED'
      */
     public static StateReason getFromString(String string) {
         if (string == null) {
-            return NONE;
+            return COMPLETED;
         }
 
         switch (string.toLowerCase()) {
@@ -74,7 +63,7 @@ public static StateReason getFromString(String string) {
             case "duplicate":
                 return DUPLICATE;
             default:
-                return ANY;
+                return COMPLETED;
         }
     }
 }