[java-plugin-shibd] branch main updated: Rename AgentCriterion for clarity.
Codeberg
noreply at shibboleth.net
Tue Jul 21 18:22:48 UTC 2026
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/504adc8ded61ef5bbec27d1fda84be95e8468d32
The following commit(s) were added to refs/heads/main by this push:
new 504adc8 Rename AgentCriterion for clarity.
504adc8 is described below
commit 504adc8ded61ef5bbec27d1fda84be95e8468d32
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Tue Jul 21 14:22:32 2026 -0400
Rename AgentCriterion for clarity.
---
.../src/test/java/net/shibboleth/sp/service/AgentResolverTest.java | 4 ++--
.../sp/{AgentCriterion.java => AgentCredentialCriterion.java} | 4 ++--
sp-server-api/src/main/java/net/shibboleth/sp/AgentResolver.java | 2 +-
.../net/shibboleth/sp/authn/impl/InitializeAgentRequestContext.java | 4 ++--
.../src/main/java/net/shibboleth/sp/impl/DefaultAgentResolver.java | 6 +++---
.../src/main/java/net/shibboleth/sp/testing/MockAgentResolver.java | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java b/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
index eb4634c..2391eba 100644
--- a/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
+++ b/sp-conf-impl/src/test/java/net/shibboleth/sp/service/AgentResolverTest.java
@@ -37,7 +37,7 @@ import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor;
import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.sp.Agent;
-import net.shibboleth.sp.AgentCriterion;
+import net.shibboleth.sp.AgentCredentialCriterion;
import net.shibboleth.sp.AgentResolver;
import net.shibboleth.sp.Application;
import net.shibboleth.sp.impl.BasicApplication;
@@ -227,7 +227,7 @@ public class AgentResolverTest extends AbstractTestNGSpringContextTests {
*/
@Nullable private Agent resolveAgent(@Nonnull final String agentId) throws ResolverException {
try (final ServiceableComponent<AgentResolver> component = resolver.getServiceableComponent()) {
- return component.getComponent().resolveSingle(new CriteriaSet(new AgentCriterion(agentId)));
+ return component.getComponent().resolveSingle(new CriteriaSet(new AgentCredentialCriterion(agentId)));
}
}
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/AgentCriterion.java b/sp-server-api/src/main/java/net/shibboleth/sp/AgentCredentialCriterion.java
similarity index 91%
rename from sp-server-api/src/main/java/net/shibboleth/sp/AgentCriterion.java
rename to sp-server-api/src/main/java/net/shibboleth/sp/AgentCredentialCriterion.java
index e22bedd..efe19f4 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/AgentCriterion.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/AgentCredentialCriterion.java
@@ -24,7 +24,7 @@ import net.shibboleth.shared.resolver.Criterion;
/**
* Resolver {@link Criterion} identifying an agent by means of a "credential" name.
*/
-public class AgentCriterion implements Criterion {
+public class AgentCredentialCriterion implements Criterion {
/** Application ID. */
@Nonnull @NotEmpty final String credentialId;
@@ -34,7 +34,7 @@ public class AgentCriterion implements Criterion {
*
* @param id agent ID
*/
- public AgentCriterion(@Nonnull @NotEmpty final String id) {
+ public AgentCredentialCriterion(@Nonnull @NotEmpty final String id) {
credentialId = Constraint.isNotNull(StringSupport.trimOrNull(id), "Agent credential name cannot be null or empty");
}
diff --git a/sp-server-api/src/main/java/net/shibboleth/sp/AgentResolver.java b/sp-server-api/src/main/java/net/shibboleth/sp/AgentResolver.java
index 54b967f..4a35516 100644
--- a/sp-server-api/src/main/java/net/shibboleth/sp/AgentResolver.java
+++ b/sp-server-api/src/main/java/net/shibboleth/sp/AgentResolver.java
@@ -21,7 +21,7 @@ import net.shibboleth.shared.resolver.Resolver;
* Interface to a resolution service that identifies the target {@link Agent}
* for a request based on extensible criteria.
*
- * <p>The {@link AgentCriterion} criterion type MUST be supported; other
+ * <p>The {@link AgentCredentialCriterion} criterion type MUST be supported; other
* types are optional.</p>
*/
public interface AgentResolver extends Resolver<Agent,CriteriaSet> {
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/authn/impl/InitializeAgentRequestContext.java b/sp-server-impl/src/main/java/net/shibboleth/sp/authn/impl/InitializeAgentRequestContext.java
index 43df3dd..78ef4c6 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/authn/impl/InitializeAgentRequestContext.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/authn/impl/InitializeAgentRequestContext.java
@@ -41,7 +41,7 @@ import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceException;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.sp.Agent;
-import net.shibboleth.sp.AgentCriterion;
+import net.shibboleth.sp.AgentCredentialCriterion;
import net.shibboleth.sp.AgentResolver;
import net.shibboleth.sp.context.AgentRequestContext;
@@ -179,7 +179,7 @@ public class InitializeAgentRequestContext extends AbstractAuthenticationAction
try (final ServiceableComponent<AgentResolver> resolver = agentResolver.getServiceableComponent()) {
- final Agent agent = resolver.getComponent().resolveSingle(new CriteriaSet(new AgentCriterion(agentCredentialID)));
+ final Agent agent = resolver.getComponent().resolveSingle(new CriteriaSet(new AgentCredentialCriterion(agentCredentialID)));
if (agent == null) {
log.warn("{} Unknown agent based on credential ID: '{}'", getLogPrefix(), agentCredentialID);
ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.UNKNOWN_USERNAME);
diff --git a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/DefaultAgentResolver.java b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/DefaultAgentResolver.java
index fc717d6..8577bd3 100644
--- a/sp-server-impl/src/main/java/net/shibboleth/sp/impl/DefaultAgentResolver.java
+++ b/sp-server-impl/src/main/java/net/shibboleth/sp/impl/DefaultAgentResolver.java
@@ -32,7 +32,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.spring.config.IdentifiedComponentManager;
import net.shibboleth.sp.Agent;
-import net.shibboleth.sp.AgentCriterion;
+import net.shibboleth.sp.AgentCredentialCriterion;
import net.shibboleth.sp.AgentResolver;
/**
@@ -95,9 +95,9 @@ public class DefaultAgentResolver extends IdentifiedComponentManager<Agent> impl
@Nullable public Agent resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
if (criteria != null) {
- final AgentCriterion c_agent = criteria.get(AgentCriterion.class);
+ final AgentCredentialCriterion c_agent = criteria.get(AgentCredentialCriterion.class);
if (c_agent != null) {
- log.trace("Looking up agent {}", c_agent.getId());
+ log.trace("Looking up agent via username: {}", c_agent.getId());
return agentMap.get(c_agent.getId());
}
}
diff --git a/sp-testing/src/main/java/net/shibboleth/sp/testing/MockAgentResolver.java b/sp-testing/src/main/java/net/shibboleth/sp/testing/MockAgentResolver.java
index be29969..d8ada29 100644
--- a/sp-testing/src/main/java/net/shibboleth/sp/testing/MockAgentResolver.java
+++ b/sp-testing/src/main/java/net/shibboleth/sp/testing/MockAgentResolver.java
@@ -24,7 +24,7 @@ import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.testing.MockReloadableService;
import net.shibboleth.shared.testing.MockResolver;
import net.shibboleth.sp.Agent;
-import net.shibboleth.sp.AgentCriterion;
+import net.shibboleth.sp.AgentCredentialCriterion;
import net.shibboleth.sp.AgentResolver;
/**
@@ -48,9 +48,9 @@ public class MockAgentResolver extends MockResolver<Agent> implements AgentResol
@Nullable public Agent resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
super.resolveSingle(criteria);
- final AgentCriterion agentCrit = criteria != null ? criteria.get(AgentCriterion.class) : null;
+ final AgentCredentialCriterion agentCrit = criteria != null ? criteria.get(AgentCredentialCriterion.class) : null;
if (agentCrit == null) {
- throw new ResolverException("No AgentCriterion provided.");
+ throw new ResolverException("No AgentCredentialCriterion provided.");
}
if (agentCrit.getId().equals(agent.getId())) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list