[utilities COMMIT] /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 22 16:30:01 2013
New Revision: 477

URL: http://svn.shibboleth.net/view/utilities?rev=477&view=rev
Log:
Annotations and trimming.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/QNameSupport.java

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=477&r1=476&r2=477&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 Fri Nov 22 16:30:01 2013
@@ -23,6 +23,7 @@
 import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -44,19 +45,20 @@
      * 
      * @return the QName respresented by the string
      */
-    @Nonnull public static QName constructQName(@Nonnull final Element owningElement, @Nonnull final String qname) {
-        Constraint.isNotNull(owningElement, "Owning element may not be null");
-        Constraint.isNotNull(qname, "Name may not be null");
+    @Nonnull public static QName constructQName(@Nonnull final Element owningElement,
+            @Nonnull @NotEmpty final String qname) {
+        Constraint.isNotNull(owningElement, "Owning element cannot be null");
+        String trimmedName = Constraint.isNotNull(StringSupport.trimOrNull(qname), "QName cannot be null");
 
         String nsPrefix;
         String name;
-        if (qname.indexOf(":") > -1) {
-            final StringTokenizer qnameTokens = new StringTokenizer(qname, ":");
+        if (trimmedName.indexOf(":") > -1) {
+            final StringTokenizer qnameTokens = new StringTokenizer(trimmedName, ":");
             nsPrefix = StringSupport.trim(qnameTokens.nextToken());
             name = qnameTokens.nextToken();
         } else {
             nsPrefix = null;
-            name = qname;
+            name = trimmedName;
         }
 
         final String nsURI = owningElement.lookupNamespaceURI(nsPrefix);
@@ -72,10 +74,10 @@
      * 
      * @return the QName
      */
-    @Nonnull public static QName constructQName(@Nullable final String namespaceURI, @Nonnull final String localName,
-            @Nullable final String prefix) {
+    @Nonnull public static QName constructQName(@Nullable final String namespaceURI,
+            @Nonnull @NotEmpty final String localName, @Nullable final String prefix) {
         String trimmedLocalName =
-                Constraint.isNotNull(StringSupport.trimOrNull(localName), "Local name may not be null");
+                Constraint.isNotNull(StringSupport.trimOrNull(localName), "Local name cannot be null or empty");
         String trimmedPrefix = StringSupport.trimOrNull(prefix);
 
         if (trimmedPrefix == null) {