Commit Graph

1680 Commits

Author SHA1 Message Date
Stephane Nicoll 7874de4062 Restore tests that were failing with Java 13
Closes gh-17607
2019-08-05 20:43:08 +02:00
Madhura Bhave ea244aa32b Merge branch '2.1.x'
Closes gh-17769
2019-08-02 09:16:05 -07:00
Madhura Bhave faaada1416 Remove liquibase check change log location
Missing change logs would lead to an exception even
if the checkChangeLogLocation was set to false. Spring Boot's check
would pass but Liquibase would fail later making this property redundant.

Fixes gh-16232
2019-08-02 09:03:45 -07:00
Stephane Nicoll f021c227e1 Polish 2019-08-02 17:42:38 +02:00
Stephane Nicoll 45915d085e Merge branch '2.1.x'
Closes gh-17767
2019-08-02 17:35:39 +02:00
Stephane Nicoll eb26492eef Polish 2019-08-02 17:31:07 +02:00
Michael Simons 274098f2e2 Refine back-off strategy of Neo4j SessionFactory
This commit separates the auto-configuration of the `SessionFactory` in
an isolated class so that the rest of the auto-configuration is still
applied if the user provides a custom `SessionFactory` bean.

See gh-17662
2019-08-02 17:12:01 +02:00
Madhura Bhave e06b06d817 Polish "Support RFC 8414 in JwtDecoders and ClientRegistrations"
See gh-17761
2019-08-01 18:31:50 -07:00
HaiTao Zhang 8baec96453 Support RFC 8414 in JwtDecoders and ClientRegistrations
See gh-17761
2019-08-01 18:18:49 -07:00
Madhura Bhave f7f858bce8 Merge branch '2.1.x'
Closes gh-17759
2019-08-01 12:44:18 -07:00
Madhura Bhave 5f3364326b Configure interceptors for WelcomePageHandlerMapping
Fixes gh-16309
2019-08-01 12:27:53 -07:00
Stephane Nicoll bee373d6cf Start building against Spring HATEOAS 1.0 snapshots
See gh-17755
2019-08-01 15:19:41 +02:00
Stephane Nicoll da0ab06d1a Merge branch '2.1.x'
Closes gh-17754
2019-08-01 14:49:22 +02:00
Stephane Nicoll f2fd169c3a Rename restClient to elasticsearchRestClient
For consistency, similar beans have been renamed as well.

Closes gh-17751
2019-08-01 14:45:33 +02:00
Stephane Nicoll 1ec8e822a1 Fix broken build 2019-08-01 14:42:01 +02:00
Stephane Nicoll 48e07c8fda Merge branch '2.1.x'
Closes gh-17753
2019-08-01 14:24:23 +02:00
Stephane Nicoll fb0fccf3c7 Polish "Create RestClient from a RestHighLevelClient if available"
This significantly rework the auto-configuration to reflect the order
in which things are expected. Rather than keeping a conceptual cycle
between the builder and the two inner classes that are processed first,
the configuration is now split in three parts:

* The builder that is required and common
* The configuration when the HighLevelClient is available
* The RestClient configuration when that's not the case

See gh-17488
2019-08-01 14:16:22 +02:00
Dmytro Nosan 0e87b9c163 Create RestClient from a RestHighLevelClient if available
See gh-17488
2019-08-01 14:16:22 +02:00
Phillip Webb 34c31ce099 Remove BeanTypeRegistry
Remove `BeanTypeRegistry` and rely entirely on standard calls Spring
Framework APIs.

Closes gh-17594
2019-08-01 10:15:15 +01:00
Phillip Webb da4f436140 Change SearchStrategy EXHAUSTIVE to TYPE_HIERARCHY
Fixup references following upstream Spring Framework change.
2019-07-31 15:11:43 +01:00
Johnny Lim 2c2ee92a39 Remove ConditionEvaluationReportLoggingListener in a test
See gh-17742
2019-07-31 14:58:46 +02:00
Stephane Nicoll c08fe65429 Merge branch '2.1.x'
See gh-17744
2019-07-31 13:57:48 +02:00
Stephane Nicoll dc4e67f5dd Remove useless classpath override 2019-07-31 13:55:38 +02:00
Stephane Nicoll 44a0afcec3 Polish "Allow for custom EntityMapper bean"
See gh-17661
2019-07-31 10:46:29 +02:00
P.J. Meisch a1cf665f98 Allow for custom EntityMapper bean
See gh-17661
2019-07-31 10:31:27 +02:00
Stephane Nicoll e52d398771 Adapt to recent changes in Spring Security snapshots 2019-07-30 17:36:51 +02:00
dreis2211 8d2f2b75bd Upgrade to AssertJ 3.13.1
See gh-17690
2019-07-30 09:48:33 +02:00
Madhura Bhave b6754f6f20 Fix test 2019-07-29 14:48:25 -07:00
Madhura Bhave 805264a13c Merge pull request #17646 from htztomic
* pr/17646:
  Polish "Default password shouldn't be generated for resource server"
  Default password should not be generated when using resource server

