[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 14:10:32 2012
New Revision: 188

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=188&view=rev
Log:
Add, and use. isEntityOrEntitiesDescriptor help method - MDA-43

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/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/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/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=188&r1=187&r2=188&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 14:10:32 2012
@@ -162,8 +162,7 @@
         Element descriptor;
         for (DomElementItem item : orderedItems) {
             descriptor = item.unwrap();
-            if (SamlMetadataSupport.isEntitiesDescriptor(descriptor)
-                    || SamlMetadataSupport.isEntityDescriptor(descriptor)) {
+            if (SamlMetadataSupport.isEntityOrEntitiesDescriptor(descriptor)) {
                 descriptor = (Element) entitiesDescriptorDocument.importNode(descriptor, true);
                 entitiesDescriptor.appendChild(descriptor);
 

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java Mon Mar 19 14:10:32 2012
@@ -113,8 +113,7 @@
      */
     protected Long getShortestCacheDuration(@Nonnull final Element descriptor) {
         Long shortestCacheDuration = null;
-        if (!SamlMetadataSupport.isEntitiesDescriptor(descriptor)
-                && !SamlMetadataSupport.isEntityDescriptor(descriptor)) {
+        if (!SamlMetadataSupport.isEntitiesDescriptor(descriptor)) {
             return shortestCacheDuration;
         }
 

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java Mon Mar 19 14:10:32 2012
@@ -116,8 +116,7 @@
      */
     protected Long getNearestValidUntil(@Nonnull final Element descriptor) {
         Long nearestValidUntil = null;
-        if (!SamlMetadataSupport.isEntitiesDescriptor(descriptor)
-                && !SamlMetadataSupport.isEntityDescriptor(descriptor)) {
+        if (!SamlMetadataSupport.isEntityOrEntitiesDescriptor(descriptor)) {
             return nearestValidUntil;
         }
 

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SamlMetadataSupport.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SamlMetadataSupport.java?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SamlMetadataSupport.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SamlMetadataSupport.java Mon Mar 19 14:10:32 2012
@@ -63,9 +63,21 @@
     }
 
     /**
+     * Check if the given element is an EntityDescriptor or EntitiesDescriptor.
+     * 
+     * @param e element to check
+     * 

[... 94 lines stripped ...]