Commit Graph

1196 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
spencergibb
2b30b355b6 Merge branch 'fitzoh-master' 2020-05-19 17:35:35 -04:00
Andrew Fitzgerald
de0a14b7a5 Removes deprecated ServiceInstanceSupplier
Fixes gh-753
2020-05-19 17:35:07 -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
spencergibb
b49f107dcd Merge branch '2.2.x' 2020-05-15 11:49:31 -04:00
spencergibb
b59a546ce8 Stops casting RandomPropertySource.
This avoids casting errors if property sources are wrapped.

Fixes gh-757
2020-05-15 11:49:17 -04:00
spencergibb
d8034eb31d ignores .sdkmanrc 2020-05-15 11:46:22 -04: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
如梦技术
4892418207 spring-cloud-loadbalancer add additional-spring-configuration-metadata.json
# Conflicts:
#	spring-cloud-loadbalancer/src/main/resources/META-INF/additional-spring-configuration-metadata.json
2020-05-04 18:29:22 +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
Olga Maciaszek-Sharma
c1c815eac4 Update license comments. 2020-04-27 15:45:22 +02:00
Olga Maciaszek-Sharma
ad5cb2ebb9 Update license comments. 2020-04-23 15:14:47 +02:00
Ryan Baxter
e7bb7ed3ae Merge remote-tracking branch 'origin/2.2.x' 2020-04-20 10:16:57 -04:00
Tim van Baarsen
047bca54e2 #738 (#740)
The default value for management.endpoint.env.post.enabled should be false instead of true.
2020-04-20 10:16:20 -04:00
Ryan Baxter
bb0fe1af46 Merge remote-tracking branch 'origin/2.2.x' 2020-04-20 10:12:17 -04:00
Ryan Baxter
8519d3dd16 Changing default value to be false. Fixes #738 2020-04-20 10:10:45 -04: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
bcffbd98d4 Merge remote-tracking branch 'origin/2.2.x' 2020-04-02 11:09:04 -04:00
Ryan Baxter
5ed5bc9253 Add utility method to provide a service if to IdUtils (#721) 2020-04-02 10:57:00 -04:00
Ryan Baxter
51e8bfbb0c Merge remote-tracking branch 'origin/2.2.x' 2020-04-02 10:26:50 -04: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
Nikita Konev
333779070f fix Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format (#701) 2020-03-29 17:11:20 -04:00
Spencer Gibb
1ddb18bfd0 Merge branch '2.2.x' 2020-03-25 14:38:21 -04:00
robotmrv
0e3ea3397d try to fix flaky test (#718)
fixes gh-716
2020-03-25 14:36:45 -04:00
Spencer Gibb
de9882ced9 Ignores failing test because of old boot version.
see gh-717
2020-03-20 15:19:51 -04:00
Spencer Gibb
a03fd4c3f8 Fixes issue 2020-03-20 14:43:47 -04:00
Spencer Gibb
a5d9810016 Merge branch '2.2.x' 2020-03-20 14:42:12 -04:00
Spencer Gibb
d5dc4465b2 Ignores flaky test.
See gh-1627
2020-03-20 14:40:24 -04:00
buildmaster
9441a25938 Bumping versions 2020-03-19 16:06:11 +00:00
Spencer Gibb
128ca4392a Bumps to build 2.3.0.BUILD-SNAPSHOT 2020-03-19 10:48:57 -04:00
Spencer Gibb
155c7d9131 Updates ilford boot compatibility 2020-03-18 17:42:24 -04:00
Spencer Gibb
bcdd56e74b Merge branch '2.2.x' 2020-03-18 17:41:45 -04:00
Spencer Gibb
7dd88a6e7f Verifies current boot version is in CompatibilityVerifierProperties.
Also fixes support for wildcard 2.2.x beyond boot 2.1.x

fixes gh-715
2020-03-18 17:31:29 -04:00
Spencer Gibb
d679add055 Updates compatible versions to 2.2.x and 2.3.x
see https://github.com/spring-cloud/spring-cloud-build/issues/153
2020-03-18 17:30:13 -04:00
Spencer Gibb
41208021ed Bumps to build 2.2.4.BUILD-SNAPSHOT 2020-03-18 16:55:30 -04:00
Spencer Gibb
e946ef1e79 Adds boot 2.3 compatiblity 2020-03-18 16:48:02 -04:00
Olga Maciaszek-Sharma
dd0aa3f7f1 Merge remote-tracking branch 'origin/2.2.x' 2020-03-17 18:44:53 +01:00
Olga Maciaszek-Sharma
c30b424e5d Minor refactoring to adjust to team conventions. 2020-03-17 18:42:20 +01:00
Spencer Gibb
589d6d0ca2 Merge branch '2.2.x' 2020-03-16 15:43:28 -04:00
Timothy
b85f7375d1 Adds reconstructURI method to ReactorLoadBalancerExchangeFilterFunction
fixes gh-711
2020-03-16 15:42:50 -04:00
Spencer Gibb
289d1dbae5 Increase timeout for CI tests 2020-03-10 15:31:01 -04:00