Use locale param if one is defined over accept-language header

Author: optionsome

application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java

@@ -4,11 +4,15 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import org.opentripplanner.framework.i18n.I18NString;
 
 public class GraphQLUtils {
 
-  public static String getTranslation(I18NString input, DataFetchingEnvironment environment) {
+  public static String getTranslation(
+    @Nullable I18NString input,
+    DataFetchingEnvironment environment
+  ) {
     if (input == null) {
       return null;
     }
@@ -24,15 +28,18 @@ public static Locale getLocale(DataFetchingEnvironment environment) {
     return getLocaleFromEnvironment(environment);
   }
 
-  public static Locale getLocale(DataFetchingEnvironment environment, String localeString) {
+  public static Locale getLocale(
+    DataFetchingEnvironment environment,
+    @Nullable String localeString
+  ) {
     if (localeString != null) {
       return Locale.forLanguageTag(localeString);
     }
 
     return getLocaleFromEnvironment(environment);
   }
 
-  public static Locale getLocale(DataFetchingEnvironment environment, Locale locale) {
+  public static Locale getLocale(DataFetchingEnvironment environment, @Nullable Locale locale) {
     if (locale != null) {
       return locale;
     }
@@ -42,18 +49,10 @@ public static Locale getLocale(DataFetchingEnvironment environment, Locale local
 
   public static Locale getLocaleFromEnvironment(DataFetchingEnvironment environment) {
     // This can come from the accept-language header
-    var userLocale = environment.getLocale();
-    var defaultLocale = getDefaultLocale(environment);
-
-    if (userLocale == null) {
-      return defaultLocale.orElse(Locale.forLanguageTag("*"));
-    }
-
-    if (defaultLocale.isPresent() && acceptAnyLocale(userLocale)) {
-      return defaultLocale.get();
-    }
-
-    return userLocale;
+    var envLocale = environment.getLocale();
+    // This can come from a locale param
+    var localContextLocale = getDefaultLocale(environment);
+    return localContextLocale.orElse(envLocale);
   }
 
   private static Optional<Locale> getDefaultLocale(DataFetchingEnvironment environment) {
@@ -63,8 +62,4 @@ private static Optional<Locale> getDefaultLocale(DataFetchingEnvironment environ
     }
     return Optional.ofNullable((Locale) localContext.get("locale"));
   }
-
-  private static boolean acceptAnyLocale(Locale locale) {
-    return locale.getLanguage().equals("*");
-  }
 }

application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java

@@ -79,8 +79,7 @@ void testGetLocaleWithDefinedLocaleArg() {
   void testGetLocaleWithEnvLocale() {
     var frenchLocale = Locale.FRENCH;
     var env = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(executionContext)
-      .localContext(Map.of("locale", Locale.GERMAN))
-      .locale(frenchLocale)
+      .locale(Locale.FRENCH)
       .build();
 
     var locale = GraphQLUtils.getLocale(env);
@@ -90,10 +89,11 @@ void testGetLocaleWithEnvLocale() {
 
   @Test
   void testGetLocaleWithLocalContextLocale() {
-    // Should use locale from local context if env locale is not defined
+    // Should use locale from local context even if env locale is defined
 
     var frenchLocale = Locale.FRENCH;
     var envWithNoLocale = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(executionContext)
+      .locale(Locale.GERMAN)
       .localContext(Map.of("locale", Locale.FRENCH))
       .build();