[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl: AbstractD...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Oct 23 21:06:38 2014
New Revision: 4108

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4108&view=rev
Log:
Further cleanup work on abstract dynamic metadata provider superclasses.
Implement strawman simple concrete dynamic resolver impl which builds request URLs based on a function.

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityRequestURLBuilder.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/SimpleDynamicHTTPMetadataResolver.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java?rev=4108&r1=4107&r2=4108&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java Thu Oct 23 21:06:38 2014
@@ -176,7 +176,7 @@
         
             HttpResponse response = httpClient.execute(request);
             
-            processResponse(response, request.getURI());
+            processResponse(response, request.getURI(), entityID);
             
             return lookupEntityID(entityID);
             
@@ -229,10 +229,11 @@
      * 
      * @param response the received response
      * @param requestURI the original request URI
+     * @param expectedEntityID the expected entityID of the resolved metadata
      * @throws ResolverException if there is a fatal error processing the response
      */
-    protected void processResponse(@Nonnull final HttpResponse response, @Nonnull final URI requestURI) 
-            throws ResolverException {
+    protected void processResponse(@Nonnull final HttpResponse response, @Nonnull final URI requestURI, 
+            @Nonnull final String expectedEntityID) throws ResolverException {
         
         int httpStatusCode = response.getStatusLine().getStatusCode();
         
@@ -252,7 +253,7 @@
         XMLObject root = null;
         try {
             try {
-                validateResponse(response, requestURI);
+                validateHttpResponse(response, requestURI);
             } catch (ResolverException e) {
                 log.error("Problem validating dynamic metadata HTTP response", e);
                 return;
@@ -270,7 +271,7 @@
         }
             
         try {
-            processNewMetadata(root);
+            processNewMetadata(root, expectedEntityID);
         } catch (FilterException e) {
             log.error("Metadata filtering problem processing new metadata", e);
             return;
@@ -301,7 +302,7 @@
      * @param requestURI the original request URI
      * @throws ResolverException if the response was not valid, or if there is a fatal error validating the response
      */
-    public void validateResponse(@Nonnull final HttpResponse response, @Nonnull final URI requestURI) 
+    public void validateHttpResponse(@Nonnull final HttpResponse response, @Nonnull final URI requestURI) 
             throws ResolverException {
         if (!getSupportedContentTypes().isEmpty()) {
             Header contentType = response.getEntity().getContentType();

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java?rev=4108&r1=4107&r2=4108&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java Thu Oct 23 21:06:38 2014
@@ -19,6 +19,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
@@ -166,11 +167,14 @@
             
             List<EntityDescriptor> descriptors = lookupEntityID(entityID);
             if (!descriptors.isEmpty()) {
+                log.trace("Found requested metadata in backing store, returning");
                 return descriptors;
             }
         } finally {
             readLock.unlock();
         }
+        

[... 53 lines stripped ...]