951 Commits

Author SHA1 Message Date
Stephane Nicoll
2d36a6f952 Merge branch '2.0.x' 2018-10-01 10:50:58 -04:00
Johnny Lim
1eca492c5e Polish
See gh-14621
2018-10-01 10:46:27 -04:00
Johnny Lim
698bbd6a9e Polish
Closes gh-14597
2018-09-26 11:45:21 -04:00
Andy Wilkinson
f88ebf75cd Use Mongo 3.5.5 by default with Embedded mongo
Closes gh-14476
2018-09-25 16:44:38 -04:00
Andy Wilkinson
1a8f519922 Raise 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-25 15:19:34 -04:00
Phillip Webb
a04e913c22 Make ResourceHandlerRegistrationCustomizer public
Make `ResourceHandlerRegistrationCustomizer` a public top level class.

Closes gh-14587
2018-09-24 10:20:25 -04:00
Phillip Webb
ff98ba0fa5 Allow early OnWebApplication filtering
Update `OnWebApplicationCondition` to be an
`AutoConfigurationImportFilter` and filter out classes early.

Closes gh-13328
2018-09-24 09:46:30 -04:00
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 1a4ad96dd02839d9a7a63994299e4322f2763748. 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