[spring-extensions] branch master updated: OSJ-191 - Support for OpenSAML security features in HTTPResource layer

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=a13a9adfcce38644ed4a98b51c01ff818757f81f

The following commit(s) were added to refs/heads/master by this push:
       new  a13a9ad   OSJ-191 - Support for OpenSAML security features in HTTPResource layer
a13a9ad is described below

commit a13a9adfcce38644ed4a98b51c01ff818757f81f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Dec 29 19:35:35 2016 -0500

    OSJ-191 - Support for OpenSAML security features in HTTPResource layer
    
    https://issues.shibboleth.net/jira/browse/OSJ-191
    
    Wasn't thinking, need to move the client context hook into java-support.
---
 .../ext/spring/resource/HTTPResource.java          | 32 +---------------------
 .../ext/spring/resource/HTTPResourceTest.java      |  2 +-
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
index 47cade9..3962dc4 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
@@ -27,12 +27,12 @@ import java.net.URL;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
@@ -384,36 +384,6 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
     }
     
     /**
-     * Extension that allows the {@link HttpClientContext} to be externally manipulated before use.
-     */
-    @ThreadSafe
-    public static interface HttpClientContextHandler {
-        
-        /**
-         * Perform any desired context modifications before use.
-         * 
-         * @param context the context to operate on
-         * @param request the request that will be executed
-         * 
-         * @throws IOException if the call should be aborted
-         */
-        void invokeBefore(@Nonnull final HttpClientContext context, @Nonnull final HttpUriRequest request)
-            throws IOException;
-        
-        /**
-         * Perform any desired context modifications after use.
-         * 
-         * @param context the context to operate on
-         * @param request the request that was executed
-         * 
-         * @throws IOException if the call should be aborted
-         */
-        void invokeAfter(@Nonnull final HttpClientContext context, @Nonnull final HttpUriRequest request)
-            throws IOException;
-        
-    }
-    
-    /**
      * A wrapper around the entity content {@link InputStream} represented by an {@link HttpResponse}
      * that closes the stream and the HttpResponse when {@link #close()} is invoked.
      */
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
index 405db1b..ffe56e4 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
@@ -23,9 +23,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 
-import net.shibboleth.ext.spring.resource.HTTPResource.HttpClientContextHandler;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
+import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
 import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
 
 import org.apache.http.client.HttpClient;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.