KEYCLOAK-15459 Fix serialization of locale in admin console's “whoami” (keycloak#7397)

devopsix · web-flow · commit 590ee1b1a206 · 2021-03-29T18:37:26.000-04:00
call.
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
@@ -163,6 +163,11 @@ public Locale getLocale() {
         public void setLocale(Locale locale) {
             this.locale = locale;
         }
+
+        @JsonProperty(value = "locale")
+        public String getLocaleLanguageTag() {
+            return locale != null ? locale.toLanguageTag() : null;
+        }
     }
 
     /**
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminConsoleWhoAmILocaleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminConsoleWhoAmILocaleTest.java
@@ -36,7 +36,7 @@ public class AdminConsoleWhoAmILocaleTest extends AbstractKeycloakTest {
     private static final String DEFAULT_LOCALE = "en";
     private static final String REALM_LOCALE = "no";
     private static final String USER_LOCALE = "de";
-    private static final String EXTRA_LOCALE = "ru";
+    private static final String EXTRA_LOCALE = "zh-CN";
 
     private CloseableHttpClient client;
 

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,11 @@ public Locale getLocale() {`
`163`	`163`	`public void setLocale(Locale locale) {`
`164`	`164`	`this.locale = locale;`
`165`	`165`	`}`
	`166`	`+`
	`167`	`+ @JsonProperty(value = "locale")`
	`168`	`+ public String getLocaleLanguageTag() {`
	`169`	`+ return locale != null ? locale.toLanguageTag() : null;`
	`170`	`+ }`
`166`	`171`	`}`
`167`	`172`
`168`	`173`	`/**`