From ceb01c78e760e32e803be30c559e772323bd68cb Mon Sep 17 00:00:00 2001 From: Dominik Frantisek Bucik Date: Thu, 2 Dec 2021 16:22:03 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20fallbacking=20of=20?= =?UTF-8?q?locale=20to=20the=20code=20to=20prevent=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cz/muni/ics/openid/connect/config/JsonMessageSource.java | 4 +++- .../muni/ics/openid/connect/config/TestJsonMessageSource.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java index e76c12209..c96848dea 100644 --- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java +++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/JsonMessageSource.java @@ -58,6 +58,8 @@ public class JsonMessageSource extends AbstractMessageSource { this.config = config; } + + @Override protected MessageFormat resolveCode(String code, Locale locale) { @@ -73,7 +75,7 @@ public class JsonMessageSource extends AbstractMessageSource { if (value == null) { // if it's still null, return null - return null; + return new MessageFormat(code, locale); } else { // otherwise format the message return new MessageFormat(value, locale); diff --git a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java index 0afbc9505..4611d9fb9 100644 --- a/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java +++ b/perun-oidc-server/src/test/java/cz/muni/ics/openid/connect/config/TestJsonMessageSource.java @@ -43,7 +43,8 @@ public class TestJsonMessageSource { @Test public void verifyWhenLocaleDoesNotExist_cannotResolveCode() { + String code = "test"; MessageFormat mf = jsonMessageSource.resolveCode("test", localeThatDoesNotHaveAFile); - assertNull(mf); + assertEquals(code, mf.toPattern()); } }