[java-plugin-shibd-saml] branch main updated: Eliminate dedicated base class, setting is not in use.

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-plugin-shibd-saml.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-saml/commit/7dae718dbb11a8a1a3042649306e1a5bd2980d59

The following commit(s) were added to refs/heads/main by this push:
     new 7dae718  Eliminate dedicated base class, setting is not in use.
7dae718 is described below

commit 7dae718dbb11a8a1a3042649306e1a5bd2980d59
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 4 12:04:07 2026 -0500

    Eliminate dedicated base class, setting is not in use.
---
 .../profile/config/SAML2ProfileConfiguration.java  | 35 ----------------------
 .../impl/AbstractSAML2ProfileConfiguration.java    | 29 +-----------------
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/sp-saml-api/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/SAML2ProfileConfiguration.java b/sp-saml-api/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/SAML2ProfileConfiguration.java
deleted file mode 100644
index 55f3f52..0000000
--- a/sp-saml-api/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/SAML2ProfileConfiguration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.sp.saml.saml2.profile.config;
-
-import javax.annotation.Nullable;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-
-/** Common interface for SAML 2.0 SP profile configurations. */
-public interface SAML2ProfileConfiguration extends net.shibboleth.saml.saml2.profile.config.SAML2ProfileConfiguration {
-
-    /**
-     * Get the entityID assigned to this system.
-     * 
-     * @param profileRequestContext current profile request context
-     * 
-     * @return our own entityID
-     */
-    @Nullable @NotEmpty String getEntityID(@Nullable final ProfileRequestContext profileRequestContext);
-    
-}
\ No newline at end of file
diff --git a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/AbstractSAML2ProfileConfiguration.java b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/AbstractSAML2ProfileConfiguration.java
index 244d5f1..2f526ed 100644
--- a/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/AbstractSAML2ProfileConfiguration.java
+++ b/sp-saml-impl/src/main/java/net/shibboleth/sp/saml/saml2/profile/config/impl/AbstractSAML2ProfileConfiguration.java
@@ -25,7 +25,7 @@ import net.shibboleth.shared.logic.Constraint;
 import net.shibboleth.shared.logic.FunctionSupport;
 import net.shibboleth.shared.logic.PredicateSupport;
 import net.shibboleth.sp.profile.config.AbstractConditionalProfileConfiguration;
-import net.shibboleth.sp.saml.saml2.profile.config.SAML2ProfileConfiguration;
+import net.shibboleth.saml.saml2.profile.config.SAML2ProfileConfiguration;
 
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -34,9 +34,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
 public abstract class AbstractSAML2ProfileConfiguration extends AbstractConditionalProfileConfiguration implements
         SAML2ProfileConfiguration {
     
-    /** Function used to obtain our entityID. */
-    @Nonnull private Function<ProfileRequestContext,String> entityIDLookupStrategy;
-    
     /** Predicate used to determine if the generated request should be signed. Default returns false. */
     @Nonnull private Predicate<ProfileRequestContext> signRequestsPredicate;
 
@@ -61,7 +58,6 @@ public abstract class AbstractSAML2ProfileConfiguration extends AbstractConditio
     public AbstractSAML2ProfileConfiguration(@Nonnull @NotEmpty final String profileId) {
         super(profileId);
 
-        entityIDLookupStrategy = FunctionSupport.constant(null);
         signRequestsPredicate = PredicateSupport.alwaysFalse();
         signResponsesPredicate = PredicateSupport.alwaysFalse();
         encryptionOptionalPredicate = PredicateSupport.alwaysFalse();
@@ -74,29 +70,6 @@ public abstract class AbstractSAML2ProfileConfiguration extends AbstractConditio
     public boolean isIgnoreRequestSignatures(@Nullable ProfileRequestContext profileRequestContext) {
         throw new UnsupportedOperationException("ignoreRequestSignatures is unsupported");
     }
-    
-    /** {@inheritDoc} */
-    @Nullable @NotEmpty public String getEntityID(@Nullable final ProfileRequestContext profileRequestContext) {
-        return entityIDLookupStrategy.apply(profileRequestContext);
-    }
-    
-    /**
-     * Set the entityID of this system.
-     * 
-     * @param id entityID
-     */
-    public void setEntityID(@Nullable @NotEmpty final String id) {
-        entityIDLookupStrategy = FunctionSupport.constant(id);
-    }
-    
-    /**
-     * Set the lookup strategy for the entityID of this system
-     * 
-     * @param strategy lookup strategy
-     */
-    public void setEntityIDLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        entityIDLookupStrategy = Constraint.isNotNull(strategy, "EntityID lookup strategy cannot be null");
-    }
 
     /** {@inheritDoc} */
     public boolean isSignRequests(@Nullable final ProfileRequestContext profileRequestContext) {

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