SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
551 Commits 43 Branches 0 Tags
ff00aa8eeee12286e1f01b1b1adcc713bdbcd7a3
Commit Graph

128 Commits

Author SHA1 Message Date
Dave Syer
51fb39e281 Use public methods on CPBPP 2017-10-04 14:36:49 +01:00
Dave Syer
4ee42f2cf2 Merge branch 'master' into 2.0.x 2017-10-04 14:34:13 +01:00
Dave Syer
a7caee5f1f Protect refresh of single bean as well 2017-10-04 14:34:06 +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
115233a29c Tidy imports 2017-09-26 16:24:48 +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
19adf5f11d Update to new Boot 2 actuator @Endpoint. 
Again.
 2017-09-12 14:31:07 -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
f34498228d Merge branch 'master' into 2.0.x 2017-06-30 20:20:16 -06:00
Spencer Gibb
2aa6c39322 Reinstate @ConditionalOnClass(EnvironmentEndpoint.class) 2017-06-30 20:19:35 -06: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
Fabio Matos
2e81db24cf Disables endpoint creation (#208) 
Fixes gh-117
 2017-06-30 19:38:03 -04:00
Spencer Gibb
ed91ad845f Programmatically set context id rather than using spring.application.name. 
This allows other bootstrap application listeners to resolve the
spring.application.name during the bootstrap phase, but allows bootstrap
to determine if the context is the bootstrap context.

fixes gh-214
 2017-06-16 13:42:17 -06:00
Spencer Gibb
b5f5912125 add back removing of spring.application.name of bootstrap 
see gh-214
 2017-06-06 10:05:53 -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
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
c1972a8574 Simplify EnvironmentUtils (maybe could be deleted?) 2017-05-09 09:09:34 +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
ef19c34666 Work around https://github.com/spring-projects/spring-boot/issues/9053#issuecomment-298362685 2017-05-01 10:25:39 -06:00
Spencer Gibb
f804361f38 Update to web app type enum 2017-05-01 09:08:31 -06:00
Spencer Gibb
6a4789a691 Update to new binder 2017-05-01 08:58:28 -06:00
Spencer Gibb
6abf2def40 Change type to String 2017-04-28 18:57:43 -06:00
Spencer Gibb
c6c391158f Removes RelaxedPropertyResolver 2017-04-28 15:29:49 -06:00
Spencer Gibb
b611e78075 Merge branch 'master' into 2.0.x 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-starter/pom.xml
 2017-04-06 21:43:05 -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
d11abd8f5e make code compile 2017-03-17 18:46:39 -06:00
Dave Syer
45b0c078eb Merge branch '1.1.x' 2017-03-15 12:18:14 +00:00
Dave Syer
ba281228f6 Apply bootstrap initializers to all contexts in a hierarchy 
The fix for gh-153 was sensible, but has now exposed another issue
which is that the bootstrap initializers, whilst they are now only
created once, actually only get applied to the parent context
in a hierarchy.

Most of the time this doesn't matter because the child contexts all
benefit from environment changes and additional beans added
to the parent. If the children are supposed to actually have
different environments, though, there is a problem. So this change
locates the existing bootstrap context and applies it to each
new context created separately.

Unfortunately we have to use reflection to do that for now because
there is no way to discover the parent with a public API before
the context is refreshed.

See gh-190
 2017-03-15 12:16:32 +00:00
Dave Syer
70d601df84 Register a BeanDefinition manually instead of using @Bean 
For RefreshScope this stops Spring from moaning about the @Bean
method with a WARN log (which is benign but hard to get rid of
and confusing for users).

See gh-401
 2017-03-15 12:15:51 +00:00
Biju Kunjummen
4e0d2e520f Fixes possible infinite loop 
Fixes edge case of an infinite loop in decrypting properties in a hierarchy of application contexts.


fixes gh-178
 2017-03-01 12:41:00 -05:00
Dave Syer
d2ab1c6de9 Merge branch '1.1.x' 2017-02-24 09:42:36 +00:00
Dave Syer
331e790026 Ensure there is a single bootstrap parent context 
Only one neds to be created, and once it is in place in the hierarchy
it should be usable by all the child contexts that get added.

Fixes gh-153
 2017-02-24 09:38:30 +00:00
Dave Syer
d5a63c988d Merge branch '1.1.x' 2017-02-21 10:18:29 +00:00
Dave Syer
8347c5741c Extract target from @ConfigurationProperties proxy 
Fixes gh-175 (more of a workaround really and gh-177 is still open
to track further changes).
 2017-02-21 10:01:05 +00:00
Spencer Gibb
5b8ae3a96a Make sure bootstrap sources are ordered before use. 
Make call to sort() before setting on builder.sources().

fixes gh-176

(cherry picked from commit 6dc35d1)
 2017-02-14 14:18:48 -07:00
Spencer Gibb
6dc35d1edc Make sure bootstrap sources are ordered before use. 
Make call to sort() before setting on builder.sources().

fixes gh-176
 2017-02-14 14:17:11 -07:00
Dave Syer
3269b8df54 Fix line endings 2017-02-10 10:55:37 +00:00
Matt Benson
941275ded2 consider spring.profiles.include values from bootstrap PropertySources (#123) 2017-01-26 12:14:43 -05:00