[java-identity-provider COMMIT] in /trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml: saml1/profile/config/Ab...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec  9 10:56:46 2016
New Revision: 8576

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8576&view=rev
Log:
Refactor artifact config support methods.

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AbstractSAML1ArtifactAwareProfileConfiguration.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AbstractSAML2ArtifactAwareProfileConfiguration.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/AttributeQueryProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/config/SingleLogoutProfileConfiguration.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java?rev=8576&r1=8575&r2=8576&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/AttributeQueryProfileConfiguration.java	Fri Dec  9 10:56:46 2016
@@ -18,30 +18,17 @@
 package net.shibboleth.idp.saml.saml1.profile.config;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
-import com.google.common.base.Function;
-import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.profile.logic.NoIntegrityMessageChannelPredicate;
 
-import net.shibboleth.idp.saml.profile.config.AbstractSAMLProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactAwareProfileConfiguration;
-import net.shibboleth.idp.saml.profile.config.SAMLArtifactConfiguration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 /** Configuration support for SAML 1 attribute query requests. */
 public class AttributeQueryProfileConfiguration
-        extends AbstractSAMLProfileConfiguration
-        implements SAML1ProfileConfiguration, SAMLArtifactAwareProfileConfiguration {
+        extends AbstractSAML1ArtifactAwareProfileConfiguration {
 
     /** ID for this profile configuration. */
     public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/saml1/query/attribute";
-
-    /** Lookup function to supply {@link #artifactConfig} property. */
-    @Nullable private Function<ProfileRequestContext,SAMLArtifactConfiguration> artifactConfigurationLookupStrategy;
-
-    /** SAML artifact configuration. */
-    @Nullable private SAMLArtifactConfiguration artifactConfig;
     
     /** Constructor. */
     public AttributeQueryProfileConfiguration() {
@@ -57,31 +44,5 @@
         super(profileId);
         setSignResponses(new NoIntegrityMessageChannelPredicate());
     }
-    
-    /** {@inheritDoc} */
-    @Override @Nullable public SAMLArtifactConfiguration getArtifactConfiguration() {
-        return getIndirectProperty(artifactConfigurationLookupStrategy, artifactConfig);
-    }
-
-    /**
-     * Set the SAML artifact configuration, if any.
-     * 
-     * @param config configuration to set
-     */
-    public void setArtifactConfiguration(@Nullable final SAMLArtifactConfiguration config) {
-        artifactConfig = config;
-    }
-
-    /**
-     * Set a lookup strategy for the {@link #artifactConfig} property.
-     *
-     * @param strategy  lookup strategy
-     * 
-     * @since 3.3.0
-     */
-    public void setArtifactConfigurationLookupStrategy(
-            @Nullable final Function<ProfileRequestContext,SAMLArtifactConfiguration> strategy) {
-        artifactConfigurationLookupStrategy = strategy;
-    }
 
 }

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java?rev=8576&r1=8575&r2=8576&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml1/profile/config/BrowserSSOProfileConfiguration.java	Fri Dec  9 10:56:46 2016
@@ -40,9 +40,6 @@
 
 import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;

[... 271 lines stripped ...]