Dave Syer
fb36b67913
Add failing test for decrypting and rebinding
...
See gh-269
2017-11-01 09:24:20 +00:00
Spencer Gibb
8f9dfd38e3
Update tests for 2.0.x
2017-10-30 19:19:20 -04:00
Spencer Gibb
f302c166a5
Merge branch 'master' into 2.0.x
2017-10-30 19:15:24 -04:00
Spencer Gibb
707787dc13
Adds test for bootstrap context parent closing
2017-10-30 19:13:36 -04:00
Dave Syer
942df8ed45
Remove lombok from spring-cloud-context
2017-10-24 08:49:10 +01:00
Dave Syer
801183e01b
Fix nasty state bug in BootstrapApplicationListener
...
In Spring 5.0.0 the SpringFactoriesLoader is stateful and
BootstrapApplicationListener inadvertently modifies the state
by adding class names to a list loaded from spring.factories.
Probably harmless in most apps, but caused some tests to fail
(depending on the order they were run in).
2017-10-20 12:51:13 +01:00
Dave Syer
2fd2f99c9d
Suppress use of configuration properties source in refresh
2017-10-20 11:18:30 +01:00
Dave Syer
1f28206158
Fix compiler warnings in tests
2017-10-20 08:46:36 +01:00
Dave Syer
92cabcdf1a
Skip stub property sources during bootstrap
...
The stub property sources from a web application context do not
contain any properties so they cab't have any effect on
bootstrap. It's cleaner to leave them out of the bootstrap
application context.
2017-10-20 08:46:36 +01:00
Spencer Gibb
74d9cd3060
Trying to fix tests
2017-10-19 23:54:18 -04:00
Dave Syer
20dd5da52c
Fix test to accommodate changed property source order
2017-10-19 13:59:13 +01:00
Dave Syer
484d68cfff
Merge branch 'master' into 2.0.x
2017-10-19 13:43:12 +01:00
Dave Syer
1add1067df
Fix ordering of property sources on refresh
...
If there were *no* bootstrapProperties (i.e. properties added by
PropertySourceLocators) on startup, and then in a refresh event
some new sources were picked up, they would have been added to the
end, instead of the beginning of the list.
Fixes https://github.com/spring-cloud/spring-cloud-config/issues/815
2017-10-19 13:41:05 +01:00
Dave Syer
ed409a6c9f
Merge branch 'master' into 2.0.x
2017-10-11 08:13:04 -04:00
Dave Syer
ccf613c29c
Make method accessible in GenericScope proxy target
...
Otherwise app crashes on first access of scoped proxy.
Fixes gh-261
2017-10-11 08:12:32 -04:00
Dave Syer
ff00aa8eee
Remove verbose logging in test
2017-10-05 09:21:56 +01:00
Dave Syer
039c987cb1
Merge branch 'master' into 2.0.x
2017-10-04 14:21:05 +01:00
Dave Syer
c28ca5de91
Add extra concurrency test for refresh scope
...
The test passes (would have failed in parent commit)
because a lock is taken in the scoped proxy itself, not
in the target.
2017-10-04 14:14:45 +01:00
Dave Syer
9639787b03
Fix configuration properties in refresh scope for Boot 2.0
...
The old hack in RefreshScope has been replaced with a new hack.
It has to "reset" the ConfigurationProperties bean post processor
and the new rebinder API has changed the internals of that, so
we needed to adjust.
2017-09-29 13:44:41 +01:00
Dave Syer
8357724ad8
Use the new ConfigurationPropertiesBinder API from Spring Boot
...
Fixes gh-177
2017-09-26 16:06:57 +01:00
Spencer Gibb
883558fa07
Fix service-registry and refresh endpoint tests
2017-09-25 15:39:24 -04:00
Spencer Gibb
ea75972c98
Update post to /env
2017-09-25 12:42:40 -04:00
Spencer Gibb
fa71529ea0
Ignore broken tests
2017-09-11 17:06:46 -06:00
Spencer Gibb
e1f8f3a5a5
Fix broken refresh auto-config without actuator test.
2017-09-11 16:29:24 -06:00
Spencer Gibb
f8d9e18fb9
Update to new Boot 2 actuator @Endpoint.
...
Some tests are still broken.
Fixes gh-238
2017-09-07 21:21:37 -06:00
Ryan Baxter
d4bc52014c
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-22 14:10:29 -04:00
Biju Kunjummen
5aaafb19af
Replaces deprecated o.s.b.a.PropertyPlaceholderAutoConfiguration
2017-08-21 20:35:45 -07:00
Biju Kunjummen
a6b7f70b8e
Show better message for missing config keystore props ( #232 )
...
* Show better message for missing config keystore props
* Removes unused ExpectedException
Fixes #230
2017-08-04 15:53:35 -04:00
Ryan Baxter
2b5860fe4f
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-03 11:44:44 -04:00
Johannes Edmeier
94a42737ec
Fix empty keys in EnvironmentChangedEvent on resetting the Environment ( #229 )
...
When the Environment is resetted the EnvironmentChangedEvent always
contains an empty keySet, since the live view of the cleared map was
used. This commit fixes this.
2017-07-25 11:58:15 -04:00
Spencer Gibb
80b91d0a03
fix merge error
2017-06-30 19:33:31 -06:00
Spencer Gibb
c44c3f37e4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java
2017-06-30 18:14:37 -06:00
Spencer Gibb
c75673110b
formatting
2017-06-30 17:47:08 -06:00
Fabio Matos
2e81db24cf
Disables endpoint creation ( #208 )
...
Fixes gh-117
2017-06-30 19:38:03 -04:00
Spencer Gibb
853d7c43a7
Comment out broken tests
2017-05-31 14:18:05 -06:00
Spencer Gibb
ebf4112116
Updates to boot 2.0 changes
2017-05-16 13:23:21 -06:00
Dave Syer
3f005ab238
Update to fix issues introduced in Boot 2.0.0.M1
2017-05-16 18:16:14 +01:00
Dave Syer
021a77d997
Uningnored some tests to do with binding to lists
...
See https://github.com/spring-projects/spring-boot/issues/9137
2017-05-14 11:06:37 +01:00
Dave Syer
d030225d46
Split out ModifiedClassPathRunner into a separate jar
2017-05-12 11:05:17 +01:00
Dave Syer
c3f9b1a821
Fix more Spring Boot related mayhem
2017-05-12 10:42:06 +01:00
Dave Syer
4b4e7650fa
Switch to new class loader filter runner
2017-05-12 10:42:06 +01:00
Dave Syer
1850155bad
Add link to comment
2017-05-11 12:03:39 +01:00
Dave Syer
f191110228
Hack the configuration properties to fix tests
...
See https://github.com/spring-projects/spring-boot/issues/9160
2017-05-11 11:34:24 +01:00
Dave Syer
80555b3354
Updates to adapt to Spring Boot changes
...
Also adjusts bootstrap listener to be smarter about default
properties:
It's better not to use the default properties at all because the
user might pass some in and we don't want to overwrite them. Before
Boot 2.0 we got away with it, but since 2.0 we have to be more
cautious.
2017-05-09 07:01:46 +01:00
Spencer Gibb
ac16a94880
comment out broken test
2017-05-01 10:25:55 -06:00
Spencer Gibb
922608651a
fix test path
2017-05-01 09:27:37 -06:00
Spencer Gibb
6a4789a691
Update to new binder
2017-05-01 08:58:28 -06:00
Spencer Gibb
b40ceef356
RefreshEventListener no longer depends on RefreshEndpoint.
...
Instead it depends on ContextRefresher with actually does the work.
This allows applications to use the listener even if they don't depend
on actuator.
fixes gh-171
2017-04-03 20:13:11 -06:00
Spencer Gibb
78d10fc223
Use relaxed property resolver in KeyCondition
...
Allows users to define properties like encrypt.key-store.password=letmein
fixes gh-191
(cherry picked from commit 7744b63 )
2017-04-03 19:52:17 -06:00
Spencer Gibb
1eddbc125b
fix compile errors in tests
2017-03-15 12:08:04 -06:00