Commit Graph

1152 Commits

Author SHA1 Message Date
Andy Wilkinson
85a4fb389d Merge branch '2.0.x' 2018-10-11 11:51:56 +01:00
Andy Wilkinson
a296a805c5 Tolerate different quoting of annotation attributes on Java 8 and 9+
Closes gh-13594
2018-10-11 11:51:34 +01:00
Stephane Nicoll
3f4fbe32ff Merge branch '2.0.x' 2018-10-11 11:56:13 +02:00
Stephane Nicoll
81377e2fd5 Invoke Flyway#setCallbacks only if necessary
Closes gh-14775
2018-10-11 11:50:53 +02:00
Phillip Webb
85f86243c9 Order class filter checks and exit early
Update the logic in `OnClassCondition` so that filtering exits on the
first missing class. Also refactor the implementation to save
unnecessary `Set` creation when there is just a single class to check.

The `AutoConfigureAnnotationProcessor` has also been updated to order
classes so that any starting `org.springframework` are considered last.
The assumption being that other classes are more likely to be missing.

Closes gh-12131
2018-10-10 22:02:05 -07:00
Phillip Webb
b1d4cf4ea8 Fix Neo4J Tests
Update Neo4J tests following SPR-17333 which has broken our previous
method of simulating Embedded Neo4J.

Closes gh-14779
2018-10-10 17:51:41 -07:00
Phillip Webb
33c2d24560 Support ConfigurationProperties BindHandler advise
Allow custom `BinderHandler` advise to be applied to the `Binder` used
for `@ConfigurationProperties`.  This mechanism has been added to allow
Spring Cloud Stream to manipulate `Bindable` instances before binding
occurs.

NOTE: This commit introduces a breaking change to the `BindHandler`
interface since the `onStart` method now returns a `Bindable` rather
than a `boolean`.

Closes gh-14745
2018-10-10 12:40:11 -07:00
Phillip Webb
94798062ab Configure Cassandra JMX Reporting
Allow Cassandra JMX reporting to be configured via a property, and
disable it by default since it won't work with Dropwizard metrics 4.

Also update some of our own tests to explicitly disable it.

Closes gh-14778
2018-10-10 10:00:44 -07:00
Stephane Nicoll
73ad17d2cb Use standard SpringBeanJobFactory to create Quartz Job instances
A recent update to SpringBeanJobFactory provides the same features as
our AutowireCapableBeanJobFactory override so this commit removes it in
favour of the standard factory.

Closes gh-14772
2018-10-10 16:01:59 +02:00
Stephane Nicoll
c5122fb365 Merge branch '2.0.x' 2018-10-10 15:44:12 +02:00
Hanope
29b453d8b0 Fix typo
Closes gh-14770
2018-10-10 15:43:29 +02:00
Stephane Nicoll
c91d9bfda8 Polish "Add encoding support for git and build properties"
Closes gh-10771
2018-10-10 13:43:44 +02:00
hengyunabc
f7a4a56fba Add encoding support for git and build properties
See gh-10771
2018-10-10 13:43:44 +02:00
Andy Wilkinson
646c20ed6a Merge branch '2.0.x' 2018-10-10 12:22:00 +01:00
Andy Wilkinson
f9b6c1ab4d Include more information in NoSuchBeanDefinition failure analysis
Closes gh-13594
2018-10-10 12:21:46 +01:00
Madhura Bhave
b18751ebd9 Provide loggingCodecCustomizer only if property is set
Fixes gh-14723
2018-10-09 14:41:17 -07:00
Andy Wilkinson
37c60b6603 Merge branch '2.0.x' 2018-10-09 17:47:18 +01:00
Andy Wilkinson
3f7a01fd27 Use ApplicationContextRunner in SpringDataWebAutoConfigurationTests
See gh-14413
2018-10-09 17:46:55 +01:00
Andy Wilkinson
fa47073d11 Merge branch '2.0.x' 2018-10-09 15:09:15 +01:00
Andy Wilkinson
c6fdb4f0f2 Improve documentation of Quartz DataSource customization
Closes gh-12780
2018-10-09 15:05:25 +01:00
Andy Wilkinson
f2446f78df Align Session Redis tests with changes in latest Apple snapshots
See gh-14732
2018-10-09 12:39:08 +01:00
Stephane Nicoll
a22d089cdc Use a dedicated hook point to customize InfluxDB's HTTP client
This commit introduces a dedicated hook point for InfluxDB's http client
builder and retains backward compatibility, in a deprecated fashion, for
looking up a OkHttpClient.Builder bean.

