[java-shib-profile] 02/02: Checkstyle.
Codeberg
noreply at shibboleth.net
Tue Jul 21 16:21:37 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-shib-profile.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-profile/commit/14470afea183aee2581e01c742230776becd4d49
commit 14470afea183aee2581e01c742230776becd4d49
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Tue Jul 21 12:21:26 2026 -0400
Checkstyle.
---
.../impl/CriteriaDecryptionConfigurationResolver.java | 13 ++++++++-----
.../relyingparty/impl/CriteriaSelfEntityIDResolver.java | 3 ++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaDecryptionConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaDecryptionConfigurationResolver.java
index a63a57f..74a5a2a 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaDecryptionConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/CriteriaDecryptionConfigurationResolver.java
@@ -49,7 +49,8 @@ public class CriteriaDecryptionConfigurationResolver
extends BaseCriteriaRelyingPartyConfiigurationResolver<List<DecryptionConfiguration>> {
/** {@inheritDoc} */
- @Nonnull public Iterable<List<DecryptionConfiguration>> resolve(@Nullable final CriteriaSet criteria) throws ResolverException {
+ @Nonnull public Iterable<List<DecryptionConfiguration>> resolve(@Nullable final CriteriaSet criteria)
+ throws ResolverException {
checkComponentActive();
final List<DecryptionConfiguration> config = resolveSingle(criteria);
if (config != null) {
@@ -59,10 +60,12 @@ public class CriteriaDecryptionConfigurationResolver
}
/** {@inheritDoc} */
- @Nullable public List<DecryptionConfiguration> resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
+ @Nullable public List<DecryptionConfiguration> resolveSingle(@Nullable final CriteriaSet criteria)
+ throws ResolverException {
checkComponentActive();
- final Pair<RelyingPartyConfiguration, ProfileRequestContext> rpcData = resolveRelyingPartyConfiguration(criteria);
+ final Pair<RelyingPartyConfiguration, ProfileRequestContext> rpcData =
+ resolveRelyingPartyConfiguration(criteria);
if (rpcData != null) {
final RelyingPartyConfiguration rpc = rpcData.getFirst();
final ProfileRequestContext prc = rpcData.getSecond();
@@ -83,12 +86,12 @@ public class CriteriaDecryptionConfigurationResolver
* @return the list of configurations
*/
@Nonnull private List<DecryptionConfiguration> buildConfigList(@Nonnull final RelyingPartyConfiguration rpc,
- @Nonnull final ProfileRequestContext prc, CriteriaSet criteria) {
+ @Nonnull final ProfileRequestContext prc, @Nullable final CriteriaSet criteria) {
final List<DecryptionConfiguration> configs = new ArrayList<>();
String profileID = null;
- final ProfileIDCriterion profileIDCriterion = criteria.get(ProfileIDCriterion.class);
+ final ProfileIDCriterion profileIDCriterion = criteria != null ? criteria.get(ProfileIDCriterion.class) : null;
if (profileIDCriterion != null) {
profileID = profileIDCriterion.getProfileId();
}
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 1ac4716..faf781f 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
@@ -51,7 +51,8 @@ public class CriteriaSelfEntityIDResolver extends BaseCriteriaRelyingPartyConfii
@Nullable public String resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
checkComponentActive();
- final Pair<RelyingPartyConfiguration, ProfileRequestContext> rpcData = resolveRelyingPartyConfiguration(criteria);
+ final Pair<RelyingPartyConfiguration, ProfileRequestContext> rpcData =
+ resolveRelyingPartyConfiguration(criteria);
if (rpcData != null) {
final RelyingPartyConfiguration rpc = rpcData.getFirst();
final ProfileRequestContext prc = rpcData.getSecond();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list