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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov  7 13:15:36 2016
New Revision: 8560

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8560&view=rev
Log:
OSJ-183 - backgroundInitializationFromCacheDelay property misspelled in AbstractDynamicMetadataProvider

https://issues.shibboleth.net/jira/browse/OSJ-183

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/LocalDynamicMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicPersistentCacheBean.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicPersistentCacheDirectory.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java?rev=8560&r1=8559&r2=8560&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicMetadataProviderParser.java	Mon Nov  7 13:15:36 2016
@@ -135,9 +135,9 @@
                             element.getAttributeNS(null, "initializeFromPersistentCacheInBackground")));
         }
         
-        if (element.hasAttributeNS(null, "backgroundInitializatonFromCacheDelay")) {
-            builder.addPropertyValue("backgroundInitializatonFromCacheDelay",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "backgroundInitializatonFromCacheDelay")));
+        if (element.hasAttributeNS(null, "backgroundInitializationFromCacheDelay")) {
+            builder.addPropertyValue("backgroundInitializationFromCacheDelay",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "backgroundInitializationFromCacheDelay")));
         }
         
         if (element.hasAttributeNS(null, "initializationFromCachePredicateRef")) {

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java?rev=8560&r1=8559&r2=8560&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	Mon Nov  7 13:15:36 2016
@@ -72,14 +72,14 @@
         
         Assert.assertTrue(resolver.isInitializeFromPersistentCacheInBackground());
         
-        Assert.assertEquals(resolver.getBackgroundInitializatonFromCacheDelay(), new Long(2*1000));
+        Assert.assertEquals(resolver.getBackgroundInitializationFromCacheDelay(), new Long(2*1000));
         
         Assert.assertEquals(resolver.getRequestURLBuilder().getClass(), HTTPEntityIDRequestURLBuilder.class);
     }
     
     @Test
     public void testClientSecurityParamsParams() throws Exception {
-        FunctionDrivenDynamicHTTPMetadataResolver resolver = getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
+        getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
                 "dynamicClientSecurityParams.xml", "beans.xml", "httpClient.xml");
         
         // We can't really test the actual timeout values, this is just to test that parser, factory bean, etc are ok.
@@ -87,7 +87,7 @@
     
     @Test
     public void testTimeoutParams() throws Exception {
-        FunctionDrivenDynamicHTTPMetadataResolver resolver = getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
+        getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
                 "dynamicTimeouts.xml", "beans.xml", "httpClient.xml");
         
         // We can't really test the actual timeout values, this is just to test that parser, factory bean, etc are ok.
@@ -95,7 +95,7 @@
     
     @Test
     public void testMaxConnectionsParams() throws Exception {

[... 84 lines stripped ...]