From 788417df7f62c79fc5ab5acdc18a5519a28ca212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Thu, 1 Aug 2024 15:16:23 +0200
Subject: [PATCH] Remove duplicate metadata for Enum default values

See gh-7562
---
 ...itional-spring-configuration-metadata.json |  88 ---------
 ...itional-spring-configuration-metadata.json | 184 ------------------
 ...itional-spring-configuration-metadata.json |  30 ---
 3 files changed, 302 deletions(-)
 delete mode 100644 spring-boot-project/spring-boot-docker-compose/src/main/resources/META-INF/additional-spring-configuration-metadata.json

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 99bdb22e48e..15f80b79284 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
@@ -30,14 +30,6 @@
       "description": "Whether to enable default metrics exporters.",
       "defaultValue": true
     },
-    {
-      "name": "management.endpoint.configprops.show-values",
-      "defaultValue": "never"
-    },
-    {
-      "name": "management.endpoint.env.show-values",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoint.health.probes.add-additional-paths",
       "type": "java.lang.Boolean",
@@ -50,10 +42,6 @@
       "description": "Whether to enable liveness and readiness probes.",
       "defaultValue": false
     },
-    {
-      "name": "management.endpoint.health.show-details",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoint.health.status.order",
       "defaultValue": [
@@ -69,10 +57,6 @@
       "description": "Whether to validate health group membership on startup. Validation fails if a group includes or excludes a health contributor that does not exist.",
       "defaultValue": true
     },
-    {
-      "name": "management.endpoint.quartz.show-values",
-      "defaultValue": "never"
-    },
     {
       "name": "management.endpoints.enabled-by-default",
       "type": "java.lang.Boolean",
@@ -107,26 +91,6 @@
         "health"
       ]
     },
-    {
-      "name": "management.ganglia.metrics.export.addressing-mode",
-      "defaultValue": "multicast"
-    },
-    {
-      "name": "management.ganglia.metrics.export.duration-units",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.graphite.metrics.export.duration-units",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.graphite.metrics.export.protocol",
-      "defaultValue": "pickled"
-    },
-    {
-      "name": "management.graphite.metrics.export.rate-units",
-      "defaultValue": "seconds"
-    },
     {
       "name": "management.health.cassandra.enabled",
       "type": "java.lang.Boolean",
@@ -277,10 +241,6 @@
         "errors"
       ]
     },
-    {
-      "name": "management.influx.metrics.export.consistency",
-      "defaultValue": "one"
-    },
     {
       "name": "management.info.build.enabled",
       "type": "java.lang.Boolean",
@@ -305,10 +265,6 @@
       "description": "Whether to enable git info.",
       "defaultValue": true
     },
-    {
-      "name": "management.info.git.mode",
-      "defaultValue": "simple"
-    },
     {
       "name": "management.info.java.enabled",
       "type": "java.lang.Boolean",
@@ -2079,45 +2035,17 @@
         "level": "error"
       }
     },
-    {
-      "name": "management.newrelic.metrics.export.client-provider-type",
-      "defaultValue": "insights-api"
-    },
     {
       "name": "management.observations.annotations.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether auto-configuration of Micrometer annotations is enabled.",
       "defaultValue": false
     },
-    {
-      "name": "management.otlp.logging.compression",
-      "defaultValue": "none"
-    },
-    {
-      "name": "management.otlp.metrics.export.aggregation-temporality",
-      "defaultValue": "cumulative"
-    },
-    {
-      "name": "management.otlp.metrics.export.base-time-unit",
-      "defaultValue": "milliseconds"
-    },
-    {
-      "name": "management.otlp.tracing.compression",
-      "defaultValue": "none"
-    },
     {
       "name": "management.otlp.tracing.export.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether auto-configuration of tracing is enabled to export OTLP traces."
     },
-    {
-      "name": "management.prometheus.metrics.export.histogram-flavor",
-      "defaultValue": "prometheus"
-    },
-    {
-      "name": "management.prometheus.metrics.export.pushgateway.shutdown-operation",
-      "defaultValue": "none"
-    },
     {
       "name": "management.server.add-application-context-header",
       "type": "java.lang.Boolean",
@@ -2218,22 +2146,6 @@
       "name": "management.server.ssl.trust-store-type",
       "description": "Type of the trust store."
     },
