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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct  4 09:04:54 2016
New Revision: 8459

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8459&view=rev
Log:
IDP-1047 Add Properties, deprecate constructor.

https://issues.shibboleth.net/jira/browse/IDP-1047

Add properties to RelyingPartyMetadataProvider and deprecate the
parameterized constructor.  Change the parser (and ServiceStrategy) to
use it.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java?rev=8459&r1=8458&r2=8459&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java	Tue Oct  4 09:04:54 2016
@@ -142,7 +142,7 @@
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass(element));
             doNativeParse(element, parserContext, childBeanDefinitionBuilder);
 
-            builder.addConstructorArgValue(childBeanDefinitionBuilder.getBeanDefinition());
+            builder.addPropertyValue("embeddedResolver", childBeanDefinitionBuilder.getBeanDefinition());
 
             if (element.hasAttributeNS(null, "sortKey")) {
                 builder.addPropertyValue("sortKey", StringSupport.trimOrNull(element.getAttributeNS(null, "sortKey")));

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.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/MetadataResolverServiceStrategy.java?rev=8459&r1=8458&r2=8459&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataResolverServiceStrategy.java	Tue Oct  4 09:04:54 2016
@@ -80,7 +80,8 @@
             chain.setResolvers(resolverList);
             chain.setId("MultiFileResolverFor:"+resolvers.size()+":Resources");
             chain.initialize();
-            final RelyingPartyMetadataProvider result = new RelyingPartyMetadataProvider(chain);
+            final RelyingPartyMetadataProvider result = new RelyingPartyMetadataProvider();
+            result.setEmbeddedResolver(chain);
             result.initialize();
             return result;
         } catch (final ResolverException | ComponentInitializationException e) {

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java?rev=8459&r1=8458&r2=8459&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java	Tue Oct  4 09:04:54 2016
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -52,7 +53,7 @@
     private final Logger log = LoggerFactory.getLogger(RelyingPartyMetadataProvider.class);
 
     /** The embedded resolver. */
-    @Nonnull private final MetadataResolver resolver;
+    @NonnullAfterInit private MetadataResolver resolver;
 
     /** The key by which we sort the provider. */
     @NonnullAfterInit private Integer sortKey;
@@ -61,9 +62,16 @@
      * Constructor.
      * 
      * @param child The {@link MetadataResolver} to embed.
-     */
-    public RelyingPartyMetadataProvider(@Nonnull final MetadataResolver child) {

[... 42 lines stripped ...]