Commit Graph

994 Commits

Author SHA1 Message Date
Phillip Webb c2f8398c06 Allow early OnBeanCondition filtering
Update `OnBeanCondition` to be an `AutoConfigurationImportFilter` and
filter out classes early.

See gh-13328
2018-09-24 09:45:49 -04:00
Phillip Webb e4f54a45be Add AutoConfigurationImportFilter base classes
Add `FilteringSpringBootCondition` base class and refactor the existing
`OnClassCondition` to use it. Also update the `match` method so that
the `autoConfigurationClasses` array may include `null` elements.

See gh-13328
2018-09-24 09:45:05 -04:00
Stephane Nicoll 831b0d7bdd Merge branch '2.0.x' 2018-09-23 10:49:17 +02:00
Stephane Nicoll 885948ce3b Polish 2018-09-23 10:47:09 +02:00
Stephane Nicoll 92afd041b0 Merge branch '2.0.x' 2018-09-22 19:31:45 +02:00
artsiom 7fb13d0dc2 Fix WebSocket web server customizer bean names
Closes gh-14582
2018-09-22 19:29:48 +02:00
Andy Wilkinson 8e9a93e5f3 Align SessionAutoConfigurationRedisTests with changes in Bean-RC1
See gh-14573
2018-09-22 14:57:43 +01:00
Andy Wilkinson 5d0a1ee0da Upgrade to Spring AMQP 2.1.0.RC1
Closes gh-14574
2018-09-21 19:22:33 +01:00
Stephane Nicoll 9d46fee6db Merge branch '2.0.x' 2018-09-21 16:47:33 +02:00
Gary Russell 26c1e389df Polish RabbitMQ properties doc
Fix description for `prefetch`; remove reference to transactions since
the direct container does not support transactionSize.

Also fix `transactionSize` to just reference acks; autoConfiguration
doesn't support enabling transactions.

Closes gh-14569
2018-09-21 16:46:12 +02:00
Stephane Nicoll cbae22f0c9 Polish "Migrate size properties to DataSize"
Closes gh-14549
2018-09-21 16:27:28 +02:00
qct eb9f635004 Migrate size properties to DataSize
See gh-14549
2018-09-21 16:01:55 +02:00
Andy Wilkinson 4b00dc8a5c Add support for Spring Data JDBC (auto-config, starter, and test slice)
Closes gh-14489
2018-09-21 14:18:52 +01:00
Andy Wilkinson 426ff3ada7 Store ObjectProvider rather than their Streams to allow reuse
Generally speaking, methods on configuration classes will only be called once
and, therefore, it should be safe to hold a reference to a Stream for later
one-time usage. However, there are some scenarios in Spring Fu where functional
registration results in an attempt being made to use a Stream more than use.

This commit protects against multiple use by storing the ObjectProvider and
getting a new ordered Stream each time it's needed.

Closes gh-14467
2018-09-20 16:16:42 +01:00
Andy Wilkinson cc6cf880cf Stop using ObjectProvider<List> and ObjectProvider<Collection>
Closes gh-14467
2018-09-20 13:19:40 +01:00
Stephane Nicoll 8652f40781 Allow Quartz property to set the scheduler name
This commit makes sure that "org.quartz.scheduler.instanceName" is
honoured if set. Previously, "spring.quartz.scheduler-name" had a
default value and was always set. As a result, `SchedulerFactoryBean`
did not take the quartz property into account.

