[java-opensaml COMMIT] in /trunk/opensaml-core/src/main/java/org/opensaml/core/xml: NamespaceManager.java io/Abstract...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 22 17:26:06 2013
New Revision: 3506

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3506&view=rev
Log:
Annotations and warnings.

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/BaseXMLObjectMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/BaseXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/MarshallerFactory.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/UnmarshallerFactory.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSAnyImpl.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSAnyMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSAnyUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryImpl.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBase64BinaryUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBooleanImpl.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBooleanMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/schema/impl/XSBooleanUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/IDIndex.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexedXMLObjectChildrenList.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java?rev=3506&r1=3505&r2=3506&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/NamespaceManager.java Fri Nov 22 17:26:06 2013
@@ -27,6 +27,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.collection.LazyMap;
 import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -98,7 +99,7 @@
      * @param name attribute name as a QName
      * @return a string attribute ID
      */
-    @Nonnull public static String generateAttributeID(@Nonnull final QName name) {
+    @Nonnull @NotEmpty public static String generateAttributeID(@Nonnull final QName name) {
        return name.toString(); 
     }
     

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java?rev=3506&r1=3505&r2=3506&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java Fri Nov 22 17:26:06 2013
@@ -38,7 +38,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import com.google.common.base.Objects;
@@ -135,9 +134,8 @@
         if (log.isTraceEnabled()) {
             log.trace("Building XMLObject for {}", QNameSupport.getNodeQName(domElement));
         }
-        XMLObjectBuilder xmlObjectBuilder;
-
-        xmlObjectBuilder = xmlObjectBuilderFactory.getBuilder(domElement);
+
+        XMLObjectBuilder<?> xmlObjectBuilder = xmlObjectBuilderFactory.getBuilder(domElement);
         if (xmlObjectBuilder == null) {
             xmlObjectBuilder = xmlObjectBuilderFactory.getBuilder(
                     XMLObjectProviderRegistrySupport.getDefaultProviderQName());
@@ -230,7 +228,8 @@
         QName attribName = QNameSupport.getNodeQName(attribute);
         if (XmlConstants.XSI_TYPE_ATTRIB_NAME.equals(attribName)) {
             if (log.isTraceEnabled()) {
-                log.trace("Saw XMLObject {} with an xsi:type of: {}", xmlObject.getElementQName(), attribute.getValue());
+                log.trace("Saw XMLObject {} with an xsi:type of: {}", xmlObject.getElementQName(),
+                        attribute.getValue());
             }
         } else if (XmlConstants.XSI_SCHEMA_LOCATION_ATTRIB_NAME.equals(attribName)) {
             if (log.isTraceEnabled()) {

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/BaseXMLObjectMarshaller.java

[... 849 lines stripped ...]