Commit Graph

386 Commits

Author SHA1 Message Date
buildmaster
f19f4be761 Bumping versions to 2.0.4.BUILD-SNAPSHOT after release 2019-02-22 15:22:11 +00:00
buildmaster
ea5abfd3a5 Going back to snapshots 2019-02-22 15:22:11 +00:00
buildmaster
5ea5bdcf70 Update SNAPSHOT to 2.0.3.RELEASE 2019-02-22 15:19:33 +00:00
Ryan Baxter
4413f136aa Revert "Only attempt to decrypt properties that are not overridden (#462)"
This reverts commit 59798f52ed.
2019-02-14 17:14:14 -05:00
Ryan Baxter
5e52806440 Revert "Allow overriding encrypted properties with unencrypted properties (#459)"
This reverts commit 4a66435d38.
2019-02-14 17:09:28 -05:00
Spencer Gibb
703c7c2bbf 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:34:26 -05:00
Ryan Baxter
d7d0320905 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2019-01-18 16:13:43 -05:00
Ryan Baxter
b91e2ab731 Trim profile names in array (#469)
* Trim profile names in array.  Fixes #460

* Use tokenizeToStringArray
2019-01-18 16:12:52 -05:00
Ryan Baxter
43c270a53c Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:30:05 -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
Ryan Baxter
9b8a70e557 Check type before invoking bean factory to prevent early creation of FactoryBeans. (#436) 2018-10-27 07:45:26 -04:00
buildmaster
e80bb61107 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 15:46:50 +00:00
buildmaster
8c6e38b789 Going back to snapshots 2018-10-23 15:46:50 +00:00
buildmaster
080b4f77df Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 15:43:52 +00:00
lxy
bbc82b423c Set MainApplicationClass if it is null (#426)
MainApplicationClass will be null, if it is booted from SpringBootServletInitializer. So we need to set it properly.

Fixes gh-425
2018-10-18 09:51:59 -04:00
Ryan Baxter
a2ba7a57e3 Bumping versions to 1.3.6.BUILD-SNAPSHOT after release 2018-10-15 14:29:42 -04:00
Ryan Baxter
dcc1a8339e Going back to snapshots 2018-10-15 14:29:41 -04:00
Ryan Baxter
da245fc428 Update SNAPSHOT to 1.3.5.RELEASE 2018-10-15 14:28:06 -04:00
durigon
b91313d913 Refactor String#replaceAll (#417)
If we repeatedly call String#replaceAll, we internally repeatedly call the regular expression pattern compilation every time as following:
```java
    public String replaceAll(String regex, String replacement) {
        return Pattern.compile(regex).matcher(this).replaceAll(replacement);
    }
```
The modifications are to keep the compiled pattern.
Therefore, compiling a relatively expensive regular expression pattern does not have to be done every time.
2018-09-19 20:41:07 -04:00
Spencer Gibb
6533e0ca53 Makes ContextRefresher easier to extend.
Adds protected getters for context and scope.

Adds new refreshEnvironment() method.

fixes gh-382
2018-08-15 14:48:58 -04:00
Spencer Gibb
69181c14d1 formatting 2018-08-01 13:20:28 -04:00
buildmaster
8efcb1577e Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:05:58 +00:00
buildmaster
36146312ab Going back to snapshots 2018-07-31 18:05:58 +00:00
buildmaster
1998ac2892 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:03:14 +00:00
Ryan Baxter
7949aaa1b5 Merge remote-tracking branch 'origin/1.3.x' 2018-07-30 16:40:12 -04:00
Ryan Baxter
57ab7ed469 Add null check in RefreshScopeHealthIndicator. Fixes #397. (#398) 2018-07-26 15:09:05 -04:00
Ryan Baxter
1de9d12150 Extract target class code into utility class (#391)
* Extract target class code into utility class
2018-07-11 16:01:14 -04:00
buildmaster
d711556fe8 Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2018-06-28 14:20:22 +00:00
buildmaster
9896cb7062 Going back to snapshots 2018-06-28 14:20:21 +00:00
buildmaster
b9c04fb14b Update SNAPSHOT to 1.3.4.RELEASE 2018-06-28 14:19:20 +00:00
buildmaster
a707941e5c Bumping versions to 2.0.1.BUILD-SNAPSHOT after release 2018-06-18 13:29:50 +00:00
buildmaster
917c134350 Going back to snapshots 2018-06-18 13:29:49 +00:00
buildmaster
1ade0553ee Update SNAPSHOT to 2.0.0.RELEASE 2018-06-18 13:26:29 +00:00
Spencer Gibb
bd138dac44 fixes formatting 2018-06-13 16:09:30 -04:00
Spencer Gibb
13722cb6b7 Merge branch '1.3.x' 2018-06-13 16:06:43 -04:00
Matt Benson
e833dbaa37 Fix GenericScope so that multiple subclasses can live in the same context (non-static inner class cannot resolve parent bean) 2018-06-13 15:59:16 -04:00
Ryan Baxter
816afaf3d1 Merge remote-tracking branch 'origin/1.3.x' 2018-06-07 14:31:07 -04:00
Ryan Baxter
edb2f9ad2d Add boot autoconfigure processor. Fixes #377 2018-06-07 14:27:30 -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
buildmaster
9849895867 Going back to snapshots 2018-05-24 19:00:21 +00:00
buildmaster
445fffff34 Update SNAPSHOT to 2.0.0.RC2 2018-05-24 18:59:33 +00: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
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