Commit Graph

162 Commits

Author SHA1 Message Date
Olga Maciaszek-Sharma
4b3a399f7b Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClient.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientTests.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/ReactorLoadBalancerExchangeFilterFunctionTests.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java
2020-10-12 15:33:22 +02:00
alchemy24
72762d76ed Deprecates SimpleServiceInstance in favor of DefaultServiceInstance (#835)
* Initial Commit

* Added URI to DefaultServiceInstance

* Added default constructor

* Fixed PR Comments
2020-10-12 13:41:39 +02:00
buildmaster
44b35c2cbf Going back to snapshots 2020-10-03 13:41:52 +00:00
buildmaster
83b7a1d6b3 Update SNAPSHOT to 3.0.0-M4 2020-10-03 13:39:52 +00:00
Olga Maciaszek-Sharma
25c17082ee Avoid retrying on same instance (#834)
* cherry-pick switching to properties

* Pass information on previous ServiceInstance to RequestContext.

# Conflicts:
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/retry/BlockingLoadBalancedRetryPolicy.java

* Add a RoundRobinLoadBalancer implementation that avoids same service instance while retrying.

* Wrap instances in ArrayList. Add tests.

* Enable AvoidPreviousInstanceRoundRobinLoadBalancer by default if SpringRetry on classpath.

* Fix failing tests. Add javadocs and author tags.

* Fix properties.

* Add documentation.

* Fix docs after review.

* Fix docs after review.

* Handle avoiding previous instance with ServiceInstanceListSupplier in place of LoadBalancer.

* Fix property name.

* Change spelling.
2020-09-29 19:36:54 +02:00
Olga Maciaszek-Sharma
1badef953f Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-commons.adoc
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicy.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/AbstractLoadBalancerAutoConfigurationTests.java
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/InterceptorRetryPolicyTest.java
#	spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
#	spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfigurationTests.java
2020-09-24 18:02:35 +02:00
Olga Maciaszek-Sharma
5401628aed Add retry support for blocking LoadBalancer (#832)
* Add LoadBalancerProperties and BlockingLoadBalancedRetryPolicy. Add spring-retry dependency in LoadBalancer.

* Add BlockingLoadBalancedRetryFactory

* Move retry properties to LoadBalancerRetryProperties.

* Refactor and remove deprecations, fix checkstyle.

* Add BlockingLoadBalancedRetryPolicy to autoconfiguration. Set default retryableStatusCode prop. Fix javadoc.

* Allow using @Order on LoadBalancedRetryFactory beans.

* Add tests. Reformat tests. Add explanatory comments.

* Add documentation.

* Fix javadoc.

* Fix docs after review.

* Change field name.
2020-09-24 17:31:38 +02:00
Olga Maciaszek-Sharma
00668991a4 Reformat. 2020-09-17 09:44:37 -04:00
buildmaster
ec264fb23e Bumping versions to 2.2.6.BUILD-SNAPSHOT after release 2020-08-28 19:25:12 +00:00
buildmaster
0cdd6e5aa7 Going back to snapshots 2020-08-28 19:25:12 +00:00
buildmaster
dc3a4674c4 Update SNAPSHOT to 2.2.5.RELEASE 2020-08-28 19:20:48 +00:00
Olga Maciaszek-Sharma
7beca68a39 Merge remote-tracking branch 'origin/2.2.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-webflux-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
2020-08-11 13:25:00 +02:00
Olga Maciaszek-Sharma
018aae3632 Subscribe on flux earlier. Fixes gh-802. 2020-08-11 13:05:07 +02:00
Spencer Gibb
a183bc709f Use new boot ConfigData framework (#703)
Bootstrap is now opt-in using `spring.config.use-legacy-processing`. Otherwise, bootstrap is left as is.

If bootstrap is disabled, the `ContextRefresher` uses new `ConfigData` framework from boot.

See #608 for original motivation.
2020-08-06 12:54:25 -04:00
buildmaster
6b8776bd3a Bumping versions to 2.2.5.BUILD-SNAPSHOT after release 2020-07-31 20:03:49 +00:00
buildmaster
4cc1a68ebb Going back to snapshots 2020-07-31 20:03:49 +00:00
buildmaster
f290f97816 Update SNAPSHOT to 2.2.4.RELEASE 2020-07-31 19:59:52 +00:00
spencergibb
828912100f Disables failing test.
See gh-802
2020-07-31 15:35:14 -04:00
buildmaster
b38e31f263 Going back to snapshots 2020-07-23 17:52:56 +00:00
buildmaster
ffa885b2f5 Update SNAPSHOT to 3.0.0-M3 2020-07-23 17:51:24 +00:00
Olga Maciaszek-Sharma
46bf5a01ac Lb complete lifecycle (#783)
* Add LoadBalancerLifecycle. Trigger lifecycle callbacks. Set hints from properties.

* Trigger LB lifecycle callbacks from BlockingLoadBalancerClient and RetryLoadBalancerInterceptor.

* Register LifecycleProcessors with @LoadBalancerClients

* Register LifecycleProcessors with @LoadBalancerClients configuration.

* Handle null lifecycle beans map returned from factory. Adjust tests to code changes.

* Handle null lifecycle beans map returned from factory in RetryLoadBalancerInterceptor. Ensure ReactiveLoadBalancer.Factory bean is present while instantiating RetryLoadBalancerInterceptor. Add more tests.

* Remove generics from supports(...) method signature.

* Allow setting hint per service via properties.

* Add some toString() methods. Add more info on deprecated callbacks in javadocs and comments.

* Add javadocs.

* Format javadocs. Add docs.

* Update hint docs.

* Fix docs.

* Fix docs.

* Extract filtering supported lifecycle processors to a separate class; Execute onComplete() calls for DISCARD status in RetryLoadBalancerInterceptor. Remove duplicated `onComplete` calls for FAILED and SUCCESS status in RetryLoadBalancerInterceptor. Add test for no duplicated lifecycle calls in RetryLoadBalancerInterceptorTest.

* Small refactoring: remove deprecated methods use, add final keywords, remove unnecessary keywords.

* Add javadoc.
2020-07-21 18:38:52 +02:00
Olga Maciaszek-Sharma
43ea5b17fc Remove deprecated Request and Response classes. (#779) 2020-07-04 19:15:30 +02:00
buildmaster
af62e6e015 Going back to snapshots 2020-05-29 18:22:19 +00:00
buildmaster
d50a2ae6cd Update SNAPSHOT to 3.0.0-M2 2020-05-29 18:21:00 +00:00
buildmaster
7ff8100c19 Bumping versions to 2.2.4.BUILD-SNAPSHOT after release 2020-05-28 17:06:16 +00:00
buildmaster
7fcfceea42 Going back to snapshots 2020-05-28 17:06:16 +00:00
buildmaster
a6191e08f9 Update SNAPSHOT to 2.2.3.RELEASE 2020-05-28 17:02:22 +00:00
Olga Maciaszek-Sharma
b430529ccc Switch initialDelay to Duration. (#768) 2020-05-27 20:18:30 +02:00
Olga Maciaszek-Sharma
cfeb38a369 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	docs/src/main/asciidoc/_configprops.adoc
2020-05-27 20:17:48 +02:00
Olga Maciaszek-Sharma
da23fe4f07 Handle exceptions and timeouts new (#767)
* Handle timeouts and exceptions while retrieving instances.

* Update docs.
2020-05-27 20:11:47 +02:00
Olga Maciaszek-Sharma
b37ef447dc Desynchronise HealthCheck and Cache. 2020-05-27 17:01:11 +02:00
Olga Maciaszek-Sharma
87e5d7a62b Fix execution thread for blocking and adjusts timing
* Fix execution thread for blocking DiscoveryClientServiceInstanceListSupplier.

* Desynchronise HealthCheck and Cache. Add info about using HealthCheck without Cache to docs.

See gh-760
2020-05-27 10:13:55 -04:00
Olga Maciaszek-Sharma
587f5f568a Gh 760 health check with cache new (#765)
* Cache first element of service instance list flux.

* Invoke destroy() and afterPropertiesSet() in non-bean ServiceInstanceListSupplier delegates.

* Fix return updated instances.

* Fix return updated instances.

(cherry picked from commit 88b2f0e869)
2020-05-26 16:38:04 +02:00
Olga Maciaszek-Sharma
88b2f0e869 Gh 760 health check with cache new (#765)
* Cache first element of service instance list flux.

* Invoke destroy() and afterPropertiesSet() in non-bean ServiceInstanceListSupplier delegates.

* Fix return updated instances.

* Fix return updated instances.
2020-05-26 16:35:09 +02:00
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
Spencer Gibb
a10fbb9b07 Renames ServiceInstanceListSuppliers to ServiceInstanceListSupplierBuilder (#761)
Puts static builder() method on ServiceInstanceListSupplier.

Deprecates ServiceInstanceListSupplier.fixed(Environment) and replaces with fixed(serviceId).
2020-05-21 14:08:09 -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
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
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
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
Spencer Gibb
1ddb18bfd0 Merge branch '2.2.x' 2020-03-25 14:38:21 -04:00