Code style: imports, simplify and performance improvements

Author: jamo

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

@@ -161,11 +161,8 @@ private boolean versionCheck() {
         }
 
         Date now = new Date();
-        if (previous != null && previous.getTime() + defaultUpdateInterval > now.getTime()) {
-            return false;
-        }
+        return !(previous != null && previous.getTime() + defaultUpdateInterval > now.getTime()) && runAutoUpdate();
 
-        return runAutoUpdate();
     }
 
     public boolean runAutoUpdate() {

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

@@ -75,7 +75,7 @@ public int getAccountCount() {
         return this.accountArray.size();
     }
 
-    public List<Account> getAccountList() {
+    private List<Account> getAccountList() {
         return Collections.unmodifiableList(this.accountArray);
     }
 

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

@@ -43,7 +43,7 @@ public static CourseInfo load(Path courseInfoFile) {
             //Return null if file is not found, this is normal behaviour
             return null;
         }
-        Reader reader = null;
+        Reader reader;
         try {
             reader = Files.newBufferedReader(courseInfoFile, Charset.forName("UTF-8"));
         } catch (IOException e) {

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

@@ -94,7 +94,7 @@ public static boolean savePropertiesTo(HashMap<String, String> properties, Path
      * Get the correct directory in which our config files go
      * ie /home/user/.config/tmc-cli/.
      */
-    protected static Path getConfigDirectory() {
+    static Path getConfigDirectory() {
         Path configPath;
         if (EnvironmentUtil.isWindows()) {
             String appdata = System.getenv("APPDATA");
@@ -123,7 +123,8 @@ private static Path getAccountsFile(Path configRoot) {
         if (!Files.exists(configRoot)) {
             try {
                 Files.createDirectories(configRoot).getParent();
-            } catch (Exception e) { }
+            } catch (IOException e) {
+            }
             try {
                 Files.createFile(configRoot);
             } catch (Exception e) { }

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

@@ -82,7 +82,7 @@ public static List<Course> listCourses(CliContext ctx) {
         return new ArrayList<>();
     }
 
-    public static Course getDetails(CliContext ctx, Course course) {
+    private static Course getDetails(CliContext ctx, Course course) {
         try {
             TmcCore core = ctx.getTmcCore();
             return core.getCourseDetails(ProgressObserver.NULL_OBSERVER, course).call();
@@ -213,7 +213,7 @@ public static boolean sendFeedback(CliContext ctx, List<FeedbackAnswer> answers,
         }
     }
 
-    protected static void handleTmcExceptions(CliContext ctx, Exception exception) {
+    private static void handleTmcExceptions(CliContext ctx, Exception exception) {
         Io io = ctx.getIo();
         Throwable cause = exception.getCause();
 

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

@@ -133,7 +133,7 @@ private String getExercisesAsString(String courseName, List<Exercise> exercises)
         for (Exercise exercise : exercises) {
             String deadline = getDeadline(exercise);
             if (!deadline.equals(prevDeadline)) {
-                sb.append("\nDeadline: " + deadline + "\n");
+                sb.append("\nDeadline: ").append(deadline).append("\n");
                 prevDeadline = deadline;
             }
             sb.append(getExerciseStatus(exercise));

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

@@ -35,12 +35,11 @@ public void getOptions(Options options) {
 
     @Override
     public void run(CliContext context, CommandLine args) {
-        CliContext ctx = context;
-        this.io = ctx.getIo();
-        if (!ctx.loadBackend()) {
+        this.io = context.getIo();
+        if (!context.loadBackend()) {
             return;
         }
-        WorkDir workdir = ctx.getWorkDir();
+        WorkDir workdir = context.getWorkDir();
         String[] stringArgs = args.getArgs();
 
         Boolean valid;
@@ -85,9 +84,9 @@ public void run(CliContext context, CommandLine args) {
         }
 
         String exerciseName = exercisenames.get(0);
-        CourseInfo info = ctx.getCourseInfo();
+        CourseInfo info = context.getCourseInfo();
         Exercise exercise = info.getExercise(exerciseName);
-        URI uri = TmcUtil.sendPaste(ctx, exercise, message);
+        URI uri = TmcUtil.sendPaste(context, exercise, message);
         if (uri == null && exercise.hasDeadlinePassed()) {
             io.println("Unable to send the paste."
                     + " The deadline for submitting this exercise has passed");

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

@@ -28,12 +28,11 @@ public void getOptions(Options options) {
 
     @Override
     public void run(CliContext context, CommandLine args) {
-        CliContext ctx = context;
-        this.io = ctx.getIo();
+        this.io = context.getIo();
 
         boolean unset = args.hasOption("u");
         String[] arguments = args.getArgs();
-        HashMap<String, String> props = ctx.getProperties();
+        HashMap<String, String> props = context.getProperties();
         if (arguments.length == 0) {
             printAllProps(props);
             return;
@@ -75,7 +74,7 @@ public void run(CliContext context, CommandLine args) {
                         + ", was " + last);
             }
         }
-        ctx.saveProperties();
+        context.saveProperties();
     }
 
     private void printAllProps(HashMap<String, String> props) {
@@ -94,7 +93,7 @@ private void printAllProps(HashMap<String, String> props) {
 
         for (String key : array) {
             sb = new StringBuilder();
-            sb.append(key + ":");
+            sb.append(key).append(":");
             for (int i = key.length() + 1; i < Math.max(longest + 1, 7); i++) {
                 sb.append(" ");
             }

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

@@ -41,19 +41,18 @@ public void getOptions(Options options) {
 
     @Override
     public void run(CliContext context, CommandLine args) {
-        CliContext ctx = context;
-        Io io = ctx.getIo();
+        Io io = context.getIo();
 
         String[] exercisesFromArgs = parseArgs(args);
         if (exercisesFromArgs == null) {
             return;
         }
 
-        if (!ctx.loadBackendWithoutLogin()) {
+        if (!context.loadBackendWithoutLogin()) {
             return;
         }
 
-        WorkDir workDir = ctx.getWorkDir();
+        WorkDir workDir = context.getWorkDir();
         for (String exercise : exercisesFromArgs) {
             if (!workDir.addPath(exercise)) {
                 io.println("Error: " + exercise + " is not a valid exercise.");
@@ -67,10 +66,10 @@ public void run(CliContext context, CommandLine args) {
             return;
         }
 
-        CourseInfo info = ctx.getCourseInfo();
+        CourseInfo info = context.getCourseInfo();
 
-        Color passedColor = ctx.getApp().getColor("testresults-left");
-        Color failedColor = ctx.getApp().getColor("testresults-right");
+        Color passedColor = context.getApp().getColor("testresults-left");
+        Color failedColor = context.getApp().getColor("testresults-right");
         ResultPrinter resultPrinter = new ResultPrinter(io, showDetails, showPassed,
                 passedColor, failedColor);
 
@@ -80,14 +79,14 @@ public void run(CliContext context, CommandLine args) {
             io.println(ColorUtil.colorString("Testing: " + name, Color.YELLOW));
             Exercise exercise = info.getExercise(name);
 
-            RunResult runResult = TmcUtil.runLocalTests(ctx, exercise);
+            RunResult runResult = TmcUtil.runLocalTests(context, exercise);
             if (runResult == null) {
                 io.println("Failed to run test");
                 resultPrinter.addFailedExercise();
                 continue;
             }
 
-            ValidationResult valResult = TmcUtil.runCheckStyle(ctx, exercise);
+            ValidationResult valResult = TmcUtil.runCheckStyle(context, exercise);
             boolean testsPassed = resultPrinter.printLocalTestResult(
                     runResult, valResult, isOnlyExercise);
 

src/main/java/fi/helsinki/cs/tmc/cli/core/AbstractCommand.java

@@ -20,7 +20,7 @@ public abstract class AbstractCommand {
      *
      * @return Description text
      */
-    public String getDescription() {
+    protected String getDescription() {
         return null;
     }
 
@@ -52,7 +52,7 @@ public void execute(CliContext context, String[] stringArgs) {
         }
     }
 
-    public CommandLine parseArgs(CliContext context, String[] stringArgs) {
+    protected CommandLine parseArgs(CliContext context, String[] stringArgs) {
         GnuParser parser = new GnuParser();
         CommandLine args;
         Options options = getOptions();