From 8ac3ab5551f1edd4d86ba60578fb9f53810fea74 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 23 Apr 2020 14:39:10 +0200
Subject: [PATCH] Add missing metadata for removed configuration keys

Closes gh-20846
---
 ...itional-spring-configuration-metadata.json |  9 +++
 ...itional-spring-configuration-metadata.json | 57 +++++++++++++++++++
 2 files changed, 66 insertions(+)

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 287c5b01219..6e81b453b92 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
@@ -973,6 +973,15 @@
       "name": "management.endpoints.jmx.exposure.include",
       "defaultValue": "*"
     },
+    {
+      "name" : "management.endpoints.jmx.unique-names",
+      "type" : "java.lang.Boolean",
+      "description" : "Whether unique runtime object names should be ensured.",
+      "deprecation" : {
+        "replacement": "spring.jmx.unique-names",
+        "level" : "error"
+      }
+    },
     {
       "name": "management.endpoints.web.exposure.include",
       "defaultValue": [
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 bf7319bede6..bc54e9abb66 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
@@ -923,6 +923,15 @@
       "name": "server.ssl.trust-store-type",
       "description": "Type of the trust store."
     },
+    {
+      "name": "server.tomcat.max-http-header-size",
+      "type": "org.springframework.util.unit.DataSize",
+      "description": "Maximum size of the HTTP message header.",
+      "deprecation": {
+        "replacement": "server.max-http-header-size",
+        "level": "error"
+      }
+    },
     {
       "name": "server.undertow.buffers-per-region",
       "type": "java.lang.Integer",
@@ -1059,6 +1068,14 @@
         "localhost"
       ]
     },
+    {
+      "name": "spring.data.cassandra.load-balancing-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the load balancing policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.cassandra.read-timeout-millis",
       "type": "java.lang.Integer",
@@ -1068,6 +1085,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.data.cassandra.reconnection-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the reconnection policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.cassandra.repositories.enabled",
       "type": "java.lang.Boolean",
@@ -1084,6 +1109,14 @@
       "description": "Type of Cassandra repositories to enable.",
       "defaultValue": "auto"
     },
+    {
+      "name": "spring.data.cassandra.retry-policy",
+      "type": "java.lang.Class",
+      "description": "Class name of the retry policy. The class must have a default constructor.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.data.couchbase.consistency",
       "defaultValue": "read-your-own-writes"
@@ -1843,6 +1876,14 @@
         "level": "error"
       }
     },
+    {
+      "name": "spring.kafka.streams.cache-max-bytes-buffering",
+      "type": "java.lang.Integer",
+      "deprecation": {
+        "replacement": "spring.kafka.streams.cache-max-size-buffering",
+        "level": "error"
+      }
+    },
     {
       "name": "spring.liquibase.check-change-log-location",
       "type": "java.lang.Boolean",
@@ -1883,6 +1924,14 @@
       "name": "spring.mustache.suffix",
       "defaultValue": ".mustache"
     },
+    {
+      "name": "spring.mvc.favicon.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable resolution of favicon.ico.",
+      "deprecation": {
+        "level": "error"
+      }
+    },
     {
       "name": "spring.mvc.formcontent.filter.enabled",
       "type": "java.lang.Boolean",
@@ -1951,6 +2000,14 @@
       "name": "spring.rabbitmq.listener.type",
       "defaultValue": "simple"
     },
+    {
+      "name": "spring.rabbitmq.template.queue",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "spring.rabbitmq.template.default-receive-queue",
+        "level": "error"
+      }
+    },
     {
       "name": "spring.reactor.stacktrace-mode.enabled",
       "description": "Whether Reactor should collect stacktrace information at runtime.",