Commit Graph

184 Commits

Author SHA1 Message Date
Ryan Baxter
656feb2758 Merge branch '2.1.x' of github.com:spring-cloud/spring-cloud-commons into 2.1.x 2019-08-22 12:11:58 -04:00
Ryan Baxter
e52736cef1 Merge branch 'master' of https://github.com/rhanton/spring-cloud-commons into rhanton-master 2019-08-22 11:42:56 -04:00
Tim Ysewyn
86650dc215 Updated license header 2019-07-26 15:08:53 +01:00
Tim Ysewyn
c19575b978 Added optimizations to EnvironmentDecryptApplicationInitializer 2019-07-26 15:08:53 +01:00
Tim Ysewyn
28b9727250 Changed order of decrypting values. (#581)
Reversed order of sources in CompositePropertySource to adhere to the order of sources returned by the Spring Cloud Config server.
2019-07-16 18:28:26 +02:00
Olga Maciaszek-Sharma
3eeee62272 Apply Spring Boot's solution of coercing false LogLevel to OFF. (#575)
Fixes gh-556.
2019-07-01 14:01:39 +02:00
Spring Operator
2a84af80d4 URL Cleanup (#523)
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 275 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2019-03-26 15:48:29 -04:00
Ryan Baxter
bb1e769ce3 Revert #473 2019-02-14 18:51:22 -05:00
Spencer Gibb
b38ce54410 Sets the child class loader to parent class loader.
This prevents odd behavior in jdk 11 +

Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
2019-02-14 15:54:27 -05:00
Spencer Gibb
a7c344f83f formatting 2019-02-14 15:52:32 -05:00
Spencer Gibb
109e5779e9 Ignores MapPropertySources not created by boot
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.

This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.

Fixes gh-476
2019-02-13 11:33:06 -05:00
Marcin Grzejszczak
377eaad4a1 Checkstyle for tests 2019-02-03 15:13:41 +01:00
Marcin Grzejszczak
04d764d33a Updated copyrights 2019-02-01 14:41:18 +01:00
Marcin Grzejszczak
ae314100f5 Applied checkstyle and turned it on by default 2019-02-01 12:50:02 +01:00
Jasper Aarts
e024f6f5c2 Fix override behaviour when using CompositePropertySource. (#473)
* Fix override behaviour when using CompositePropertySource.
Fixes gh-471

* Improve imports
2019-01-31 20:51:37 -05:00
Ryan Baxter
ecabe2bb8d Merge remote-tracking branch 'origin/2.0.x' 2019-01-07 12:43:08 -05:00
Jasper Aarts
59798f52ed Only attempt to decrypt properties that are not overridden (#462) 2019-01-07 12:33:09 -05:00
Jasper Aarts
4a66435d38 Allow overriding encrypted properties with unencrypted properties (#459) 2018-12-21 15:05:57 -05:00
Spencer Gibb
6c9231a4da Verify ConfigProps is a bean and refreshables is actually tested. 2018-10-04 11:47:43 -04:00
Jone
b606806066 Fixes decryption of CompositePropertySource
Since CompositePropertySource extends EnumerablePropertySource
the else statement in
EnvironmentDecryptApplicationInitializer.decrypt() was never reached.
2018-09-10 13:37:10 -04:00
rhanton
d8bc895f5e Try to fix circleci error with log message checking. 2018-08-21 13:23:39 -07:00
rhanton
a9fa0c3d77 Adding tests of EnvironmentDecryptApplicationInitializer change 2018-08-21 10:45:13 -07:00
Spencer Gibb
1d646290ab Moves away from @EventListener to interface implementations for framework 5.1 changes
fixes gh-405
2018-08-21 11:42:27 -04:00
Spencer Gibb
23d7eae038 Moves away from @EventListener to interface implementations for framework 5.1 changes 2018-08-21 11:14:48 -04:00
Spencer Gibb
87bb8f1fa1 Upgrades to build 2.1.0.BUILD-SNAPSHOT and boot 2.1.x
Moves refresh scope proxy creation from BeanDefinitionRegistryPostProcessor to BeanPostProcessor

fixes gh-400
2018-08-02 11:19:17 -04:00
Ryan Baxter
57ab7ed469 Add null check in RefreshScopeHealthIndicator. Fixes #397. (#398) 2018-07-26 15:09:05 -04:00
Spencer Gibb
a8e90681b7 Renames environmentWebEndpointExtension to environmentEndpointWebExtension.
This matches boot, even though the boot bean shouldn't be created because of a @ConditionalOnMissingBean

see gh-374
2018-05-31 12:57:42 -04:00
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
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
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
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
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
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
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
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
Biju Kunjummen
cdd4268b4a Adds additional test for encyptor with RSA private key (#315) 2018-02-02 13:03:39 -05:00