From f28af3db9fe31541eb942ae938cb198caf9ef4d2 Mon Sep 17 00:00:00 2001
From: Alessandro Falappa <alex.falappa@gmail.com>
Date: Thu, 17 Oct 2019 16:52:03 +0200
Subject: [PATCH] Narrow type for Tomcat 'locale' and 'encoding' properties

See gh-18637
---
 ...itional-spring-configuration-metadata.json | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index a1a3ec94dc7..635da717b8f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -2170,6 +2170,28 @@
         }
       ]
     },
+    {
+      "name": "server.tomcat.accesslog.encoding",
+      "providers": [
+        {
+          "name": "handle-as",
+          "parameters": {
+            "target": "java.nio.charset.Charset"
+          }
+        }
+      ]
+    },
+    {
+      "name": "server.tomcat.accesslog.locale",
+      "providers": [
+        {
+          "name": "handle-as",
+          "parameters": {
+            "target": "java.util.Locale"
+          }
+        }
+      ]
+    },
     {
       "name": "spring.liquibase.change-log",
       "providers": [