Commit Graph

2653 Commits

Author SHA1 Message Date
Phillip Webb
302f038e84 Polish 2017-05-15 20:35:29 -07:00
Phillip Webb
f4444a36b3 Merge branch '1.5.x' 2017-05-15 16:00:28 -07:00
Phillip Webb
440d03bf9e Merge branch '1.4.x' into 1.5.x 2017-05-15 15:59:08 -07:00
Phillip Webb
9a4a20537c Polish 2017-05-15 11:19:19 -07:00
Andy Wilkinson
2c315d3d6f Merge branch '1.5.x' 2017-05-15 17:44:50 +01:00
Andy Wilkinson
fd2ab2fee0 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:44:42 +01:00
Andy Wilkinson
198093c6a8 Fix violation reported by Checkstyle 2017-05-15 17:44:17 +01:00
Andy Wilkinson
8afaba0b9f Merge branch '1.5.x' 2017-05-15 17:11:56 +01:00
Andy Wilkinson
5693acf558 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:08:53 +01:00
Andy Wilkinson
a6f8351dd6 Close Liquibase-specific DataSource once database has been migrated
Previously, when the liquibase.url, .username, and .password
properties were used to configure a DataSource specifically for
Liquibase that DataSource would never be explicitly closed. As it is
created by DataSourceBuilder with no explicitly configured type it
will use whichever connection pool is available and, therefore, will
create and keep open the pool's minimum number of connections. This
is an unnecessary use of resources both in the application and in the
database.

This commit updates LiquibaseAutoConfiguration so that if it uses
DataSourceBuilder to create a DataSource then it will also close that
DataSource once the database has been migrated.

Closes gh-9218
2017-05-15 17:08:45 +01:00
Stephane Nicoll
1480f0717f Polish "Add Kafka Kerberos Configuration Properties"
Closes gh-9151
2017-05-14 18:13:00 +02:00
Gary Russell
c4cfc4dd0c Add Kafka Kerberos Configuration Properties
See gh-9151
2017-05-14 17:56:53 +02:00
Stephane Nicoll
b2e3c5dd61 Fix order of connection pools in DataSourceBuilder
Closes gh-6013
2017-05-14 17:48:48 +02:00
Madhura Bhave
f15cf4b991 Remove redundant uses of @NestedConfigurationProperty
Closes gh-9216
2017-05-12 10:43:43 -07:00
Andy Wilkinson
61d89ef207 Remove misleading use of legacy from simple container's description
Closes gh-9173
2017-05-12 17:30:17 +01:00
Stephane Nicoll
cf88508e1d Avoid exposing spring.resources.favicon-locations as a property
Closes gh-9214
2017-05-12 17:25:35 +02:00
Brian Clozel
d7ba7ecc48 Allow RouterFunction parameterized with different types
This commit allows *any* type of `RouterFunction` to be injected in the
WebFlux.fn auto-configuration; previously the `RouterFunction<T>` would
restrict injected beans to a single parameterized type.

Doing requires using the `RouterFunction.andOther` method to collect
them.

Fixes gh-9181
2017-05-12 17:18:14 +02:00
Brian Clozel
4a47c1eff8 Keep default Thymeleaf media types in reactive support
This commit removes the default configuration value previously set
for `spring.thymeleaf.reactive.media-types` since this value overrides
the defaults provided by Thymeleaf.

This value does not drive the default media type used by views, but
rather all media types that the templating engine should support.

Fixes gh-9134
2017-05-12 17:17:49 +02:00
Brian Clozel
89c284cb13 Add reactive websocket auto-configuration for Tomcat
This commit adds a `TomcatWebSocketReactiveWebServerCustomizer`
that customizes the Tomcat context to accept WebSockets connections.
Since reactive servers don't use the JSR 356 for that support,
only Tomcat customization is required for now.

This commit also reorders the server auto-configuration
so that undertow has a chance to be auto-configured before
reactor-netty, which should be a popular dependency thanks to
its HTTP client library.

The existing WebSocket infrastructure for Serlvet based containers
has been moved to a dedicated package and renamed accordingly.

