Changeset 1685

Timestamp:

2010-08-18 07:48:38 (3 years ago)

Author:

mpo

Message:

preparing refactoring for adding feature requested in #335
marked some possible places where error detection and messaging could be enhanced

File:

• trunk/universe/kauri-template/src/main/java/org/kauriproject/template/InsertBlock.java (modified) (5 diffs)

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/InsertBlock.java

@@ -19 +19 @@
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -27 +28 @@
 import org.kauriproject.template.el.Expression;
 import org.kauriproject.template.source.Source;
+import org.kauriproject.util.io.IOUtils;
 import org.kauriproject.util.xml.XmlMediaTypeHelper;
 import org.kauriproject.xml.sax.EmbedXmlFilter;
@@ -88 +90 @@
             Source source = null;
             String valueStr = null;
+            String usedMode = "undefined";
 
             try {
@@ -98 +101 @@
                     valueStr = (String) valueExpr.evaluate(context.getTemplateContext());
                 }   
-                InputStream inputStr = (source != null ? source.getInputStream() :  new ByteArrayInputStream(valueStr.getBytes()));
-                
-                if (mode != null) {
-                    parseType = ParseType.fromMode(mode);
+
+                if (mode != null) {
+                    parseType = ParseType.fromMode(mode);  // this is silent about unknown modes
                 }
-                if (parseType == null) {
-                    parseType = ParseType.fromString(source.getMediaType());
+                if (parseType == null) { 
+                    parseType = ParseType.fromMediaType(source.getMediaType()); // this could NPE when source == null
                 }
 
-                if (ParseType.TXT == parseType) {
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(inputStr));
-                    String line = reader.readLine();
-                    while (line != null) {
-                        result.characters(line.toCharArray(), 0, line.length());
-                        line = reader.readLine();
-                    }
-                } else {
-                    // default to XML: parse with saxparser
-                    XmlConsumer consumer = new EmbedXmlFilter(result);
-                    XMLReader xmlReader = parser.getXMLReader();
-                    xmlReader.setContentHandler(consumer);
-                    xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", consumer);
-                    xmlReader.parse(new InputSource(inputStr));
-                }
-                inputStr.close();
+                usedMode = parseType.name();
+                parseType.doInsert(source, valueStr, result, parser); // this could NPE when parseType was still not found
+
             } catch (FileNotFoundException ex) {
-                throw new TemplateException("Error inserting XML from " + (sourceLocation != null ? sourceLocation : valueStr) + ": " + ex);
+                throw new TemplateException("Error inserting " + usedMode + "(mode) from " + (sourceLocation != null ? sourceLocation : valueStr) + ": " + ex);
             } catch (Exception ex) {
-                throw new TemplateException("Error parsing XML from " + (sourceLocation != null ? sourceLocation : valueStr) + ": " + ex);
+                throw new TemplateException("Error parsing " + usedMode + "(mode) from " + (sourceLocation != null ? sourceLocation : valueStr) + ": " + ex);
             } finally {
                 if (source != null) {
@@ -145 +134 @@
 
     }
-
-    enum ParseType {
-        XML, TXT;
-
-        public static ParseType fromMode(String mode) {
-            if (mode.equals("xml")) {
-                return XML;
-            } else if (mode.equals("txt")) {
-                return TXT;
-            } else {
-                return null;
+}
+
+enum ParseType {
+    XML("xml", new XMLInsertStrategy()), 
+    TXT("txt", new TextInsertStrategy()),
+    HTML("html", new HTMLInsertStrategy());
+
+    private final String mode;
+    private final InsertStrategy strategy;
+    
+    private ParseType(final String mode, final InsertStrategy strategy){
+        this.mode = mode;
+        this.strategy = strategy;
+    }
+    
+    void doInsert(Source src, String value, TemplateResult result, SAXParser parser) throws IOException, SAXException{
+        this.strategy.doInsert(src, value, result, parser);
+    }
+    
+    static ParseType fromMode(final String lookupMode) {
+        for (ParseType candidate : ParseType.values()) {
+            if (candidate.mode.equals(lookupMode))
+                return candidate;
+        }
+        return null; // none found
+    }
+
+    static ParseType fromMediaType(String mime) {
+        if (XmlMediaTypeHelper.isXmlMediaType(mime)) {
+            return XML;
+        } else if (mime.startsWith("text/html")) {
+            return HTML;
+        } else if (mime.startsWith("text")) {
+            return TXT;
+        } else {
+            return null;
+        }
+    }
+}
+
+interface InsertStrategy {
+    void doInsert(Source src, String value, TemplateResult result, SAXParser parser) throws IOException, SAXException;
+}
+
+class XMLInsertStrategy implements InsertStrategy {
+    public void doInsert(final Source source, final String valueStr, final TemplateResult result, final SAXParser parser) throws IOException, SAXException {
+        InputStream inputStr = null;
+        try {
+            inputStr = (source != null ? source.getInputStream() :  new ByteArrayInputStream(valueStr.getBytes()));
+  
+            // default to XML: parse with saxparser
+            XmlConsumer consumer = new EmbedXmlFilter(result);
+            XMLReader xmlReader = parser.getXMLReader();
+            xmlReader.setContentHandler(consumer);
+            xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", consumer);
+            xmlReader.parse(new InputSource(inputStr));
+        } finally {
+            IOUtils.closeQuietly(inputStr);
+        }
+    }
+}
+
+class TextInsertStrategy implements InsertStrategy {
+    public void doInsert(final Source source, final String valueStr, final TemplateResult result, SAXParser parser) throws IOException, SAXException {
+        InputStream inputStr = null;
+        try {
+            inputStr = (source != null ? source.getInputStream() :  new ByteArrayInputStream(valueStr.getBytes()));
+        
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStr));
+            String line = reader.readLine();
+            while (line != null) {
+                result.characters(line.toCharArray(), 0, line.length());
+                line = reader.readLine();
             }
-        }
-
-        public static ParseType fromString(String name) {
-            if (XmlMediaTypeHelper.isXmlMediaType(name)) {
-                return XML;
-            } else if (name.startsWith("text")) {
-                return TXT;
-            } else {
-                return null;
-            }
-        }
-    }
-
-}
+        } finally {
+            IOUtils.closeQuietly(inputStr);
+        }
+    }
+}
+
+class HTMLInsertStrategy implements InsertStrategy {
+    public void doInsert(final Source source, final String valueStr, final TemplateResult result, SAXParser parser) throws SAXException, IOException {
+        InputStream inputStr = null;
+        try {
+            inputStr = (source != null ? source.getInputStream() :  new ByteArrayInputStream(valueStr.getBytes()));
+              
+            // fake for now
+            final char[] msg = "TODO: HTML insert mode not yet supported.".toCharArray();
+            result.characters(msg, 0, msg.length);
+            
+            // TODO real HTML cleaning and insertion
+            
+        } finally {
+            IOUtils.closeQuietly(inputStr);
+        }
+    }
+}