Closes gh-14709
2018-10-09 13:33:14 +02:00
Stephane Nicoll
7da3396555 Merge branch '2.0.x' 2018-10-08 10:45:49 +02:00
dreis2211
55ec016bac Remove unused fields in tests
Closes gh-14707
2018-10-08 10:40:04 +02:00
Phillip Webb
01b8667dd7 Update copyright year for changed files 2018-10-05 13:40:07 -07:00
Phillip Webb
6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Andy Wilkinson
4d1fc196de Use Windows-specific custom features so download URI is correct
Closes gh-14690
2018-10-05 14:56:07 +01:00
Andy Wilkinson
9bc6dbd8d8 Merge branch '2.0.x' 2018-10-05 13:06:38 +01:00
Andy Wilkinson
ad647ba073 Make JSON-B auto-config back of if no JSON-P implementation is available
Closes gh-14675
2018-10-05 13:05:14 +01:00
Andy Wilkinson
8a7d127600 Merge branch '2.0.x' 2018-10-05 11:04:10 +01:00
Andy Wilkinson
7490d8b99d Make JSON-B auto-config back off when no implementation is available
Previously, the JSON-B auto-configuration would be enabled when the JSON-B API was
on the classpath. This led to a failure if there was no implementation available.

The JSON-B API loads an implementation using the service loader. This commit updates
the auto-configuration to be conditional on the presence of a
META-INF/services/javax.json.bind.spi.JsonbProvider file on the classpath.

Closes gh-14675
2018-10-05 11:03:49 +01:00
Phillip Webb
11ac9bf6b5 Polish "Add ReloadableResourceBundleMessageSource support"
See gh-13377
2018-10-04 19:45:42 -07:00
Rui Figueira
22abe35f95 Add ReloadableResourceBundleMessageSource support
Add a `spring.messages.reloadable` configuration property which can be
used to auto-configure a `ReloadableResourceBundleMessageSource` rather
than a `ResourceBundleMessageSource`.

Closes gh-13377
2018-10-04 19:45:41 -07:00
Phillip Webb
8b59503291 Validate server.servlet.path does not contain '*'
Update `WebMvcProperties` to enforce that `server.servlet.path` never
contains a wildcard ['*'] character.

Closes gh-13292
2018-10-04 19:45:41 -07:00
Madhura Bhave
daa3d457b7 Revert OAuth2 Client Registration Grant Type Hierarchy
Closes gh-14554
2018-10-04 15:21:36 -07:00
Stephane Nicoll
7e3bee35d7 Merge branch '2.0.x' 2018-10-04 17:54:25 +02:00
Stephane Nicoll
6cc272ecf5 Polish "Make sure cache busting works with error pages"
Closes gh-14583
2018-10-04 17:53:56 +02:00
artsiom
64f04fceea Make sure cache busting works with error pages
See gh-14583
2018-10-04 17:53:56 +02:00
Stephane Nicoll
5d0e812afe Merge branch '2.0.x' 2018-10-04 15:53:26 +02:00
Stephane Nicoll
1b10d3fcbf Fix missing metadata for nested POJO
This commit fixes missing descriptions and default values when
applicable for `management.server.ssl`, `server.compression`,
`server.http2`, `server.servlet.jsp`, `server.servlet.session` and
`server.ssl`.

Those nested namespace are managed by a POJO that is declared outside
of the module of the target @ConfigurationProperties type using it. As
a result, the annotation processor has no access to the source model and
can't extract the description and the default value, if any.

This commit migrates the misleading field-level Javadoc to manual meta
data for the time being.

Closes gh-14669
2018-10-04 15:49:04 +02:00
Stephane Nicoll
d445ed7560 Merge branch '2.0.x' 2018-10-04 12:24:14 +02:00
Roland Weisleder
d2a063b26a Clarify Javadoc of ConditionalOn annotations
Closes gh-14681
2018-10-04 12:22:52 +02:00
Andy Wilkinson
b4638b82d0 Prevent ApplicationListener that depends on EMF from creating a cycle
Previously, when an EntityManagerFactory was being initialized
synchronously, the DataSourceSchemaCreatedEvent would be published
during its initialization. This meant that an application listener that
depends on the EntityManagerFactory would create a dependency cycle if
it was a potential recipient of the event.

For the synchronous case, this commit moves the publication of the
event so that it occurs after the initialisation of the entity manager
factory. This allows an application listener that is a potential
recipient of the DataSourceSchemaCreatedEvent to depend on the
EntityManagerFactory without creating a cycle.

