Move the "dbObject"s to their own package.

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

diff --git a/src/org/cacert/gigi/EmailAddress.java b/src/org/cacert/gigi/EmailAddress.java
deleted file mode 100644 (file)
index 07ebfcc..0000000
--- a/src/org/cacert/gigi/EmailAddress.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.cacert.gigi;
-
-import java.io.IOException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.email.EmailProvider;
-import org.cacert.gigi.email.MailProbe;
-import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.util.RandomToken;
-
-public class EmailAddress implements IdCachable {
-
-    private String address;
-
-    private int id;
-
-    private User owner;
-
-    private String hash = null;
-
-    private EmailAddress(int id) throws SQLException {
-        PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT memid, email, hash FROM `emails` WHERE id=? AND deleted=0");
-        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));
-        address = rs.getString(2);
-        hash = rs.getString(3);
-        rs.close();
-    }
-
-    public EmailAddress(String address, User owner) {
-        if ( !EmailProvider.MAIL.matcher(address).matches()) {
-            throw new IllegalArgumentException("Invalid email.");
-        }
-        this.address = address;
-        this.owner = owner;
-        this.hash = RandomToken.generateToken(16);
-    }
-
-    public void insert(Language l) {
-        if (id != 0) {
-            throw new IllegalStateException("already inserted.");
-        }
-        try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `emails` SET memid=?, hash=?, email=?");
-            ps.setInt(1, owner.getId());
-            ps.setString(2, hash);
-            ps.setString(3, address);
-            synchronized (EmailAddress.class) {
-                ps.execute();
-                id = DatabaseConnection.lastInsertId(ps);
-                myCache.put(this);
-            }
-            MailProbe.sendMailProbe(l, "email", id, hash, address);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public synchronized void verify(String hash) throws GigiApiException {
-        if (this.hash.equals(hash)) {
-
-            try {
-                PreparedStatement ps = DatabaseConnection.getInstance().prepare("UPDATE `emails` SET hash='' WHERE id=?");
-                ps.setInt(1, id);
-                ps.execute();
-                hash = "";
-
-                // Verify user with that primary email
-                PreparedStatement ps2 = DatabaseConnection.getInstance().prepare("update `users` set `verified`='1' where `id`=? and `email`=? and `verified`='0'");
-                ps2.setInt(1, owner.getId());
-                ps2.setString(2, address);
-                ps2.execute();
-                this.hash = "";
-            } catch (SQLException e) {
-                throw new GigiApiException(e);
-            }
-
-        } else {
-            throw new GigiApiException("Email verification hash is invalid.");
-        }
-    }
-
-    public boolean isVerified() {
-        return hash.isEmpty();
-    }
-
-    private static ObjectCache<EmailAddress> myCache = new ObjectCache<>();
-
-    public static EmailAddress getById(int id) throws IllegalArgumentException {
-        EmailAddress em = myCache.get(id);
-        if (em == null) {
-            try {
-                synchronized (EmailAddress.class) {
-                    myCache.put(em = new EmailAddress(id));
-                }
-            } catch (SQLException e1) {
-                throw new IllegalArgumentException(e1);
-            }
-        }
-        return em;
-    }
-}