You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2007/11/10 19:27:13 UTC

svn commit: r593804 - in /labs/vysper/src: main/java/org/apache/vysper/xmpp/xmldecoder/ test/java/org/apache/vysper/mina/codec/ test/java/org/apache/vysper/xmpp/xmldecoder/

Author: berndf
Date: Sat Nov 10 10:27:10 2007
New Revision: 593804

URL: http://svn.apache.org/viewvc?rev=593804&view=rev
Log:
[vysper] turn nightmare into dream? not quite, but refactored element parsing from using regex to scanning. works now. tests pass.

Modified:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java
    labs/vysper/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLParticleTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLParticle.java Sat Nov 10 10:27:10 2007
@@ -34,7 +34,7 @@
     public static final String ELEMENT_START_CLOSING = "</";
     public static final String ELEMENT_END_START_AND_END = "/>";
     public static final Pattern PATTERN_NAME_FROM_CLOSINGONLY_ELEMENT = Pattern.compile("\\<[\\!\\?\\/]?\\W*([-:\\w]*)\\W*[\\!\\?\\/]?\\>");
-    public static final Pattern PATTERN_NAME_FROM_OPENING_ELEMENT = Pattern.compile("\\<[\\!\\?]?(\\w[\\-\\:\\w]*)\\W+.*");
+//TODO REMOVE    public static final Pattern PATTERN_NAME_FROM_OPENING_ELEMENT = Pattern.compile("\\<[\\!\\?]?(\\w[\\-\\:\\w]*)\\W+.*");
 
     public XMLParticle(String content) {
         this.content = content;
@@ -103,12 +103,62 @@
             matcher = PATTERN_NAME_FROM_CLOSINGONLY_ELEMENT.matcher(content);
             if (!matcher.matches()) throw new DecodingException("closing element name could not be determined by parser for " + content);
         } else if (isOpeningElement()) {
-            matcher = PATTERN_NAME_FROM_OPENING_ELEMENT.matcher(content);
-            boolean matches = matcher.matches();
-            if (!matches) throw new DecodingException("opening element name could not be determined by parser for " + content);
+            elementName = parseElementName();
+            if (":".equals(elementName)) throw new DecodingException("':' is not a legitimate XML element name");
+            return elementName;
         } else throw new IllegalStateException("element must be opening or closing (or both)");
         elementName = matcher.group(1);
         return elementName;
+    }
+    
+    public String parseElementName() throws DecodingException {
+        StringBuilder elementNameBuilder = new StringBuilder();
+        boolean beforeElement = true;
+        for (int i = 0; i < content.length(); i++) {
+            int current = content.codePointAt(i);
+            if (i == 0) {
+                if (current != '<') throw new DecodingException("element does not start with '<'");
+                continue;
+            } else if (i == 1) {
+                if (current == '!' || current == '?' || current == '/') continue; // TODO check, if next char is '>'
+            }
+            if (beforeElement) {
+                if (!isLegitemateNameStartChar(current)) {
+                    throw new DecodingException("cannot start element name with char " + (char)current);
+                } 
+                beforeElement = false;
+            } else {
+                if (!isLegitemateNameChar(current)) {
+                    if (!isWhitespace(current) &&  current != '>' && current != '/') {
+                        throw new DecodingException("char not allowed in element name: " + (char)current);
+                    } else {
+                        break; // name is completed
+                    }
+                }
+            }
+            elementNameBuilder.append((char)current);
+        }
+        return elementNameBuilder.toString();
+    }
+
+    private boolean isWhitespace(int current) {
+        return (Character.isWhitespace(current) || /* next char is not relevant */
+                current == '!' || current == '?' /* TODO check, if next char is '>'*/
+               );
+    }
+
+    /**
+     * 
+     * NameChar	 ::=  Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
+     * @param c
+     * @return
+     */
+    private boolean isLegitemateNameChar(int c) {
+        return isLegitemateNameStartChar(c) || Character.isDigit(c) || c == '.' || c == '-';
+    }
+    
+    private boolean isLegitemateNameStartChar(int c) {
+        return Character.isLetter(c) || c == '_' || c == ':'; 
     }
     
 }

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverter.java Sat Nov 10 10:27:10 2007
@@ -145,7 +145,10 @@
             elementName = elementName.substring(0, i);
             if ("".equals(namespace) || "".equals(elementName)) throw new DecodingException("illegal element name " + namespace + ":" + elementName); 
         } else if (i == 0) {
-            throw new DecodingException("':' is not a valid element name");
+            // element something like "<:foo> this is legal XML. in this case, acccording to XML spec section 2.3,
+            // the colon belongs to the element name and is not a separator for the namespace.
+            // but we do not support that.
+            throw new DecodingException("unsupported legal XML: colon at start of element name and no namespace specified");
         }
         if (createStanza) return new Stanza(elementName, namespace, attributes, innerFragments);
         else return new XMLElement(elementName, namespace, attributes, innerFragments);

Modified: labs/vysper/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/mina/codec/XMLStreamTokenizerTestCase.java Sat Nov 10 10:27:10 2007
@@ -20,9 +20,10 @@
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
 import org.apache.vysper.charset.CharsetUtil;
