Further fix for tsantalis#963

Author: pouryafard75

src/main/java/gui/webdiff/DiffDriver.java

@@ -2,6 +2,7 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
+import org.refactoringminer.exceptions.NetworkException;
 import gui.webdiff.export.WebExporter;
 import org.refactoringminer.astDiff.models.ASTDiff;
 import org.refactoringminer.astDiff.models.ProjectASTDiff;
@@ -48,18 +49,14 @@ public class DiffDriver {
 To export the mappings/actions, add --export to the end of the command.
 """;
 
-    public ProjectASTDiff getProjectASTDiff() {
+    public ProjectASTDiff getProjectASTDiff() throws Exception {
         RunMode runMode = RunMode.getRunMode(this);
         if (runMode == null) return null;
         ProjectASTDiff projectASTDiff;
-        try {
-            projectASTDiff = runMode.getProjectASTDIFF(this);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        projectASTDiff = runMode.getProjectASTDIFF(this);
         return projectASTDiff;
     }
-    public void execute(String[] args) {
+    public void execute(String[] args) throws Exception {
         JCommander jCommander = JCommander.newBuilder()
                 .addObject(this)
                 .build();
@@ -83,13 +80,32 @@ public void execute(String[] args) {
                 else
                     webDiff.openInBrowser();
             }
-        } catch (org.kohsuke.github.HttpException e) {
-            System.out.println("Error in connecting. Please retry");
-            throw new RuntimeException(e);
         } catch (Exception e) {
-            System.out.println(HELP_MSG);
-            throw new RuntimeException(e);
+            if (isConnectionIssue(e))
+                throw new NetworkException();
+            else
+            {
+                System.out.println(HELP_MSG);
+                throw e;
+            }
+        }
+    }
+
+    private static boolean isConnectionIssue(Throwable e) {
+        while (e != null) {
+            if (e instanceof java.net.ConnectException ||
+                e instanceof java.nio.channels.UnresolvedAddressException ||
+                (e.getMessage() != null && (
+                        e.getMessage().contains("api.github.com") ||
+                        e.getMessage().contains("Failed to connect") ||
+                        e.getMessage().contains("Connection refused") ||
+                        e.getMessage().contains("Network is unreachable")
+                ))) {
+                return true;
+            }
+            e = e.getCause();
         }
+        return false;
     }
 
     public static void export(ProjectASTDiff projectASTDiff, String exportDestination) throws IOException {

src/main/java/org/refactoringminer/exceptions/NetworkException.java

@@ -0,0 +1,21 @@
+package org.refactoringminer.exceptions;
+
+public class NetworkException extends RuntimeException {
+
+    private static final String DEFAULT_MESSAGE = "❌ Error in connecting. Please retry.";
+
+    public NetworkException() {
+        super(DEFAULT_MESSAGE);
+    }
+	public NetworkException(String msg){
+		super(msg);
+	}
+
+	public NetworkException(Throwable cause) {
+		super(DEFAULT_MESSAGE, cause);
+	}
+
+	public NetworkException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

src/main/java/org/refactoringminer/exceptions/OAuthTokenNotFoundException.java

@@ -0,0 +1,14 @@
+package org.refactoringminer.exceptions;
+
+public class OAuthTokenNotFoundException extends NetworkException {
+	private static final String DEFAULT_MESSAGE =
+			"❌ Missing OAuth token. Please set the environment variable 'OAuthToken' with your personal access token.";
+
+	public OAuthTokenNotFoundException() {
+		super(DEFAULT_MESSAGE);
+	}
+
+	public OAuthTokenNotFoundException(Exception e) {
+		super(DEFAULT_MESSAGE, e);
+	}
+}

src/main/java/org/refactoringminer/rm1/GitHistoryRefactoringMinerImpl.java

@@ -10,7 +10,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -71,6 +70,7 @@
 import org.refactoringminer.astDiff.models.ProjectASTDiff;
 import org.refactoringminer.astDiff.utils.URLHelper;
 import org.refactoringminer.astDiff.matchers.ProjectASTDiffer;
+import org.refactoringminer.exceptions.OAuthTokenNotFoundException;
 import org.refactoringminer.util.GitServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -729,14 +729,16 @@ private GitHub connectToGitHub() {
 					if(gitHub.isCredentialValid()) {
 						logger.info("Connected to GitHub with OAuth token");
 					}
+					else {
+						throw new OAuthTokenNotFoundException();
+					}
 				}
 				else {
 					gitHub = GitHub.connect();
 				}
-			} catch(FileNotFoundException e) {
-				logger.warn("File github-oauth.properties was not found in RefactoringMiner's execution directory", e);
-			} catch(IOException ioe) {
-				ioe.printStackTrace();
+			}
+			catch (Exception e){
+				throw new OAuthTokenNotFoundException(e);
 			}
 		}
 		return gitHub;
@@ -945,10 +947,8 @@ public void detectAtCommit(Repository repository, String commitId, RefactoringHa
 			f.get(timeout, TimeUnit.SECONDS);
 		} catch (TimeoutException e) {
 			f.cancel(true);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
+		} catch (ExecutionException | InterruptedException e) {
+			throw new RuntimeException(e);
 		} finally {
 			service.shutdown();
 		}
@@ -997,10 +997,8 @@ public void detectAtCommit(String gitURL, String commitId, RefactoringHandler ha
 			f.get(timeout, TimeUnit.SECONDS);
 		} catch (TimeoutException e) {
 			f.cancel(true);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
+		} catch (ExecutionException | InterruptedException e) {
+			throw new RuntimeException(e);
 		} finally {
 			service.shutdown();
 		}
@@ -1902,10 +1900,8 @@ public ProjectASTDiff diffAtPullRequest(String cloneURL, int pullRequestId, int
 			f.get(timeout, TimeUnit.SECONDS);
 		} catch (TimeoutException e) {
 			f.cancel(true);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
+		} catch (ExecutionException | InterruptedException e) {
+			throw new RuntimeException(e);
 		} finally {
 			service.shutdown();
 		}
@@ -2078,10 +2074,8 @@ public ProjectASTDiff diffAtCommit(String gitURL, String commitId, int timeout)
 			f.get(timeout, TimeUnit.SECONDS);
 		} catch (TimeoutException e) {
 			f.cancel(true);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
+		} catch (ExecutionException | InterruptedException e) {
+			throw new RuntimeException(e);
 		} finally {
 			service.shutdown();
 		}