Commit Graph

1288 Commits

Author SHA1 Message Date
buildmaster
a09abe00a4 Bumping versions 2020-10-12 16:04:56 +00:00
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
Olga Maciaszek-Sharma
ba8fd08adf Adjust after PR merge. Minor refactoring. 2020-10-12 14:20:51 +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
Ryan Baxter
084da119a1 Revert "Setting reactor bom to 2020.0.0-SNAPSHOT due to reactor bom overriding in HATEOAS"
This reverts commit 6ea0b4738b.
2020-10-02 12:46:03 -04:00
Olga Maciaszek-Sharma
e1c570af07 Add equals(), hashCode() and toString() methods to HintRequestContext and RetryableRequestContext. 2020-10-02 13:55:34 +02:00
Olga Maciaszek-Sharma
0fc6f97974 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/DefaultRequest.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/DefaultRequestContext.java
2020-10-02 13:43:26 +02:00
Olga Maciaszek-Sharma
653222d561 Override equals(), hashCode() and toString() in DefaultRequest and DefaultRequestContext. 2020-10-02 13:38:54 +02:00
Ralph Goers
4a2e83ea46 Remove URL check that causes loading 401 responses from Spring Cloud Config 2020-10-01 10:35:54 -04:00
Olga Maciaszek-Sharma
0f0a4963d9 Merge remote-tracking branch 'origin/2.2.x'
# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptor.java
2020-10-01 14:46:55 +02:00
Olga Maciaszek-Sharma
8748ef400f Add more logs. 2020-10-01 14:38:39 +02: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
cbe4bb1139 Merge remote-tracking branch 'origin/2.2.x' 2020-09-28 18:41:36 +02:00
Mushtaq Ahmed
d95a4d8c44 Updating Evictor Project link 2020-09-28 18:37:49 +02:00
Jay Bryant
4900893c14 Wording changes (#784)
Replacing some terms
2020-09-28 10:34:58 -04: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
Olga Maciaszek-Sharma
034768bc8f Adjust to updates in boot. 2020-09-17 09:44:37 -04:00
spencergibb
f9bc96747d Merge branch '2.2.x' 2020-09-15 14:21:47 -04:00
Dave Syer
f7360b05ad Compatibility check if Spring Boot version is unknown
It is better not to fail the compatibility check if the Spring Boot version is unknown.
2020-09-15 14:18:06 -04:00
Spencer Gibb
5f92501a0d Performance improvements to NamedContextFactory. (#826)
Fixes gh-825
2020-09-15 14:13:17 -04:00
buildmaster
462c85de57 Bumping versions 2020-09-07 16:05:04 +00:00
Dave Syer
1f7f8c2f59 Make HATEOAS properly optional 2020-09-07 16:05:57 +01: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
buildmaster
b146be486f Bumping versions 2020-08-27 16:05:38 +00:00
spencergibb
c5a824c7fb Merge branch '2.2.x' 2020-08-25 14:48:26 -04:00
spencergibb
eb571682b7 Removes dependency management for okhttp3 and httpclient
These are managed by boot.

Fixes gh-813
2020-08-25 14:47:41 -04:00
Ryan Baxter
57a0c43e11 Merge remote-tracking branch 'origin/2.2.x' 2020-08-24 14:47:11 -04:00
jialindai
fb8b1d8da0 add common classes for TLS properties (#803)
* add common classes for TLS test

* Revert "add common classes for TLS test"

This reverts commit 7f5d076ad3fd628611aaab70215b1c9615affa21.

* add common tls properties

* add unit tests for tls properties
2020-08-24 14:00:09 -04:00
Marcin Grzejszczak
6ea0b4738b Setting reactor bom to 2020.0.0-SNAPSHOT due to reactor bom overriding in HATEOAS 2020-08-21 18:04:22 +02:00
spencergibb
b6c852c506 Updates to use new BootstrapRegistry for ConfigData 2020-08-21 10:06:13 -04: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
spencergibb
46eec89c0c Updates to use repo.spring.io/snapshot 2020-08-10 15:47:20 -04:00
spencergibb
474295989b Formatting 2020-08-10 15:36:51 -04:00
spencergibb
8f8f7d4920 Adds spring-cloud-starter-bootstrap.
This allows users to opt-in to bootstrap via classpath rather than properties.
2020-08-10 15:27:17 -04:00
spencergibb
da469626f4 Updates to use new ConfigDataEnvironmentPostProcessor.applyTo() method 2020-08-06 21:40:10 -04:00
spencergibb
08ca4105ab Replaces usage of ConfigFileApplicationListener with a subclass.
BootstrapConfigFileApplicationListener.java overrides the onApplicationEvent() method to not throw an exception.
2020-08-06 14:17:40 -04: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
spencergibb
0be2794631 Fixes s-c-build version to snapshot 2020-08-03 12:54:28 -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
spencergibb
7c6c32cb87 Mock property source name 2020-07-31 15:04:39 -04:00