fix: SQL change database call pattern

[gigi.git] / src / org / cacert / gigi / dbObjects / CertificateOwner.java

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index 2adda5ee4fea22130a37503464ad44e69c9c71c2..8ba04feece6b42e7bfb4445b761be1469208876d 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -3,7 +3,6 @@ package org.cacert.gigi.dbObjects;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 
@@ -18,9 +17,10 @@ public abstract class CertificateOwner implements IdCachable {
     }
 
     protected CertificateOwner() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `certOwners` DEFAULT VALUES");
-        ps.execute();
-        id = ps.lastInsertId();
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `certOwners` DEFAULT VALUES")) {
+            ps.execute();
+            id = ps.lastInsertId();
+        }
         myCache.put(this);
     }
 
@@ -31,18 +31,19 @@ public abstract class CertificateOwner implements IdCachable {
     public static synchronized CertificateOwner getById(int id) {
         CertificateOwner u = myCache.get(id);
         if (u == null) {
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT *, `users`.`id` AS uid, `organisations`.`id` AS oid FROM `certOwners` LEFT JOIN `users` ON `users`.`id`=`certOwners`.`id` LEFT JOIN `organisations` ON `organisations`.`id` = `certOwners`.`id` WHERE `certOwners`.`id`=? AND `deleted` is null");
-            ps.setInt(1, id);
-            try (GigiResultSet rs = ps.executeQuery()) {
-                if ( !rs.next()) {
-                    return null;
-                }
-                if (rs.getString("uid") != null) {
-                    myCache.put(u = new User(rs));
-                } else if (rs.getString("oid") != null) {
-                    myCache.put(u = new Organisation(rs));
-                } else {
-                    System.err.print("Malformed cert owner: " + id);
+            try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT *, `users`.`id` AS uid, `organisations`.`id` AS oid FROM `certOwners` LEFT JOIN `users` ON `users`.`id`=`certOwners`.`id` LEFT JOIN `organisations` ON `organisations`.`id` = `certOwners`.`id` WHERE `certOwners`.`id`=? AND `deleted` is null")) {
+                ps.setInt(1, id);
+                try (GigiResultSet rs = ps.executeQuery()) {
+                    if ( !rs.next()) {
+                        return null;
+                    }
+                    if (rs.getString("uid") != null) {
+                        myCache.put(u = new User(rs));
+                    } else if (rs.getString("oid") != null) {
+                        myCache.put(u = new Organisation(rs));
+                    } else {
+                        System.err.print("Malformed cert owner: " + id);
+                    }
                 }
             }
         }
@@ -50,30 +51,26 @@ public abstract class CertificateOwner implements IdCachable {
     }
 
     public Domain[] getDomains() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `id` FROM `domains` WHERE `memid`=? AND `deleted` IS NULL");
-        ps.setInt(1, getId());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `memid`=? AND `deleted` IS NULL")) {
+            ps.setInt(1, getId());
 
-        try (GigiResultSet rs = ps.executeQuery()) {
-            LinkedList<Domain> data = new LinkedList<Domain>();
+            try (GigiResultSet rs = ps.executeQuery()) {
+                LinkedList<Domain> data = new LinkedList<Domain>();
 
-            while (rs.next()) {
-                data.add(Domain.getById(rs.getInt(1)));
-            }
+                while (rs.next()) {
+                    data.add(Domain.getById(rs.getInt(1)));
+                }
 
-            return data.toArray(new Domain[0]);
+                return data.toArray(new Domain[0]);
+            }
         }
     }
 
     public Certificate[] getCertificates(boolean includeRevoked) {
-        GigiPreparedStatement ps;
-        if (includeRevoked) {
-            ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=?");
-        } else {
-            ps = DatabaseConnection.getInstance().prepare("SELECT id FROM certs WHERE memid=? AND revoked IS NULL");
-        }
-        ps.setInt(1, getId());
+        try (GigiPreparedStatement ps = new GigiPreparedStatement(includeRevoked ? "SELECT id FROM certs WHERE memid=?" : "SELECT id FROM certs WHERE memid=? AND revoked IS NULL")) {
+            ps.setInt(1, getId());
 
-        try (GigiResultSet rs = ps.executeQuery()) {
+            GigiResultSet rs = ps.executeQuery();
             LinkedList<Certificate> data = new LinkedList<Certificate>();
 
             while (rs.next()) {
@@ -98,32 +95,34 @@ public abstract class CertificateOwner implements IdCachable {
     public abstract boolean isValidEmail(String email);
 
     public void delete() {
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `certOwners` SET `deleted`=NOW() WHERE `id`=?");
-        ps.setInt(1, getId());
-        ps.execute();
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `certOwners` SET `deleted`=NOW() WHERE `id`=?")) {
+            ps.setInt(1, getId());
+            ps.execute();
+        }
         myCache.remove(this);
     }
 
     public String[] getAdminLog() {
-        GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `when`, type, information FROM `adminLog` WHERE uid=? ORDER BY `when` ASC");
-        prep.setInt(1, getId());
-        GigiResultSet res = prep.executeQuery();
-        List<String> entries = new LinkedList<String>();
+        try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `when`, type, information FROM `adminLog` WHERE uid=? ORDER BY `when` ASC")) {
+            prep.setInt(1, getId());
+            GigiResultSet res = prep.executeQuery();
+            List<String> entries = new LinkedList<String>();
 
-        while (res.next()) {
-            entries.add(res.getString(2) + " (" + res.getString(3) + ")");
+            while (res.next()) {
+                entries.add(res.getString(2) + " (" + res.getString(3) + ")");
+            }
+            return entries.toArray(new String[0]);
         }
-
-        return entries.toArray(new String[0]);
     }
 
     public static CertificateOwner getByEnabledSerial(String serial) {
-        GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT `memid` FROM `certs` WHERE serial=? AND `disablelogin`='0' AND `revoked` is NULL");
-        prep.setString(1, serial.toLowerCase());
-        GigiResultSet res = prep.executeQuery();
-        if (res.next()) {
-            return getById(res.getInt(1));
+        try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `memid` FROM `certs` WHERE serial=? AND `disablelogin`='0' AND `revoked` is NULL")) {
+            prep.setString(1, serial.toLowerCase());
+            GigiResultSet res = prep.executeQuery();
+            if (res.next()) {
+                return getById(res.getInt(1));
+            }
+            return null;
         }
-        return null;
     }
 }