Closes gh-17646
2019-07-29 14:15:00 -07:00
Madhura Bhave e184298c50 Polish "Default password shouldn't be generated for resource server"
See gh-17646
2019-07-29 14:13:35 -07:00
HaiTao Zhang 1b0cf7bd22 Default password should not be generated when using resource server
See gh-17646
2019-07-29 14:09:20 -07:00
Phillip Webb 6675f49334 Switch to multi-line security configuration
Now that we have lambda style security configuration we can further
improve readability by switching to one statement per line.

See gh-17525
2019-07-29 11:28:51 +01:00
Stephane Nicoll 858199a2fa Only configure Spring Data jdbc if a transaction manager is present
This commit adds an extra condition to JdbcRepositoriesAutoConfiguration
so that it doesn't scan for repositories if a transaction manager is not
available as this dependency is now mandatory.

Closes gh-17654
2019-07-28 09:59:19 +02:00
Stephane Nicoll 97907aac30 Polish 2019-07-28 09:47:04 +02:00
Johnny Lim a80749ed81 Add missing assertion in dispatcherServletCustomConfig()
See gh-17648
2019-07-27 09:32:24 +02:00
Madhura Bhave 3423dbf6ac Add transaction manager in Spring Data jdbc tests
See gh-17654
2019-07-27 09:06:01 +02:00
Madhura Bhave 39a7b9da38 Switch to lambda style security configuration
Closes gh-17525
2019-07-26 14:41:49 -07:00
Stephane Nicoll b79de1e7e3 Fix broken build 2019-07-26 16:26:37 +02:00
Brian Clozel 5beb7edfbb Reinstate RSocket codecs configuration ordering
Since spring-projects/spring-framework#23314 and the following commit
spring-projects/spring-framework@be4facef1b, the RSocket codec selection
is relaxed and the order of configured commits matters again.

This commit ensures that the CBOR codec is configured ahead of the JSON
codec so that it can be chosen first if no data mime type is specified
when a connection is established with a client requester.
2019-07-24 20:39:55 +02:00
Brian Clozel 1996952e68 Update RSocket configuration after Framework changes
Since spring-projects/spring-framework#23314, the `RSocketStrategies`
provide more codecs by default, and there is no need to order them to
avoid conflicts during mime type selection.

This commit also ensures that the `PayloadDecoder.ZERO_COPY` is
configured on the RSocket server if the configured `DataBufferFactory`
is compatible with that strategy.
2019-07-24 15:51:27 +02:00
Dmytro Nosan efce9388e7 Trim OAuth2 provider property whitespace
Update `OAuth2ClientPropertiesRegistrationAdapter` to trim whitespace
of the "provider" property.

See gh-17497
2019-07-24 14:32:41 +01:00
Phillip Webb 8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
dreis2211 c8097692ea Align JavaVersion.NINE name with JDK versioning
See gh-17611
2019-07-24 11:12:02 +02:00
Johnny Lim 43345b36e6 Polish
See gh-17616
2019-07-24 11:00:40 +02:00
Stephane Nicoll 690019ba8f Polish "Disable tests that are failing on Java 13"
See gh-17607
2019-07-23 15:51:21 +02:00
Stephane Nicoll 5f3fff6470 Disable tests that are failing on Java 13
Hazelcast YAML support does not work with Java 13 so this commit
disables relevant tests when Java 13 is detected

See https://github.com/hazelcast/hazelcast/issues/15348

See gh-17607
2019-07-23 12:41:24 +02:00
Brian Clozel 53afbbe233 Update RouteMatcher configuration for RSocket
This commit updates the `RouteMatcher` configuration after the latest
Spring Framework changes. The default route matcher implementation based
on the `PathPattern` infrastructure is now tailored for the messaging
use case (path separator, path encoding options and trailing separator).

