- Added lastModified attribute to FolderItems.

pborissow · pborissow · commit c03f29fdfb6d · 2011-10-01T14:28:19.000Z
- Refactored getItems method in the Folder class (getItems is a now non-static method).
 - Moved getItem method from the Folder class to the FolderItem constructor.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-exchange@134 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/exchange/Contact.java b/src/javaxt/exchange/Contact.java
@@ -75,7 +75,13 @@ protected Contact(){}
    *  effectively creating a clone.
    */
     public Contact(javaxt.exchange.Contact contact){
+
+      //General information
         this.id = contact.id;
+        this.updates = contact.updates;
+        this.lastModified = contact.lastModified;
+
+      //Contact specific information
         this.firstName = contact.firstName;
         this.lastName = contact.lastName;
         this.fullName = contact.fullName;
@@ -86,7 +92,6 @@ public Contact(javaxt.exchange.Contact contact){
         this.phoneNumbers = contact.phoneNumbers;
         this.physicalAddresses = contact.physicalAddresses;
         this.birthday = contact.birthday;
-        this.updates = contact.updates;
     }
 
 
@@ -932,14 +937,9 @@ public String getTitle(){
   /**  Used to save/update a contact. Returns the Exchange ID for the item.
    */
     public String save(Connection conn) throws ExchangeException {
-
-        if (id==null){
-            return create(conn);
-        }
-        else{
-            update(conn);
-            return id;
-        }
+        if (id==null) create(conn);
+        else update(conn);
+        return id;
     }
 
 
@@ -1005,25 +1005,18 @@ private void update(Connection conn) throws ExchangeException {
 System.out.println(msg + "\r\n");
 
         updates.clear();
-//if (true) return;
 
         conn.execute(msg.toString());
-        //javaxt.http.Response response = conn.execute(msg.toString());
-
-        //String txt = response.getText();
-        //System.out.println(txt);
-
     }
 
 
 
   //**************************************************************************
   //** create
   //**************************************************************************
-  /** Used to create a new contact. Returns an id for the newly created
-   *  contact or null is there was an error.
+  /** Used to create a new contact. 
    */
-    private String create(Connection conn) throws ExchangeException {
+    private void create(Connection conn) throws ExchangeException {
 
         StringBuffer msg = new StringBuffer();        
         msg.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
@@ -1126,30 +1119,12 @@ private String create(Connection conn) throws ExchangeException {
         if (nodes!=null && nodes.getLength()>0){
             id = javaxt.xml.DOM.getAttributeValue(nodes.item(0), "Id");
         }
-        
-        return id;
+
+        if (id==null) throw new ExchangeException("Failed to parse ItemId while saving the contact.");
     }
 
 
-  //**************************************************************************
-  //** delete
-  //**************************************************************************
-  /** Used to delete a contact.
-   */
-    public void delete(Connection conn) throws ExchangeException {
-        String msg =
-        "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-        + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\" xmlns:m=\"http://schemas.microsoft.com/exchange/services/2006/messages\">"
-        //+ "<soap:Header><t:RequestServerVersion Version=\"Exchange2007_SP1\"/></soap:Header>"
-        + "<soap:Body>"
-        + "<m:DeleteItem DeleteType=\"MoveToDeletedItems\">"
-        + "<m:ItemIds>"
-        + "<t:ItemId Id=\"" + id + "\"/></m:ItemIds>" //ChangeKey=\"EQAAABYAAAA9IPsqEJarRJBDywM9WmXKAAV+D0Dq\"
-        + "</m:DeleteItem>"
-        + "</soap:Body>"
-        + "</soap:Envelope>";
-        conn.execute(msg);
-    }
+
 
 
     public String toString(){
diff --git a/src/javaxt/exchange/ContactsFolder.java b/src/javaxt/exchange/ContactsFolder.java
@@ -47,7 +47,7 @@ public Contact[] getContacts() throws ExchangeException {
     public Contact[] getContacts(int numEntries, int offset) throws ExchangeException {
 
         java.util.ArrayList<Contact> contacts = new java.util.ArrayList<Contact>();
-        org.w3c.dom.NodeList nodes = getItems(conn, numEntries, offset).getElementsByTagName("t:Contact");
+        org.w3c.dom.NodeList nodes = getItems(numEntries, offset).getElementsByTagName("t:Contact");
         //org.w3c.dom.NodeList nodes = new javaxt.io.File("/temp/exchange-findItem.xml").getXML().getElementsByTagName("t:Contact");
 
         int numRecordsReturned = 0;
diff --git a/src/javaxt/exchange/Folder.java b/src/javaxt/exchange/Folder.java
@@ -11,8 +11,9 @@
 public class Folder {
 
     private String id;
-    private String changeKey;
-    private Integer count;
+    private Connection conn;
+    //private String changeKey;
+    //private Integer count;
 
     protected Folder(){}
 
@@ -25,78 +26,100 @@ protected Folder(){}
    */
     public Folder(String folderName, Connection conn) throws ExchangeException {
 
-        folderName = getDistinguishedFolderId(folderName);
+        this.conn = conn;
+
+        String folderID = getDistinguishedFolderId(folderName);
+        if (folderID==null) folderID = folderName;
 
         String msg =
         "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
         + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\">"
         + "<soap:Body>"
         + "<GetFolder xmlns=\"http://schemas.microsoft.com/exchange/services/2006/messages\" xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\">"
         + "<FolderShape><t:BaseShape>Default</t:BaseShape></FolderShape>"
-        + "<FolderIds><t:DistinguishedFolderId Id=\"" + folderName + "\"/></FolderIds></GetFolder>"
+
+        
+        //This returns the LastModifiedTime for the folder. Unfortunately, this
+        //does not reflect changes made to items in this folder
+        /*
+        + "<FolderShape>"
+                + "<t:BaseShape>Default</t:BaseShape>"
+                + "<t:AdditionalProperties>"
+                + "<t:ExtendedFieldURI PropertyTag=\"0x3008\" PropertyType=\"SystemTime\" />" 
+                + "</t:AdditionalProperties>"
+        + "</FolderShape>"
+        */
+
+
+        + "<FolderIds><t:DistinguishedFolderId Id=\"" + folderID + "\"/></FolderIds></GetFolder>"
         + "</soap:Body>"
         + "</soap:Envelope>";
-
-
-
         parseXML(conn.execute(msg));
     }
 
 
-
-  //**************************************************************************
-  //** Constructor
-  //**************************************************************************
-  /** Creates a new instance of Folder. */
-
+    /*
     public Folder(String xml) {
         this(javaxt.xml.DOM.createDocument(xml));
     }
 
     public Folder(org.w3c.dom.Document xml){
         parseXML(xml);
     }
-
+    */
 
     private void parseXML(org.w3c.dom.Document xml){
-
         org.w3c.dom.Node folderID = javaxt.xml.DOM.getElementsByTagName("FolderId", xml)[0]; //xml.getElementsByTagName("t:FolderId").item(0);
         this.id = javaxt.xml.DOM.getAttributeValue(folderID, "Id");
-        this.changeKey = javaxt.xml.DOM.getAttributeValue(folderID, "ChangeKey");
-        
-        try{
-            String count = javaxt.xml.DOM.getNodeValue(xml.getElementsByTagName("t:TotalCount").item(0));
-            this.count = javaxt.utils.string.cint(count);
-        }
-        catch(Exception e){
-        }
     }
 
-    public String getID(){
+  //**************************************************************************
+  //** getID
+  //**************************************************************************
+  /** Returns the unique Exchange ID for this folder. */
+
+    public String getExchangeID(){
         return id;
     }
 
+    /*
     public String getChangeKey(){
         return changeKey;
     }
 
     public Integer getCount(){
         return count;
     }
+    */
 
 
-    
-    protected org.w3c.dom.Document getItems(Connection conn, int maxEntries, int offset) throws ExchangeException {
+  //**************************************************************************
+  //** getItems
+  //**************************************************************************
+  /** Returns an XML document with shallow representations of items found in
+   *  this folder.
+   */
+    protected org.w3c.dom.Document getItems(int maxEntries, int offset) throws ExchangeException {
 
         String msg =
         "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
         + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\" xmlns:m=\"http://schemas.microsoft.com/exchange/services/2006/messages\">"
-        //+ "<soap:Header><t:RequestServerVersion Version=\"Exchange2007_SP1\"/></soap:Header>"
         + "<soap:Body>"
         + "<m:FindItem Traversal=\"Shallow\">"
-        + "<m:ItemShape><t:BaseShape>Default</t:BaseShape>"
+        /*
+        + "<m:ItemShape><t:BaseShape>Default</t:BaseShape>" //<--"Default" vs "AllProperties"
         + "<t:AdditionalProperties><t:FieldURI FieldURI=\"item:ItemClass\"/></t:AdditionalProperties>"
         + "</m:ItemShape>"
+        */
+        + "<m:ItemShape>"
+                + "<t:BaseShape>Default</t:BaseShape>" //<--"Default" vs "AllProperties"
+                + "<t:AdditionalProperties>"
+                + "<t:FieldURI FieldURI=\"item:ItemClass\"/>"
+                //+ "<t:FieldURI FieldURI=\"item:LastModifiedTime\"/>" //value="item:LastModifiedTime" //<--This doesn't work...
+                + "<t:ExtendedFieldURI PropertyTag=\"0x3008\" PropertyType=\"SystemTime\" />" //<--This returns the LastModifiedTime!
+                + "</t:AdditionalProperties>"
+        + "</m:ItemShape>"
+
         + "<m:IndexedPageItemView MaxEntriesReturned=\"" + maxEntries + "\" Offset=\"" + offset + "\" BasePoint=\"Beginning\"/><m:ParentFolderIds>"
         + "<t:FolderId Id=\"" + id + "\"/>"
         + "</m:ParentFolderIds>"
@@ -108,51 +131,127 @@ protected org.w3c.dom.Document getItems(Connection conn, int maxEntries, int off
     }
 
 
-    protected static org.w3c.dom.Node getItem(String itemID, Connection conn) throws ExchangeException {
+  //**************************************************************************
+  //** getIndex
+  //**************************************************************************
+  /** Returns a hashmap of all the items found in this folder. The hashmap key
+   *  is the item id and the corresponding value is the last modification date.
+   */
+    public java.util.HashMap<String, javaxt.utils.Date> getIndex() throws ExchangeException {
+
         String msg =
         "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
-        + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" "
-            + "xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\" "
-            + "xmlns:m=\"http://schemas.microsoft.com/exchange/services/2006/messages\">"
+        + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:t=\"http://schemas.microsoft.com/exchange/services/2006/types\" xmlns:m=\"http://schemas.microsoft.com/exchange/services/2006/messages\">"
         + "<soap:Body>"
-        + "<m:GetItem>"
-        + "<m:ItemShape><t:BaseShape>AllProperties</t:BaseShape></m:ItemShape>"
-        + "<m:ItemIds><t:ItemId Id=\"" + itemID + "\"/></m:ItemIds>"
-        + "</m:GetItem>"
+        + "<m:FindItem Traversal=\"Shallow\">"
+        + "<m:ItemShape>"
+                + "<t:BaseShape>IdOnly</t:BaseShape>" //<--"Default" vs "AllProperties"
+                + "<t:AdditionalProperties>"
+                + "<t:ExtendedFieldURI PropertyTag=\"0x3008\" PropertyType=\"SystemTime\" />" //<--This returns the LastModifiedTime!
+                + "</t:AdditionalProperties>"
+        + "</m:ItemShape>"
+
+        + "<m:SortOrder>"
+        + "<t:FieldOrder Order=\"Descending\">"
+            + "<t:ExtendedFieldURI PropertyTag=\"0x3008\" PropertyType=\"SystemTime\" />"
+        + "</t:FieldOrder>"
+        + "</m:SortOrder>"
+            
+        //+ "<m:IndexedPageItemView MaxEntriesReturned=\"1\" Offset=\"0\" BasePoint=\"Beginning\"/>"
+        + "<m:ParentFolderIds>"
+        + "<t:FolderId Id=\"" + id + "\"/>"
+        + "</m:ParentFolderIds>"
+        + "</m:FindItem>"
         + "</soap:Body>"
         + "</soap:Envelope>";
-        
-        //return conn.execute(msg);
+
         org.w3c.dom.Document xml = conn.execute(msg);
+        //new javaxt.io.File("/temp/exchange-sort.xml").write(xml);
+
+        java.util.HashMap<String, javaxt.utils.Date> index = new java.util.HashMap<String, javaxt.utils.Date>();
 
         org.w3c.dom.Node[] items = javaxt.xml.DOM.getElementsByTagName("Items", xml);
         if (items.length>0){
             org.w3c.dom.NodeList nodes = items[0].getChildNodes();
             for (int i=0; i<nodes.getLength(); i++){
                 org.w3c.dom.Node node = nodes.item(i);
                 if (node.getNodeType()==1){
-                    return node;
+                    FolderItem item = new FolderItem(node);
+                    index.put(item.getExchangeID(), item.getLastModifiedTime());
                 }
             }
 
-        }
+        }        
+
+        return index;
+    }
+
 
-        throw new ExchangeException("Failed to find Items");
+    protected void findItem(){
+    /*
+      <m:FindItem Traversal="Shallow"
+          xmlns:m=".../messages"
+          xmlns:t=".../types">
+          <m:ItemShape>
+            <t:BaseShape>IdOnly</t:BaseShape>
+            <t:AdditionalProperties>
+              <t:FieldURI FieldURI="item:Subject" />
+              <t:FieldURI FieldURI="calendar:CalendarItemType" />
+            </t:AdditionalProperties>
+          </m:ItemShape>
+          <m:Restriction>
+            <t:And>
+              <t:IsGreaterThan>
+                <t:FieldURI FieldURI="calendar:Start" />
+                <t:FieldURIOrConstant>
+                  <t:Constant Value="2006-10-16T00:00:00-08:00" />
+                </t:FieldURIOrConstant>
+              </t:IsGreaterThan>
+              <t:IsLessThan>
+                <t:FieldURI FieldURI="calendar:End" />
+                <t:FieldURIOrConstant>
+                  <t:Constant Value="2006-10-20T23:59:59-08:00" />
+                </t:FieldURIOrConstant>
+              </t:IsLessThan>
+            </t:And>
+          </m:Restriction>
+          <m:ParentFolderIds>
+            <t:DistinguishedFolderId Id="calendar"/>
+          </m:ParentFolderIds>
+        </m:FindItem>
+     */
     }
 
 
+  //**************************************************************************
+  //** getDistinguishedFolderIds
+  //**************************************************************************
+  /** Returns a list of Distinguished Folder IDs.
+   */
     public static String[] getDistinguishedFolderIds(){
         return DistinguishedFolderIds;
     }
 
+    
+  //**************************************************************************
+  //** getDistinguishedFolderId
+  //**************************************************************************
+  /** Returns the DistinguishedFolderID for a given folder.
+   */
     public static String getDistinguishedFolderId(String folderName){
         for (String folderID : DistinguishedFolderIds){
             if (folderID.equalsIgnoreCase(folderName)) return folderID;
         }
         return null;
     }
 
-    //http://msdn.microsoft.com/en-us/library/exchangewebservices.distinguishedfolderidnametype%28v=exchg.140%29.aspx
+    
+  //**************************************************************************
+  //** DistinguishedFolderIds
+  //**************************************************************************
+  /** Static list of Distinguished Folder IDs. Source:
+   *  http://msdn.microsoft.com/en-us/library/exchangewebservices.distinguishedfolderidnametype%28v=exchg.140%29.aspx
+   */
     private static String[] DistinguishedFolderIds = new String[]{
         "archivedeleteditems",
         "archivemsgfolderroot",
diff --git a/src/javaxt/exchange/FolderItem.java b/src/javaxt/exchange/FolderItem.java
