From 623fbcbf8cc6f9870e55a6755af35558879ddaea Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 23 Apr 2020 15:18:23 +0200
Subject: [PATCH] Polish

---
 ...itional-spring-configuration-metadata.json |  6 ++-
 ...itional-spring-configuration-metadata.json | 38 ++++++++++++++++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 53f7705670..c47249a854 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1327,6 +1327,10 @@
       "name": "management.metrics.export.prometheus.histogram-flavor",
       "defaultValue": "prometheus"
     },
+    {
+      "name": "management.metrics.export.prometheus.pushgateway.shutdown-operation",
+      "defaultValue": "none"
+    },
     {
       "name": "management.metrics.export.signalfx.num-threads",
       "type": "java.lang.Integer",
@@ -1413,7 +1417,7 @@
       "name": "management.metrics.web.server.auto-time-requests",
       "type": "java.lang.Boolean",
       "deprecation": {
-        "replacement": "management.metrics.web.server.request.autotime.enabled"
+        "replacement": "management.metrics.web.server.request.autotime.enabled",
         "level": "error"
       }
     },
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 e2b7b5a350..6c86bc2b51 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
@@ -601,6 +601,10 @@
       "name": "server.error.include-stacktrace",
       "defaultValue": "never"
     },
+    {
+      "name": "server.forward-headers-strategy",
+      "defaultValue": "ncsa"
+    },
     {
       "name": "server.http2.enabled",
       "description": "Whether to enable HTTP/2 support, if the current environment supports it.",
@@ -1218,7 +1222,7 @@
       "name": "spring.data.cassandra.pool.max-queue-size",
       "type": "java.lang.Integer",
       "deprecation": {
-        "replacement": "spring.data.cassandra.throttler.max-queue-size",
+        "replacement": "spring.data.cassandra.request.throttler.max-queue-size",
         "level": "error"
       }
     },
@@ -1273,6 +1277,10 @@
       "description": "Type of Cassandra repositories to enable.",
       "defaultValue": "auto"
     },
+    {
+      "name": "spring.data.cassandra.request.throttler.type",
+      "defaultValue": "none"
+    },
     {
       "name": "spring.data.cassandra.retry-policy",
       "type": "java.lang.Class",
@@ -1281,10 +1289,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.data.cassandra.throttler.type",
-      "defaultValue": "none"
-    },
     {
       "name": "spring.data.couchbase.consistency",
       "type": "org.springframework.data.couchbase.core.query.Consistency",
@@ -2411,6 +2415,10 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.rsocket.server.transport",
+      "defaultValue": "tcp"
+    },
     {
       "name": "spring.security.filter.dispatcher-types",
       "defaultValue": [
@@ -2445,6 +2453,14 @@
       "name": "spring.session.hazelcast.flush-mode",
       "defaultValue": "on-save"
     },
+    {
+      "name": "spring.session.hazelcast.save-mode",
+      "defaultValue": "on-set-attribute"
+    },
+    {
+      "name": "spring.session.jdbc.flush-mode",
+      "defaultValue": "on-save"
+    },
     {
       "name": "spring.session.jdbc.initialize-schema",
       "defaultValue": "embedded"
@@ -2458,6 +2474,10 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.session.jdbc.save-mode",
+      "defaultValue": "on-set-attribute"
+    },
     {
       "name": "spring.session.mongo.collection-name",
       "type": "java.lang.String",
@@ -2468,10 +2488,18 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.session.redis.configure-action",
+      "defaultValue": "notify-keyspace-events"
+    },
     {
       "name": "spring.session.redis.flush-mode",
       "defaultValue": "on-save"
     },
+    {
+      "name": "spring.session.redis.save-mode",
+      "defaultValue": "on-set-attribute"
+    },
     {
       "name": "spring.session.servlet.filter-dispatcher-types",
       "defaultValue": [