From 913855d890d4ae9c436d57e983cb14125ecd8cb2 Mon Sep 17 00:00:00 2001 From: apyw Date: Mon, 30 Jan 2023 15:18:20 -0500 Subject: [PATCH 1/2] Angie Wong Cleanup Bonus Implementation --- .../java/ca/uwaterloo/cs489/exercise2/MainApp.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java index c699133..bffdeb5 100644 --- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java +++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java @@ -4,6 +4,7 @@ import java.io.InputStreamReader; import java.io.IOException; import java.io.FileNotFoundException; +import java.io.File; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -35,6 +36,15 @@ public static void main(String[] args) { for (Path entry : ds) { Job job = new Job(entry.toFile()); logger.info(String.format("Job %d yields %d\n", job.getInput(), job.processJob())); + // Remove job after job has been processed + // Reference: https://www.w3schools.com/java/java_files_delete.asp + // Github username: apyw + File jobPath = entry.toFile(); + if (jobPath.delete()) { + logger.info(String.format("Deleted the job: %d\n" + jobPath.getName())); + } else { + logger.info(String.format("Failed to delete the job: %d\n" + jobPath.getName())); + } } } catch (IOException e) { e.printStackTrace(); From 58bfc6f9c149774b37e7e805d0289d56747b1d32 Mon Sep 17 00:00:00 2001 From: apyw Date: Mon, 30 Jan 2023 15:38:15 -0500 Subject: [PATCH 2/2] Fix logging message --- java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java index bffdeb5..f529e06 100644 --- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java +++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java @@ -41,9 +41,9 @@ public static void main(String[] args) { // Github username: apyw File jobPath = entry.toFile(); if (jobPath.delete()) { - logger.info(String.format("Deleted the job: %d\n" + jobPath.getName())); + logger.info(String.format("Deleted the job: %s\n", jobPath.getName())); } else { - logger.info(String.format("Failed to delete the job: %d\n" + jobPath.getName())); + logger.info(String.format("Failed to delete the job: %s\n", jobPath.getName())); } } } catch (IOException e) {