[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml: Entit...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Mar 19 12:39:19 2012
New Revision: 184

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=184&view=rev
Log:
Add constraint annotations
Minor code clean ups and constraint checks

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityPublisherPathFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRegistrationAuthorityFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PushDownCacheDurationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PushDownValidUntilStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveContactPersonStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SamlMetadataSupport.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetPublicationInfo.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java?rev=184&r1=183&r2=184&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java Mon Mar 19 12:39:19 2012
@@ -21,14 +21,18 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.xml.namespace.QName;
 
 import net.shibboleth.metadata.dom.DomElementItem;
 import net.shibboleth.metadata.pipeline.BaseStage;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Assert;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -59,16 +63,10 @@
     private boolean noChildrenAProcessingError;
 
     /** Strategy used to order a collection of Items. The default strategy performs no ordering. */
-    private ItemOrderingStrategy orderingStrategy;
+    private ItemOrderingStrategy orderingStrategy = new NoOpItemOrderingStrategy();
 
     /** Name to use for the EntitiesDescriptor. */
     private String descriptorName;
-
-    /** Constructor. */
-    public EntitiesDescriptorAssemblerStage() {
-        super();
-        orderingStrategy = new NoOpItemOrderingStrategy();
-    }
 
     /**
      * Gets whether attempting to turn an empty item collection, which would result in a schema-invalid childless
@@ -89,7 +87,7 @@
     public synchronized void setNoChildrenAProcessingError(boolean isError) {
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+
         noChildrenAProcessingError = isError;
     }
 
@@ -98,7 +96,7 @@
      * 
      * @return strategy used to order a collection of Items
      */
-    public ItemOrderingStrategy getItemOrderingStrategy() {
+    @Nonnull public ItemOrderingStrategy getItemOrderingStrategy() {
         return orderingStrategy;
     }
 
@@ -107,11 +105,11 @@
      * 

[... 1051 lines stripped ...]