converted strings to Path and URI bojects for tmc-core

zinkko · zinkko · commit 41efbf178fac · 2015-08-21T09:27:22.000+03:00
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java
@@ -20,6 +20,8 @@
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
@@ -79,8 +81,8 @@ public void actionPerformed(ActionEvent e) {
     }
 
     public void run() {
+        final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
         try {
-            final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
             if (backgroundProcessingOrNoCurrentCourse(currentCourseBeforeUpdate)) {
                 return;
             }
@@ -93,13 +95,16 @@ public void run() {
             Futures.addCallback(currentCourseFuture, new UpdateCourseForExerciseUpdate(exerciseRefresh));
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
+            dialogs.displayError("An exception occurred in tmc core", ex);
+        } catch (URISyntaxException ex) {
+            String illegalUri = currentCourseBeforeUpdate.getDetailsUrl();
+            dialogs.displayError("Illegal uri from server: " + illegalUri, ex);
+            Exceptions.printStackTrace(ex);
         }
     }
 
-    private String detailUrl(final Course currentCourseBeforeUpdate) {
-        return new ServerAccess().addApiCallQueryParameters(
-                currentCourseBeforeUpdate.getDetailsUrl()
-        );
+    private URI detailUrl(final Course currentCourseBeforeUpdate) throws URISyntaxException {
+        return new URI(currentCourseBeforeUpdate.getDetailsUrl());
     }
 
     /**
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java
@@ -16,6 +16,8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -108,7 +110,8 @@ private void submitPaste(final TmcProjectInfo projectInfo, final Exercise exerci
         projectMediator.saveAllFiles();
         final String errorMsgLocale = settings.getErrorMsgLocale().toString();
         try {
-            ListenableFuture<URI> result = TmcCoreSingleton.getInstance().pasteWithComment(projectInfo.getProjectDirAbsPath(), messageForReviewer);
+            Path path = Paths.get(projectInfo.getProjectDirAbsPath());
+            ListenableFuture<URI> result = TmcCoreSingleton.getInstance().pasteWithComment(path, messageForReviewer);
             Futures.addCallback(result, new PasteResult());
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java
@@ -13,6 +13,8 @@
 import fi.helsinki.cs.tmc.utilities.FutureCallbackList;
 import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -80,8 +82,9 @@ public void run() {
         try {
             if (settingsAreSet()) {
                 ProgressHandle courseRefresh = ProgressHandleFactory.createSystemHandle(
-                    "Refreshing course list");
+                        "Refreshing course list");
                 courseRefresh.start();
+
                 ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses();
                 Futures.addCallback(listCourses, new LoadCourses(courseRefresh));
             }
@@ -102,7 +105,7 @@ class LoadCourses implements FutureCallback<List<Course>> {
         private ProgressHandle lastAction;
 
         /**
-         * This callBack is run when ListenableFuture (to witch this is
+         * This callBack is run when ListenableFuture (to which this is
          * attached) is done. On success method takes list of Course-objects,
          * searches the current course and starts uploading the details of the
          * course. If no currentCourse found, no need to update details.
@@ -124,13 +127,17 @@ public void onSuccess(final List<Course> courses) {
                     ProgressHandle loadingCourse = ProgressHandleFactory.
                             createSystemHandle("Loading course");
                     loadingCourse.start();
-                    ListenableFuture<Course> courseFuture = tmcCore.getCourse(
-                            currentCourse.getDetailsUrl()
-                    );
+                    URI uri = new URI(currentCourse.getDetailsUrl());
+                    System.out.println(uri + "  here we go!\n\n\n\n\n\n\n\n\n\n");
+                    ListenableFuture<Course> courseFuture = tmcCore.getCourse(uri);
+
                     Futures.addCallback(courseFuture, new UpdateCourse(courses, loadingCourse));
                 } catch (TmcCoreException ex) {
                     Exceptions.printStackTrace(ex);
                     callbacks.onFailure(ex);
+                } catch (URISyntaxException ex) {
+                    Exceptions.printStackTrace(ex);
+                    callbacks.onFailure(ex);
                 }
             } else {
                 callbacks.onSuccess(courses);
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SendFeedbackAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SendFeedbackAction.java
@@ -14,6 +14,8 @@
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,23 +43,23 @@ public void run() {
         try {
             ListenableFuture<HttpResult> feedbackFuture;
             feedbackFuture = core.sendFeedback(
-                    getFeedbackAnswers(), result.getFeedbackAnswerUrl()
+                    getFeedbackAnswers(), new URI(result.getFeedbackAnswerUrl())
             );
             Futures.addCallback(feedbackFuture, new FeedbackReplyCallback());
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
-        } catch (IOException ex) {
+        } catch (URISyntaxException ex) {
             Exceptions.printStackTrace(ex);
         }
     }
 
     private Map<String, String> getFeedbackAnswers() {
         Map<String, String> answerMap = new HashMap<String, String>();
-        
+
         for (FeedbackAnswer answer : answers) {
             answerMap.put("" + answer.getQuestion().getId(), answer.getAnswer());
         }
-        
+
         return answerMap;
     }
 
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java
@@ -19,6 +19,8 @@
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
@@ -38,7 +40,9 @@ public final class SubmitExerciseAction extends AbstractExerciseSensitiveAction
     private ConvenientDialogDisplayer dialogs;
 
     public static class InvokedEvent implements TmcEvent {
+
         public final TmcProjectInfo projectInfo;
+
         public InvokedEvent(TmcProjectInfo projectInfo) {
             this.projectInfo = projectInfo;
         }
@@ -83,7 +87,8 @@ private void submitProject(TmcProjectInfo info) {
         final SubmissionResultWaitingDialog dialog = SubmissionResultWaitingDialog.createAndShow();
         try {
             ListenableFuture<SubmissionResult> result;
-            result = core.submit(info.getProjectDirAbsPath());
+            Path path = Paths.get(info.getProjectDirAbsPath());
+            result = core.submit(path);
             Futures.addCallback(result, new SubmissionCallback(exercise, dialog));
         } catch (TmcCoreException ex) {
             String message = "There was an error submitting project " + info.getProjectName();
@@ -116,7 +121,7 @@ private SubmissionCallback(Exercise exercise, SubmissionResultWaitingDialog dial
 
         @Override
         public void onSuccess(final SubmissionResult result) {
-            if(result == null){
+            if (result == null) {
                 System.err.println("Result is null.");
             }
             SwingUtilities.invokeLater(new Runnable() {
@@ -126,7 +131,7 @@ public void run() {
                     dialog.close();
                     final ResultCollector resultCollector = new ResultCollector(exercise);
                     resultCollector.setValidationResult(result.getValidationResult());
-             
+
                     resultDisplayer.showSubmissionResult(exercise, result, resultCollector);
                     exercise.setAttempted(true);
                     if (result.isAllTestsPassed()) {
@@ -158,4 +163,3 @@ public void run() {
     }
 
 }
-
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/runners/CheckstyleRunHandler.java b/tmc-plugin/src/fi/helsinki/cs/tmc/runners/CheckstyleRunHandler.java
@@ -12,6 +12,7 @@
 import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+import java.nio.file.Paths;
 
 import javax.swing.SwingUtilities;
 
@@ -30,16 +31,16 @@ public void performAction(final ResultCollector resultCollector, final Project p
         final TmcProjectInfo projectInfo = ProjectMediator.getInstance().wrapProject(project);
         final String projectType = projectInfo.getProjectType().name();
         ProjectMediator.getInstance().saveAllFiles();
-
         try {
-            ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(projectInfo.getProjectDirAsFile().getAbsolutePath());
-            Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
-
+        ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(
+                Paths.get(
+                        projectInfo.getProjectDirAsFile().getAbsolutePath()
+                ));
+        Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
         } catch (TmcCoreException ex) {
             ConvenientDialogDisplayer.getDefault().displayError("Checkstyle audit failed.");
             Exceptions.printStackTrace(ex);
         }
-
     }
 
 }
@@ -48,7 +49,7 @@ class ExplainValidationResult implements FutureCallback<ValidationResult> {
 
     ResultCollector resultCollector;
     ConvenientDialogDisplayer dialogDisplayer;
-    
+
     public ExplainValidationResult(ResultCollector resultCollector, ConvenientDialogDisplayer dialogDisplayer) {
         this.resultCollector = resultCollector;
         this.dialogDisplayer = dialogDisplayer;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java b/tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java
@@ -24,6 +24,7 @@
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import static java.util.logging.Level.INFO;
@@ -72,7 +73,7 @@ public void performAction(final ResultCollector resultCollector, Project... proj
                     "Running tests.");
             runningTestsLocally.start();
             try {
-                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance().test(projectInfo.getProjectDirAbsPath());
+                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance().test(Paths.get(projectInfo.getProjectDirAbsPath()));
                 Futures.addCallback(result, new FutureCallback<RunResult>() {
                     @Override
                     public void onSuccess(final RunResult result) {
