Commit Graph

5263 Commits

Author SHA1 Message Date
Andy Wilkinson 4043286f59 Merge branch '3.3.x' into 3.4.x 2025-03-05 14:51:50 +00:00
Andy Wilkinson 8e49a4e49a Increase independence of core auto-configuration tests
Remove some more references to Thymeleaf and FreeMarker
auto-configuration that were missed in 85ffbbc.

See gh-44513
2025-03-05 14:49:58 +00:00
Andy Wilkinson 8cf5584257 Merge branch '3.4.x'
Closes gh-44577
2025-03-05 14:35:06 +00:00
Andy Wilkinson 0fb1d2bed7 Merge branch '3.3.x' into 3.4.x
Closes gh-44576
2025-03-05 14:34:50 +00:00
Andy Wilkinson 85ffbbc384 Make core auto-configuration tests more independent
Closes gh-44513
2025-03-05 14:33:57 +00:00
Andy Wilkinson a3093a50cb Merge branch '3.4.x'
Closes gh-44531
2025-03-04 18:03:17 +00:00
Andy Wilkinson d92551f15a Merge branch '3.3.x' into 3.4.x
Closes gh-44530
2025-03-04 18:03:07 +00:00
Andy Wilkinson dc41feff1f Merge branch '3.4.x'
Closes gh-44529
2025-03-04 18:02:54 +00:00
Andy Wilkinson 3715eb8df2 Merge branch '3.3.x' into 3.4.x
Closes gh-44528
2025-03-04 18:02:23 +00:00
Andy Wilkinson 27779bec0a Remove AutoConfigurationReproTests
Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests
which, through the expectations that it sets up on the mock bean
factory, already checks that early initialization will not be
triggered.

Closes gh-44511
2025-03-04 17:50:19 +00:00
Andy Wilkinson c9f3688df9 Remove redundant tests
Closes gh-44520
2025-03-04 17:45:23 +00:00
Brian Clozel 83f678a8b1 Separate transports in GraphQL auto-configurations
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.

Closes gh-44495
2025-02-28 18:12:31 +01:00
Moritz Halbritter f01199341b Merge branch '3.4.x'
Closes gh-44484
2025-02-28 11:28:47 +01:00
Moritz Halbritter f6f1a9ffac Merge branch '3.3.x' into 3.4.x
Closes gh-44483
2025-02-28 11:20:37 +01:00
Benjamin König 23fd79f425 Remove obsolete hints for Flyway Teams features
See gh-44460

Signed-off-by: Benjamin König <koenig87@googlemail.com>
2025-02-28 11:18:41 +01:00
Moritz Halbritter c91c8e202a Fix tests 2025-02-28 10:53:54 +01:00
Moritz Halbritter 19ba2ec0e9 Merge pull request #44467 from nosan
* pr/44467:
  Close InputStream when loading Log4j2 Configuration from a Resource

Closes gh-44467
2025-02-28 10:30:57 +01:00
Moritz Halbritter 79ec0ea182 Merge branch '3.4.x'
Closes gh-44440
2025-02-26 11:50:57 +01:00
Moritz Halbritter 8705ed0ecc Merge branch '3.3.x' into 3.4.x
Closes gh-44436
2025-02-26 11:49:59 +01:00
Moritz Halbritter abf320d273 Register reflection hints for SslBundleSslEngineFactory
Closes gh-44435
2025-02-26 11:46:55 +01:00
Moritz Halbritter e7d9f195d2 Merge branch '3.4.x'
Closes gh-44438
2025-02-26 11:35:08 +01:00
Moritz Halbritter ea25734599 Merge branch '3.3.x' into 3.4.x
Closes gh-44437
2025-02-26 11:28:49 +01:00
Moritz Halbritter 453002b77b Add class of SslBundleSslEngineFactory to Kafka config map
Closes gh-44414
2025-02-26 10:46:12 +01:00
Dmytro Nosan 35db02bf48 Add spring.data.mongodb.protocol property
This commit allows configuring the MongoDB connection
protocol using the 'spring.data.mongodb.protocol' property.