See spring-projects/spring-framework#23310
2019-07-22 15:30:40 +02:00
Stephane Nicoll 3c7ac4fe7f Polish 2019-07-22 13:17:51 +02:00
Stephane Nicoll 55079c3a80 Merge branch '2.1.x'
Closes gh-17602
2019-07-22 13:16:58 +02:00
Stephane Nicoll 1661da8774 Polish "Configure ActiveMQConnectionFactory properly without spring-jms"
See gh-17531
2019-07-22 13:09:31 +02:00
Dmytro Nosan 77b52b993b Configure ActiveMQConnectionFactory properly without spring-jms
See gh-17531
2019-07-22 13:08:42 +02:00
adavid9 6211a682d6 Replace deprecated media type
See gh-17596
2019-07-21 18:28:10 +02:00
Phillip Webb ff9f5fd1c7 Polish OnBeanCondition
Polish `OnBeanCondition` and make it easier to remove `BeanTypeRegistry`
in the future.

See gh-17594
2019-07-20 13:36:56 +01:00
Andy Wilkinson ea1dc85d50 Isolate Jackson2ObjectMapperBuilder mutation
Previously, Jackson2ObjectMapperBuilder was a singleton bean. This
meant that if it was injected and mutated in one injection point,
usage in a subsequent injection point would see the previous
injection point's mutation which can lead to unexpected failures.

This commit updates the auto-configuration of the builder to make it
a protoype bean. Mutation of the builder that is intended to apply
globally should be made using a customizer.

Closes gh-17477
2019-07-19 13:57:55 +01:00
Andy Wilkinson c7d2799f4e Add configuration property for DispatcherServlet event publishing
Closes gh-17500
2019-07-19 13:11:19 +01:00
Stephane Nicoll 3dd5426ea5 Polish "Adjust to changes in Spring AMQP 2.2 snapshots"
See gh-17587
2019-07-19 13:20:25 +02:00
dreis2211 e71a417399 Adjust to changes in Spring AMQP 2.2 snapshots
See gh-17587
2019-07-19 13:19:57 +02:00
Stephane Nicoll dd2f20fcd2 Polish "Add support for configuring Tomcat's relaxed path and query chars"
See gh-17510
2019-07-18 16:00:06 +02:00
dirkdeyne 1fee797af7 Add support for configuring Tomcat's relaxed path and query chars
See gh-17510
2019-07-18 15:04:29 +02:00
dreis2211 2038fac825 Remove testsupport.assertj package
See gh-17557
2019-07-18 14:20:28 +02:00
Andy Wilkinson 3bf5cf1124 Merge branch '2.1.x'
Closes gh-17562
2019-07-18 07:22:24 +01:00
Andy Wilkinson b725c60177 Deprecate DeploymentInfo customization with reactive Undertow
Fixes gh-17555
2019-07-18 06:54:38 +01:00
Phillip Webb a9ba7080ce Merge branch '2.1.x' 2019-07-17 21:48:42 +01:00
Phillip Webb d567261790 Polish 2019-07-17 21:38:44 +01:00
Andy Wilkinson dad7fb4f6d Add NettyServerCustomizer beans to the auto-configured factory
Closes gh-17556
2019-07-17 14:58:11 +01:00
Andy Wilkinson ea1139755d Ensure that customizers registered multiple times are only called once
Closes gh-17264
2019-07-17 14:52:29 +01:00
Andy Wilkinson 73f7a9318f Merge branch '2.1.x'
Closes gh-17546
2019-07-17 09:07:28 +01:00
Andy Wilkinson e84477cfe2 Only perform Quartz DataSource init when using JDBC store
Fixes gh-17545
2019-07-17 09:04:17 +01:00
Stephane Nicoll 1f7615a964 Polish "Add support for configuring Spring Session SaveMode"
See gh-17514
2019-07-16 11:30:38 +02:00
Vedran Pavic e073792448 Add support for configuring Spring Session SaveMode
See gh-17514
2019-07-16 11:09:54 +02:00
Andy Wilkinson 8aed06452d Allow custom resource handlers to provide favicon.ico
Closes gh-17381
2019-07-15 14:18:45 +01:00
Phillip Webb eff1147ccc Rename classpath runner package
Remove `runner` since we're no longer tied to JUnit 4.

See gh-17491
2019-07-15 13:40:26 +01:00
Phillip Webb 1117fdb2b3 Make ModifiedClassPathExtension package private
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.

See gh-17491
2019-07-15 13:38:26 +01:00
dreis2211 0f0278e69b Migrate ModifiedClassPath tests to JUnit 5
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.