Closes gh-14651
2018-10-03 17:29:54 +01:00
Andy Wilkinson
7cbee701cd Allow user-provided ExecuteListenerProvider to go after Boot's
Closes gh-14598
2018-10-03 16:56:50 +01:00
Johnny Lim
335775892b Polish
See gh-14667
2018-10-03 13:57:18 +02:00
Phillip Webb
d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Stephane Nicoll
aaecdfb527 Deprecate Cassandra properties that require a default constructor
Closes gh-14473
2018-10-02 17:43:59 +02:00
Stephane Nicoll
068040e227 Register SpringBeanContainer with default Hibernate setup
Closes gh-13717
2018-10-02 16:41:02 +02:00
Phillip Webb
2add65fe15 Polish Neo4J BookmarkManager auto-configuration
Closes gh-14568
2018-10-01 10:34:10 -07:00
Michael J. Simons
b7847d98a7 Auto-configure Neo4J BookmarkManager when possible
Add `Neo4jBookmarkManagementConfiguration` which provides an instance
of `BookmarkManager` if necessary and Caffeine cache is on the
classpath. Depending on the kind of application, the `BookmarkManager`
will be request scoped or singleton, as recommended by Spring Data
Neo4j.

See gh-14568
2018-10-01 10:29:17 -07:00
Johnny Lim
b079eeff1a Polish
Closes gh-14621
2018-10-01 10:51:13 -04:00
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 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
Madhura Bhave
cf31325e5d Polish "OIDC issuer uri in OAuth resource server config"
Closes gh-14190
2018-08-24 14:57:45 -07:00
artsiom
0c299bbc1f Support OIDC issuer uri in OAuth resource server config 2018-08-24 14:19:14 -07:00
mhyeon.lee
c827530f4b Add user-info-authentication-method
Closes gh-13865
2018-08-24 12:38:27 -07:00
Madhura Bhave
d07e2fa0b2 Polish "OAuth2 client secret should not be required"
Closes gh-14156
2018-08-24 12:23:41 -07:00
artsiom
6be4307712 OAuth2 client secret property should not be required 2018-08-24 12:20:43 -07:00
Madhura Bhave
caf7221485 Update OAuth2 config following changes in Spring Security DSL
Closes gh-14169
2018-08-24 12:15:35 -07:00
Stephane Nicoll
833e39eeb6 Let Hibernate configure the transaction manager on WebSphere
Closes gh-8926
2018-08-24 10:48:20 +02:00
Madhura Bhave
fc4340c5d4 Rename OAuth2 resource server properties
Closes gh-14165
2018-08-23 16:51:27 -07:00
Stephane Nicoll
26353a8f35 Port test to use ehcache3
Hibernate 5.3 has deprecated the ehcache2 region factory so this commit
upgrades the integration test to use JCache instead.
2018-08-23 17:07:52 +02:00
Brian Clozel
0881b7c390 Revert "Consider only current context in WebFlux setup"
This reverts commit da4624a882.
2018-08-23 16:50:48 +02:00
Stephane Nicoll
03d6cd9f0b Merge branch '2.0.x' 2018-08-23 16:16:25 +02:00
Stephane Nicoll
be00c1db63 Fix dependency between cache and hibernate
This commit fixes the ordering between `CacheAutoConfiguration` and
`HibernateJpaAutoConfiguration` so that the auto-configured
`CacheManager` is configured before Hibernate starts.

Closes gh-14181
2018-08-23 16:15:42 +02:00
Brian Clozel
da4624a882 Consider only current context in WebFlux setup
This commit introduces a subclass of `DispatcherHandler` that only
considers the current context when looking for WebFlux infrastructure
beans.

This avoids issues where a child context (e.g. with Actuator) picks up
infrastructure beans from the parent context and exposes all endpoints
instead of getting only the ones from the current context.

Closes gh-14012
2018-08-23 15:35:34 +02:00
Stephane Nicoll
1b7f713487 Merge branch '2.0.x' 2018-08-23 11:34:49 +02:00
Stephane Nicoll
5e7be50265 Restore trace request param behaviour with error controller
This commits restores the behaviour of Spring Boot 1.x with regards to
the "trace" request param used to add the stacktrace to the model.

This was inadvertently changed so that the stacktrace would be added
if the parameter wasn't set.

Closes gh-14171
2018-08-23 11:34:16 +02:00
Brian Clozel
53f3982748 Support Jetty RS as HTTP driver for WebClient
This commit adds a new auto-configuration choice for
`ClientHttpConnector`, this time using the Jetty RS HTTP client library
if available.

This is the best choice in case the application runs on a Jetty reactive
server, as both client and server will share resources.

Closes gh-14005
2018-08-23 10:51:43 +02:00
Stephane Nicoll
1bbe3afdec Merge branch '2.0.x' 2018-08-23 10:27:47 +02:00
Stephane Nicoll
9938d1f4b6 Order IntegrationAutoConfiguration properly
This commit makes sure that the auto-configuration for Spring
Integration runs after the datasource has been auto-configured if
necessary as there is an optional part that can initialize the jdbc
schema.

