[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingParty...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Dec  6 21:16:26 2014
New Revision: 7049

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7049&view=rev
Log:
IDP-526 - stop exposing component interfaces as a core part of service API

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java?rev=7049&r1=7048&r2=7049&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java Sat Dec  6 21:16:26 2014
@@ -23,14 +23,13 @@
 import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
 import net.shibboleth.utilities.java.support.resolver.Resolver;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
 /** Resolves a {@link RelyingPartyConfiguration} for a given profile request context. */
 public interface RelyingPartyConfigurationResolver extends Resolver<RelyingPartyConfiguration,ProfileRequestContext>,
-        IdentifiedComponent, InitializableComponent {
+        IdentifiedComponent {
 
     /**
      * Return the default security configuration for the profile.
@@ -40,4 +39,5 @@
      * @return the configured default configuration
      */
     @Nullable SecurityConfiguration getDefaultSecurityConfiguration(@Nonnull @NotEmpty final String profileId);
+    
 }

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java?rev=7049&r1=7048&r2=7049&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java Sat Dec  6 21:16:26 2014
@@ -71,6 +71,7 @@
     @Override @Nonnull @NonnullElements public Iterable<RelyingPartyConfiguration> resolve(
             @Nullable final ProfileRequestContext context) throws ResolverException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;
         try {
             component = service.getServiceableComponent();
@@ -80,14 +81,14 @@
                 final RelyingPartyConfigurationResolver resolver = component.getComponent();
                 return Sets.newHashSet(resolver.resolve(context));
             }
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             log.error("RelyingPartyResolver '{}': error in resolution", getId(), e);
         } finally {
             if (null != component) {
                 component.unpinComponent();
             }
         }
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     /** {@inheritDoc} */
@@ -95,7 +96,6 @@
             throws ResolverException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
 
-        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;
         try {
             component = service.getServiceableComponent();
@@ -105,7 +105,7 @@
                 final RelyingPartyConfigurationResolver resolver = component.getComponent();
                 return resolver.resolveSingle(context);
             }
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             log.error("RelyingPartyResolver '{}': error in resolution", getId(), e);
         } finally {
             if (null != component) {
@@ -119,7 +119,6 @@
     @Override public SecurityConfiguration getDefaultSecurityConfiguration(String profileId) {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
 
-        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ServiceableComponent<RelyingPartyConfigurationResolver> component = null;

[... 9 lines stripped ...]