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

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Mar 17 14:02:35 2012
New Revision: 180

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=180&view=rev
Log:
Conver with constraint annotations - MDA-61

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/FirstItemIdItemIdentificationStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemIdentificationStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemSerializer.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Version.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemMetadataSupport.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java?rev=180&r1=179&r2=180&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java Sat Mar 17 14:02:35 2012
@@ -16,6 +16,9 @@
  */
 
 package net.shibboleth.metadata;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.jcip.annotations.ThreadSafe;
 import net.shibboleth.metadata.util.ClassToInstanceMultiMap;
@@ -43,7 +46,7 @@
     }
 
     /** {@inheritDoc} */
-    public T unwrap() {
+    @Nullable public T unwrap() {
         return data;
     }
 
@@ -52,12 +55,12 @@
      * 
      * @param newData the data
      */
-    protected synchronized void setData(final T newData) {
+    protected synchronized void setData(@Nullable final T newData) {
         data = newData;
     }
 
     /** {@inheritDoc} */
-    public ClassToInstanceMultiMap<ItemMetadata> getItemMetadata() {
+    @Nonnull public ClassToInstanceMultiMap<ItemMetadata> getItemMetadata() {
         return metadata;
     }
 }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java?rev=180&r1=179&r2=180&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java Sat Mar 17 14:02:35 2012
@@ -19,6 +19,10 @@
 
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+
 /** Strategy used to merge the results of each child pipeline in to the collection of Items given to this stage. */
 public interface CollectionMergeStrategy {
 
@@ -28,5 +32,6 @@
      * @param target collection in to which all the Items should be merged, never null
      * @param sources collections of Items to be merged in to the target, never null not containing any null elements
      */
-    public void mergeCollection(Collection<Item<?>> target, Collection<Item<?>>... sources);
+    public void mergeCollection(@Nonnull @NonnullElements final Collection<Item<?>> target,
+            @Nonnull @NonnullElements final Collection<Item<?>>... sources);
 }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java?rev=180&r1=179&r2=180&view=diff
==============================================================================

[... 617 lines stripped ...]