Commit Graph

2368 Commits

Author SHA1 Message Date
Phillip Webb
5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb
f42ebe428c Remove JSR-330 configuration annotations
Replace JSR-330 validation annotations from all internal
`@ConfigurationProperties` classes with standard Asserts.

Prior to this commit validation of our own configuration properties
would only occur when the user happens to have compliant JSR-330
implementation on their classpath.

See gh-7579
2017-01-18 20:51:35 -08:00
Phillip Webb
0a6456a748 Always use prefix config annotation attribute
Update use of `@ConfigurationProperties` to prefer the more explicit
`prefix` attribute, rather than `value`.

See gh-7579
2017-01-18 20:49:53 -08:00
Phillip Webb
43d432a527 Polish 2017-01-18 20:35:41 -08:00
Andy Wilkinson
a608e09990 Merge branch '1.5.x' 2017-01-17 16:14:30 +00:00
Kazuki Shimizu
19e117c9cb Use constructor injection in DataSourceInitializer
Closes gh-7973
2017-01-17 16:13:10 +00:00
Stephane Nicoll
f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Kazuki Shimizu
bd6ae47d68 Prevent unnecessary debug log message creation
Closes gh-8001
2017-01-17 09:57:15 +01:00
Stephane Nicoll
d556e82cf7 Polish contribution
Closes gh-8004
2017-01-17 09:56:05 +01:00
Johnny Lim
acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Stephane Nicoll
f714b1d4be Merge branch '1.5.x' 2017-01-16 16:09:48 +01:00
Stephane Nicoll
ada441bccc Allow custom override of user info OAuth2RestTemplate
Closes gh-5996
2017-01-16 16:09:32 +01:00
Stephane Nicoll
87cf236aae Merge branch '1.5.x' 2017-01-16 10:41:56 +01:00
Stephane Nicoll
3e05329fd7 Order internal RepositoryRestConfigurer
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.

Closes gh-7981
2017-01-16 10:41:44 +01:00
Stephane Nicoll
d271b54f63 Merge branch '1.5.x' 2017-01-16 10:08:55 +01:00
Vedran Pavic
8f6a0e96fd Improve UserInfoTokenServices logging
Closes gh-7995
2017-01-16 10:08:28 +01:00
Andy Wilkinson
ae3434ba4c Merge branch '1.4.x' into 1.5.x 2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5 Merge branch '1.5.x' 2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af Merge branch '1.4.x' into 1.5.x 2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061 Correct copyright dates and enforce that starting year is 2012
Closes gh-7923
2017-01-13 15:36:06 -05:00
Andy Wilkinson
6100b3e850 Merge branch '1.5.x' 2017-01-13 07:29:26 -05:00
Andy Wilkinson
66915a456a Merge branch '1.4.x' into 1.5.x 2017-01-13 07:29:17 -05:00
Andy Wilkinson
6f7d1de167 Remove redundant logic from OAuth2MethodSecurityConfiguration
Previously, OAuth2MethodSecurityConfiguration set the
PermissionEvaluator on the expression evaluator by looking in the
context for a PermissionEvaluator bean. This is unnecessary as
GlobalMethodSecurityConfiguration already does the same thing and does
so after the post-processor in OAuth2MethodSecurityConfiguration has
run. This commit removes the redundant logic and adds tests to check
that both the PermissionEvaluator and the RoleHierarchy are set use
beans in the context.

Closes gh-7979
2017-01-13 07:28:57 -05:00
Stephane Nicoll
b4ceb46a6b Merge branch '1.5.x' 2017-01-12 09:09:57 -05:00
Stephane Nicoll
5ee12a824f Fix assertion
See gh-7962
2017-01-12 09:09:42 -05:00
Andy Wilkinson
78a06c3278 Merge branch '1.5.x' 2017-01-10 17:05:09 -05:00
Andy Wilkinson
65025d8dab Enable Neo4J's open in view interceptor by default
Closes gh-7943
2017-01-10 17:04:51 -05:00
Stephane Nicoll
9afa52c18f Merge branch '1.5.x' 2017-01-06 12:45:20 +01:00
Stephane Nicoll
4523927e28 Polish 2017-01-06 12:44:32 +01:00
Phillip Webb
c35454e5f4 Merge branch '1.5.x' 2017-01-05 23:40:58 -08:00
Phillip Webb
10de30ff11 Polish LDAP contribution
See gh-7733
2017-01-05 23:35:43 -08:00
Eddú Meléndez
6a84c369fd Add LDAP auto-configuration support
Add auto-configuration support for spring-ldap and spring-data-ldap.

See gh-2645
See gh-7733
2017-01-05 23:34:50 -08:00
Phillip Webb
77f9bb09ca Further Polish Mockito 2 support
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
6776ec2704 Merge branch '1.5.x' 2017-01-05 11:04:37 -08:00
Phillip Webb
565f75438e Polish 2017-01-05 11:04:07 -08:00
Dave Syer
21be9ef666 Merge remote-tracking branch 'origin/1.5.x' 2017-01-05 11:59:49 +00:00
Dave Syer
fe344df9c5 Change default order of OAuth2 resource server filter chain
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.

Fixes gh-5072
2017-01-05 11:58:36 +00:00
Phillip Webb
125d9d6181 Merge branch '1.5.x' 2017-01-04 20:04:09 -08:00
Phillip Webb
eb22220961 Upgrade to hibernate-validator 5.3.4
Upgrade to `hibernate-validator` 5.3.4 and introduce a new
`MessageInterpolatorFactory` that creates a suitable
`MessageInterpolator` (taking into account missing EL dependencies).

Rework `ConfigurationPropertiesBindingPostProcessor` and
`ValidationAutoConfiguration` to make use of the new factory.

Fixes gh-7598
2017-01-04 18:28:32 -08:00
Stephane Nicoll
de4e3508f1 Merge branch '1.5.x' 2017-01-04 12:42:40 +01:00
Stephane Nicoll
0a26a4146b Make spring.session.store-type mandatory
This commit removes the automatic enabling of Redis as the Spring Session
store when it is available. This case is covered by a warning in `1.4.x`
that this commit removes as well.

Closes gh-7858
2017-01-04 12:42:04 +01:00
Stephane Nicoll
9a113e3b64 Merge branch '1.5.x' 2017-01-04 10:48:25 +01:00
Stephane Nicoll
bf7271afa5 Upgrade to Couchbase Cache Client 2.1.0
As of 2.1 cache expiration times are to be set in seconds. This commit
migrates to the new method, yet keeping the milliseconds unit.

Closes gh-7824
2017-01-04 10:46:17 +01:00
Stephane Nicoll
506f6497c0 Merge branch '1.5.x' 2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a Polish 2017-01-04 09:53:45 +01:00
Phillip Webb
b1cb8bb3d9 Merge branch '1.5.x' 2017-01-03 15:14:41 -08:00
Phillip Webb
76d5b913cd Polish 2017-01-03 14:43:24 -08:00
Stephane Nicoll
85f176da08 Merge branch '1.5.x' 2017-01-03 11:39:33 +01:00
Stephane Nicoll
fe89af5e82 Polish contribution
Closes gh-7796
2017-01-03 11:33:57 +01:00