Reworked GitHub auto issue creator.

Author: halirutan

Mathematica-IntelliJ-Plugin.iml

@@ -20,7 +20,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" exported="" name="com.google.guava:guava:r09" level="project" />
-    <orderEntry type="library" name="com.jcabi:jcabi-github:0.9.4" level="project" />
     <orderEntry type="library" name="org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5" level="project" />
   </component>
 </module>

lib/gson-2.2.2.jar

@@ -82,7 +82,7 @@
   <extensions defaultExtensionNs="com.intellij">
     <internalFileTemplate name="Package"/>
 
-    <errorHandler implementation="de.halirutan.mathematica.errorreporting.ErrorReporter"/>
+    <errorHandler implementation="de.halirutan.mathematica.errorreporting.GitHubErrorReporter"/>
     <fileTypeFactory implementation="de.halirutan.mathematica.MathematicaFileTypeFactory"/>
     <lang.parserDefinition language="Mathematica"
                            implementationClass="de.halirutan.mathematica.parsing.prattparser.MathematicaParserDefinition"/>

lib/org.eclipse.egit.github.core-2.1.5.jar

@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2017 Patrick Scheibe
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+report.error.to.plugin.vendor=Report error to plugin vendor
+report.error.progress.dialog.text=Submitting error report...
+report.error.connection.failure=Could not communicate with GitHub
+
+git.issue.title=[auto-generated:{0}] {1}
+git.issue.label=auto-generated
+git.issue.text=<a href="{0}">Created issue {1}</a>. Thank you for your feedback!
+git.issue.duplicate.text = <a href="{0}">A similar issues was already reported (#{1})</a>. Thank you for your feedback!
+

resources/META-INF/plugin.xml

@@ -21,63 +21,100 @@
 
 package de.halirutan.mathematica.errorreporting;
 
+import com.intellij.openapi.diagnostic.SubmittedReportInfo;
+import com.intellij.openapi.diagnostic.SubmittedReportInfo.SubmissionStatus;
 import org.eclipse.egit.github.core.Issue;
 import org.eclipse.egit.github.core.Label;
 import org.eclipse.egit.github.core.RepositoryId;
 import org.eclipse.egit.github.core.client.GitHubClient;
+import org.eclipse.egit.github.core.client.PageIterator;
 import org.eclipse.egit.github.core.service.IssueService;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.*;
 import java.util.Map.Entry;
 
 class AnonymousFeedback {
 
   private final static String gitAccessToken = "097a2a4e4a94ff65a73508083da690d4565fd038";
-  private final static String gitRepoUser = "halirutan";
-  private final static String gitRepo = "Mathematica-IntelliJ-Plugin";
+  private final static String gitRepoUser = "Mathematica-IntelliJ-Plugin";
+  private final static String gitRepo = "Auto-generated-issues-for-the-Mathematica-Plugin";
 
-  private GitHubClient myGitHub;
-  private RepositoryId myRepoID;
+  private final static String issueLabel = "auto-generated";
 
-  AnonymousFeedback() {
-    myGitHub = new GitHubClient();
-    myGitHub.setOAuth2Token(gitAccessToken);
-    myRepoID = new RepositoryId(gitRepoUser, gitRepo);
+  private AnonymousFeedback() { }
+
+  static SubmittedReportInfo sendFeedback(LinkedHashMap<String, String> environmentDetails) {
+
+    final SubmittedReportInfo result;
+    try {
+      GitHubClient client = new GitHubClient();
+      client.setOAuth2Token(gitAccessToken);
+      RepositoryId repoID = new RepositoryId(gitRepoUser, gitRepo);
+      IssueService issueService = new IssueService(client);
+
+      String errorDescription = environmentDetails.get("error.description");
+
+      Issue newGibHubIssue = createNewGibHubIssue(environmentDetails);
+      Issue duplicate = findFirstDuplicate(newGibHubIssue.getTitle(), issueService, repoID);
+      boolean isNewIssue = true;
+      if (duplicate != null) {
+        if(errorDescription != null) {
+          issueService.createComment(repoID, duplicate.getNumber(), errorDescription);
+        }
+        newGibHubIssue = duplicate;
+        isNewIssue = false;
+      } else {
+        newGibHubIssue = issueService.createIssue(repoID, newGibHubIssue);
+      }
+
+      final long id = newGibHubIssue.getNumber();
+      final String htmlUrl = newGibHubIssue.getHtmlUrl();
+      final String message = ErrorReportBundle.message(isNewIssue ? "git.issue.text" : "git.issue.duplicate.text", htmlUrl, id);
+      result = new SubmittedReportInfo(htmlUrl, message, isNewIssue ? SubmissionStatus.NEW_ISSUE : SubmissionStatus.DUPLICATE);
+      return result;
+    } catch (IOException e) {
+      return new SubmittedReportInfo(null, ErrorReportBundle.message("report.error.connection.failure"), SubmissionStatus.FAILED);
+    }
   }
-//
-//  public int findDuplicate(@NotNull final String titel) {
-//    final HashMap<String, String> filter = new HashMap<>();
-//    filter.put("filter", "all");
-//    for (Issue issue : myIssues.iterate(filter)) {
-//      System.out.println(issue);
-//    }
-//    return 0;
-//  }
-
-  String sendFeedback(LinkedHashMap<String, String> environmentDetails) throws IOException {
-    String errorMessage = environmentDetails.get("error.message");
+
+  @Nullable
+  private static Issue findFirstDuplicate(String uniqueTitle, final IssueService service, RepositoryId repo) throws IOException {
+    Map<String, String> searchParameters = new HashMap<>(2);
+    searchParameters.put(IssueService.FILTER_STATE, IssueService.STATE_OPEN);
+    final PageIterator<Issue> pages = service.pageIssues(repo, searchParameters);
+    for (Collection<Issue> page : pages) {
+      for (Issue issue : page) {
+        if (issue.getTitle().equals(uniqueTitle)) {
+          return issue;
+        }
+      }
+    }
+    return null;
+  }
+
+  private static Issue createNewGibHubIssue(LinkedHashMap<String, String> details) {
+    String errorMessage = details.get("error.message");
     if (errorMessage == null || errorMessage.isEmpty()) {
       errorMessage = "Unspecified error";
     }
-    environmentDetails.remove("error.message");
+    details.remove("error.message");
 
-    final String body = generateGitHubIssueBody(environmentDetails);
-    try {
-      final Issue newIssue = new Issue();
-      newIssue.setTitle(ErrorReportBundle.message("issue.title", errorMessage));
-      newIssue.setBody(body);
-      Label label = new Label();
-      label.setName("auto-generated");
-      newIssue.setLabels(Collections.singletonList(label));
-      IssueService issueService = new IssueService(myGitHub);
-      final Issue issue = issueService.createIssue(myRepoID, newIssue);
-      final long id = issue.getNumber();
-      return "<a href=\"" + issue.getHtmlUrl() + "\">Created issue #" + id + "</a>";
-    } catch (IOException e) {
-      throw new IOException("Failed to create issue on GitHub");
+    String errorHash = details.get("error.hash");
+    if (errorHash == null) {
+      errorHash = "";
     }
+    details.remove("error.hash");
+
+    final Issue gitHubIssue = new Issue();
+    final String body = generateGitHubIssueBody(details);
+    gitHubIssue.setTitle(ErrorReportBundle.message("git.issue.title", errorHash, errorMessage));
+    gitHubIssue.setBody(body);
+    Label label = new Label();
+    label.setName(issueLabel);
+    gitHubIssue.setLabels(Collections.singletonList(label));
+    return gitHubIssue;
   }
 
   private static String generateGitHubIssueBody(LinkedHashMap<String, String> details) {
@@ -87,11 +124,6 @@ private static String generateGitHubIssueBody(LinkedHashMap<String, String> deta
     }
     details.remove("error.description");
 
-    String errorHash = details.get("error.hash");
-    if (errorHash == null) {
-      errorHash = "";
-    }
-    details.remove("error.hash");
 
     String stackTrace = details.get("error.stacktrace");
     if (stackTrace == null || stackTrace.isEmpty()) {
@@ -118,8 +150,6 @@ private static String generateGitHubIssueBody(LinkedHashMap<String, String> deta
     result.append(stackTrace);
     result.append("\n```\n");
 
-    result.append("Hash Code:\n").append(errorHash);
-
     return result.toString();
   }
 }

resources/de/halirutan/mathematica/errorreporting/ErrorReportBundle.properties

@@ -21,6 +21,7 @@
 
 package de.halirutan.mathematica.errorreporting;
 
+import com.intellij.openapi.diagnostic.SubmittedReportInfo;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task.Backgroundable;
 import com.intellij.openapi.project.Project;
@@ -37,32 +38,23 @@
  * As per answer from here: http://devnet.jetbrains.com/message/5526206;jsessionid=F5422B4AF1AFD05AAF032636E5455E90#5526206
  */
 public class AnonymousFeedbackTask extends Backgroundable {
-  private final Consumer<String> myCallback;
-  private final Consumer<Exception> myErrorCallback;
+  private final Consumer<SubmittedReportInfo> myCallback;
   private final LinkedHashMap<String, String> myParams;
 
   AnonymousFeedbackTask(@Nullable Project project,
                         @NotNull String title,
                         boolean canBeCancelled,
                         LinkedHashMap<String, String> params,
-                        final Consumer<String> callback,
-                        final Consumer<Exception> errorCallback) {
+                        final Consumer<SubmittedReportInfo> callback) {
     super(project, title, canBeCancelled);
 
     myParams = params;
     myCallback = callback;
-    myErrorCallback = errorCallback;
   }
 
   @Override
   public void run(@NotNull ProgressIndicator indicator) {
     indicator.setIndeterminate(true);
-    AnonymousFeedback feedback = new AnonymousFeedback();
-    try {
-      String token = feedback.sendFeedback(myParams);
-      myCallback.consume(token);
-    } catch (Exception e) {
-      myErrorCallback.consume(e);
-    }
+    myCallback.consume(AnonymousFeedback.sendFeedback(myParams));
   }
 }