See gh-44366

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 14:02:29 +01:00
Stéphane Nicoll ed5ec225a7 Merge branch '3.4.x'
Closes gh-44417
2025-02-24 08:04:36 +01:00
Stéphane Nicoll f235d7e9ff Merge branch '3.3.x' into 3.4.x
Closes gh-44416
2025-02-24 08:01:46 +01:00
Stéphane Nicoll bf1dc09c86 Update copyright of changed files
See gh-44323
2025-02-24 07:52:35 +01:00
Johnny Lim 332ad7bb70 Polish
See gh-44323

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-24 07:46:25 +01:00
Stéphane Nicoll be0e6722b8 Merge branch '3.4.x'
Closes gh-44406
2025-02-22 18:48:39 +01:00
Stéphane Nicoll 56bd551ce9 Update copyright year of changed file
See gh-44393
2025-02-22 18:43:30 +01:00
Johnny Lim 133ecab3cf Replace unconventional Optional usages
See gh-44393

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-22 18:40:47 +01:00
Stéphane Nicoll 7ac438547f Merge branch '3.4.x'
Closes gh-44405
2025-02-22 18:38:18 +01:00
Stéphane Nicoll f7b23f548d Merge branch '3.3.x' into 3.4.x
Closes gh-44404
2025-02-22 18:38:10 +01:00
Stéphane Nicoll 7fd19556b2 Polish contribution
See gh-44384
2025-02-22 18:33:05 +01:00
Dmytro Nosan 2f288bf614 Clarify which Mongo properties are ignored when URI property is set
See gh-44384

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-22 18:28:42 +01:00
Moritz Halbritter 53405a48c2 Add property to configure Spring Kafka's authExceptionRetryInterval
Closes gh-44199
2025-02-19 09:14:57 +01:00
Phillip Webb 651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Stéphane Nicoll 5c49a76c82 Merge branch '3.4.x'
Closes gh-44322
2025-02-18 11:18:45 +01:00
Stéphane Nicoll ceaf88c1a4 Polish "Include non-default DataSource candidates"
See gh-44293
2025-02-18 11:18:26 +01:00
Yanming Zhou 8d27f4ee7c Include non-default DataSource candidates
This commit updates H2ConsoleAutoConfiguration to consider non-default
data sources when logging connection URLs.

See gh-44293

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-02-18 11:18:26 +01:00
Moritz Halbritter dae891f473 Add SSL service connection support for Kafka
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 789d30deab Add SSL service connection support for ElasticSearch
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 7cf9cc74a2 Add SSL service connection support for Redis
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 109fd6f97d Add SSL service connection support for MongoDB
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 0ccf1b81d8 Add SSL service connection support for Couchbase
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter 9c520d6af7 Add SSL service connection support for Cassandra
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter e26ccbe028 Add SSL service connection support for AMQP
See gh-41137
2025-02-17 13:23:15 +01:00
Stéphane Nicoll 631d07cfe1 Merge branch '3.4.x'
Closes gh-44308
2025-02-17 13:10:17 +01:00
Stéphane Nicoll 4d21f1e8b1 Merge branch '3.3.x' into 3.4.x
Closes gh-44307
2025-02-17 13:10:10 +01:00
Dmytro Nosan 35a77e2cf1 Fix build
See gh-44306

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 13:09:52 +01:00
Stéphane Nicoll 3ed0e021ac Polish "Auto-configure ObjectDirectoryMapper"
See gh-44290
2025-02-17 12:02:39 +01:00
Dmytro Nosan 8435aeb0e2 Auto-configure ObjectDirectoryMapper
This commit improves LdapAutoConfiguration to also auto-configure an
ObjectDirectoryMapper and configure LdapTemplate to use it.