-    {
-      "name": "management.signalfx.metrics.export.published-histogram-type",
-      "defaultValue": "default"
-    },
-    {
-      "name": "management.simple.metrics.export.mode",
-      "defaultValue": "cumulative"
-    },
-    {
-      "name": "management.statsd.metrics.export.flavor",
-      "defaultValue": "datadog"
-    },
-    {
-      "name": "management.statsd.metrics.export.protocol",
-      "defaultValue": "udp"
-    },
     {
       "name": "management.trace.http.enabled",
       "deprecation": {
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 78431ff4d24..4046881cfea 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
@@ -37,22 +37,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "server.error.include-binding-errors",
-      "defaultValue": "never"
-    },
-    {
-      "name": "server.error.include-message",
-      "defaultValue": "never"
-    },
-    {
-      "name": "server.error.include-path",
-      "defaultValue": "always"
-    },
-    {
-      "name": "server.error.include-stacktrace",
-      "defaultValue": "never"
-    },
     {
       "name": "server.http2.enabled",
       "description": "Whether to enable HTTP/2 support, if the current environment supports it.",
@@ -72,10 +56,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "server.jetty.accesslog.format",
-      "defaultValue": "ncsa"
-    },
     {
       "name": "server.jetty.accesslog.locale",
       "deprecation": {
@@ -279,10 +259,6 @@
       "name": "server.servlet.session.tracking-modes",
       "description": "Session tracking modes."
     },
-    {
-      "name": "server.shutdown",
-      "defaultValue": "immediate"
-    },
     {
       "name": "server.ssl.bundle",
       "description": "The name of a configured SSL bundle."
@@ -499,10 +475,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.batch.jdbc.initialize-schema",
-      "defaultValue": "embedded"
-    },
     {
       "name": "spring.batch.job.enabled",
       "type": "java.lang.Boolean",
@@ -1055,10 +1027,6 @@
       "name": "spring.data.mongodb.uri",
       "defaultValue": "mongodb://localhost/test"
     },
-    {
-      "name": "spring.data.mongodb.uuid-representation",
-      "defaultValue": "java-legacy"
-    },
     {
       "name": "spring.data.neo4j.auto-index",
       "description": "Auto index mode.",
@@ -1157,10 +1125,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.data.rest.detection-strategy",
-      "defaultValue": "default"
-    },
     {
       "name" : "spring.datasource.continue-on-error",
       "type" : "java.lang.Boolean",
@@ -1619,10 +1583,6 @@
       "name": "spring.info.git.location",
       "defaultValue": "classpath:git.properties"
     },
-    {
-      "name": "spring.integration.jdbc.initialize-schema",
-      "defaultValue": "embedded"
-    },
     {
       "name": "spring.jackson.constructor-detector",
       "defaultValue": "default"
@@ -1639,22 +1599,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.jersey.type",
-      "defaultValue": "servlet"
-    },
-    {
-      "name": "spring.jms.listener.session.acknowledge-mode",
-      "defaultValue": "auto"
-    },
-    {
-      "name": "spring.jms.template.session.acknowledge-mode",
-      "defaultValue": "auto"
-    },
-    {
-      "name": "spring.jmx.registration-policy",
-      "defaultValue": "fail-on-existing"
-    },
     {
       "name": "spring.jpa.hibernate.use-new-id-generator-mappings",
       "type": "java.lang.Boolean",
@@ -1835,10 +1779,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.kafka.consumer.isolation-level",
-      "defaultValue": "read-uncommitted"
-    },
     {
       "name": "spring.kafka.consumer.ssl.keystore-location",
       "type": "org.springframework.core.io.Resource",
@@ -1875,10 +1815,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.kafka.jaas.control-flag",
-      "defaultValue": "required"
-    },
     {
       "name": "spring.kafka.listener.only-log-record-metadata",
       "type": "java.lang.Boolean",
@@ -1889,10 +1825,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.kafka.listener.type",
-      "defaultValue": "single"
-    },
     {
       "name": "spring.kafka.producer.ssl.keystore-location",
       "type": "org.springframework.core.io.Resource",
@@ -2097,10 +2029,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.mvc.pathmatch.matching-strategy",
-      "defaultValue": "path-pattern-parser"
-    },
     {
       "name": "spring.mvc.throw-exception-if-no-handler-found",
       "deprecation": {
@@ -2108,58 +2036,22 @@
       	"level": "error"
       }
     },
-    {
-      "name": "spring.neo4j.security.trust-strategy",
-      "defaultValue": "trust-system-ca-signed-certificates"
-    },
     {
       "name": "spring.neo4j.uri",
       "defaultValue": "bolt://localhost:7687"
     },
-    {
-      "name": "spring.pulsar.client.failover.policy",
-      "defaultValue": "order"
-    },
-    {
-      "name": "spring.pulsar.consumer.subscription.initial-position",
-      "defaultValue": "latest"
-    },
-    {
-      "name": "spring.pulsar.consumer.subscription.mode",
-      "defaultValue": "durable"
-    },
-    {
-      "name": "spring.pulsar.consumer.subscription.topics-mode",
-      "defaultValue": "persistentonly"
-    },
-    {
-      "name": "spring.pulsar.consumer.subscription.type",
-      "defaultValue": "exclusive"
-    },
     {
       "name": "spring.pulsar.function.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether to enable function support.",
       "defaultValue": true
     },
-    {
-      "name": "spring.pulsar.producer.access-mode",
-      "defaultValue": "shared"
-    },
     {
       "name": "spring.pulsar.producer.cache.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether to enable caching in the PulsarProducerFactory.",
       "defaultValue": true
     },
-    {
-      "name": "spring.pulsar.producer.hashing-scheme",
-      "defaultValue": "javastringhash"
-    },
-    {
-      "name": "spring.pulsar.producer.message-routing-mode",
-      "defaultValue": "roundrobinpartition"
-    },
     {
       "name": "spring.quartz.jdbc.comment-prefix",
       "defaultValue": [
@@ -2167,30 +2059,10 @@
         "--"
       ]
     },
-    {
-      "name": "spring.quartz.jdbc.initialize-schema",
-      "defaultValue": "embedded"
-    },
-    {
-      "name": "spring.quartz.job-store-type",
-      "defaultValue": "memory"
-    },
     {
       "name": "spring.quartz.scheduler-name",
       "defaultValue": "quartzScheduler"
     },
-    {
-      "name": "spring.r2dbc.pool.validation-depth",
-      "defaultValue": "local"
-    },
-    {
-      "name": "spring.rabbitmq.address-shuffle-mode",
-      "defaultValue": "none"
-    },
-    {
-      "name": "spring.rabbitmq.cache.connection.mode",
-      "defaultValue": "channel"
-    },
     {
       "name": "spring.rabbitmq.dynamic",
       "type": "java.lang.Boolean",
@@ -2204,10 +2076,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.rabbitmq.listener.type",
-      "defaultValue": "simple"
-    },
     {
       "name": "spring.rabbitmq.publisher-confirms",
       "type": "java.lang.Boolean",
@@ -2223,10 +2091,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "spring.reactor.context-propagation",
-      "defaultValue": "limited"
-    },
     {
       "name": "spring.reactor.stacktrace-mode.enabled",
       "description": "Whether Reactor should collect stacktrace information at runtime.",
@@ -2772,10 +2636,6 @@
       "name": "spring.rsocket.server.ssl.trust-store-type",
       "description": "Type of the trust store."
     },
-    {
-      "name": "spring.rsocket.server.transport",
-      "defaultValue": "tcp"
-    },
     {
       "name": "spring.security.filter.dispatcher-types",
       "defaultValue": [
@@ -2798,46 +2658,10 @@
         "level": "error"
       }
     },
-    {
-      "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"
-    },
-    {
-      "name": "spring.session.jdbc.save-mode",
-      "defaultValue": "on-set-attribute"
-    },
     {
       "name": "spring.session.redis.cleanup-cron",
       "defaultValue": "0 * * * * *"
     },
-    {
-      "name": "spring.session.redis.configure-action",
-      "defaultValue": "notify-keyspace-events"
-    },
-    {
-      "name": "spring.session.redis.flush-mode",
-      "defaultValue": "on-save"
-    },
-    {
-      "name": "spring.session.redis.repository-type",
-      "defaultValue": "default"
-    },
-    {
-      "name": "spring.session.redis.save-mode",
-      "defaultValue": "on-set-attribute"
-    },
     {
       "name": "spring.session.servlet.filter-dispatcher-types",
       "defaultValue": [
@@ -2856,10 +2680,6 @@
         "level": "warning"
       }
     },
-    {
-      "name": "spring.sql.init.mode",
-      "defaultValue": "embedded"
-    },
     {
       "name": "spring.threads.virtual.enabled",
       "type": "java.lang.Boolean",
@@ -2893,10 +2713,6 @@
       "name": "spring.thymeleaf.suffix",
       "defaultValue": ".html"
     },
-    {
-      "name": "spring.web.locale-resolver",
-      "defaultValue": "accept-header"
-    },
     {
       "name": "spring.webflux.hiddenmethod.filter.enabled",
       "type": "java.lang.Boolean",
diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-docker-compose/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 3d2b4e37383..00000000000
--- a/spring-boot-project/spring-boot-docker-compose/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "groups": [],
-  "hints": [],
-  "properties": [
-    {
-      "name": "spring.docker.compose.lifecycle-management",
-      "defaultValue": "start-and-stop"
-    },
-    {
-      "name": "spring.docker.compose.readiness.wait",
-      "defaultValue": "always"
-    },
-    {
-      "name": "spring.docker.compose.start.command",
-      "defaultValue": "up"
-    },
-    {
-      "name": "spring.docker.compose.start.log-level",
-      "defaultValue": "info"
-    },
-    {
-      "name": "spring.docker.compose.start.skip",
-      "defaultValue": "if-running"
-    },
-    {
-      "name": "spring.docker.compose.stop.command",
-      "defaultValue": "stop"
-    }
-  ]
-}