Changeset 1481

Timestamp:

11/20/08 08:17:53 (7 weeks ago)

Author:

marcelo

Message:

Rss/Atom syndication format refactoring

Location:

branches/dev-instedd

Files:

• org.javarosa.demo/build.properties (modified) (1 diff)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/FeedReader.java (modified) (1 diff)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/FeedWriter.java (modified) (2 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/ISyndicationFormat.java (modified) (4 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/XMLContent.java (modified) (2 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/atom/AtomSyndicationFormat.java (modified) (3 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/rss/RssSyndicationFormat.java (modified) (3 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/rms/storage/EntityContent.java (modified) (2 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/adapters/rms/storage/RmsRecordContent.java (modified) (2 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/model/IContent.java (modified) (2 diffs)
• org.mesh4j.sync/src/org/mesh4j/sync/model/NullContent.java (modified) (2 diffs)

branches/dev-instedd/org.javarosa.demo/build.properties

@@ -25 +25 @@
 #device.identifier=Palm/TungstenC
 device.identifier=Generic/DefaultColorPhone
+#device.identifier=Sony-Ericsson/P1i
 #device.identifier=Generic/MppPhone
 #device.identifier=Palm/Treo650

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/FeedReader.java

@@ -93 +93 @@
                                 if(ISyndicationFormat.SX_ELEMENT_SYNC.equals(element.getName())){
                                         sync = readSync(element);
-                                } else if(ISyndicationFormat.SX_ELEMENT_ITEM_TITLE.equals(element.getName()) || "subtitle".equals(element.getName())){
+                                } else if(this.syndicationFormat.isFeedItemTitle(element)){
                                         title = element.getText(0);
-                                } else if(ISyndicationFormat.SX_ELEMENT_ITEM_DESCRIPTION.equals(element.getName())){
+                                } else if(this.syndicationFormat.isFeedItemDescription(element)){
                                         description = element.getText(0);
-                                } else if(ISyndicationFormat.SX_ELEMENT_ITEM_LINK.equals(element.getName())){
+                                } else if(this.syndicationFormat.isFeedItemLink(element)){
                                         link = element.getText(0);
                                 } else if(!ISyndicationFormat.SX_ELEMENT_AUTHOR.equals(element.getName())){

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/FeedWriter.java

@@ -51 +51 @@
                 this.syndicationFormat.writeStartItem(writer);
                 
-                this.writeContent(writer, item.getContent());
+                this.writeContent(writer, item.getSync(), item.getContent(), this.syndicationFormat);
                 
                 String by = this.identityProvider.getAuthenticatedUser();
@@ -70 +70 @@
         }       
                 
-        private void writeContent(Writer writer, IContent content) throws Exception {
-                String xmlContent = XMLContent.normalizeContent(content);
-                if(xmlContent != null && xmlContent.trim().length() > 0){
-                        writer.write(xmlContent);
-                }
-                
-                if(content instanceof XMLContent){
-                        XMLContent contentAsXMLContent = (XMLContent) content;
-                        if(contentAsXMLContent.getTitle() != null && contentAsXMLContent.getTitle().trim().length() > 0){
-                                writer.write("<title>");
-                                writer.write(contentAsXMLContent.getTitle());
-                                writer.write("</title>");
-                        }
-                        
-                        if(contentAsXMLContent.getDescription() != null && contentAsXMLContent.getDescription().trim().length() > 0){
-                                writer.write("<description>");
-                                writer.write(contentAsXMLContent.getDescription());
-                                writer.write("</description>");
-                        }               
-                }
+        private void writeContent(Writer writer, Sync sync, IContent content, ISyndicationFormat format) throws Exception {
+                content.addToFeedPayload(writer, sync, format);
         }
 

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/ISyndicationFormat.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.feed;
 
+import java.io.IOException;
 import java.io.Writer;
 import java.util.Date;
@@ -14 +15 @@
         Element getBaseElement(Document document);
 
+        boolean isFeedItemTitle(Element element);
+        boolean isFeedItemDescription(Element element);
+        boolean isFeedItemLink(Element element);
+        
         Date parseDate(String dateAsString);
         String formatDate(Date date);
@@ -22 +27 @@
         void writeEndDocument(Writer writer) throws Exception;
         
+        void writeStartFeedItemTitle(Writer writer) throws IOException;
+        void writeEndFeedItemTitle(Writer writer) throws IOException;
+
+        void writeStartFeedItemDescription(Writer writer) throws IOException;
+        void writeEndFeedItemDescription(Writer writer) throws IOException;
+
+        void writeStartFeedItemLink(Writer writer) throws IOException;
+        void writeEndFeedItemLink(Writer writer) throws IOException;
 
         // / <summary>
@@ -62 +75 @@
         public static final String SX_ATTRIBUTE_HISTORY_WHEN = "when";
         public static final String SX_ATTRIBUTE_HISTORY_BY = "by";
-        
-        // sx:item
-        public static final String SX_ELEMENT_ITEM_TITLE = "title";
-        public static final String SX_ELEMENT_ITEM_DESCRIPTION = "description";
-        public static final String SX_ELEMENT_ITEM_LINK = "link";
-                
+                        
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/XMLContent.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.feed;
 
+import java.io.Writer;
+
 import org.mesh4j.sync.model.Content;
-import org.mesh4j.sync.model.IContent;
+import org.mesh4j.sync.model.Sync;
 
 
@@ -59 +61 @@
     }
 
-        public static String normalizeContent(IContent content) {
-                return content.getPayloadForFeed();
-        }
-        
-        public String getPayloadForFeed(){
-                return this.getPayload();
+        public void addToFeedPayload(Writer writer, Sync sync, ISyndicationFormat format) throws Exception{
+                format.writeStartFeedItemTitle(writer);
+                writer.write(this.getTitle());
+                format.writeEndFeedItemTitle(writer);
+                
+                format.writeStartFeedItemDescription(writer);
+                writer.write(this.getDescription());
+                format.writeEndFeedItemDescription(writer);
+
+                writer.write(this.getPayload());
         }
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/atom/AtomSyndicationFormat.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.feed.atom;
 
+import java.io.IOException;
 import java.io.Writer;
 import java.util.Date;
@@ -13 +14 @@
         private static final String ATOM_ELEMENT_FEED = "feed";
         private static final String ATOM_ELEMENT_ENTRY = "entry";
+        public static final String FEED_ITEM_ELEMENT_TITLE = "title";
+        public static final String FEED_ITEM_ELEMENT_DESCRIPTION = "content";
+        public static final String FEED_ITEM_ELEMENT_LINK = "link";
         public static final AtomSyndicationFormat INSTANCE = new AtomSyndicationFormat();
 
@@ -55 +59 @@
                 return "ATOM";
         }
+
+        public boolean isFeedItemDescription(Element element) {
+                return FEED_ITEM_ELEMENT_DESCRIPTION.equals(element.getName());
+        }
+
+        public boolean isFeedItemLink(Element element) {
+                return FEED_ITEM_ELEMENT_LINK.equals(element.getName());
+        }
+
+
+        public boolean isFeedItemTitle(Element element) {
+                return FEED_ITEM_ELEMENT_TITLE.equals(element.getName());
+        }
+
+        public void writeStartFeedItemDescription(Writer writer) throws IOException {
+                writer.write("<content>");
+        }
+        
+        public void writeEndFeedItemDescription(Writer writer) throws IOException {
+                writer.write("</content>");     
+        }
+
+        public void writeStartFeedItemLink(Writer writer) throws IOException {
+                writer.write("<link>");         
+        }
+
+        public void writeEndFeedItemLink(Writer writer) throws IOException {
+                writer.write("</link>");        
+        }
+        
+        public void writeStartFeedItemTitle(Writer writer) throws IOException {
+                writer.write("<title>");
+        }
+
+        public void writeEndFeedItemTitle(Writer writer) throws IOException {
+                writer.write("</title>");
+        }
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/feed/rss/RssSyndicationFormat.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.feed.rss;
 
+import java.io.IOException;
 import java.io.Writer;
 import java.util.Date;
@@ -14 +15 @@
         public static final String RSS_ELEMENT_ITEM = "item";
         public static final String RSS_ELEMENT_CHANNEL = "channel";
+        public static final String FEED_ITEM_ELEMENT_TITLE = "title";
+        public static final String FEED_ITEM_ELEMENT_DESCRIPTION = "description";
+        public static final String FEED_ITEM_ELEMENT_LINK = "link";
         public static final RssSyndicationFormat INSTANCE = new RssSyndicationFormat();
 
@@ -76 +80 @@
         }
 
+        public boolean isFeedItemDescription(Element element) {
+                return FEED_ITEM_ELEMENT_DESCRIPTION.equals(element.getName());
+        }
+
+        public boolean isFeedItemLink(Element element) {
+                return FEED_ITEM_ELEMENT_LINK.equals(element.getName());
+        }
+
+
+        public boolean isFeedItemTitle(Element element) {
+                return FEED_ITEM_ELEMENT_TITLE.equals(element.getName());
+        }
+
+        public void writeStartFeedItemDescription(Writer writer) throws IOException {
+                writer.write("<description>");
+        }
+        
+        public void writeEndFeedItemDescription(Writer writer) throws IOException {
+                writer.write("</description>"); 
+        }
+
+        public void writeStartFeedItemLink(Writer writer) throws IOException {
+                writer.write("<link>");         
+        }
+
+        public void writeEndFeedItemLink(Writer writer) throws IOException {
+                writer.write("</link>");        
+        }
+        
+        public void writeStartFeedItemTitle(Writer writer) throws IOException {
+                writer.write("<title>");
+        }
+
+        public void writeEndFeedItemTitle(Writer writer) throws IOException {
+                writer.write("</title>");
+        }
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/rms/storage/EntityContent.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.rms.storage;
 
+import java.io.Writer;
+
 import org.kxml2.kdom.Element;
+import org.mesh4j.sync.adapters.feed.ISyndicationFormat;
 import org.mesh4j.sync.model.Content;
 import org.mesh4j.sync.model.IContent;
+import org.mesh4j.sync.model.Sync;
 import org.mesh4j.sync.utils.XmlHelper;
 
@@ -77 +81 @@
         }
 
-        public String getPayloadForFeed() {
-                StringBuffer sb = new StringBuffer();
-                sb.append("<title>");
-                sb.append(this.entityName);
-                sb.append("</title>");
+        public void addToFeedPayload(Writer writer, Sync sync, ISyndicationFormat format) throws Exception{
+                format.writeStartFeedItemTitle(writer);
+                writer.write(this.entityName);
+                format.writeEndFeedItemTitle(writer);
                 
-                sb.append("<description>");
-                sb.append("Sync id: " + this.getId());
-                sb.append(" version: " + this.getVersion());
-                sb.append("</description>");
-                
-                sb.append(this.getPayload());
-                return sb.toString();
+                format.writeStartFeedItemDescription(writer);
+                writer.write("Sync id: " + this.getId() );
+                writer.write(" version: " + this.getVersion());
+                format.writeEndFeedItemDescription(writer);
+
+                writer.write(this.getPayload());
         }
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/adapters/rms/storage/RmsRecordContent.java

@@ -1 +1 @@
 package org.mesh4j.sync.adapters.rms.storage;
 
+import java.io.Writer;
+
+import org.mesh4j.sync.adapters.feed.ISyndicationFormat;
 import org.mesh4j.sync.model.IContent;
+import org.mesh4j.sync.model.Sync;
 import org.mesh4j.sync.validations.Guard;
 
@@ -90 +94 @@
         }
 
-        public String getPayloadForFeed() {
-                StringBuffer sb = new StringBuffer();
-                sb.append("<title>");
-                sb.append(this.entityName);
-                sb.append("</title>");
+        public void addToFeedPayload(Writer writer, Sync sync, ISyndicationFormat format) throws Exception{
+                format.writeStartFeedItemTitle(writer);
+                writer.write(this.entityName);
+                format.writeEndFeedItemTitle(writer);
                 
-                sb.append("<description>");
-                sb.append("Sync id: " + this.syncId);
-                sb.append(" version: " + this.getVersion());
-                sb.append("</description>");
-                
-                sb.append(this.payload);
-                return sb.toString();
+                format.writeStartFeedItemDescription(writer);
+                writer.write("Sync id: " + this.syncId );
+                writer.write(" version: " + this.getVersion());
+                format.writeEndFeedItemDescription(writer);
+
+                writer.write(this.payload);
         }
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/model/IContent.java

@@ -1 +1 @@
 package org.mesh4j.sync.model;
+
+import java.io.Writer;
+
+import org.mesh4j.sync.adapters.feed.ISyndicationFormat;
 
 public interface IContent{
@@ -11 +15 @@
         int getVersion();
 
-        String getPayloadForFeed();
-
+        void addToFeedPayload(Writer writer, Sync sync, ISyndicationFormat format) throws Exception;
 }

branches/dev-instedd/org.mesh4j.sync/src/org/mesh4j/sync/model/NullContent.java

@@ -1 +1 @@
 package org.mesh4j.sync.model;
 
+import java.io.Writer;
+
+import org.mesh4j.sync.adapters.feed.ISyndicationFormat;
 import org.mesh4j.sync.validations.Guard;
 
@@ -52 +55 @@
         }
 
-        public String getPayloadForFeed() {
-                StringBuffer sb = new StringBuffer();
-                sb.append("<title>deleted</title>");            
-                sb.append("<description>deleted</description>");
-                return sb.toString();
+        public void addToFeedPayload(Writer writer, Sync sync, ISyndicationFormat format) throws Exception{
+                format.writeStartFeedItemTitle(writer);
+                if(sync.isDeleted()){
+                        writer.write("--DELETED--");
+                } else {
+                        writer.write("--UNKNOWN--");
+                }
+                format.writeEndFeedItemTitle(writer);
+                
+                format.writeStartFeedItemDescription(writer);
+                writer.write("Id: " + this.getId() + " version: " + this.getVersion());
+                format.writeEndFeedItemDescription(writer);
         }
 }