[java-plugin-shibd] branch main updated: Null fixes, javadoc fixes.

[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.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd/commit/491ff1beff3272f19c66652eb388af645af3f6b3

The following commit(s) were added to refs/heads/main by this push:
     new 491ff1b  Null fixes, javadoc fixes.
491ff1b is described below

commit 491ff1beff3272f19c66652eb388af645af3f6b3
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Tue May 19 14:48:13 2026 -0400

    Null fixes, javadoc fixes.
---
 .../net/shibboleth/sp/profile/BasicTokenConsumerFlowDescriptor.java  | 2 +-
 .../java/net/shibboleth/sp/profile/TokenConsumerFlowDescriptor.java  | 3 +--
 sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicAgent.java  | 2 +-
 .../src/main/java/net/shibboleth/sp/impl/BasicApplication.java       | 5 ++---
 .../shibboleth/sp/authn/impl/AgentSecretCredentialValidatorTest.java | 2 +-
 .../shibboleth/sp/authn/impl/ValidateCachedAuthenticationTest.java   | 4 ++--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/profile/BasicTokenConsumerFlowDescriptor.java b/sp-server-api/src/main/java/net/shibboleth/sp/profile/BasicTokenConsumerFlowDescriptor.java
index 62a3d2a..a84fc1d 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/profile/BasicTokenConsumerFlowDescriptor.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/profile/BasicTokenConsumerFlowDescriptor.java
@@ -32,7 +32,7 @@ import net.shibboleth.shared.logic.PredicateSupport;
 public class BasicTokenConsumerFlowDescriptor extends AbstractIdentifiableInitializableComponent
         implements TokenConsumerFlowDescriptor {
     
-    /** Whether this flow supports non-browser clients. */
+    /** Whether this flow supports a particular request. */
     @Nonnull private Predicate<ProfileRequestContext> activationCondition;
     
     /** Constructor. */
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/profile/TokenConsumerFlowDescriptor.java b/sp-server-api/src/main/java/net/shibboleth/sp/profile/TokenConsumerFlowDescriptor.java
index c33adf8..6c32dca 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/profile/TokenConsumerFlowDescriptor.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/profile/TokenConsumerFlowDescriptor.java
@@ -36,8 +36,7 @@ import net.shibboleth.idp.profile.FlowDescriptor;
 public interface TokenConsumerFlowDescriptor extends FlowDescriptor {
 
     /**
-     * Gets the activation condition to run to determine whether this flow can handle the
-     * request.
+     * Gets the activation condition to run to determine whether this flow can handle the request.
      * 
      * @return a condition governing use of this flow
      */
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicAgent.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicAgent.java
index 4240b55..467efeb 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicAgent.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicAgent.java
@@ -307,7 +307,7 @@ public class BasicAgent extends BasicApplication implements Agent {
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
-        return getId().hashCode();
+        return ensureId().hashCode();
     }
 
     /** {@inheritDoc} */
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
index 379d41a..4c16a5c 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/BasicApplication.java
@@ -134,10 +134,9 @@ public class BasicApplication extends BasicRelyingPartyConfiguration implements
     }
         
     /** {@inheritDoc} */
-    @SuppressWarnings("null")
     @Override
     @Nonnull @NotEmpty public String getApplicationId() {
-        return getId();
+        return ensureId();
     }
     
     /**
@@ -655,7 +654,7 @@ public class BasicApplication extends BasicRelyingPartyConfiguration implements
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
-        return getId().hashCode();
+        return ensureId().hashCode();
     }
 
     /** {@inheritDoc} */
diff --git a/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/AgentSecretCredentialValidatorTest.java b/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/AgentSecretCredentialValidatorTest.java
index a2918c7..3368920 100644
--- a/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/AgentSecretCredentialValidatorTest.java
+++ b/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/AgentSecretCredentialValidatorTest.java
@@ -84,7 +84,7 @@ public class AgentSecretCredentialValidatorTest extends BaseAgentRequestTest {
             final Subject subject = validator.validate(prc, ac, null, null);
             assert subject != null;
             final Set<UsernamePrincipal> principals = subject.getPrincipals(UsernamePrincipal.class);
-            Assert.assertTrue(principals.contains(new UsernamePrincipal(agent.getId())));
+            Assert.assertTrue(principals.contains(new UsernamePrincipal(agent.ensureId())));
         } catch (final Exception e) {
             Assert.fail("Validator should not have thrown");
         }
diff --git a/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/ValidateCachedAuthenticationTest.java b/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/ValidateCachedAuthenticationTest.java
index aeaa4f9..4db48a3 100644
--- a/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/ValidateCachedAuthenticationTest.java
+++ b/sp-server-impl/src/test/java/net/shibboleth/sp/authn/impl/ValidateCachedAuthenticationTest.java
@@ -104,7 +104,7 @@ public class ValidateCachedAuthenticationTest extends BaseAgentRequestTest {
 
         final MockHttpSession session = new MockHttpSession(); 
         session.setAttribute(ValidateCachedAuthentication.AGENT_SESSION_ATTRIBUTE,
-                new CachedAgentAuthentication(agent.getId(), "127.0.0.1", Instant.now().minusSeconds(30)));
+                new CachedAgentAuthentication(agent.ensureId(), "127.0.0.1", Instant.now().minusSeconds(30)));
         request.setSession(session);
         
         final Event event = action.execute(src);
@@ -143,7 +143,7 @@ public class ValidateCachedAuthenticationTest extends BaseAgentRequestTest {
         
         final MockHttpSession session = new MockHttpSession(); 
         session.setAttribute(ValidateCachedAuthentication.AGENT_SESSION_ATTRIBUTE,
-                new CachedAgentAuthentication(agent.getId(), "127.0.0.1", Instant.now().plusSeconds(3600)));
+                new CachedAgentAuthentication(agent.ensureId(), "127.0.0.1", Instant.now().plusSeconds(3600)));
         request.setSession(session);
         
         final Event event = action.execute(src);

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