[java-identity-provider] branch master updated: IDP-1231 - RelyingPartyMetadataProvider logs a null ID

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2c12d876e31a0b3e382e5c73c0228510a07d0f56

The following commit(s) were added to refs/heads/master by this push:
       new  2c12d87   IDP-1231 - RelyingPartyMetadataProvider logs a null ID
2c12d87 is described below

commit 2c12d876e31a0b3e382e5c73c0228510a07d0f56
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 6 16:55:17 2017 -0500

    IDP-1231 - RelyingPartyMetadataProvider logs a null ID
    
    https://issues.shibboleth.net/jira/browse/IDP-1231
    
    Fix lack of MetadatResolver initialization at top of object tree.
---
 .../metadata/AbstractMetadataProviderParser.java   |  2 ++
 .../metadata/RelyingPartyMetadataProvider.java     | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
index 7efab73..9a662f8 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataProviderParser.java
@@ -137,6 +137,8 @@ public abstract class AbstractMetadataProviderParser extends AbstractSingleBeanD
             final BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
         if (isTopMost(element)) {
+            builder.setInitMethodName("initialize");
+            builder.setDestroyMethodName("destroy");
             builder.setLazyInit(true);
             final BeanDefinitionBuilder childBeanDefinitionBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass(element));
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
index d56ea76..8a3cfae 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
@@ -26,6 +26,8 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterI
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
@@ -66,7 +68,7 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
      */
     @Deprecated public RelyingPartyMetadataProvider(
             @Nonnull @ParameterName(name="child") final MetadataResolver child) {
-        log.warn("Using deprecated constructor");
+        DeprecationSupport.warnOnce(ObjectType.METHOD, "RelyingPartyMetadataProvider(MetadataResolver)", null, null);
         resolver = Constraint.isNotNull(child, "MetadataResolver cannot be null");
     }
     
@@ -106,14 +108,14 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
     /** {@inheritDoc} */
     @Override @Nonnull public Iterable<EntityDescriptor> resolve(@Nullable final CriteriaSet criteria)
             throws ResolverException {
-
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         return resolver.resolve(criteria);
     }
 
     /** {@inheritDoc} */
     @Override @Nullable public EntityDescriptor resolveSingle(@Nullable final CriteriaSet criteria)
             throws ResolverException {
-
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         return resolver.resolveSingle(criteria);
     }
 
@@ -124,6 +126,8 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
 
     /** {@inheritDoc} */
     @Override public void setRequireValidMetadata(final boolean requireValidMetadata) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        
         resolver.setRequireValidMetadata(requireValidMetadata);
 
     }
@@ -134,6 +138,13 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
     }
 
     /** {@inheritDoc} */
+    @Override public void setMetadataFilter(@Nullable final MetadataFilter newFilter) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        
+        resolver.setMetadataFilter(newFilter);
+    }
+
+    /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         setId(resolver.getId());
         super.doInitialize();
@@ -152,11 +163,6 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
     }
 
     /** {@inheritDoc} */
-    @Override public void setMetadataFilter(@Nullable final MetadataFilter newFilter) {
-        resolver.setMetadataFilter(newFilter);
-    }
-
-    /** {@inheritDoc} */
     @Override @Nonnull public MetadataResolver getComponent() {
         return this;
     }

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