Closes gh-14243
2018-09-20 11:27:57 +02:00
Johnny Lim 521f746151 Polish
Closes gh-14517
2018-09-20 09:51:10 +02:00
Andy Wilkinson efae363974 Register functional rather than reflective bean definitions where possible
Closes gh-14516
2018-09-19 19:59:09 +01:00
yongsungjeon 11864f2bb6 Use constant for produces attribute
Closes gh-14501
2018-09-19 11:38:29 +02:00
Johnny Lim d0a252181b Polish
Closes gh-14449
2018-09-19 09:58:31 +02:00
Andy Wilkinson c1b864c826 Polish 2018-09-18 11:18:28 +01:00
Madhura Bhave 9201e23f67 Revert "Raised the default version of Mongo to 3.6.5 when using Embedded Mongo."
This reverts commit 1a4ad96dd0. Reverting
to see if this fixes CI timeouts.
2018-09-17 15:25:54 -07:00
Madhura Bhave b2dd162572 Merge branch '2.0.x' 2018-09-17 14:30:38 -07:00
Madhura Bhave d7d5cbf959 Simplify printing ConditionEvaluationReport when using context runner
Closes gh-13119
2018-09-17 14:23:47 -07:00
Andy Wilkinson e1328f05e7 Merge branch '2.0.x' 2018-09-17 15:55:35 +01:00
Andy Wilkinson fc60d9f6d4 Merge branch '1.5.x' into 2.0.x 2018-09-17 15:50:12 +01:00
Gary Russell 19cea75e74 Start building against Spring Kafka 2.2.0 snapshots
See gh-14491
Closes gh-14420
2018-09-17 12:35:37 +01:00
Andy Wilkinson 1a4ad96dd0 Raised the default version of Mongo to 3.6.5 when using Embedded Mongo.
While MongoDB 3.6.7 has been released, 3.6.5 is the latest version that's supported
by the version of Embedded Mongo that we're currently using.

Closes gh-14476
2018-09-17 12:29:48 +01:00
Andy Wilkinson a1d1a7392f Polish "Use ExecutorProvider bean if available when auto-configuring jOOQ"
Closes gh-14471
2018-09-17 11:20:45 +01:00
davinkevin 620419f9e4 Use ExecutorProvider bean if available when auto-configuring jOOQ
See gh-14471
2018-09-17 11:15:47 +01:00
Phillip Webb 5cc1a830b2 Fixup abstract configuration following SPR-16839
Spring Framework now requires that all nested configuration classes
are contained within a `@Component` class (see SPR-16839). This means
that our abstract `JpaBaseConfiguration` class should have a
`@Configuration` annotation.

Closes gh-14480
2018-09-15 18:03:53 -07:00
Madhura Bhave 01e61d88e7 Merge branch '2.0.x' 2018-09-14 11:48:37 -07:00
Madhura Bhave 5708792d82 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:43:33 -07:00
Madhura Bhave d9efca146e Merge branch '2.0.x' 2018-09-14 11:21:31 -07:00
Madhura Bhave 09ccf875b7 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:17:59 -07:00
Madhura Bhave 1113c356dc ReactiveOAuth2ClientAutoConfiguration backs off for servlet env
Fixes gh-14463
2018-09-13 12:39:18 -07:00
Phillip Webb 84b6fff8c0 Update copyright year for changed files 2018-09-11 14:28:28 -07:00
Phillip Webb 424dfc398b Move 'insights.web' properties to 'spring.http'
Relocate the 'spring.insights.web.log-request-details' property to
'spring.http.log-request-details'.

Closes gh-14313
2018-09-11 12:51:14 -07:00
Andy Wilkinson 79e3deec0e Merge branch '2.0.x' 2018-09-11 12:41:27 +01:00
Andy Wilkinson 2e86a6f479 Merge branch '1.5.x' into 2.0.x 2018-09-11 12:31:09 +01:00
Madhura Bhave 968a637e50 Refactor ReactiveOAuth2ClientAutoConfiguration for non webapps
Non web applications might want to leverage
`ReactiveClientRegistrationRepository` and
`ServerOAuth2AuthorizedClientRepository` to configure `WebClient`.

