Commit Graph

208 Commits

Author SHA1 Message Date
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
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
Dave Syer
c5382ccfd6 Refactor ConfigurationPropertiesRebinder a bit
It's not super expensive, but it all adds up, and rebinding beans
that don't need to be rebound is wasteful. This change should improve
things in three places:

The ConfigurationPropertiesRebinder
has always done a pre-emptive re-bind on startup, which was a bit
of a blunt instrument, since all we really wanted as to rebind the
beans in the parent context (to the current context's Environment).

The rebinding always happened twice for every bean because we
explicitly called into the ConfigurationPropertiesPostProcessor
directly as well as indirectly through the initialization callbacks.

Rebinding in response to an EnvironmentChangeEvent was not able to
distinguish between events published locally and by child contexts.
The child context always binds the parent's beans anyway, so you
don't need to do it twice.
2017-12-15 15:58:17 +00:00
Spencer Gibb
b1a83c40f9 Allow refresh auto config to be disabled by property.
fixes gh-276
2017-11-28 20:14:30 -05:00
Spencer Gibb
2fdbc5a397 Merge branch '1.3.x' 2017-11-28 20:04:25 -05:00
Spencer Gibb
259aa437d7 Allow refresh auto config to be disabled by property.
fixes gh-276
2017-11-28 19:57:54 -05:00
Spencer Gibb
6e9745b7a4 Updates for boot 2 actuator path changes 2017-11-27 13:33:41 -05:00
Spencer Gibb
a051c24bf2 Reinstate encryption test. 2017-11-22 11:41:18 -05:00
Spencer Gibb
ad9cfc665c Updates to boot 2.0 compatibility 2017-11-22 11:31:00 -05:00
Spencer Gibb
39cb6be306 Merge branch 'master' into 2.0.x 2017-11-21 19:19:50 -05:00
Misagh Moayyed
4868cd3183 Update PropertySourceBootstrapProperties.java (#274) 2017-11-16 12:42:45 -05:00
Spencer Gibb
5c5e6f4d65 Merge branch 'master' into 2.0.x
# Conflicts:
#	spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
2017-11-14 11:13:12 -05:00
Spencer Gibb
1bd2c3112a Make sure cli args are copied to bootstrap. 2017-11-14 11:11:12 -05:00
Dave Syer
a513d0a4af Explicitly copy over properties from bootstrap.properties
Fixes gh-273
2017-11-14 12:49:31 +00:00
Dave Syer
7eb310066a Merge branch 'master' into 2.0.x 2017-11-14 12:48:54 +00:00
Dave Syer
4352d9a81a Add test for profiles picked up from bootstrap.properties 2017-11-14 12:47:41 +00:00
Dave Syer
d43e0ba8c1 Ignore a test and revert a Boot change to work with M6 2017-11-07 17:31:26 +00:00
Dave Syer
46ea8e5754 Merge branch 'master' into 2.0.x 2017-11-07 17:12:00 +00:00
Dave Syer
1b219b086c Tidy up compiler warnings 2017-11-07 17:06:16 +00:00
Dave Syer
49277b9e80 Merge branch 'master' into 2.0.x 2017-11-07 16:51:42 +00:00
Dave Syer
93a0365422 Prevent logging system from being pinged on context refresh
A context refresh is actually only trying to recalculate environment
properties. Spring Boot doesn't provide an explicit API for that so
we create a "mini application" to mimic the startup. There is no
need for the logging system to be touched at all, so we can try
and filter out the listeners we know might do that.

Fixes gh-260
2017-11-07 10:32:23 +00:00
Dave Syer
c7b907d9cd Destroy beans before initializing them
Fixes gh-268
2017-11-07 08:37:44 +00:00
Dave Syer
2907f2facd Uncomment ignored test and adapt to new name
Fixes gh-269 (actually fixed in Spring Boot).
2017-11-07 08:30:09 +00:00
Dave Syer
7096d6c36a More changes in Spring Boot
This time they changed the way spring.config.location is handled
so you have to repeat the default value if you want those to be
read as well.
2017-11-03 16:40:39 +00:00
Dave Syer
0d16cf0f83 Merge branch 'master' into 2.0.x 2017-11-03 14:12:27 +00:00
Dave Syer
91f60b3f4c Be more selective with the property sources in a context refresh
We need to tread a very fine line. Ideally the process of refreshing
the Environment builds it back exactly as happened on startup.
In particular we probably don't want to have things like
application.properties already there when we start the process.

This change replaces the more liberal copy of all property sources
only a select few (actually only one), paremeterized as a constant.
2017-11-03 14:01:29 +00:00
Dave Syer
cdcf42ed60 Merge branch 'master' into 2.0.x 2017-11-01 16:55:28 +00:00
Dave Syer
e388b5c4d2 Make nested ckass public
So that it is fully introspectable with BeanInfo (Java Beans).
Prevents a WARN log on startup about ambiguous write methods.
2017-11-01 16:54:16 +00:00
Dave Syer
b29539e865 Simplify ConfigurationPropertiesRebinder
It actually doesn't need to use the public Binder API now
because Spring Boot faithfully uses the Environment state as it is
at runtime.
2017-11-01 09:25:07 +00:00
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
Spencer Gibb
449f51a748 Merge branch '1.2.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-10-30 19:01:22 -04:00
Spencer Gibb
abe5374c79 Ensure parent context of bootstrap context is closed.
fixes gh-267
2017-10-30 18:56:01 -04:00
Spencer Gibb
c9e8f02188 Remove reflection hack.
All tests pass, just with the call to afterPropertiesSet()
2017-10-30 17:35:45 -04:00
Spencer Gibb
d31e7ae499 Adds reflection hack back.
Hopefully not for long.
2017-10-30 16:27:12 -04:00
Dave Syer
ff6fa5a65d Merge branch 'master' into 2.0.x 2017-10-24 08:51:01 +01:00
Dave Syer
942df8ed45 Remove lombok from spring-cloud-context 2017-10-24 08:49:10 +01:00
Dave Syer
880c1160e6 Replace lombok logger 2017-10-24 08:43:45 +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