From 30504057927abcb89a2722ec0c69524bee09b725 Mon Sep 17 00:00:00 2001 From: Riley Schneider <88947587+Ferryry@users.noreply.github.com> Date: Tue, 6 Jan 2026 23:36:29 +0100 Subject: [PATCH] Hotfix to address the IOException in the SimpleDatabaseManager class, modified modifier and deleted useless test. --- ...eleteTaskTable.sql => DeleteTaskTable.sql} | 0 ...nsertTaskTable.sql => InsertTaskTable.sql} | 0 ...tWorkerTable.sql => InsertWorkerTable.sql} | 0 ...electTaskTable.sql => SelectTaskTable.sql} | 0 ...pdateTaskTable.sql => UpdateTaskTable.sql} | 0 .../provider/SimpleDatabaseManager.java | 30 +++++++++---------- .../temp/project/DatabaseBadCasesTest.java | 4 --- .../temp/project/DatabaseGoodCasesTest.java | 7 ----- 8 files changed, 15 insertions(+), 26 deletions(-) rename resources/sql/{deleteTaskTable.sql => DeleteTaskTable.sql} (100%) rename resources/sql/{insertTaskTable.sql => InsertTaskTable.sql} (100%) rename resources/sql/{insertWorkerTable.sql => InsertWorkerTable.sql} (100%) rename resources/sql/{selectTaskTable.sql => SelectTaskTable.sql} (100%) rename resources/sql/{updateTaskTable.sql => UpdateTaskTable.sql} (100%) diff --git a/resources/sql/deleteTaskTable.sql b/resources/sql/DeleteTaskTable.sql similarity index 100% rename from resources/sql/deleteTaskTable.sql rename to resources/sql/DeleteTaskTable.sql diff --git a/resources/sql/insertTaskTable.sql b/resources/sql/InsertTaskTable.sql similarity index 100% rename from resources/sql/insertTaskTable.sql rename to resources/sql/InsertTaskTable.sql diff --git a/resources/sql/insertWorkerTable.sql b/resources/sql/InsertWorkerTable.sql similarity index 100% rename from resources/sql/insertWorkerTable.sql rename to resources/sql/InsertWorkerTable.sql diff --git a/resources/sql/selectTaskTable.sql b/resources/sql/SelectTaskTable.sql similarity index 100% rename from resources/sql/selectTaskTable.sql rename to resources/sql/SelectTaskTable.sql diff --git a/resources/sql/updateTaskTable.sql b/resources/sql/UpdateTaskTable.sql similarity index 100% rename from resources/sql/updateTaskTable.sql rename to resources/sql/UpdateTaskTable.sql diff --git a/src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java b/src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java index 4b364c49..ea7dc34e 100644 --- a/src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java +++ b/src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java @@ -19,14 +19,14 @@ public class SimpleDatabaseManager implements DatabaseManager { private final static Path SELECT_TASK = Path.of("resources/sql/SelectTaskTable.sql"); private final static Path UPDATE_TASK = Path.of("resources/sql/UpdateTaskTable.sql"); private final static Path COUNT_ALL_TASK = Path.of("resources/sql/CountAllFieldsTask.sql"); - private final static Path SELECT_ALL_TASK = Path.of("resources/sql/SelectAllFieldsTask.sql"); + private final static Path SELECT_ALL_TASK = Path.of("resources/sql/SelectAllTask.sql"); private final static Path SELECT_TASK_BY_ID = Path.of("resources/sql/SelectTaskById.sql"); private final static Path INSERT_WORKER = Path.of("resources/sql/InsertWorkerTable.sql"); private final static Path DELETE_WORKER = Path.of("resources/sql/DeleteWorkerTable.sql"); private final static Path SELECT_WORKER = Path.of("resources/sql/SelectWorkerTable.sql"); private final static Path UPDATE_WORKER = Path.of("resources/sql/UpdateWorkerTable.sql"); private final static Path COUNT_ALL_WORKER = Path.of("resources/sql/CountAllFieldsWorker.sql"); - private final static Path SELECT_ALL_WORKER = Path.of("resources/sql/SelectAllFieldsWorker.sql"); + private final static Path SELECT_ALL_WORKER = Path.of("resources/sql/SelectAllWorker.sql"); private final static Path SELECT_WORKER_BY_ID = Path.of("resources/sql/SelectWorkerById.sql"); public enum QueryMode { @@ -46,7 +46,7 @@ public class SimpleDatabaseManager implements DatabaseManager { SELECT_WORKER_BY_ID, } - public String loadFile(QueryMode queryMode) throws IOException { + private String loadFile(QueryMode queryMode) throws IOException { switch (queryMode) { case INSERT_TASK -> { return Files.readString(INSERT_TASK); @@ -110,7 +110,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.INSERT_TASK); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -136,7 +136,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.INSERT_WORKER); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -159,7 +159,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.UPDATE_TASK); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -177,7 +177,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.UPDATE_WORKER); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -194,7 +194,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.DELETE_TASK); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -209,7 +209,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.DELETE_WORKER); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return; } try (PreparedStatement preparedStatement = connection.prepareStatement(query);) { @@ -224,7 +224,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.SELECT_ALL_TASK); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return null; } @@ -257,7 +257,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.SELECT_ALL_WORKER); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return null; } @@ -286,7 +286,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.SELECT_TASK_BY_ID); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return null; } @@ -320,7 +320,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.SELECT_WORKER_BY_ID); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return null; } @@ -350,7 +350,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.COUNT_ALL_TASK); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return -1; } try (Statement statement = connection.createStatement(); @@ -370,7 +370,7 @@ public class SimpleDatabaseManager implements DatabaseManager { try { query = loadFile(QueryMode.COUNT_ALL_WORKER); } catch (IOException e) { - System.err.println(e.getStackTrace()); + e.printStackTrace(); return -1; } try (Statement statement = connection.createStatement(); diff --git a/test/hhn/temp/project/DatabaseBadCasesTest.java b/test/hhn/temp/project/DatabaseBadCasesTest.java index bda06a3f..a2654836 100644 --- a/test/hhn/temp/project/DatabaseBadCasesTest.java +++ b/test/hhn/temp/project/DatabaseBadCasesTest.java @@ -5,12 +5,8 @@ import hhn.temp.project.provider.SimpleDatabaseManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; - -import java.io.IOException; import java.sql.SQLException; -import static org.junit.jupiter.api.Assertions.*; - public class DatabaseBadCasesTest { private DatabaseManager databaseManager; diff --git a/test/hhn/temp/project/DatabaseGoodCasesTest.java b/test/hhn/temp/project/DatabaseGoodCasesTest.java index 88a214fb..4ccf289c 100644 --- a/test/hhn/temp/project/DatabaseGoodCasesTest.java +++ b/test/hhn/temp/project/DatabaseGoodCasesTest.java @@ -7,8 +7,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; -import java.io.IOException; -import java.net.URISyntaxException; import java.sql.SQLException; import java.util.Collection; import java.util.List; @@ -82,9 +80,4 @@ public class DatabaseGoodCasesTest { assertEquals(0, databaseManager.getTotalNumberOfTasks()); assertEquals(0, databaseManager.getTotalNumberOfWorkers()); } - - @Test - public void testRandom() throws IOException, URISyntaxException { - System.out.println(databaseManager.loadFile(SimpleDatabaseManager.QueryMode.INSERT_TASK)); - } } \ No newline at end of file