From 1d057156be86d33103ba894cff1458624c86cb32 Mon Sep 17 00:00:00 2001
From: joeappleton18 <joeappleton18@gmail.com>
Date: Fri, 1 Mar 2024 09:01:59 +0000
Subject: [PATCH] finished exercise-2-2-solution

---
 src/main/java/com/yatl/Main.java       | 39 +++++++++++---------------
 src/main/java/com/yatl/model/Todo.java |  1 -
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/yatl/Main.java b/src/main/java/com/yatl/Main.java
index 1c2ca50..1bc801b 100644
--- a/src/main/java/com/yatl/Main.java
+++ b/src/main/java/com/yatl/Main.java
@@ -1,5 +1,5 @@
 package com.yatl;
-import java.net.URL;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,44 +7,39 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.yatl.util.Database;
 import com.yatl.model.Todo;
-
+import com.yatl.util.Database;
 
 public class Main {
-	
+
 	static List<Todo> todos = new ArrayList<>();
- 
+
 	public static void main(String[] args) {
-	
-		URL resourceFolderUrl = Main.class.getClassLoader().getResource("");
-		String databasePath = resourceFolderUrl.getPath() + "database.db";
+
+		String databasePath = "src/main/resources/database.db";
 		String url = "jdbc:sqlite:" + databasePath;
-		
-		Database db = Database.getInstance(url);
-		Connection conn = db.getConnection();
+		Database database = Database.getInstance(url);
+		Connection conn = database.getConnection();
 		Statement stmt;
 		try {
 			stmt = conn.createStatement();
 			ResultSet rs = stmt.executeQuery("SELECT * FROM todos");
 			while (rs.next()) {
+
 				todos.add(new Todo(rs.getInt("id"), rs.getString("title"), rs.getBoolean("completed")));
+
 			}
-			
-			for(Todo todo: todos) {
-				
-				System.out.println(todo.toString()); 
-				
+
+			for (Todo todo : todos) {
+
+				System.out.println(todo.toString());
+
 			}
-			
-			
-			
 		} catch (SQLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
-		
+
 	}
-	
+
 }
diff --git a/src/main/java/com/yatl/model/Todo.java b/src/main/java/com/yatl/model/Todo.java
index b3ab63d..195ed7e 100644
--- a/src/main/java/com/yatl/model/Todo.java
+++ b/src/main/java/com/yatl/model/Todo.java
@@ -9,7 +9,6 @@ public class Todo {
 	
 	
 	public Todo(int id, String title, boolean done) {
-		super();
 		this.id = id;
 		this.title = title;
 		this.done = done;
-- 
GitLab