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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Mar 19 11:54:33 2012
New Revision: 182

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

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseIteratingStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineProcessingException.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Stage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StageProcessingException.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java?rev=182&r1=181&r2=182&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java Mon Mar 19 11:54:33 2012
@@ -24,12 +24,17 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.metadata.FirstItemIdItemIdentificationStrategy;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemIdentificationStrategy;
 import net.shibboleth.metadata.ItemMetadata;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Assert;
 
@@ -57,7 +62,7 @@
      * @return {@link ItemMetadata} classes that, if the an {@Item} contains, will cause the {@link Item} to be
      *         selected, never null nor containing null elements
      */
-    public Collection<Class<ItemMetadata>> getSelectionRequirements() {
+    @Nonnull @NonnullElements @Unmodifiable public Collection<Class<ItemMetadata>> getSelectionRequirements() {
         return selectionRequirements;
     }
 
@@ -68,11 +73,16 @@
      * @param requirements {@link ItemMetadata} classes that, if the an {@Item} contains, will cause the
      *            {@link Item} to be selected, may be null or contain null elements
      */
-    public synchronized void setSelectionRequirements(Collection<Class<ItemMetadata>> requirements) {
+    public synchronized void setSelectionRequirements(
+            @Nullable @NullableElements final Collection<Class<ItemMetadata>> requirements) {
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
-        selectionRequirements = ImmutableList.copyOf(Iterables.filter(requirements, Predicates.notNull()));
+        if (requirements == null) {
+            selectionRequirements = Collections.emptyList();
+        } else {

[... 1655 lines stripped ...]