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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Mar 19 13:31:17 2012
New Revision: 250

URL: http://svn.shibboleth.net/view/utilities?rev=250&view=rev
Log:
Add some constraint annotations and javadoc

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

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java?rev=250&r1=249&r2=250&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/SimpleNamespaceContext.java Mon Mar 19 13:31:17 2012
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
@@ -79,7 +80,7 @@
     }
 
     /** {@inheritDoc} */
-    @Nullable public String getNamespaceURI(String prefix) {
+    @Nullable public String getNamespaceURI(@Nonnull String prefix) {
         if (prefix == null) {
             throw new IllegalArgumentException("Prefix can not be null");
         }
@@ -93,7 +94,7 @@
     }
 
     /** {@inheritDoc} */
-    @Nullable public String getPrefix(String namespaceURI) {
+    @Nullable public String getPrefix(@Nonnull String namespaceURI) {
         if (namespaceURI == null) {
             throw new IllegalArgumentException("Namespace URI can not be null");
         }
@@ -102,7 +103,7 @@
     }
 
     /** {@inheritDoc} */
-    public Iterator<String> getPrefixes(String namespaceURI) {
+    @Nonnull public Iterator<String> getPrefixes(String namespaceURI) {
         if (namespaceURI == null) {
             throw new IllegalArgumentException("Namespace URI can not be null");
         }
@@ -115,7 +116,12 @@
         }
     }
     
-    private Builder<String, String> getMappingsBuilder(){
+    /**
+     * Build the initial set of mappings which contains entries for XML and XMLNS.
+     * 
+     * @return initial set of mappings
+     */
+    @Nonnull private Builder<String, String> getMappingsBuilder(){
         Builder mappingBuilder = new Builder<String, String>();
         
         mappingBuilder.put(XmlConstants.XML_PREFIX, XmlConstants.XML_NS);