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

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Dec 28 15:58:39 2011
New Revision: 169

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=169&view=rev
Log:
update to use the guava-ized java-support library

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomResourceSourceStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.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/EntityRegistrationAuthorityFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/Pipeline.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRegistrationAuthorityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java?rev=169&r1=168&r2=169&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java Wed Dec 28 15:58:39 2011
@@ -19,8 +19,9 @@
 
 import net.jcip.annotations.ThreadSafe;
 import net.shibboleth.utilities.java.support.logic.Assert;
-import net.shibboleth.utilities.java.support.primitive.ObjectSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
+import com.google.common.base.Objects;
 
 /** Carries a unique identifier for the data carried by an Item. */
 @ThreadSafe
@@ -68,7 +69,7 @@
         }
 
         ItemId other = (ItemId) obj;
-        return ObjectSupport.equals(id, other.id);
+        return Objects.equal(id, other.id);
     }
 
     /** {@inheritDoc} */

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java?rev=169&r1=168&r2=169&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java Wed Dec 28 15:58:39 2011
@@ -17,8 +17,9 @@
 
 package net.shibboleth.metadata;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotNull;
 import net.shibboleth.utilities.java.support.logic.Assert;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -40,7 +41,7 @@
      * @param componentId ID of the component creating the status message, never null or empty
      * @param statusMessage the status message, never null or empty
      */
-    public StatusMetadata(@NotNull @NotEmpty final String componentId, @NotNull @NotEmpty final String statusMessage) {
+    public StatusMetadata(@Nonnull @NotEmpty final String componentId, @Nonnull @NotEmpty final String statusMessage) {
         component = Assert.isNotNull(StringSupport.trimOrNull(componentId), "Component ID can not be null or empty");
         message = Assert.isNotNull(StringSupport.trimOrNull(statusMessage), "Status message can not be null or empty");
     }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomFilesystemSourceStage.java?rev=169&r1=168&r2=169&view=diff

[... 996 lines stripped ...]