Closes gh-14175
2018-08-23 10:27:25 +02:00
Brian Clozel
e2a7594246 Configure Reactor HTTP client resources
This commit adds support for the new `ReactorResourceFactory` and
ensures that such a bean is created and destroyed with the application
context. This will create a `ClientHttpConnector` bean, to be configured
on the `WebClient.Builder` instance - or let developers create their own
`ClientHttpConnector` bean to override that opinion.

By default, the `ReactorResourceFactory` is configured to participate
with the global resources, for better efficiency.

Closes gh-14058
2018-08-22 19:14:34 +02:00
Stephane Nicoll
6d4bab911c Polish "Add Kafka Streams auto-configuration"
Closes gh-14021
2018-08-22 16:08:25 +02:00
Gary Russell
a7acbbd625 Add Kafka Streams auto-configuration
See gh-14021
2018-08-22 15:41:42 +02:00
Stephane Nicoll
597fe237b5 Polish "Add PropertyMapper.from(value)"
Closes gh-13837
2018-08-22 15:40:36 +02:00
Dmytro Nosan
1bd52bc432 Add PropertyMapper.from(value)
See gh-13837
2018-08-22 15:27:00 +02:00
Johnny Lim
c95b339f02 Polish
Closes gh-14149
2018-08-22 10:38:00 +02:00
Madhura Bhave
84901fa58e OnClassCondition report should only include relevant condition
Closes gh-11086
2018-08-21 18:59:34 -07:00
Stephane Nicoll
d9a42a5165 Merge branch '2.0.x' 2018-08-20 15:03:24 +02:00
Stephane Nicoll
e03f01564a Deprecate EntityManagerFactoryBeanCallback
Closes gh-14083
2018-08-20 14:54:32 +02:00
Madhura Bhave
f6f9f27189 Merge branch '2.0.x' 2018-08-17 16:04:43 -07:00
Madhura Bhave
f7135ff18f Use ResolverStyle.SMART when a custom format is specified
Fixes gh-13970
2018-08-17 16:01:10 -07:00
artsiom
1c224e5fbb Add WebFluxRegistrations for custom WebFlux beans
This commit adds a new `WebFluxRegistrations` interface that
allows developers to register custom instances of key WebFlux
infrastructure components, such as `RequestMappingHandlerMapping`
and `RequestMappingHandlerAdapter`.

Closes gh-13997
2018-08-17 16:59:41 +02:00
Stephane Nicoll
ba2f2a3727 Polish jaxb setup for JDK 9 and further 2018-08-17 16:17:00 +02:00
Brian Clozel
6ecbd8d21b Auto-Configure FormContentFilter in Spring MVC
Because `HttpPutFormContentFilter` has been deprecated in Spring
Framework 5.1, this commit updates the auto-configuration to replace it
with the new `FormContentFilter`. This new filter is building on the
previous one and supports HTTP DELETE requests as well.

Both filters should not be used in addition, so the former
configuration has been removed. This commit also adds configuration
metadata to let developers know about the configuration key change.

Closes: gh-13363
2018-08-17 15:25:14 +02:00
Stephane Nicoll
d1ac774af2 Configure build to be compatible with Java 11
See gh-14028
2018-08-17 15:16:02 +02:00
Stephane Nicoll
930c838da9 Remove Narayana support
The Spring Boot integration is now handled by the Narayana project
itself at https://github.com/snowdrop/narayana-spring-boot

This commit removes our support.

Closes gh-12026
2018-08-17 15:08:55 +02:00
Brian Clozel
5e836b1231 Merge branch '2.0.x' 2018-08-17 13:41:36 +02:00
artsiom
51fd27fad4 Configure HiddenHttpMethodFilter for Spring WebFlux
Closes gh-14008
2018-08-17 13:40:43 +02:00
Stephane Nicoll
82e3a6a1a4 Polish 2018-08-17 13:29:07 +02:00
Brian Clozel
8c1df92566 Align with DispatcherServlet changes
The `shouldHandleFailure` configuration option has been removed from
`DispatcherServlet`.

See gh-13511
2018-08-17 13:24:00 +02:00
artsiom
d22c3e2787 Add property to disable HiddenHttpMethodFilter
Closes gh-14030
2018-08-17 10:29:06 +02:00
Madhura Bhave
d724f154f4 Merge branch '2.0.x' 2018-08-16 15:45:20 -07:00
Madhura Bhave
b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
2018-08-16 15:41:02 -07:00
Andy Wilkinson
90608fa40e Align test with changes made in ab1f5931
See gh-13511
2018-08-16 20:47:08 +01:00