Commit Graph

340 Commits

Author SHA1 Message Date
Spencer Gibb
83bb54bafd Renames ServiceInstanceListSuppliers to ServiceInstanceListSupplierBuilder (#761)
Puts static builder() method on ServiceInstanceListSupplier.

Deprecates ServiceInstanceListSupplier.fixed(Environment) and replaces with fixed(serviceId).
2020-05-21 17:06:35 -04:00
Olga Maciaszek-Sharma
84358e143f Merge remote-tracking branch 'origin/2.2.x' 2020-05-18 16:26:40 +02:00
Olga Maciaszek-Sharma
c998d69c66 Add predefined ServiceInstanceListSupplier configurations. 2nd part of gh-741. (#758) 2020-05-18 16:23:48 +02:00
Olga Maciaszek-Sharma
44c9d75953 Merge branch '2.2.x' 2020-05-05 17:59:21 +02:00
Olga Maciaszek-Sharma
8dff101d6f Lb configuration builders (#751)
* Adds ServiceInstanceListSuppliers.java with Builder

* Implement TODOs.

* Add javadocs.

* Remove unused type.

* Add test.

* Safer caching config: resolve LoadBalancerCacheManager lazily. Return delegate if LoadBalancerCacheManager not available.

* Switch to using builder in LoadBalancerClientConfiguration.

* Autoformatting with spring-java-format.

* Update docs.

Co-authored-by: Spencer Gibb <spencer@gibb.us>
2020-05-05 17:55:03 +02:00
Olga Maciaszek-Sharma
c33363dde2 Merge branch '2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
#	spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json
2020-05-04 18:38:03 +02:00
Olga Maciaszek-Sharma
5f413a7297 Fix capitalisation. 2020-05-04 18:32:42 +02:00
Olga Maciaszek-Sharma
aeb30b597d Merge branch '2.2.x'
# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicator.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunction.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/OnNoRibbonDefaultCondition.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerExchangeFilterFunctionTests.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfigurationTests.java
2020-04-30 15:43:04 +02:00
Olga Maciaszek-Sharma
d27b59e6f6 Fix docs on Instance Health-Check for LoadBalancer. Fixes gh-746. 2020-04-30 15:34:15 +02:00
buildmaster
dffbf85119 Bumping versions 2020-04-16 22:37:51 +00:00
buildmaster
f773511eb8 Going back to snapshots 2020-04-09 22:11:02 +00:00
buildmaster
1cbd1f9588 Update SNAPSHOT to 3.0.0.M1 2020-04-09 22:09:46 +00:00
Ryan Baxter
bea81f7b51 Cherry picking commit 4119a9c 2020-04-02 10:26:24 -04:00
Marcin Grzejszczak
f78a9a8859 Updated docs 2020-04-01 13:42:33 +02:00
Ryan Baxter
4119a9c138 Add a property source that produces a random value that is cached (#719)
* Add a property source that produces a random value that is cached.
2020-03-30 09:25:23 -04:00
buildmaster
9441a25938 Bumping versions 2020-03-19 16:06:11 +00:00
Spencer Gibb
7d84168da5 Removes references to Hystrix 2020-03-10 15:29:38 -04:00
Spencer Gibb
75c78754bf Merge branch '2.2.x' 2020-03-10 15:27:36 -04:00
JinSoo Han
3863d389bb Typo correction in document (#708)
Co-authored-by: jinsoohan <jinsoo.han@gmail.com>
2020-03-10 15:24:21 -04:00
buildmaster
c6b069d72d Bumping versions 2020-03-04 16:05:15 +00:00
buildmaster
86d9fc762f Bumping versions to 2.2.3.BUILD-SNAPSHOT after release 2020-03-04 15:28:35 +00:00
buildmaster
f18c131bb8 Going back to snapshots 2020-03-04 15:28:35 +00:00
buildmaster
562088c03d Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 15:21:54 +00:00
Spencer Gibb
f6a4bebf91 Merge branch '2.2.x' 2020-03-03 17:55:32 -05:00
Spencer Gibb
69a8cece5f Ensures HikariDataSource is never re-bound.
Removes HikariDataSource from extra-refreshable and adds it to a new property never-refreshable.

ConfigurationPropertiesRebinder now checks that property and does not rebind beans whose class is in never-refreshable.

fixes gh-687
2020-03-03 17:54:58 -05:00
Olga Maciaszek-Sharma
2710c8251d Remove ribbon integration (#691)
* Remove Ribbon-specific configuration.

* Remove Ribbon-specific docs. Refactor.
2020-02-22 14:04:55 +01:00
Olga Maciaszek-Sharma
d0b6278f87 Merge branch '2.2.x' 2020-02-04 18:27:27 +01:00
Olga Maciaszek-Sharma
070e0a8518 Add info on SimpleDiscoveryClient in the docs. Remove redundant param. (#684)
* Add info on SimpleDiscoveryClient in the docs. Remove redundant parameter.

* Remove warning after discussion.
2020-02-04 18:26:44 +01:00
Olga Maciaszek-Sharma
1170910112 Merge branch '2.2.x' 2020-02-04 10:15:17 +01:00
Olga Maciaszek-Sharma
47a810606d Fix gh 629 new (#683)
* Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.

Swaps with ConditionalOnAvailableEndpoint

* Migrates to new OutputCaptureRule

* Migrates to new OutputCaptureRule

* Add health check loadBalancing implementation.

* Make isAlive() method protected.

Co-authored-by: Spencer Gibb <spencer@gibb.tech>
2020-02-04 10:14:08 +01:00
Ryan Baxter
80e36d4b97 Merge remote-tracking branch 'origin/2.2.x' 2020-01-28 20:20:04 -05:00
Ryan Baxter
cb0a693cc9 merge 2.1.x into 2.2.x 2020-01-28 20:19:31 -05:00
Ryan Baxter
c982cd8798 Merge branch '466' of https://github.com/srempfer/spring-cloud-commons into srempfer-466 2020-01-28 20:15:16 -05:00
buildmaster
e08b8b61aa Bumping versions 2020-01-27 16:05:57 +00:00
buildmaster
d0febfbfba Bumping versions 2020-01-21 18:07:45 +00:00
Spencer Gibb
eac5cde53a Removes unused branches 2020-01-21 12:46:54 -05:00
Marcin Grzejszczak
b6ddff7d2e Added 2.2.x to the list of whitelisted branches 2020-01-21 15:43:31 +01:00
buildmaster
c2fc64a3e5 Bumping versions 2020-01-20 16:05:03 +00:00
buildmaster
39921b2d33 Bumping versions 2020-01-20 13:11:59 +00:00
buildmaster
83d6912076 Bumping versions 2020-01-18 16:04:59 +00:00
Spencer Gibb
188b98a659 Updates to 3.0.0.BUILD-SNAPSHOT 2020-01-17 14:53:03 -05:00
Toshiaki Maki
d7767a058a Add once method for Customizer of circuit breaker (#626)
* Add Customizer.once

* Make the logic of Customer.once atomic

* Add document on how to use once method
2020-01-15 10:19:03 -05:00
Ryan Baxter
61ba39ee11 Fix broken links. Fixes #663 2020-01-06 12:46:57 -05:00
buildmaster
080cd374fc Bumping versions 2019-12-20 16:05:11 +00:00
buildmaster
2e40fcec41 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-20 11:59:03 +00:00
buildmaster
980ce49895 Going back to snapshots 2019-12-20 11:59:03 +00:00
buildmaster
f533ef1553 Update SNAPSHOT to 2.2.1.RELEASE 2019-12-20 11:53:32 +00:00
Olga Maciaszek-Sharma
8c054083cc Use configuration properties instead of environment. (#662)
* Use configuration properties instead of environment.

* Fix after review.
2019-12-19 17:27:40 +01:00
Olga Maciaszek-Sharma
75338cde79 Zoned ServiceInstanceListSupplier (#658)
* Get ServiceInstance zone from metadata.

* Add ZonePreferenceServiceInstanceListSupplier.

* Add javadocs and license entries.

* Add tests.

* Add documentation.

* Documentation fix.

* Fix after code review.
2019-12-18 15:25:51 +01:00
Ryan Baxter
04c24271e7 Merge remote-tracking branch 'origin/2.1.x' 2019-12-11 16:24:04 -05:00