[java-identity-provider] branch main updated: IDP-1861 - Typo in error message for duplicate relying party config

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=833feabb3f09e3f16118c5e57ad30b5109f9c80c

The following commit(s) were added to refs/heads/main by this push:
     new 833feabb3 IDP-1861 - Typo in error message for duplicate relying party config
833feabb3 is described below

commit 833feabb3f09e3f16118c5e57ad30b5109f9c80c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 3 09:28:37 2021 -0400

    IDP-1861 - Typo in error message for duplicate relying party config
    
    https://shibboleth.atlassian.net/browse/IDP-1861
---
 .../shibboleth/idp/relyingparty/RelyingPartyConfiguration.java    | 8 ++++----
 .../impl/DefaultRelyingPartyConfigurationResolver.java            | 2 +-
 .../impl/ReloadingRelyingPartyConfigurationResolver.java          | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
index d233005aa..9c170fc1a 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
@@ -83,7 +83,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
      */
     @Nonnull @NotEmpty public String getResponderId(@Nullable final ProfileRequestContext profileRequestContext) {
         return Constraint.isNotEmpty(responderIdLookupStrategy.apply(profileRequestContext),
-                "ResponderId cannot be null");
+                "ResponderId cannot be null or empty");
     }
 
     /**
@@ -95,7 +95,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         final String id =
-                Constraint.isNotNull(StringSupport.trimOrNull(responder), "ResponseId cannot be null or empty");
+                Constraint.isNotNull(StringSupport.trimOrNull(responder), "ResponderId cannot be null or empty");
         responderIdLookupStrategy = FunctionSupport.constant(id);
     }
 
@@ -226,7 +226,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         activationCondition =
-                Constraint.isNotNull(condition, "Relying partying configuration activation condition cannot be null");
+                Constraint.isNotNull(condition, "Relying party configuration activation condition cannot be null");
     }
 
     /** {@inheritDoc} */
@@ -234,7 +234,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
         super.doInitialize();
     
         if (responderIdLookupStrategy == null) {
-            throw new ComponentInitializationException("Responder ID lookup strategy cannot be null");
+            throw new ComponentInitializationException("ResponderID lookup strategy cannot be null");
         }
         
     }
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index 3f3a59bb7..9cd338419 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -190,7 +190,7 @@ public class DefaultRelyingPartyConfigurationResolver
         final HashSet<String> configIds = new HashSet<>(rpConfigurations.size());
         for (final RelyingPartyConfiguration config : rpConfigurations) {
             if (configIds.contains(config.getId())) {
-                throw new ComponentInitializationException("Multiple replying party configurations with ID "
+                throw new ComponentInitializationException("Multiple relying party configurations with ID "
                         + config.getId() + " detected. Configuration IDs must be unique.");
             }
             configIds.add(config.getId());
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
index 74b200038..e6566c449 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
@@ -77,7 +77,7 @@ public class ReloadingRelyingPartyConfigurationResolver extends AbstractIdentifi
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration", getId());
             } else {
                 final RelyingPartyConfigurationResolver resolver = component.getComponent();
                 final List<RelyingPartyConfiguration> results = new ArrayList<>();
@@ -105,7 +105,7 @@ public class ReloadingRelyingPartyConfigurationResolver extends AbstractIdentifi
         try {
             component = service.getServiceableComponent();
             if (null == component) {
-                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration.", getId());
+                log.error("RelyingPartyResolver '{}': error looking up Relying Party: Invalid configuration", getId());
             } else {
                 final RelyingPartyConfigurationResolver resolver = component.getComponent();
                 return resolver.resolveSingle(context);
@@ -129,7 +129,7 @@ public class ReloadingRelyingPartyConfigurationResolver extends AbstractIdentifi
             component = service.getServiceableComponent();
             if (null == component) {
                 log.error("RelyingPartyResolver '{}': error looking up default security config:"
-                        + " Invalid configuration.", getId());
+                        + " Invalid configuration", getId());
             } else {
                 final RelyingPartyConfigurationResolver resolver = component.getComponent();
                 return resolver.getDefaultSecurityConfiguration(profileId);

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