refactored the database connector to use the properties files

safarifox · May 23, 2015 · 5538e28 · 5538e28
1 parent 5437e3a
commit 5538e28
Show file tree

Hide file tree

Showing 21 changed files with 58 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,6 +23,8 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.8.6</version>
         </dependency>
+
+        <!-- itext dependencies-->
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
@@ -69,5 +71,11 @@
             <version>4.3</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/...va/lk/score/androphsy/main/ConnectDb.java → ...k/score/androphsy/database/ConnectDb.java b/...va/lk/score/androphsy/main/ConnectDb.java → ...k/score/androphsy/database/ConnectDb.java
@@ -1,4 +1,4 @@
-package lk.score.androphsy.main;// Copyright 2015 Indeewari Akarawita
+package lk.score.androphsy.database;// Copyright 2015 Indeewari Akarawita
 //
 // This file is a part of ANDROPHSY
 //
@@ -15,6 +15,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import lk.score.androphsy.exceptions.PropertyNotDefinedException;
+import lk.score.androphsy.util.AndrophsyConstants;
+import lk.score.androphsy.util.AndrophsyProperties;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -25,14 +29,20 @@
  * @author indeewari
  *
  */
+//FIXME This class must be using the singleton pattern
 public class ConnectDb {
-	private String userName = "root";
-	private String password = "dan";
-	private String url = "jdbc:mysql://localhost:3306/";
-	private String dbName = "Androspydb";
-	private String driver = "com.mysql.jdbc.Driver";
+	private String userName;
+	private String password;
+	private String url;
+	private String dbName;
+	private String driver;
+
+	private AndrophsyProperties androphsyProperties;
 
 	public Connection getConnection() {
+
+		androphsyProperties = new AndrophsyProperties();
+
 		Connection con = null;
 		Properties conProperties = new Properties();
 		conProperties.setProperty("user", userName);
@@ -53,14 +63,25 @@ public Connection getConnection() {
 		return con;
 	}
 
+	private void init() {
+		try {
+			userName = androphsyProperties.getProperty(AndrophsyConstants.DATABASE_USERNAME);
+			password = androphsyProperties.getProperty(AndrophsyConstants.DATABASE_PASSWORD);
+			dbName = androphsyProperties.getProperty(AndrophsyConstants.DATABASE_NAME);
+			driver = androphsyProperties.getProperty(AndrophsyConstants.DATABASE_DRIVER);
+			url = androphsyProperties.getProperty(AndrophsyConstants.DATABASE_URL);
+
+		} catch (PropertyNotDefinedException e) {
+			e.printStackTrace();
+		}
+	}
 	public void UpdateTable(String query) {
 		ConnectDb condb = new ConnectDb();
 		Connection con = condb.getConnection();
 		try {
 			Statement stmt = con.createStatement();
 			int count = stmt.executeUpdate(query);
 		} catch (SQLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}

diff --git a/src/main/java/lk/score/androphsy/main/AdbExecCmd.java b/src/main/java/lk/score/androphsy/main/AdbExecCmd.java
@@ -37,6 +37,8 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;

diff --git a/src/main/java/lk/score/androphsy/main/AddDevice.java b/src/main/java/lk/score/androphsy/main/AddDevice.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jface.wizard.WizardPage;

diff --git a/src/main/java/lk/score/androphsy/main/AndrospyLog.java b/src/main/java/lk/score/androphsy/main/AndrospyLog.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.layout.GridLayout;

diff --git a/src/main/java/lk/score/androphsy/main/AndrospyUtility.java b/src/main/java/lk/score/androphsy/main/AndrospyUtility.java
@@ -26,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
+
+import lk.score.androphsy.database.ConnectDb;
 import org.json.JSONException;
 import org.json.JSONObject;
 

diff --git a/src/main/java/lk/score/androphsy/main/AppAnalysis.java b/src/main/java/lk/score/androphsy/main/AppAnalysis.java
@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

diff --git a/src/main/java/lk/score/androphsy/main/BasicInfo.java b/src/main/java/lk/score/androphsy/main/BasicInfo.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.SWT;

diff --git a/src/main/java/lk/score/androphsy/main/CaseManagement.java b/src/main/java/lk/score/androphsy/main/CaseManagement.java
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;

diff --git a/src/main/java/lk/score/androphsy/main/CaseTransfer.java b/src/main/java/lk/score/androphsy/main/CaseTransfer.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;

diff --git a/src/main/java/lk/score/androphsy/main/CreateCase.java b/src/main/java/lk/score/androphsy/main/CreateCase.java
@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;

diff --git a/src/main/java/lk/score/androphsy/main/DataExtract.java b/src/main/java/lk/score/androphsy/main/DataExtract.java
@@ -32,6 +32,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.SWT;

diff --git a/src/main/java/lk/score/androphsy/main/Login.java b/src/main/java/lk/score/androphsy/main/Login.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.MessageBox;

diff --git a/src/main/java/lk/score/androphsy/main/NewCase.java b/src/main/java/lk/score/androphsy/main/NewCase.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.zip.GZIPOutputStream;
 
+import lk.score.androphsy.database.ConnectDb;
 import lk.score.androphsy.report.ReportGUITop;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;

diff --git a/src/main/java/lk/score/androphsy/main/NoneVolCollection.java b/src/main/java/lk/score/androphsy/main/NoneVolCollection.java
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;

diff --git a/src/main/java/lk/score/androphsy/main/PresentationUtil.java b/src/main/java/lk/score/androphsy/main/PresentationUtil.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import lk.score.androphsy.database.ConnectDb;
 import lk.score.androphsy.report.ReportPdf;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;

diff --git a/src/main/java/lk/score/androphsy/main/RegisterUsers.java b/src/main/java/lk/score/androphsy/main/RegisterUsers.java
@@ -27,6 +27,7 @@
 
 import javax.imageio.ImageIO;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.SWT;

diff --git a/src/main/java/lk/score/androphsy/main/Search.java b/src/main/java/lk/score/androphsy/main/Search.java
@@ -19,6 +19,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Text;

diff --git a/src/main/java/lk/score/androphsy/main/TimeLineDummy.java b/src/main/java/lk/score/androphsy/main/TimeLineDummy.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.layout.GridLayout;

diff --git a/src/main/java/lk/score/androphsy/main/UserManagement.java b/src/main/java/lk/score/androphsy/main/UserManagement.java
@@ -21,6 +21,7 @@
 import java.sql.Statement;
 import java.text.SimpleDateFormat;
 
+import lk.score.androphsy.database.ConnectDb;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;

diff --git a/src/main/java/lk/score/androphsy/report/ReportPdf.java b/src/main/java/lk/score/androphsy/report/ReportPdf.java
@@ -46,6 +46,7 @@
 import com.itextpdf.text.pdf.PdfTemplate;
 import com.itextpdf.text.pdf.PdfWriter;
 
+import lk.score.androphsy.database.ConnectDb;
 import lk.score.androphsy.main.*;
 
 /**