+import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.writer.StanzaWriter;
 import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
 import org.apache.vysper.xmpp.xmlfragment.XMLText;
-import org.apache.vysper.xmpp.writer.StanzaWriter;
 
 import java.nio.charset.CharsetEncoder;
 import java.util.ArrayList;
@@ -117,8 +118,11 @@
             int lkjl = 0;
         }
         assertEquals(1, protocolDecoderOutput.size());
-        String content = ((XMLText)protocolDecoderOutput.get(1)).getText();
-        assertEquals("\n\r", content);
+        Stanza stanzaParsed = (Stanza) protocolDecoderOutput.get(0);
+        String stanzaName = stanzaParsed.getName();
+        assertEquals("stream", stanzaName);
+        String stanzaNS = stanzaParsed.getNamespace();
+        assertEquals("stream", stanzaNS);
     }
 
     private ByteBuffer createByteBuffer() {

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLParticleTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLParticleTestCase.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLParticleTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLParticleTestCase.java Sat Nov 10 10:27:10 2007
@@ -24,7 +24,7 @@
  */
 public class XMLParticleTestCase extends TestCase {
 
-    public void testOpeningElementName() {
+    public void testOpeningElementName() throws DecodingException {
         assertOpeningElementName("<stream>", "stream");
         assertOpeningElementName("<!stream>", "stream");
         assertOpeningElementName("<stream!>", "stream");
@@ -34,31 +34,34 @@
         assertOpeningElementName("<stream:stream />", "stream:stream");
         assertOpeningElementName("<stream:stream x=\"x\" />", "stream:stream");
         assertOpeningElementName("<stream:stream x=\'x\' />", "stream:stream");
+        assertOpeningElementName("<:colon-prefixed>", ":colon-prefixed");
+        assertOpeningElementName("<wrong.separator>", "wrong.separator");
+        assertOpeningElementName("<wrong_separator>", "wrong_separator");
     }
     
     public void testWrongOpeningElementName() {
         assertFailureOpeningElementName("<>");
         assertFailureOpeningElementName("<&()ยค$%/>");
         assertFailureOpeningElementName("< space-prefixed />");
-        assertFailureOpeningElementName("<:colon-prefixed>");
         assertFailureOpeningElementName("<-prefixed>");
     } 
 
     public void testMoreWrongOpeningElementName() {
         assertFailureOpeningElementName("<wrong#separator>");
-        assertFailureOpeningElementName("<wrong.separator>");
-        assertFailureOpeningElementName("<wrong_separator>");
     } 
 
-    private void assertOpeningElementName(String input, String expected) {
-        Matcher matcher = XMLParticle.PATTERN_NAME_FROM_OPENING_ELEMENT.matcher(input);
-        assertTrue(matcher.matches());
-        String match = matcher.group(1);
-        assertEquals(expected, match);
+    private void assertOpeningElementName(String input, String expected) throws DecodingException {
+        XMLParticle particle = new XMLParticle(input);
+        assertEquals(expected, particle.getElementName());
     }
 
     private void assertFailureOpeningElementName(String input) {
-        Matcher matcher = XMLParticle.PATTERN_NAME_FROM_OPENING_ELEMENT.matcher(input);
-        assertFalse(matcher.matches());
+        XMLParticle particle = new XMLParticle(input);
+        try {
+            particle.getElementName();
+            fail("failure expected");
+        } catch (DecodingException e) {
+            // expected
+        }
     }
 }

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertErrorTestCase.java Sat Nov 10 10:27:10 2007
@@ -169,19 +169,6 @@
         }
     }
 
-    public void testElementNameColon_NoNamespace() throws DecodingException {
-        List<XMLParticle> particles = new ArrayList<XMLParticle>();
-
-        XMLParticle particle = new XMLParticle("<:name />");
-        particles.add(particle);
-        try {
-            xmlRawToFragementConverter.convert(particles);
-            fail("illegal element name");
-        } catch (DecodingException e) {
-            // test succeded
-        }
-    }
-
     public void testElementNameColon_NoName() throws DecodingException {
         List<XMLParticle> particles = new ArrayList<XMLParticle>();
 

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java?rev=593804&r1=593803&r2=593804&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/xmldecoder/XMLRawToFragementConverterConvertTestCase.java Sat Nov 10 10:27:10 2007
@@ -101,4 +101,19 @@
         assertEquals(1, ((XMLElement)xmlElement).getInnerElements().size());
     }
     
+    public void testElementNameColonAtStart() throws DecodingException {
+        List<XMLParticle> particles = new ArrayList<XMLParticle>();
+
+        XMLParticle particle = new XMLParticle("<:name />");
+        particles.add(particle);
+        try {
+            xmlRawToFragementConverter.convert(particles);
+            fail("colon at start denotes legal element name (according to XML Spec) -- but we don't support it");
+        } catch (DecodingException e) {
+            // succeeded 
+        }
+        assertEquals(":name", particle.getElementName());
+    }
+
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org