See gh-17491
2019-07-15 00:31:03 +01:00
dreis2211 b0bf2dd7ab Migrate to ApplicationContextRunner
Migrate a new tests to use the `ApplicationContextRunner`.

See gh-17491
2019-07-15 00:26:08 +01:00
Phillip Webb 0cb6a7f47d Polish 2019-07-15 00:24:19 +01:00
Phillip Webb 01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Phillip Webb b7e092e821 Fix upstream RSocket method renames
Align with the recent upstream Spring Framework changes triggered by
their issue #23170.
2019-07-13 14:01:04 +01:00
Andy Wilkinson dc0432665b Use ephemeral ports rather than 8080 in our tests
Closes gh-17025
2019-07-10 17:22:40 +01:00
Andy Wilkinson 1fffe0ab3e Merge branch '2.1.x'
Closes gh-17482
2019-07-10 13:37:32 +01:00
Dmytro Nosan 93d0427fb5 Polish AbstractDependsOnBeanFactoryPostProcessor
See gh-17480
2019-07-10 13:36:57 +01:00
Andy Wilkinson 47f4bb0d64 Merge branch '2.1.x'
Closes gh-17481
2019-07-10 13:30:10 +01:00
Andy Wilkinson f753c31988 Polish "Set up MongoClient beans' dependencies by type rather than name"
See gh-16627
2019-07-10 13:13:19 +01:00
ielatif 39f1039425 Set up MongoClient beans' dependencies by type rather than name
See gh-16627
2019-07-10 13:10:41 +01:00
Andy Wilkinson 6adcd75481 Merge branch '2.1.x'
Closes gh-17479
2019-07-10 12:37:40 +01:00
Andy Wilkinson 80650f485d Polish "Allow depended on beans to be identified by type"
See gh-17020
2019-07-10 12:25:57 +01:00
Dmytro Nosan 9923ffe9bd Allow depended on beans to be identified by type
Prior to this commit, `AbstractDependsOnBeanFactoryPostProcessor`
could only identify depended on beans by name.

See gh-17020
2019-07-10 12:25:57 +01:00
Brian Clozel 3c28622ebc Add support for reactor-tools debug agent
The `reactor-tools` dependency now brings a new Reactor Debug Agent
which instruments loaded classes for better Reactor stacktraces.
This commit removes the `spring.reactor.stacktrace-mode.enabled`
configuration property since the related Reactor Hook is about to be
removed.
As a replacement, we're introducing `spring.reactor.debug-agent.enabled`
which tells whether the Reactor Debug Agent should be loaded, given that
the `reactor-tools` dependency is available. This option is enabled by
default, since adding the dependency on classpath is a strong signal
already.

Fixes gh-17128
2019-07-10 12:06:26 +02:00
Brian Clozel b1a3849b27 Disable Jackson XML support in RSocket codecs
Prior to this commit, having the `spring-boot-starter-rsocket` and the
`jackson-dataformat-xml` dependencies on classpath would result in a
`ClassCastException` when the RSocket auto-configuration tries to
configure Jackson CBOR codecs for RSocket strategies.

This commit disables the Jackson XML support for the CBOR codec in
RSocket.

Fixes gh-17425
2019-07-10 12:06:26 +02:00
Dmytro Nosan fd9e8503bb Polish BatchAutoConfiguration
See gh-17462
2019-07-09 16:56:16 +01:00
Andy Wilkinson edff0f87e2 Merge branch '2.1.x'
Closes gh-17466
2019-07-09 16:52:13 +01:00
Andy Wilkinson acd9b61c8e Make Batch JPA auto-configuration back off without a DataSource
Fixes gh-17465
2019-07-09 15:46:45 +01:00
Andy Wilkinson a40bc64f6e Merge branch '2.1.x'
Closes gh-17463
2019-07-09 15:14:41 +01:00
Andy Wilkinson c5241f0e82 Remove accidental usage of com.hazelcast.util.Base64
Closes gh-17461
2019-07-09 15:03:31 +01:00
Andy Wilkinson d93c79316d Align with body method changes in RequestBodySpec
Closes gh-17460
2019-07-09 12:13:23 +01:00
Andy Wilkinson 3e6c15c451 Deprecate auto-configuration for Joda-Time
Closes gh-17419
2019-07-09 11:52:36 +01:00
Johnny Lim 426ef749db Polish
See gh-17413
2019-07-09 07:40:30 +02:00