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

199 Commits

Author SHA1 Message Date
Ryan Baxter
3acbb88756 Merge remote-tracking branch 'origin/2.1.x' 2019-08-22 12:14:50 -04:00
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
f608dd74a7 Merge branch '2.1.x' 2019-07-26 16:26:49 +02: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
Olga Maciaszek-Sharma
883eb59d3e Merge branch '2.1.x' 2019-07-16 18:30:54 +02: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
Ryan Baxter
8b57f1995b Changing default properties name to work around changes in boot, see Spring Boot #17141 2019-07-08 12:19:19 -04:00
Olga Maciaszek-Sharma
851a41cd89 Merge branch '2.1.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
 2019-07-01 14:13:17 +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
Ryan Baxter
df4d191856 Revert "Remove remove Ignore now that boot #17011 is fixed" 
This reverts commit 584b72587f.
 2019-06-13 11:10:12 -04:00
Ryan Baxter
584b72587f Remove remove Ignore now that boot #17011 is fixed 2019-06-13 11:04:28 -04:00
Ryan Baxter
316040ee94 Formatting changes 2019-05-23 19:59:36 -04:00
Spencer Gibb
236de03638 Removes out of place license header. 2019-04-04 11:19:34 -04:00
Spring Operator
ac8379d2cc URL Cleanup 
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).

These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http:///foobar (UnknownHostException) with 1 occurrences migrated to:
  https:///foobar ([https](https:///foobar) result UnknownHostException).
* [ ] http://a.host (UnknownHostException) with 1 occurrences migrated to:
  https://a.host ([https](https://a.host) result UnknownHostException).
* [ ] http://c.host (UnknownHostException) with 1 occurrences migrated to:
  https://c.host ([https](https://c.host) result UnknownHostException).
* [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to:
  https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException).
* [ ] http://d.host (UnknownHostException) with 1 occurrences migrated to:
  https://d.host ([https](https://d.host) result UnknownHostException).
* [ ] http://default (UnknownHostException) with 1 occurrences migrated to:
  https://default ([https](https://default) result UnknownHostException).
* [ ] http://f.host (UnknownHostException) with 1 occurrences migrated to:
  https://f.host ([https](https://f.host) result UnknownHostException).
* [ ] http://foo (UnknownHostException) with 7 occurrences migrated to:
  https://foo ([https](https://foo) result UnknownHostException).
* [ ] http://foo_underscore (UnknownHostException) with 1 occurrences migrated to:
  https://foo_underscore ([https](https://foo_underscore) result UnknownHostException).
* [ ] http://foobar (UnknownHostException) with 1 occurrences migrated to:
  https://foobar ([https](https://foobar) result UnknownHostException).
* [ ] http://g.host (UnknownHostException) with 1 occurrences migrated to:
  https://g.host ([https](https://g.host) result UnknownHostException).
* [ ] http://h.host (UnknownHostException) with 1 occurrences migrated to:
  https://h.host ([https](https://h.host) result UnknownHostException).
* [ ] http://host1:8080 (UnknownHostException) with 2 occurrences migrated to:
  https://host1:8080 ([https](https://host1:8080) result UnknownHostException).
* [ ] http://listener (UnknownHostException) with 1 occurrences migrated to:
  https://listener ([https](https://listener) result UnknownHostException).
* [ ] http://myservice/path/to/service (UnknownHostException) with 1 occurrences migrated to:
  https://myservice/path/to/service ([https](https://myservice/path/to/service) result UnknownHostException).
* [ ] http://noRetry (UnknownHostException) with 1 occurrences migrated to:
  https://noRetry ([https](https://noRetry) result UnknownHostException).
* [ ] http://s1-1:8080 (UnknownHostException) with 5 occurrences migrated to:
  https://s1-1:8080 ([https](https://s1-1:8080) result UnknownHostException).
* [ ] http://stores (UnknownHostException) with 1 occurrences migrated to:
  https://stores ([https](https://stores) result UnknownHostException).
* [ ] http://stores/stores (UnknownHostException) with 3 occurrences migrated to:
  https://stores/stores ([https](https://stores/stores) result UnknownHostException).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

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

* [ ] http://12factor.net/ with 2 occurrences migrated to:
  https://12factor.net/ ([https](https://12factor.net/) result 200).
* [ ] http://cloud.spring.io/spring-cloud-consul/ with 1 occurrences migrated to:
  https://cloud.spring.io/spring-cloud-consul/ ([https](https://cloud.spring.io/spring-cloud-consul/) result 200).
* [ ] http://cloud.spring.io/spring-cloud-netflix/ with 1 occurrences migrated to:
  https://cloud.spring.io/spring-cloud-netflix/ ([https](https://cloud.spring.io/spring-cloud-netflix/) result 200).
* [ ] http://cloud.spring.io/spring-cloud-zookeeper/ with 1 occurrences migrated to:
  https://cloud.spring.io/spring-cloud-zookeeper/ ([https](https://cloud.spring.io/spring-cloud-zookeeper/) result 200).
* [ ] http://example.com with 1 occurrences migrated to:
  https://example.com ([https](https://example.com) result 200).
* [ ] http://martinfowler.com/bliki/CircuitBreaker.html with 1 occurrences migrated to:
  https://martinfowler.com/bliki/CircuitBreaker.html ([https](https://martinfowler.com/bliki/CircuitBreaker.html) result 200).
* [ ] http://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook with 2 occurrences migrated to:
  https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook ([https](https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook) result 200).
* [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to:
  https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html with 2 occurrences migrated to:
  https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html with 2 occurrences migrated to:
  https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html) result 200).
* [ ] http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html with 2 occurrences migrated to:
  https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html ([https](https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) result 200).
* [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to:
  https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301).
* [ ] http://projects.spring.io/spring-boot with 2 occurrences migrated to:
  https://projects.spring.io/spring-boot ([https](https://projects.spring.io/spring-boot) result 301).
* [ ] http://eclipse.org with 1 occurrences migrated to:
  https://eclipse.org ([https](https://eclipse.org) result 302).
* [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to:
  https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302).
* [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to:
  https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302).

These URLs were intentionally ignored.

* http://localhost with 4 occurrences
* http://localhost:8888 with 1 occurrences
* http://testservice with 1 occurrences
 2019-03-27 12:45:00 -04: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
Spring Operator
c76e026c19 URL Cleanup (#522) 
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-21 20:30:00 -04:00
Spencer Gibb
f5e1bfd0d3 Ignores broken test 
see gh-494
 2019-03-13 17:26:30 -04:00
Spencer Gibb
3f362032b8 checkstyle 2019-03-08 22:04:06 -05:00
Spencer Gibb
d9150fcfd2 Updates context AdhocTestSuite 2019-03-08 21:50:35 -05:00
Spencer Gibb
d3dcabb480 Updates for boot 2.2.x 2019-03-07 13:16:23 -05: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