Closes gh-14350
2018-09-10 14:13:26 -07:00
Sebastien Deleuze 48367e7741 Make standard JSON builder customiser classes package-private
Closes gh-14399
2018-09-10 16:36:21 +01:00
Madhura Bhave d3ecd02987 Merge branch '2.0.x' 2018-09-07 11:40:27 -07:00
Madhura Bhave e41394233b Harmonize ReactiveSecurityAutoConfiguration
Fixes gh-14263
2018-09-07 11:38:09 -07:00
Stephane Nicoll 24051b42d0 Polish "Add support for configuring missingQueuesFatal property"
See gh-14252
2018-09-07 18:41:23 +02:00
Stephane Nicoll c1322a543c Polish "Add support for configuring missingQueuesFatal property"
Closes gh-14252
2018-09-07 16:44:37 +02:00
Dmytro Nosan 91e731a4b4 Add support for configuring missingQueuesFatal property
See gh-14252
2018-09-07 16:44:36 +02:00
Andy Wilkinson 4ae057694f Merge branch '2.0.x' 2018-09-07 11:09:06 +01:00
Andy Wilkinson aa45f3c702 Merge branch '1.5.x' into 2.0.x 2018-09-07 10:53:15 +01:00
Stephane Nicoll 4d031999ce Polish "Fix use of deprecated Mongo API"
Closes gh-14318
2018-09-06 16:44:56 +02:00
Mark Paluch b97892ff88 Fix use of deprecated Mongo API
We now use com.mongodb.MongoClientSettings to configure the reactive
MongoDB driver. This is a breaking change as
MongoClientSettingsBuilderCustomizer and user-provided
MongoClientSettings beans referenced the package the settings type
from com.mongodb.async.client.

MongoClient.getSettings() is deprecated and still in use within tests
until a replacement is available.

See gh-14318
2018-09-06 16:44:55 +02:00
Phillip Webb 8c34e053f5 Update copyright header of changed files 2018-09-05 13:09:03 -07:00
Phillip Webb c3de4c84f2 Polish 2018-09-05 12:54:20 -07:00
Stephane Nicoll 304c6a02ba Polish "Make it possible to disable the BackgroundPreinitializer"
Closes gh-14298
2018-09-05 14:33:54 +02:00
artsiom 5779767513 Make it possible to disable the BackgroundPreinitializer
See gh-14298
2018-09-05 14:32:56 +02:00
Johnny Lim 49c760d275 Update @since tag
This commit updates @since tag in CloudServiceConnectorsAutoConfiguration
as it has been renamed in cfd0ab7646.

Closes gh-14297
2018-09-05 08:46:25 +02:00
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -07:00
Phillip Webb cafff43022 Update copyright header of changed files 2018-09-04 16:19:05 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Madhura Bhave 75937f5b5c Make jmsListenerContainerFactory @ConditionalOnSingleCandidate
Closes gh-12700
2018-09-04 16:06:18 -07:00
Phillip Webb 59b5c54489 Upgrade to Rabbit AMQP Client to 5.4.0
Closes gh-14303
2018-09-04 15:21:06 -07:00
Phillip Webb 0cd64ea690 Merge branch '2.0.x' 2018-09-04 15:15:57 -07:00
Phillip Webb 45613f8c3c Merge branch '1.5.x' into 2.0.x 2018-09-04 15:12:22 -07:00
Andy Wilkinson 8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Brian Clozel 2af8a9617b Revert temporary workaround for reactor resources
This switches back the Reactor resources on global by default.

See gh-14058
See SPR-17199
2018-09-04 15:37:39 +02:00
Stephane Nicoll c0e45b7333 Adapt to Spring Framework API change 2018-09-04 14:09:57 +02:00
Stephane Nicoll 8771b34c15 Polish "Align max HTTP header size configuration"
Closes gh-14234
2018-09-04 10:51:54 +02:00
qct dbbb378650 Align max HTTP header size configuration
See gh-14234
2018-09-04 10:51:36 +02:00
Johnny Lim 5427d778fe Polish
Closes gh-14293
2018-09-04 08:52:55 +02:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish
See gh-14293
2018-09-04 08:52:13 +02:00
Stephane Nicoll 960acb0cbf Merge branch '2.0.x' 2018-09-03 12:16:32 +02:00
Stephane Nicoll 42bf594d96 Polish condition name
See gh-14285
2018-09-03 12:16:18 +02:00
Stephane Nicoll 5a1aefc76f Merge branch '2.0.x' 2018-09-03 11:17:59 +02:00
Stephane Nicoll ddeae9b58e Polish "Fix WSDL locations condition to work with a list"
Closes gh-14285
2018-09-03 11:09:44 +02:00
Eneias Cordeiro da Silva 80358f7fbf Fix WSDL locations condition to work with a list
See gh-14285
2018-09-03 11:06:34 +02:00
Johnny Lim d510bc71b1 Polish
Closes gh-14271
2018-09-03 08:53:07 +02:00
Stephane Nicoll 7dff13b632 Merge branch '2.0.x' 2018-09-03 08:52:46 +02:00
Stephane Nicoll 8950c3ebb4 Polish
See gh-14271
2018-09-03 08:51:51 +02:00
Stephane Nicoll 8b753297c3 Merge branch '2.0.x' 2018-08-31 15:24:11 +02:00
Stephane Nicoll ea2fb620b4 Clarify structure of prefixes
Closes gh-14258
2018-08-31 15:23:53 +02:00
Stephane Nicoll 374cf2c781 Merge branch '2.0.x' 2018-08-31 11:35:03 +02:00
Stephane Nicoll 6d637bc53b Add missing condition
Closes gh-14264
2018-08-31 11:34:32 +02:00
Phillip Webb 174f53e1cf Merge branch '2.0.x' 2018-08-30 16:02:25 -07:00
Phillip Webb 2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 2018-08-30 15:59:02 -07:00
Stephane Nicoll cfd0ab7646 Remove `spring.cloud.enabled` property
This commit removes an undocumented property and rename the Spring
Cloud Service Connectors auto-configuration.

