Make small refactorings

Author: Irene

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -180,20 +180,6 @@ public void run(String[] args) {
 
 
     public static void main(String[] args) {
-        while (true) {
-            Scanner reader = new Scanner(System.in);
-            System.out.println("Enter command (stop to exit)");
-            String command = reader.nextLine();
-            if (command.equals("stop")) {
-                break;
-            } else {
-                String[] argh = command.split((" "));
-                realMain(argh);
-            }
-        }
-    }
-
-    public static void realMain(String[] args) {
         Application app = new Application(new CliContext(null));
         app.run(args);
     }

src/main/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoIo.java

@@ -63,7 +63,7 @@ public static void createNewCourse(Course course, Account account, Path parentDi
         CourseInfoIo.save(info, configFile);
     }
 
-    public static void abortCreatingCourse(Course course, Path parentDir) {
+    public static void deleteConfigDirectory(Course course, Path parentDir) {
         Path configFile = parentDir.resolve(course.getName()).resolve(CourseInfoIo.COURSE_CONFIG);
         delete(configFile);
     }

src/main/java/fi/helsinki/cs/tmc/cli/backend/Settings.java

@@ -48,7 +48,7 @@ public void setWorkDir(WorkDir workDir) {
 
     @Override
     public String getServerAddress() {
-            return account.getServerAddress();
+        return account.getServerAddress();
     }
 
     @Override

src/main/java/fi/helsinki/cs/tmc/cli/backend/SettingsIo.java

@@ -73,16 +73,15 @@ public static boolean delete() {
     public static void saveCurrentSettingsToAccountList(Settings settings) {
         AccountList list = loadAccountList();
         Set<Account> deletables = new HashSet<>();
-        for (Iterator<Account> i = list.iterator(); i.hasNext(); ) {
-            Account account = i.next();
+        list.forEach(account -> {
             if (account.getUsername().equals(settings.getAccount().getUsername())) {
                 if (!account.getUsername().isPresent()) {
                     logger.error("Savable account doesn't exist");
                     return;
                 }
                 deletables.add(account);
             }
-        }
+        });
         deletables.stream().forEach(d -> list.deleteAccount(d.getUsername().get(), d.getServerAddress()));
         list.addAccount(settings.getAccount());
         saveAccountList(list);

src/main/java/fi/helsinki/cs/tmc/cli/command/ConfigCommand.java

@@ -43,7 +43,7 @@ private void configureAllowedKeys() {
         ALLOWED_KEYS.put("send-diagnostics", (key, value) -> {
             String newVal = (String) value;
             if (!newVal.trim().toLowerCase().equals("true") && !newVal.trim().toLowerCase().equals("false")) {
-                throw new BadValueTypeException("Not a boolean value");
+                throw new BadValueTypeException("Please write either true or false");
             }
             boolean send = Boolean.parseBoolean(newVal);
             context.getSettings().setSendDiagnostics(send);

src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java

@@ -88,7 +88,7 @@ public void run(CliContext context, CommandLine args) {
         List<Exercise> exercises = TmcUtil.downloadExercises(ctx, filtered, progobs);
         if (exercises == null) {
             io.errorln("Failed to download exercises");
-            CourseInfoIo.abortCreatingCourse(course, workDir.getWorkingDirectory());
+            CourseInfoIo.deleteConfigDirectory(course, workDir.getWorkingDirectory());
             return;
         }
 

src/main/java/fi/helsinki/cs/tmc/cli/command/OrganizationCommand.java

@@ -102,14 +102,14 @@ public Optional<Organization> chooseOrganization(CliContext ctx, CommandLine arg
             String slug = getOrganizationFromUser(organizations, args, printOptions, oneLine);
             printOptions = false;
             organization = organizations.stream().filter(o -> o.getSlug().equals(slug.trim().toLowerCase())).findFirst();
-            if (!organization.isPresent()) {
+            if (organization.isPresent()) {
+                break;
+            } else {
                 io.errorln("Slug doesn't match any organization.");
                 if (oneLine) {
                     oneLine = false;
                     printOptions = true;
                 }
-            } else {
-                break;
             }
         }
         if (organization.isPresent()) {

src/main/java/fi/helsinki/cs/tmc/cli/shared/CourseFinder.java

@@ -84,6 +84,10 @@ private boolean handleMultipleMatchingCourses(Map<Account, Course> matches) {
             Account entryAccount = entrySet.getKey();
             Course entryCourse = entrySet.getValue();
 
+            if (!entryAccount.getUsername().isPresent()) {
+                continue;
+            }
+
             if (io.readConfirmation(
                     "Download course from "
                             + entryAccount.getServerAddress()

src/test/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoIoTest.java

@@ -1,6 +1,5 @@
 package fi.helsinki.cs.tmc.cli.backend;
 
-import fi.helsinki.cs.tmc.cli.io.WorkDir;
 import fi.helsinki.cs.tmc.core.domain.Course;
 
 import junit.framework.Assert;
@@ -9,7 +8,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -64,7 +62,7 @@ public void abortingCourseCreationWorks() {
         CourseInfo loadedInfo = CourseInfoIo.load(this.courseFile);
         Assert.assertNotNull(loadedInfo);
 
-        CourseInfoIo.abortCreatingCourse(new Course("test-course"), Paths.get(tempDir));
+        CourseInfoIo.deleteConfigDirectory(new Course("test-course"), Paths.get(tempDir));
         Path courseJson = Paths.get(tempDir).resolve(".tmc.json");
         assertTrue(!Files.exists(courseJson));
     }

src/test/java/fi/helsinki/cs/tmc/cli/command/ConfigCommandTest.java

@@ -242,7 +242,7 @@ public void httpsIsRequiredInBeginningInValidation() {
     public void sendDiagnosticsIsValidated() {
         io.addConfirmationPrompt(true);
         app.run(new String[] {"config", "send-diagnostics=lol"});
-        io.assertContains("Not a boolean value");
+        io.assertContains("Please write either true or false");
     }
 
     @Test
@@ -270,14 +270,14 @@ public void ifSeveralPairsAndSomeInvalidConfiguresValidOnes() {
         io.addConfirmationPrompt(true);
         io.addConfirmationPrompt(true);
         app.run(new String[] {"config", "send-diagnostics=asdf", "server-address=https://mooc.fi"});
-        io.assertContains("Not a boolean value");
+        io.assertContains("Please write either true or false");
         assertEquals("https://mooc.fi", settings.getServerAddress());
     }
 
     @Test
     public void ifSeveralPairsAndSomeInvalidValuesConfiguresValidOnesWithQuiet() {
         app.run(new String[] {"config", "-q",  "send-diagnostics=asdf", "server-address=https://mooc.fi"});
-        io.assertContains("Not a boolean value");
+        io.assertContains("Please write either true or false");
         assertEquals("https://mooc.fi", settings.getServerAddress());
     }