[java-identity-provider COMMIT] in /trunk/idp-profile-spring: pom.xml src/main/java/net/shibboleth/idp/profile/spring...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Dec 19 06:51:33 2014
New Revision: 7169

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7169&view=rev
Log:
IDP-544 Tests to act as the basis of the documentation for HTTPResource configuration

Added:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResourceConfigurationTests.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPResources.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/parent.xml   (with props)
Modified:
    trunk/idp-profile-spring/pom.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java

Modified: trunk/idp-profile-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/pom.xml?rev=7169&r1=7168&r2=7169&view=diff
==============================================================================
--- trunk/idp-profile-spring/pom.xml (original)
+++ trunk/idp-profile-spring/pom.xml Fri Dec 19 06:51:33 2014
@@ -96,6 +96,14 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Managed Dependencies -->
     </dependencies>
     

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java?rev=7169&r1=7168&r2=7169&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/InMemoryCachingHttpClientFactoryBean.java Fri Dec 19 06:51:33 2014
@@ -21,8 +21,8 @@
 import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
 
 /**
- * Factory bean to accumulate the parameters into a {@link InMemoryCachingHttpClientBuilder} 
- * and to then emit a {@link org.apache.http.client.HttpClient}.
+ * Factory bean to accumulate the parameters into a {@link InMemoryCachingHttpClientBuilder} and to then emit a
+ * {@link org.apache.http.client.HttpClient}.
  */
 public class InMemoryCachingHttpClientFactoryBean extends HttpClientFactoryBean {
 
@@ -37,7 +37,7 @@
      * @param maxCacheEntries The maxCacheEntries to set.
      */
     public void setMaxCacheEntries(int maxCacheEntries) {
-        ((InMemoryCachingHttpClientBuilder)getHttpClientBuilder()).setMaxCacheEntries(maxCacheEntries);
+        ((InMemoryCachingHttpClientBuilder) getHttpClientBuilder()).setMaxCacheEntries(maxCacheEntries);
     }
 
     /**
@@ -46,11 +46,11 @@
      * @param maxCacheEntrySize The maxCacheEntrySize to set.
      */
     public void setMaxCacheEntrySize(long maxCacheEntrySize) {
-        ((InMemoryCachingHttpClientBuilder)getHttpClientBuilder()).setMaxCacheEntrySize(maxCacheEntrySize);
+        ((InMemoryCachingHttpClientBuilder) getHttpClientBuilder()).setMaxCacheEntrySize(maxCacheEntrySize);
     }
 
     /** {@inheritDoc} */
-    protected HttpClientBuilder createHttpClientBuilder() {
+    @Override protected HttpClientBuilder createHttpClientBuilder() {
         return new InMemoryCachingHttpClientBuilder();
     }