Closes gh-14219
2018-08-29 15:46:03 +02:00
Madhura Bhave a33e58fc45 Deprecate OAuth2 login redirect-uri-template
This property is deprecated in favor of
`spring.security.oauth2.client.registration.login.*.redirect-uri

Closes gh-14226
2018-08-28 15:40:54 -07:00
Madhura Bhave a54898b8f5 Remove explicit call to `authorizationCodeGrant`
See gh-13812
2018-08-28 13:56:03 -07:00
Madhura Bhave f5deebf0cb Support authorization_code grant for OAuth2 client
This commit also refactors OAuth2 client properties. With
the added support for authorization_code clients, client
registrations are now divided into `login` and `authorization_code`.
An environment post processor is used for backward compatibility with
old Open ID Connect login clients.

Closes gh-13812
2018-08-28 13:49:07 -07:00
Stephane Nicoll b7ae55866e Polish "Improve Kafka Auto-configuration"
Closes gh-14215
2018-08-28 17:10:49 +02:00
Gary Russell 59c6dc5c7a Improve Kafka Auto-configuration
- transaction manager
- error handler
- after rollback processor

See gh-14215
2018-08-28 16:22:12 +02:00
Stephane Nicoll 56329e67d7 Polish "Add support for com.mongodb.client.MongoClient"
Closes gh-14176
2018-08-28 15:24:31 +02:00
Christoph Strobl d549e6001a Add support for com.mongodb.client.MongoClient
Next to com.mongodb.MongoClient the MongoDB Java driver offers the
com.mongodb.client.MongoClient as entry point for database and
collection operations. Spring Data MongoDB supports
c.m.client.MongoClient via its MongoDbFactory using
SimpleMongoClientDbFactory.

The MongoAutoConfiguration now backs off if any of those two clients is
already defined in the Application context allowing
MongoDataAutoConfiguration to pick up the users driver implementation of
choice.

See gh-14176
2018-08-28 14:52:24 +02:00
Madhura Bhave 35d7bb7f34 Polish "issuer uri in reactive resource-server config"
Closes gh-14199
2018-08-27 14:10:40 -07:00
artsiom 04b7c4c6d9 Support issuer uri in reactive OAuth2 resource-server config 2018-08-27 14:10:32 -07:00
Dave Syer c7b7a1402a Make some nested private classes package private
Closes gh-13795
2018-08-27 18:15:53 +02:00
Stephane Nicoll d9c0dbb99d Polish "Polish some Collectors"
Closes gh-13727
2018-08-27 18:09:19 +02:00
dreis2211 422a436df1 Polish some Collectors
See gh-13727
2018-08-27 18:09:02 +02:00
Johnny Lim cf17106d8d Polish
Closes gh-14212
2018-08-27 17:28:27 +02:00
Johnny Lim fe3fe0fa63 Polish
Closes gh-14202
2018-08-26 10:48:05 +02:00