[Ogoglio-commits] SF.net SVN: ogoglio: [658] maven/trunk/ogoglio-common/src

[<tre...@us...>]

Revision: 658
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=658&view=rev
Author:   trevorolio
Date:     2008-01-01 13:34:46 -0800 (Tue, 01 Jan 2008)

Log Message:
-----------
WARNING: DB SCHEMA CHANGE

Added an emailValid field to account records, their XML docs, and the Java APIs.
Fixed up the existing email validation framework to update this value.
Added an email validation test to the integration test suite.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java
    maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2008-01-01 21:34:46 UTC (rev 658)
@@ -62,7 +62,7 @@
     }
 
     public AccountDocument createAccount(String username, String accountLevel, String firstName, String lastName, String homepage, String email, String password) throws IOException {
-        AccountDocument newAccountDoc = new AccountDocument(username, accountLevel, firstName, lastName, homepage, password, email, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
+        AccountDocument newAccountDoc = new AccountDocument(username, accountLevel, firstName, lastName, homepage, password, email, false, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
         try {
             XMLElement result = wire.sendAuthenticatedXML(descriptor.getAccountURI(), newAccountDoc.toString(), "POST", authenticator.getAuthCookie());
             return new AccountDocument(result);

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java	2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/AccountDocument.java	2008-01-01 21:34:46 UTC (rev 658)
@@ -59,9 +59,11 @@
 
     public static final String TEXT_URI = "text";
 
+    private static final String EMAIL_VALID = "emailvalid";
+
     XMLElement data = null;
 
-    public AccountDocument(String username, String accountLevel, String firstName, String lastName, String homepage, String password, String email, long creationDate, String cookie, long frozenUntil, long bodyConfigurationID, String voiceURI, String textURI) {
+    public AccountDocument(String username, String accountLevel, String firstName, String lastName, String homepage, String password, String email, boolean emailValid, long creationDate, String cookie, long frozenUntil, long bodyConfigurationID, String voiceURI, String textURI) {
         data = new XMLElement(NAME);
 
         if (username == null) {
@@ -83,6 +85,7 @@
             data.setAttribute(PASSWORD, password);
         if (email != null)
             data.setAttribute(EMAIL, email);
+        data.setAttribute(EMAIL_VALID, emailValid);
         if (cookie != null)
             data.setAttribute(COOKIE, cookie);
 
@@ -112,7 +115,7 @@
     }
 
     public AccountDocument(String username) { //used when updating the document, with absent items indicating no change
-        this(username, null, null, null, null, null, null, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
+        this(username, null, null, null, null, null, null, false, AccountDocument.NO_TIME_VALUE, null, AccountDocument.NO_TIME_VALUE, -1, null, null);
     }
 
     public XMLElement toElement() {
@@ -213,4 +216,8 @@
         }
         return getUsername().equals(((AccountDocument) obj).getUsername());
     }
+
+    public boolean isEmailValid() {
+        return data.getBooleanAttribute(EMAIL_VALID);
+    }
 }
\ No newline at end of file

Modified: maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java
===================================================================
--- maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java	2007-12-31 23:16:03 UTC (rev 657)
+++ maven/trunk/ogoglio-common/src/test/java/com/ogoglio/xml/test/XMLTest.java	2008-01-01 21:34:46 UTC (rev 658)
@@ -87,7 +87,7 @@
     }
 
     public void testAccountDocument() {
-        AccountDocument doc1 = new AccountDocument(username1, accountLevel1, firstName1, lastName1, company1, password1, email1, creationDate1, cookie1, frozenUntil1, 1, "skype:echo1234", "aim:echo");
+        AccountDocument doc1 = new AccountDocument(username1, accountLevel1, firstName1, lastName1, company1, password1, email1, false, creationDate1, cookie1, frozenUntil1, 1, "skype:echo1234", "aim:echo");
         XMLElement element = new XMLElement();
         element.parseString(doc1.toString());
         AccountDocument doc2 = new AccountDocument(element);
@@ -99,6 +99,7 @@
         assertEquals(doc1.getCookie(), doc2.getCookie());
         assertEquals(doc1.getCreationDate(), doc2.getCreationDate());
         assertEquals(doc1.getEmail(), doc2.getEmail());
+        assertEquals(doc1.isEmailValid(), doc2.isEmailValid());
         assertEquals(doc1.getFirstName(), doc2.getFirstName());
         assertEquals(doc1.getFrozenUntil(), doc2.getFrozenUntil());
         assertEquals(doc1.getLastName(), doc2.getLastName());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.