FIX: Cleanup fields

[gigi.git] / src / org / cacert / gigi / Domain.java

diff --git a/src/org/cacert/gigi/Domain.java b/src/org/cacert/gigi/Domain.java
index 2aca793e9b1d2988c9826133113b5c3fa31553ad..538081d8d37143f3e924c2579d57162894d9996c 100644 (file)
--- a/src/org/cacert/gigi/Domain.java
+++ b/src/org/cacert/gigi/Domain.java
@@ -7,104 +7,101 @@ import java.sql.SQLException;
 import org.cacert.gigi.database.DatabaseConnection;
 
 public class Domain {
-       User owner;
-       String suffix;
-       int id;
-
-       public Domain(int id) throws SQLException {
-               PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-                       "SELECT memid, domain FROM `domain` WHERE id=? AND deleted IS NULL");
-               ps.setInt(1, id);
-
-               ResultSet rs = ps.executeQuery();
-               if (!rs.next()) {
-                       throw new IllegalArgumentException("Invalid email id " + id);
-               }
-               this.id = id;
-               owner = User.getById(rs.getInt(1));
-               suffix = rs.getString(2);
-               rs.close();
-       }
-
-       public Domain(User owner, String suffix) throws GigiApiException {
-               this.owner = owner;
-               this.suffix = suffix;
-
-       }
-
-       private static void checkInsert(String suffix) throws GigiApiException {
-               try {
-                       PreparedStatement ps = DatabaseConnection
-                               .getInstance()
-                               .prepare(
-                                       "SELECT 1 FROM `domain` WHERE (domain=RIGHT(?,LENGTH(domain))  OR RIGHT(domain,LENGTH(?))=?) AND deleted IS NULL");
-                       ps.setString(1, suffix);
-                       ps.setString(2, suffix);
-                       ps.setString(3, suffix);
-                       ResultSet rs = ps.executeQuery();
-                       boolean existed = rs.next();
-                       rs.close();
-                       if (existed) {
-                               throw new GigiApiException("Domain could not be inserted. Domain is already valid.");
-                       }
-               } catch (SQLException e) {
-                       throw new GigiApiException(e);
-               }
-       }
-
-       public void insert() throws GigiApiException {
-               if (id != 0) {
-                       throw new GigiApiException("already inserted.");
-               }
-               synchronized (Domain.class) {
-                       checkInsert(suffix);
-                       try {
-                               PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-                                       "INSERT INTO `domain` SET memid=?, domain=?");
-                               ps.setInt(1, owner.getId());
-                               ps.setString(2, suffix);
-                               ps.execute();
-                               id = DatabaseConnection.lastInsertId(ps);
-                       } catch (SQLException e) {
-                               throw new GigiApiException(e);
-                       }
-               }
-       }
-
-       public void delete() throws GigiApiException {
-               if (id == 0) {
-                       throw new GigiApiException("not inserted.");
-               }
-               try {
-                       PreparedStatement ps = DatabaseConnection.getInstance().prepare(
-                               "UPDATE `domain` SET deleted=CURRENT_TIMESTAMP WHERE id=?");
-                       ps.setInt(1, id);
-                       ps.execute();
-               } catch (SQLException e) {
-                       throw new GigiApiException(e);
-               }
-       }
-
-       public User getOwner() {
-               return owner;
-       }
-
-       public int getId() {
-               return id;
-       }
-
-       public String getSuffix() {
-               return suffix;
-       }
-
-       public static Domain getById(int id) throws IllegalArgumentException {
-               // TODO cache
-               try {
-                       Domain e = new Domain(id);
-                       return e;
-               } catch (SQLException e) {
-                       throw new IllegalArgumentException(e);
-               }
-       }
+
+    private User owner;
+
+    private String suffix;
+
+    private int id;
+
+    public Domain(int id) throws SQLException {
+        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, domain FROM `domains` WHERE id=? AND deleted IS NULL");
+        ps.setInt(1, id);
+
+        ResultSet rs = ps.executeQuery();
+        if ( !rs.next()) {
+            throw new IllegalArgumentException("Invalid email id " + id);
+        }
+        this.id = id;
+        owner = User.getById(rs.getInt(1));
+        suffix = rs.getString(2);
+        rs.close();
+    }
+
+    public Domain(User owner, String suffix) throws GigiApiException {
+        this.owner = owner;
+        this.suffix = suffix;
+
+    }
+
+    private static void checkInsert(String suffix) throws GigiApiException {
+        try {
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT 1 FROM `domains` WHERE (domain=RIGHT(?,LENGTH(domain))  OR RIGHT(domain,LENGTH(?))=?) AND deleted IS NULL");
+            ps.setString(1, suffix);
+            ps.setString(2, suffix);
+            ps.setString(3, suffix);
+            ResultSet rs = ps.executeQuery();
+            boolean existed = rs.next();
+            rs.close();
+            if (existed) {
+                throw new GigiApiException("Domain could not be inserted. Domain is already valid.");
+            }
+        } catch (SQLException e) {
+            throw new GigiApiException(e);
+        }
+    }
+
+    public void insert() throws GigiApiException {
+        if (id != 0) {
+            throw new GigiApiException("already inserted.");
+        }
+        synchronized (Domain.class) {
+            checkInsert(suffix);
+            try {
+                PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `domains` SET memid=?, domain=?");
+                ps.setInt(1, owner.getId());
+                ps.setString(2, suffix);
+                ps.execute();
+                id = DatabaseConnection.lastInsertId(ps);
+            } catch (SQLException e) {
+                throw new GigiApiException(e);
+            }
+        }
+    }
+
+    public void delete() throws GigiApiException {
+        if (id == 0) {
+            throw new GigiApiException("not inserted.");
+        }
+        try {
+            PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `domains` SET deleted=CURRENT_TIMESTAMP WHERE id=?");
+            ps.setInt(1, id);
+            ps.execute();
+        } catch (SQLException e) {
+            throw new GigiApiException(e);
+        }
+    }
+
+    public User getOwner() {
+        return owner;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public static Domain getById(int id) throws IllegalArgumentException {
+        // TODO cache
+        try {
+            Domain e = new Domain(id);
+            return e;
+        } catch (SQLException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
 
 }