[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.jav...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Feb  7 14:21:29 2012
New Revision: 230

URL: http://svn.shibboleth.net/view/utilities?rev=230&view=rev
Log:
Tests, bug fixes and data for QNameSupport.  Tidy for DomTypeSupport

Added:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java   (with props)
Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qnameSupportTest.xml

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.java?rev=230&r1=229&r2=230&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/DomTypeSupport.java Tue Feb  7 14:21:29 2012
@@ -19,7 +19,6 @@
 
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.StringTokenizer;
 import java.util.TimeZone;
 
 import javax.annotation.Nonnull;
@@ -91,19 +90,8 @@
         if (hasXSIType(e)) {
             final Attr attribute = e.getAttributeNodeNS(XmlConstants.XSI_NS, "type");
             final String attributeValue = attribute.getTextContent().trim();
-            final StringTokenizer tokenizer = new StringTokenizer(attributeValue, ":");
-            String prefix = null;
-            String localPart;
-            if (tokenizer.countTokens() > 1) {
-                prefix = tokenizer.nextToken();
-                localPart = tokenizer.nextToken();
-            } else {
-                localPart = tokenizer.nextToken();
-            }
-
-            return QNameSupport.constructQName(e.lookupNamespaceURI(prefix), localPart, prefix);
+            return QNameSupport.constructQName(e, attributeValue);
         }
-
         return null;
     }
 

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java?rev=230&r1=229&r2=230&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java Tue Feb  7 14:21:29 2012
@@ -52,14 +52,14 @@
         String name;
         if (qname.indexOf(":") > -1) {
             final StringTokenizer qnameTokens = new StringTokenizer(qname, ":");
-            nsPrefix = qnameTokens.nextToken();
+            nsPrefix = StringSupport.trim(qnameTokens.nextToken());
             name = qnameTokens.nextToken();
         } else {
-            nsPrefix = "";
+            nsPrefix = null;
             name = qname;
         }
 
-        final String nsURI = NamespaceSupport.lookupNamespaceURI(owningElement, nsPrefix);
+        final String nsURI = owningElement.lookupNamespaceURI(nsPrefix);
         return constructQName(nsURI, name, nsPrefix);
     }
 
@@ -110,7 +110,8 @@
         Assert.isNotNull(qname, "QName may not be null");
 
         final StringBuffer buf = new StringBuffer();
-        if (qname.getPrefix() != null) {
+        final String s = StringSupport.trimOrNull(qname.getPrefix());
+        if (s != null) {
             buf.append(qname.getPrefix());
             buf.append(":");
         }

Modified: java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qnameSupportTest.xml
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qnameSupportTest.xml?rev=230&r1=229&r2=230&view=diff
==============================================================================
--- java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qnameSupportTest.xml (original)
+++ java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qnameSupportTest.xml Tue Feb  7 14:21:29 2012
@@ -1,12 +1,7 @@
-<parns:Parent 
+<Parent 
 xmlns="http://example.org/DefaultSpace"
-xmlns:parns="http://example.org/ParentSpace" 
 xmlns:myns1="http://example.org/NameSpace1" 
-xmlns:myns2="http://example.org/NameSpace2" 
  >
-    <Child1 xmlns="http://example.org/ChildDefault"
-        xmlns:myns1="http://example.org/Childpace2" 
-        myns1:foo="myns2:bar" />
-    <Child2 myns1:foo="myns2:bar" />
-</parns:Parent>
+    <myns1:Child/>
+</Parent>