Commit Graph

247 Commits

Author SHA1 Message Date
Dave Syer
0e259eab35 Workaround for data source cycle with hibernate
The JpaInvokerConfiguration (nested in RefreshAutoConfiguration can be
removed when and if the issue is resolved in Boot.

Also splits the hibernate test dependencies out into a separate module
so the main context tests run quicker.

Fixes gh-355
2018-05-11 09:40:52 +01:00
Peter Lajko
f7519a30ad RestartEndpoint fixed (#366)
* RestartEndpoint fixed

* method naming fix
2018-05-10 15:44:30 -04:00
Stéphane Nicoll
6560e8896c Polish (#369) 2018-05-10 15:33:07 +02:00
Stephane Nicoll
bf5de108e2 Stop exposing a duplicate web extension for the env endpoint
An actuator endpoint is designed around a single class flagged with
`@Endpoint`. Such endpoint can have some of its operations refined with
a given tech (for instance via a `EndpointWebExtension` for web specific
concerns).

This design mandates that an endpoint (and its tech specific refinements
are managed centrally to form a unified contract).

As Spring Cloud is extending the standard Spring Boot's `env` endpoint,
this commit introduces a WritableEnvironmentEndpoint with a web
extension.

Closes gh-367
Closes gh-354
2018-05-10 10:53:43 +01:00
Dave Syer
d80d07e160 Unused imports 2018-05-03 11:02:57 -04:00
Ryan Baxter
f2e018fb6d Revert "Move RefreshScope to a static @Bean method"
This reverts commit 77ac09b119.
2018-05-02 15:05:13 -04:00
Dave Syer
77ac09b119 Move RefreshScope to a static @Bean method
The test shows that this fixes a weird initialization ordering
problem that leads otherwise to Spring thinking there is a
dependency cycle (even though there is not). This problem only
surfaces when there is a schema.sql to apply.

Fixes gh-355
2018-05-02 05:46:46 -04:00
Johnny Lim
dbac0f06fe Polish RefreshScopeBeanDefinitionEnhancer.setRefreshable() (#362) 2018-04-30 20:04:13 -04:00
Spencer Gibb
78b11c35ff GenericScope throws original checked exception, rather than UndeclaredThrowableException
fixes gh-349
2018-04-02 12:29:39 -04:00
Spencer Gibb
70ff397188 Moves to new classpath exclusion classes 2018-03-21 10:48:33 -04:00
Spencer Gibb
384a576c4e Merge branch '1.3.x' 2018-03-21 10:40:11 -04:00
Ryan Baxter
ee5034ee0d Move RSA properties to its own class and make it conditional (#342)
Avoids ClassNotFoundException when RSA is not on the classpath. 

Fixes gh-334.
2018-03-21 10:35:24 -04:00
Marcin Grzejszczak
ec11d4bbfe Avoiding NPE for proxied beans upon context shutdown; fixes gh-340 2018-03-20 13:50:59 +01:00
Spencer Gibb
78d25f0fc0 Don't rebind beans with no implementation.
fixes gh-337
2018-03-16 13:53:59 -04:00
Dave Syer
3bc1576897 Merge branch '1.3.x' 2018-03-08 12:01:05 +00:00
Dave Syer
5802c0e2be Actually close parent context in RestartEndpoint
There could be consequences for apps that have more complex context
hierarchies, but RestartEndpoint doesn't work well at all for those
apps anyway, so we are probably safe to just make changes in the
endpoint itself.

Fixes gh-333
2018-03-08 11:55:49 +00:00
Dave Syer
dcc822626b Add a configurable of beans to postprocess into refresh scope
Allows you to apply @RefreshScope to beans that you do not
control or define. The list is configurable as
spring.cloud.refresh.refreshable and by default has only
HikariDataSource.

Fixes gh-318
2018-03-02 15:54:25 +00:00
Dave Syer
d14e8ffa1a Add test for binding to Hikari DataSource 2018-03-02 13:38:35 +00:00
Dave Syer
b6df5e2425 Add encrypt.salt configuration option 2018-02-22 11:07:06 +00:00
Spencer Gibb
43ea0461ee Uses new BEAN_NAME constant from spring boot 2.0
fixes gh-324
2018-02-18 13:11:42 -05:00
Biju Kunjummen
e77a3fd498 Allows more standard rsa private key for config values encryption (#323) 2018-02-15 13:50:03 -05:00
Spencer Gibb
fbabe7e3e9 Revert "Fix wrong property name to expose actuators"
This reverts commit 18ba863
2018-02-13 10:02:48 -05:00
Spencer Gibb
216d49fdd9 Move to new class name 2018-02-13 10:02:28 -05:00
Dave Syer
b5ac8fe725 Fix compiler warnings 2018-02-13 09:29:30 +00:00
Dave Syer
18ba863e5f Fix wrong property name to expose actuators 2018-02-13 09:26:02 +00:00
Dave Syer
46d92bb190 Fix class name change and port clash in tests 2018-02-13 09:23:06 +00:00
Spencer Gibb
9f3744d1e2 Update to new web endpoint property 2018-02-12 12:11:53 -05:00
Spencer Gibb
db00e13e74 Update to boot renamed class in 2.0.0.BUILD-SNAPSHOT 2018-02-09 20:25:22 -05:00
Spencer Gibb
16c43dd0d9 Temporary fix for hikari datasource sealed causing refresh errors.
See gh-318
2018-02-06 13:03:44 -05:00
Spencer Gibb
3a390a35fa Guard against missing EndpointAutoConfiguration class
fixes gh-319
2018-02-06 11:29:55 -05:00
Spencer Gibb
3866806a2c Install refresh scope health indicator.
RefreshScope bean is not available during auto-config, so get the bean lazily at runtime.
2018-02-05 23:07:26 -05:00
Bertrand Renuart
361494b70f Give application context a friendly display name. (#316)
Fixes gh307
2018-02-02 13:05:43 -05:00
Biju Kunjummen
cdd4268b4a Adds additional test for encyptor with RSA private key (#315) 2018-02-02 13:03:39 -05:00
Spencer Gibb
00eadf47f0 Merge branch '1.3.x' 2018-02-01 23:42:19 -05:00
Spencer Gibb
f7695c7d15 Moves declaration of EnvironmentManager
fixes gh-314
2018-02-01 23:36:59 -05:00
Spencer Gibb
e21d30772d Remove JPA logging 2018-02-01 19:18:54 -05:00
Spencer Gibb
ca2e5e0405 Merge branch '1.3.x' 2018-02-01 19:12:51 -05:00
Spencer Gibb
cd436c7d15 Avoid proxy error if bean implements ScopedObject
fixes gh-277
2018-02-01 19:09:11 -05:00
Spencer Gibb
528ce8dca1 polish 2018-01-17 12:09:30 -05:00
Spencer Gibb
4aa2050b4b Updates for new context id generation in boot 2 2018-01-17 12:05:36 -05:00
Spencer Gibb
7f0791a79a Force bootstrap env to set web-application-type=none
Ff an app (or test) uses spring.main.web-application-type=reactive, bootstrap will fail. This commit forces the environment to use none, because the environment overrides the setter on SpringApplication.
2018-01-11 15:05:01 -05:00
Dave Syer
aef42a65f3 Housekeeping with KeyProperties - change default settings
N.B. this change will make existing encrypted properties undecryptable.
User would need to explicitly configure the old defaults for
encrypt.rsa.algorithm=DEFAULT and encrypt.rsa.strong=false.
2017-12-27 08:56:55 +00:00
Spencer Gibb
17adaf51d2 Test for NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 17:55:53 -05:00
Spencer Gibb
fb76beb3f2 Test for NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 17:55:25 -05:00
Spencer Gibb
53bf31ecb9 Merge branch '1.3.x' 2017-12-20 12:00:27 -05:00
Spencer Gibb
464624e375 Avoids potential NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 11:57:40 -05:00
Spencer Gibb
6dfb37e77c polish 2017-12-15 11:41:22 -05:00
Dave Syer
4660ae7d14 Merge branch '1.3.x' 2017-12-15 16:20:56 +00:00
Dave Syer
8a0261f275 Test for AOP proxy generally, not just CGlib
Fixes gh-288, closes gh-289
2017-12-15 16:19:48 +00:00
Dave Syer
29cb7f3500 Merge branch '1.3.x'
Test failure in spring-cloud-commons seems unrelated.
2017-12-15 16:06:56 +00:00