[java-identity-provider] 02/02: IDP-2400 - Spring 6.2 changed MessageSource Locale parameter annotation

[Scott Cantor]

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

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

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

commit 022738335ec8ee943b224d3c31d0b814b7f07a07
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 19 11:59:41 2025 -0400

    IDP-2400 - Spring 6.2 changed MessageSource Locale parameter annotation
    
    https://shibboleth.atlassian.net/browse/IDP-2400
---
 .../java/net/shibboleth/idp/profile/AbstractProfileAction.java     | 7 ++++---
 .../navigate/tests/SpringStatusMessageLookupFunctionTest.java      | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
index 92a5611f2..1903aa4a5 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
@@ -325,7 +325,7 @@ public abstract class AbstractProfileAction extends AbstractConditionalProfileAc
     /** {@inheritDoc} */
     @Override
     @Nullable public String getMessage(@Nonnull final String code, @Nullable final Object[] args,
-            @Nullable final String defaultMessage, @Nonnull final Locale locale) {
+            @Nullable final String defaultMessage, @Nullable final Locale locale) {
         if (messageSource != null) {
             return messageSource.getMessage(code, args, defaultMessage, locale);
         }
@@ -335,7 +335,7 @@ public abstract class AbstractProfileAction extends AbstractConditionalProfileAc
     /** {@inheritDoc} */
     @Override
     @Nonnull public String getMessage(@Nonnull final String code, @Nullable final Object[] args,
-            @Nonnull final Locale locale) {
+            @Nullable final Locale locale) {
         if (messageSource != null) {
             return messageSource.getMessage(code, args, locale);
         }
@@ -344,7 +344,8 @@ public abstract class AbstractProfileAction extends AbstractConditionalProfileAc
 
     /** {@inheritDoc} */
     @Override
-    @Nonnull public String getMessage(@Nonnull final MessageSourceResolvable resolvable, @Nonnull final Locale locale) {
+    @Nonnull public String getMessage(@Nonnull final MessageSourceResolvable resolvable,
+            @Nullable final Locale locale) {
         if (messageSource != null) {
             return messageSource.getMessage(resolvable, locale);
         }
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/context/navigate/tests/SpringStatusMessageLookupFunctionTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/context/navigate/tests/SpringStatusMessageLookupFunctionTest.java
index 8ea4b2671..1f002690a 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/context/navigate/tests/SpringStatusMessageLookupFunctionTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/context/navigate/tests/SpringStatusMessageLookupFunctionTest.java
@@ -67,7 +67,7 @@ public class SpringStatusMessageLookupFunctionTest {
     private class MockMessageSource implements MessageSource {
 
         /** {@inheritDoc} */
-        public String getMessage(@Nonnull String code, @Nullable Object[] args, @Nullable String defaultMessage, @Nonnull Locale locale) {
+        public String getMessage(@Nonnull String code, @Nullable Object[] args, @Nullable String defaultMessage, @Nullable Locale locale) {
             if (code.equals("Mappable")) {
                 return "Mapped";
             }
@@ -75,7 +75,7 @@ public class SpringStatusMessageLookupFunctionTest {
         }
 
         /** {@inheritDoc} */
-        public @Nonnull String getMessage(@Nonnull String code, @Nullable Object[] args, @Nonnull Locale locale) throws NoSuchMessageException {
+        public @Nonnull String getMessage(@Nonnull String code, @Nullable Object[] args, @Nullable Locale locale) throws NoSuchMessageException {
             if (code.equals("Mappable")) {
                 return "Mapped";
             }
@@ -83,7 +83,7 @@ public class SpringStatusMessageLookupFunctionTest {
         }
 
         /** {@inheritDoc} */
-        public @Nonnull String getMessage(@Nonnull MessageSourceResolvable resolvable, @Nonnull Locale locale) throws NoSuchMessageException {
+        public @Nonnull String getMessage(@Nonnull MessageSourceResolvable resolvable, @Nullable Locale locale) throws NoSuchMessageException {
             final String[] codes = resolvable.getCodes();
             assert codes != null && codes.length >=1;
             if (codes[0].equals("Mappable")) {

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