fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,657 Commits 22 Branches 339 Tags
Commit Graph

523 Commits

Author SHA1 Message Date
Stephane Nicoll
b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211
e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson
b88a20fabb Polish 2018-05-11 13:05:17 +01:00
Stephane Nicoll
5e87a3d2fa Polish 
See gh-13130
 2018-05-11 10:03:03 +02:00
Stephane Nicoll
00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim
75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll
c35cb1b69f Merge branch '2.0.x' 2018-05-11 09:57:18 +02:00
Stephane Nicoll
4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Andy Wilkinson
d77c4c83a1 Polish 2018-05-09 09:19:03 +01:00
Andy Wilkinson
a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson
c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Brian Clozel
84c9a65e9d Auto-configure Elasticsearch REST clients 
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
 2018-05-07 17:57:09 +02:00
Stephane Nicoll
ea2a98d009 Merge branch '2.0.x' 2018-05-05 07:22:20 +02:00
Stephane Nicoll
c22e9a5514 Make sure that JpaProperties does not have Hibernate imports 
This commit removes Hibernate imports from JpaProperties so that it can
be used with another JPA provider.

This commit is a breaking change for an internal, yet public class used
to transmit customizations provided by the user. It does not change the
external functionality though: naming strategies defined as bean are
still taken into account and a customizer has a chance to override it
regardless.

Closes gh-13043
 2018-05-05 07:21:50 +02:00
Phillip Webb
a323a85e3b Merge branch '2.0.x' 2018-05-04 20:06:55 -07:00
Phillip Webb
975e986fef Polish 2018-05-04 20:06:27 -07:00
Phillip Webb
f9750248ef Migrate KafkaProperties to use PropertyMapper 2018-05-04 20:06:11 -07:00
Phillip Webb
7b120c1c97 Formatting 2018-05-04 16:36:35 -07:00
Phillip Webb
42c053cf1b Merge branch '2.0.x' 2018-05-04 16:31:46 -07:00
Phillip Webb
6de479fe6a Polish 2018-05-04 16:08:05 -07:00
Madhura Bhave
6855c5556d EndpointRequest should consider server.servlet.path 
Fixes gh-12934
 2018-05-04 16:03:31 -07:00
Phillip Webb
5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb
6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Stephane Nicoll
23c49116ff Merge branch '2.0.x' 2018-05-04 16:57:27 +02:00
Stephane Nicoll
18b1e8da60 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:57:12 +02:00
Phillip Webb
b6a2a46f78 Merge branch '2.0.x' 2018-05-03 23:54:42 -07:00
Phillip Webb
2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb
8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll
36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Stephane Nicoll
700ec6b840 Polish "Complete SSL configuration for Kafka" 
Closes gh-13031
 2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59 Complete SSL configuration for Kafka 
See gh-13031
 2018-05-03 15:38:49 +02:00
Stephane Nicoll
921c037956 Merge branch '2.0.x' 2018-05-03 11:47:33 +02:00
Stephane Nicoll
69ab956e8b Stop assuming datasource creation failure originates from auto-config 
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.

This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.

Closes gh-12947
 2018-05-03 11:46:27 +02:00
Gary Russell
8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots 
Closes gh-13007
 2018-05-02 16:15:08 +02:00
Stephane Nicoll
4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02:00
Stephane Nicoll
d6244889f5 Add default value for "spring.flyway.locations" 
See gh-12193
 2018-05-02 16:07:38 +02:00
Andy Wilkinson
0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Stephane Nicoll
0819822eb6 Merge branch '2.0.x' 2018-05-02 10:42:03 +02:00
Stephane Nicoll
fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Stephane Nicoll
9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Stephane Nicoll
0fcffae0d9 Merge branch '2.0.x' 2018-04-30 16:50:51 +02:00
Johnny Lim
d8700522d3 Rename nested *AutoConfiguration classes to *Configuration 
Closes gh-12989
 2018-04-30 16:50:18 +02:00
Stephane Nicoll
22b99a90de Polish 
See gh-12906
 2018-04-28 10:36:41 +02:00
Madhura Bhave
acc1793e96 Merge branch '2.0.x' 2018-04-27 13:19:46 -07:00
Madhura Bhave
0385bd4131 Use spring.session.timeout for Spring Session timeout 
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
 2018-04-27 13:16:17 -07:00
Stephane Nicoll
4d0fe5bbe6 Merge branch '2.0.x' 2018-04-27 09:33:48 +02:00
Johnny Lim
b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00