Skip to content

Commit 0ff8119

Browse files
committed
Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
1 parent 25e1e86 commit 0ff8119

File tree

5 files changed

+130
-124
lines changed

5 files changed

+130
-124
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"groups": [],
23
"properties": [
34
{
45
"name": "info",
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2+
"groups": [],
23
"properties": [
34
{
45
"name": "management.endpoints.migrate-legacy-ids",
56
"type": "java.lang.Boolean",
67
"description": "Whether to transparently migrate legacy endpoint IDs.",
78
"defaultValue": false
89
}
9-
]
10+
],
11+
"hints": []
1012
}

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"groups": [],
23
"properties": [
34
{
45
"name": "server.compression.enabled",
@@ -542,6 +543,14 @@
542543
"level": "error"
543544
}
544545
},
546+
{
547+
"name": "spring.data.cassandra.pool.heartbeat-interval",
548+
"defaultValue": "30s"
549+
},
550+
{
551+
"name": "spring.data.cassandra.pool.idle-timeout",
552+
"defaultValue": "5s"
553+
},
545554
{
546555
"name": "spring.data.cassandra.pool.max-queue-size",
547556
"type": "java.lang.Integer",
@@ -577,14 +586,14 @@
577586
"name": "spring.data.cassandra.request.page-size",
578587
"defaultValue": 5000
579588
},
580-
{
581-
"name": "spring.data.cassandra.request.timeout",
582-
"defaultValue": "2s"
583-
},
584589
{
585590
"name": "spring.data.cassandra.request.throttler.type",
586591
"defaultValue": "none"
587592
},
593+
{
594+
"name": "spring.data.cassandra.request.timeout",
595+
"defaultValue": "2s"
596+
},
588597
{
589598
"name": "spring.data.cassandra.retry-policy",
590599
"type": "java.lang.Class",
@@ -593,14 +602,6 @@
593602
"level": "error"
594603
}
595604
},
596-
{
597-
"name": "spring.data.cassandra.pool.heartbeat-interval",
598-
"defaultValue": "30s"
599-
},
600-
{
601-
"name": "spring.data.cassandra.pool.idle-timeout",
602-
"defaultValue": "5s"
603-
},
604605
{
605606
"name": "spring.data.couchbase.consistency",
606607
"type": "org.springframework.data.couchbase.core.query.Consistency",
@@ -1607,6 +1608,10 @@
16071608
"name": "spring.neo4j.uri",
16081609
"defaultValue": "bolt://localhost:7687"
16091610
},
1611+
{
1612+
"name": "spring.netty.leak-detection",
1613+
"defaultValue": "simple"
1614+
},
16101615
{
16111616
"name": "spring.quartz.jdbc.comment-prefix",
16121617
"defaultValue": [
@@ -1807,10 +1812,6 @@
18071812
"name": "spring.webservices.wsdl-locations",
18081813
"type": "java.util.List<java.lang.String>",
18091814
"description": "Comma-separated list of locations of WSDLs and accompanying XSDs to be exposed as beans."
1810-
},
1811-
{
1812-
"name": "spring.netty.leak-detection",
1813-
"defaultValue": "simple"
18141815
}
18151816
],
18161817
"hints": [
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2+
"groups": [],
23
"properties": [
34
{
45
"name": "spring.devtools.add-properties",
56
"type": "java.lang.Boolean",
67
"description": "Whether to enable development property defaults.",
78
"defaultValue": true
89
}
9-
]
10+
],
11+
"hints": []
1012
}

0 commit comments

Comments
 (0)