Fixes gh-9113
2017-05-12 17:17:35 +02:00
Andy Wilkinson
9f55deeb95 Merge branch '1.5.x' 2017-05-12 15:01:06 +01:00
Andy Wilkinson
a2e749940e Merge branch '1.4.x' into 1.5.x 2017-05-12 15:00:58 +01:00
Andy Wilkinson
a3f5cbc4a2 Polishing 2017-05-12 15:00:44 +01:00
Andy Wilkinson
47807b8925 Upgrade to SendGrid 3.2.0
Closes gh-9211
2017-05-12 14:22:45 +01:00
Andy Wilkinson
f24b55a236 Upgrade to Thymeleaf 3.0.6.RELEASE
Closes gh-9207
2017-05-12 13:20:47 +01:00
Andy Wilkinson
b71daac58a Remove redundant logic for uninstalling Tomcat's URL stream handler factory
Closes gh-8622
2017-05-11 17:22:15 +01:00
Vedran Pavic
94f96a281f Improve HashMapSessionConfiguration
This commit updates `MapSessionRepository` bean definition return type
and applies equivalent change to `SessionAutoConfigurationTests`.

These changes also ensure compatibility with Spring Session 2.0 which
will merge `ExpiringSession` API with `Session` API.

Closes gh-9145
2017-05-11 14:05:25 +02:00
Andy Wilkinson
9ee1edcca5 Polishing 2017-05-10 10:12:17 +01:00
Andy Wilkinson
9480e09c21 Upgrade to Spring Security 5.0.0.M1
Closes gh-8714
2017-05-10 08:48:32 +01:00
Phillip Webb
5cad11d6d2 Formatting 2017-05-09 21:59:59 -07:00
Phillip Webb
fd2e3b3505 Merge branch '1.5.x' 2017-05-09 21:55:31 -07:00
Phillip Webb
4a7dcc8786 Formatting 2017-05-09 21:43:24 -07:00
Stephane Nicoll
275bff39aa Remove deprecated code
Closes gh-8891
2017-05-05 14:32:09 +02:00
Stephane Nicoll
1e9c1a68e4 Remove deprecated spring.rabbitmq.listener.* properties
See gh-9055, gh-9108
2017-05-05 12:03:21 +02:00
Stephane Nicoll
2894e57146 Polish "Support direct AMQP container"
Closes gh-9055
2017-05-05 11:32:25 +02:00
Gary Russell
6eddf1b372 Support direct AMQP container
Add support for auto configuration - select container type and separate
discrete properties.

See gh-9055
2017-05-05 10:08:13 +02:00
Stephane Nicoll
0f38031f93 Merge branch '1.5.x' 2017-05-05 10:04:27 +02:00
Stephane Nicoll
e236b71615 Move RabbitMQ Simple listener support to dedicated namespace
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.

Closes gh-9108
See gh-9055
2017-05-05 10:03:47 +02:00
Phillip Webb
a841a6a11d Polish 2017-05-04 11:41:15 -07:00
Andy Wilkinson
525f421441 Update MultipartProperties' prefix to reflect that it's Servlet-specific
Closes gh-8628
2017-05-04 16:47:46 +01:00
Andy Wilkinson
9caf82ce80 Remove redundant ordering from ImportBeanDefinitionRegistrar implementations
Closes gh-8603
2017-05-04 16:30:01 +01:00
Stephane Nicoll
0aded58884 Polish "Add auto-configuration support for Hazelcast client"
Closes gh-7469
2017-05-04 15:52:02 +02:00
Vedran Pavic
3fbf1a2ea6 Add auto-configuration support for Hazelcast client
See gh-7469
2017-05-04 14:20:03 +02:00
Stephane Nicoll
5247fa323b Harmonize reactive auto-configuration class names
Closes gh-9086
2017-05-04 10:19:10 +02:00
Stephane Nicoll
de268d97e2 Add auto-configuration for reactive Redis
This commit provides an auto-configuration for reactive Redis and a
starter that provides Lettuce as Jedis doesn't support reactive
operations.

There are no support for reactive redis repositories at the moment so
only a `ReactiveRedisTemplate` is auto-configured if necessary.

Closes gh-8053
2017-05-04 09:25:36 +02:00
Eddú Meléndez
1d9fa8395c Replace lambdas with method references
Closes gh-9049
2017-05-03 15:08:28 +02:00
Stephane Nicoll
b0ffe18e15 Merge branch '1.5.x' 2017-05-03 13:11:01 +02:00
Stephane Nicoll
ea33cc2f7d Deprecated MustacheCompilerFactoryBean
Closes gh-8999
2017-05-03 13:09:52 +02:00
Stephane Nicoll
2b4f2c6aba Making sure to stop embedded web servers in tests
Closes gh-9012
2017-05-03 12:04:57 +02:00
Stephane Nicoll
5121b848e1 Making sure to stop embedded web servers in tests
Closes gh-9012
2017-05-03 11:33:42 +02:00
Andy Wilkinson
4a00f90545 Stop throwing checked exception from @PostConstruct in ResourceServerProperties
Closes gh-8916
2017-05-03 10:12:51 +01:00