gh-511 Support country part in Accept-Language language tags

Author: kerkhofsd

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpApiV2ProxyHttpServletRequest.java

@@ -408,31 +408,13 @@ public String getRemoteHost() {
 
     @Override
     public Locale getLocale() {
-        // Accept-Language: fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5
-        List<HeaderValue> values = this.parseHeaderValue(
-                headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE), ",", ";"
-        );
-        if (values.size() == 0) {
-            return Locale.getDefault();
-        }
-        return new Locale(values.get(0).getValue());
+        List<Locale> locales = parseAcceptLanguageHeader(headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE));
+        return locales.size() == 0 ? Locale.getDefault() : locales.get(0);
     }
 
     @Override
     public Enumeration<Locale> getLocales() {
-        List<HeaderValue> values = this.parseHeaderValue(
-                headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE), ",", ";"
-        );
-
-        List<Locale> locales = new ArrayList<>();
-        if (values.size() == 0) {
-            locales.add(Locale.getDefault());
-        } else {
-            for (HeaderValue locale : values) {
-                locales.add(new Locale(locale.getValue()));
-            }
-        }
-
+        List<Locale> locales = parseAcceptLanguageHeader(headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE));
         return Collections.enumeration(locales);
     }
 

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsHttpServletRequest.java

@@ -16,9 +16,11 @@
 import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.internal.SecurityUtils;
 import com.amazonaws.serverless.proxy.internal.testutils.Timer;
-import com.amazonaws.serverless.proxy.model.*;
+import com.amazonaws.serverless.proxy.model.AwsProxyRequestContext;
+import com.amazonaws.serverless.proxy.model.ContainerConfig;
+import com.amazonaws.serverless.proxy.model.Headers;
+import com.amazonaws.serverless.proxy.model.MultiValuedTreeMap;
 import com.amazonaws.services.lambda.runtime.Context;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
@@ -30,10 +32,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.DispatcherType;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
 import javax.ws.rs.core.MediaType;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -697,6 +704,40 @@ protected List<HeaderValue> parseHeaderValue(String headerValue, String valueSep
         return values;
     }
 
+    protected List<Locale> parseAcceptLanguageHeader(String headerValue) {
+        // Accept-Language: fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5
+        List<HeaderValue> values = this.parseHeaderValue(
+                headerValue, ",", ";"
+        );
+
+        List<Locale> locales = new ArrayList<>();
+        if (values.size() == 0) {
+            locales.add(Locale.getDefault());
+        } else {
+            for (HeaderValue locale : values) {
+                locales.add(parseLanguageTag(locale.getValue()));
+            }
+        }
+
+        return locales;
+    }
+
+    protected Locale parseLanguageTag(String languageTag) {
+        languageTag = languageTag.trim();
+        String language;
+        String country = "";
+
+        int indexDash = languageTag.indexOf('-');
+        if (indexDash > -1) {
+            country = languageTag.substring(indexDash + 1).trim();
+            language = languageTag.substring(0, indexDash).trim();
+        } else {
+            language = languageTag;
+        }
+
+        return new Locale(language, country);
+    }
+
     static String decodeRequestPath(String requestPath, ContainerConfig config) {
         try {
             return URLDecoder.decode(requestPath, config.getUriEncoding());

aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java

@@ -20,7 +20,6 @@
 import com.amazonaws.serverless.proxy.model.Headers;
 import com.amazonaws.serverless.proxy.model.RequestSource;
 import com.amazonaws.services.lambda.runtime.Context;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +28,6 @@
 import javax.servlet.http.*;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.SecurityContext;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -38,15 +36,7 @@
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -471,36 +461,16 @@ public String getRemoteHost() {
 
     @Override
     public Locale getLocale() {
-        // Accept-Language: fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5
-        List<HeaderValue> values = this.parseHeaderValue(
-                request.getMultiValueHeaders().getFirst(HttpHeaders.ACCEPT_LANGUAGE), ",", ";"
-        );
-        if (values.size() == 0) {
-            return Locale.getDefault();
-        }
-        return new Locale(values.get(0).getValue());
+        List<Locale> locales = parseAcceptLanguageHeader(request.getMultiValueHeaders().getFirst(HttpHeaders.ACCEPT_LANGUAGE));
+        return locales.size() == 0 ? Locale.getDefault() : locales.get(0);
     }
 
-
     @Override
     public Enumeration<Locale> getLocales() {
-        List<HeaderValue> values = this.parseHeaderValue(
-                request.getMultiValueHeaders().getFirst(HttpHeaders.ACCEPT_LANGUAGE), ",", ";"
-        );
-
-        List<Locale> locales = new ArrayList<>();
-        if (values.size() == 0) {
-            locales.add(Locale.getDefault());
-        } else {
-            for (HeaderValue locale : values) {
-                locales.add(new Locale(locale.getValue()));
-            }
-        }
-
+        List<Locale> locales = parseAcceptLanguageHeader(request.getMultiValueHeaders().getFirst(HttpHeaders.ACCEPT_LANGUAGE));
         return Collections.enumeration(locales);
     }
 
-
     @Override
     public boolean isSecure() {
         return securityContext.isSecure();