From 2b413d5538dd041b16de7ed96b836ef77fc4002b Mon Sep 17 00:00:00 2001
From: Nicholas Caughey <ncaughey@redhat.com>
Date: Fri, 14 Apr 2023 15:51:17 +0100
Subject: [PATCH] fixing the DB connection string

---
 src/main/java/constants/PSGQL.java |  6 +++---
 src/main/java/dto/ConnectDB.java   | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/constants/PSGQL.java b/src/main/java/constants/PSGQL.java
index 7172bc1..8be8bfa 100644
--- a/src/main/java/constants/PSGQL.java
+++ b/src/main/java/constants/PSGQL.java
@@ -1,7 +1,7 @@
 package constants;
 
 public class PSGQL {
-    public final String url = "jdbc:postgresql://localhost:5432/ScanDB";
-    public final String user = "ncaughey";
-    public final String password = "";
+    public static final String url = "jdbc:postgresql://localhost:5432/ScanDB";
+    public static final String user = "ncaughey";
+    public static final String password = "";
 }
\ No newline at end of file
diff --git a/src/main/java/dto/ConnectDB.java b/src/main/java/dto/ConnectDB.java
index f887008..cb8b084 100644
--- a/src/main/java/dto/ConnectDB.java
+++ b/src/main/java/dto/ConnectDB.java
@@ -1,19 +1,20 @@
 package dto;
 
-// import constants.PSGQL;
+import constants.PSGQL;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-public class ConnectDB{
+import static constants.PSGQL.user;
+import static constants.PSGQL.password;
+import static constants.PSGQL.url;
+
 
-    // private final String url = "jdbc:postgresql://localhost/dvdrental";
+public class ConnectDB{
+    // private final String url = "jdbc:postgresql://localhost:5432/scandb";
     // private final String user = "postgres";
-    // private final String password = "<add your password>";
-    private final String url = "jdbc:postgresql://localhost:5432/scandb";
-    private final String user = "postgres";
-    private final String password = "password";
+    // private final String password = "password";
 
     /**
      * Connect to the PostgreSQL database