See gh-44290

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 12:02:39 +01:00
Andy Wilkinson ca1bd3f633 Merge branch '3.4.x'
Closes gh-44304
2025-02-17 11:01:43 +00:00
Andy Wilkinson 9fa40adb45 Merge branch '3.3.x' into 3.4.x
Closes gh-44303
2025-02-17 11:01:31 +00:00
Andy Wilkinson 045fbee395 Document need for $ separator when auto-config is nested
Closes gh-44298
2025-02-17 11:00:29 +00:00
Stéphane Nicoll 2adbc24be1 Polish 2025-02-17 11:49:59 +01:00
Stéphane Nicoll 514666b210 Polish 2025-02-17 11:33:15 +01:00
Stéphane Nicoll 980202f654 Merge branch '3.4.x'
Closes gh-44300
2025-02-17 11:22:14 +01:00
Tran Ngoc Nhan d212232d9d Implement RuntimeHintsRegistrar
CLoses gh-44299
2025-02-17 11:21:04 +01:00
Tran Ngoc Nhan e982136f5e Implement RuntimeHintsRegistrar
See gh-44266
2025-02-17 11:09:29 +01:00
Stéphane Nicoll 4ef74747ef Merge branch '3.4.x'
Closes gh-44297
2025-02-17 11:07:05 +01:00
Stéphane Nicoll e67c8b43a2 Merge branch '3.3.x' into 3.4.x
Closes gh-44296
2025-02-17 11:06:58 +01:00
Stéphane Nicoll 6aa0055e5e Polish "Do not auto-configure ViewResolver if spring-webmvc is absent"
See gh-44259
2025-02-17 11:01:23 +01:00
Dmytro Nosan ac73766f9b Do not auto-configure ViewResolver if spring-webmvc is absent
See gh-44259

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 11:01:07 +01:00
Stéphane Nicoll 8d713fb6c7 Polish "Auto-configure CqlTemplate and ReactiveCqlTemplate"
See gh-44291
2025-02-17 09:20:03 +01:00
Dmytro Nosan e8661f6bee Auto-configure CqlTemplate and ReactiveCqlTemplate
See gh-44291

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 09:14:06 +01:00
Andy Wilkinson cefcdcfdd0 Polish RequestMatcherProvider deprecation javadoc
See gh-gh-29596
2025-02-14 07:44:47 +00:00
Andy Wilkinson 24ead90e13 Merge branch '3.4.x'
Closes gh-44216
2025-02-11 12:31:19 +00:00
Andy Wilkinson 18db70533d Merge branch '3.3.x' into 3.4.x
Closes gh-44215
2025-02-11 12:31:07 +00:00
Andy Wilkinson 3e5929a446 Remove duplicate dispatcher servlet auto-config tests
Closes gh-44207
2025-02-11 12:19:45 +00:00
Andy Wilkinson 3137f20b4a Merge branch '3.4.x'
Closes gh-44194
2025-02-10 11:09:38 +00:00
Andy Wilkinson 167dfd6bc9 Merge branch '3.3.x' into 3.4.x
Closes gh-44193
2025-02-10 11:09:12 +00:00
Andy Wilkinson ea76e46faa Apply charset to Mustache's content type
Fixes gh-44053
2025-02-10 11:07:49 +00:00
Johnny Lim 8c35bce668 Polish
See gh-44184

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-10 07:32:14 +01:00
Andy Wilkinson 822e7de3eb Start building against Spring Data Bom 2025.0.0-M1 snapshots
See gh-44159
2025-02-07 21:01:57 +00:00
Johnny Lim c335f772d0 Polish
See gh-44148

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-07 09:21:19 +01:00
Phillip Webb 9576293a03 Polish 'Add ability to match Endpoint requests by HTTP method'
See gh-29596
2025-02-04 21:57:40 -08:00
onobc 996ee243a3 Add ability to match Endpoint requests by HTTP method
Update both servlet and reactive `EndpointRequest` classes with
support for matching endpoint requests by HTTP method.

See gh-29596
2025-02-04 21:56:14 -08:00
Stéphane Nicoll e5b03862d3 Polish "Add property to configure Spring MVC default content types"
See gh-44040
2025-02-04 12:40:23 +01:00
Dmytro Nosan d27fd31a3d Add property to configure Spring MVC default content types
This commit adds a configuration property to configure the default
content types with Spring MVC.

