[java-shib-profile] branch main updated: IDP-2069 - Null Handling Task
Rod Widdowson
rdw at steadingsoftware.com
Sat Mar 18 10:49:02 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-shib-profile.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=5394862f4bd59211918a88dbe5bc25fe78e5f981
The following commit(s) were added to refs/heads/main by this push:
new 5394862 IDP-2069 - Null Handling Task
5394862 is described below
commit 5394862f4bd59211918a88dbe5bc25fe78e5f981
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 17 14:53:48 2023 +0000
IDP-2069 - Null Handling Task
https://shibboleth.atlassian.net/browse/IDP-2069
rename BaseContext#getOrCreateSubcontext to ensureSubcontext
---
.../profile/context/logic/LoopDetectionPredicateTest.java | 2 +-
.../profile/context/logic/RelyingPartyIdPredicateTest.java | 4 ++--
.../net/shibboleth/profile/context/logic/ScriptedPredicateTest.java | 2 +-
.../profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java | 6 +++---
.../relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
index 6d54ece..3ca8294 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/LoopDetectionPredicateTest.java
@@ -39,7 +39,7 @@ public class LoopDetectionPredicateTest extends OpenSAMLInitBaseTestCase {
@BeforeMethod
public void setUp() {
prc = new ProfileRequestContext();
- rpCtx = prc.getOrCreateSubcontext(RelyingPartyContext.class);
+ rpCtx = prc.ensureSubcontext(RelyingPartyContext.class);
pred = new LoopDetectionPredicate();
pred.setUsernameLookupStrategy(FunctionSupport.constant("jdoe.1"));
}
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
index b5c39e7..15ba6bf 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/RelyingPartyIdPredicateTest.java
@@ -40,7 +40,7 @@ public class RelyingPartyIdPredicateTest {
@BeforeMethod
public void setUp() {
prc = new ProfileRequestContext();
- rpCtx = prc.getOrCreateSubcontext(RelyingPartyContext.class);
+ rpCtx = prc.ensureSubcontext(RelyingPartyContext.class);
}
@Test
@@ -118,7 +118,7 @@ public class RelyingPartyIdPredicateTest {
private boolean testCandidate(final RelyingPartyIdPredicate rpIdPredicate, final String rpId) {
final ProfileRequestContext prc = new ProfileRequestContext();
- final RelyingPartyContext rpc = prc.getOrCreateSubcontext(RelyingPartyContext.class);
+ final RelyingPartyContext rpc = prc.ensureSubcontext(RelyingPartyContext.class);
rpc.setRelyingPartyId(rpId);
return rpIdPredicate.test(prc);
}
diff --git a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
index b611075..83c721f 100644
--- a/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
+++ b/shib-profile-api/src/test/java/net/shibboleth/profile/context/logic/ScriptedPredicateTest.java
@@ -41,7 +41,7 @@ public class ScriptedPredicateTest {
@BeforeClass public void setup() {
withChild = new ProfileRequestContext();
- withChild.getOrCreateSubcontext(RelyingPartyContext.class);
+ withChild.ensureSubcontext(RelyingPartyContext.class);
noChild = new ProfileRequestContext();
}
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
index 18bc311..79d15e9 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaSelfEntityIDResolver.java
@@ -165,13 +165,13 @@ public class CriteriaSelfEntityIDResolver extends AbstractIdentifiedInitializabl
if (entityID != null || entityDescriptor != null || roleDescriptor != null) {
final ProfileRequestContext prc = new ProfileRequestContext();
- final RelyingPartyContext rpc = prc.getOrCreateSubcontext(RelyingPartyContext.class);
+ final RelyingPartyContext rpc = prc.ensureSubcontext(RelyingPartyContext.class);
rpc.setVerified(true);
rpc.setRelyingPartyId(entityID);
if (entityDescriptor != null || roleDescriptor != null) {
- final SAMLPeerEntityContext peerContext = prc.getOrCreateSubcontext(SAMLPeerEntityContext.class);
+ final SAMLPeerEntityContext peerContext = prc.ensureSubcontext(SAMLPeerEntityContext.class);
rpc.setRelyingPartyIdContextTree(peerContext);
peerContext.setEntityId(entityID);
@@ -181,7 +181,7 @@ public class CriteriaSelfEntityIDResolver extends AbstractIdentifiedInitializabl
? roleDescriptor.getSchemaType() : roleDescriptor.getElementQName());
}
- final SAMLMetadataContext metadataContext = peerContext.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext metadataContext = peerContext.ensureSubcontext(SAMLMetadataContext.class);
metadataContext.setEntityDescriptor(entityDescriptor);
metadataContext.setRoleDescriptor(roleDescriptor);
}
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index f1aecb6..b296eb4 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -351,13 +351,13 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
if (entityID != null || entityDescriptor != null || roleDescriptor != null) {
final ProfileRequestContext prc = new ProfileRequestContext();
- final RelyingPartyContext rpc = prc.getOrCreateSubcontext(RelyingPartyContext.class);
+ final RelyingPartyContext rpc = prc.ensureSubcontext(RelyingPartyContext.class);
rpc.setVerified(true);
rpc.setRelyingPartyId(entityID);
if (entityDescriptor != null || roleDescriptor != null) {
- final SAMLPeerEntityContext peerContext = prc.getOrCreateSubcontext(SAMLPeerEntityContext.class);
+ final SAMLPeerEntityContext peerContext = prc.ensureSubcontext(SAMLPeerEntityContext.class);
rpc.setRelyingPartyIdContextTree(peerContext);
peerContext.setEntityId(entityID);
@@ -367,7 +367,7 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
? roleDescriptor.getSchemaType() : roleDescriptor.getElementQName());
}
- final SAMLMetadataContext metadataContext = peerContext.getOrCreateSubcontext(SAMLMetadataContext.class);
+ final SAMLMetadataContext metadataContext = peerContext.ensureSubcontext(SAMLMetadataContext.class);
metadataContext.setEntityDescriptor(entityDescriptor);
metadataContext.setRoleDescriptor(roleDescriptor);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list