See gh-44040

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-04 12:40:23 +01:00
Johnny Lim c9320de559 Use consistent exception messages in Assert calls
See gh-44044

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-03 13:58:59 +01:00
Johnny Lim a39e1c4a09 Polish
Signed-off-by: Johnny Lim <izeye@naver.com>

See gh-44034
2025-01-31 17:04:58 +01:00
Stéphane Nicoll a33b700b12 Merge branch '3.4.x' 2025-01-31 17:04:48 +01:00
Stéphane Nicoll dc9aa6d168 Polish
See gh-44034
2025-01-31 17:04:33 +01:00
Moritz Halbritter 8536520e5e Ignore unbindable datasource datasource properties
Closes gh-43988
2025-01-31 10:45:20 +01:00
Phillip Webb 921c362b97 Add 'spring.r2dbc.pool.acquire-retry' property
Add a new property to configure the pool acquire retry value.

Closes gh-44017
2025-01-29 11:48:32 -08:00
Phillip Webb a13fe0b565 Make `@ConditionalOn[Boolean]Property` `@Repeatable`
Update `ConditionalOnProperty`, `ConditionalOnBooleanProperty`
and `OnPropertyCondition` to support `@Repeatable`.

Closes gh-2541
2025-01-28 21:13:53 -08:00
Phillip Webb 3911ca7c8e Polish @ConditionalOnBean and @ConditionalOnMissingBean tests
Combine generic and regular tests and apply some polish.

See gh-29500
2025-01-28 20:14:16 -08:00
Uladzislau Seuruk aa7864ea38 Add ConditionalOnBean support for generic @Bean return types
Update `ConditionalOnBean` so support generics when resolving the
`@Bean` method.

See gh-29500

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-28 20:14:08 -08:00
Brian Clozel fc01b011d5 Merge branch '3.4.x' 2025-01-28 17:14:23 +01:00
Brian Clozel e01a23b1fe Merge branch '3.3.x' into 3.4.x
Closes gh-
2025-01-28 17:13:47 +01:00
Brian Clozel 817f466c12 Fix SSL file watcher for relative symlinks
Prior to this commit, a change in gh-43586 unlocked the support for
symlinks: instead of watching the link itself which might never change,
this would watch the target file which is likely to change.

This could break with an `IllegalStateException` in case the symlink is
using a path relative to the link itself.

This commit ensures that the target is resolved against the current
link path to avoid incorrect watch operations.

Fixes gh-43966
2025-01-28 16:35:09 +01:00
Phillip Webb 7545bed284 Polish 2025-01-27 15:29:16 -08:00
Moritz Halbritter cce509c7df Add configuration property to specify jOOQ settings file
The property is named 'spring.jooq.config' and is of type Resource,
so that it supports classpath: and all the other common prefixes.

The config is loaded through JAXB. If JAXB is not on the classpath,
an exception is thrown. Also adds a failure analyzer for this exception.

Closes gh-38778
2025-01-27 14:21:12 +01:00
Phillip Webb c22dcedb59 Fix @ConfigurationProperties prefix violation
See gh-43917
2025-01-24 15:18:59 -08:00
Phillip Webb 8ec61b9870 Polish 'Refactor `@ConfigurationProperties` that only use `prefix`'
See gh-43917
2025-01-24 14:59:32 -08:00
Yanming Zhou c1d97ffe16 Refactor `@ConfigurationProperties` that only use `prefix`
See gh-43917

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 14:58:36 -08:00
Phillip Webb 585030679a Polish 'Use isXxx() instead of getXxx() for boolean properties'
See gh-43934
2025-01-24 14:28:18 -08:00
Yanming Zhou 964abef6b3 Use isXxx() instead of getXxx() for boolean properties
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-43934
2025-01-24 14:27:47 -08:00
Yanming Zhou 7391cd876e Rename configuration class for consistency
See gh-43866

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 13:49:35 +01:00