SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving to Horsham

Browse Source
This commit is contained in:
Ryan Baxter
2019-05-29 11:25:41 -04:00
parent 23e1c36462
commit 609b4f5838
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -23,7 +23,7 @@
<bintray.package>netflix</bintray.package>
<spring-cloud-commons.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-stream.version>Germantown.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-stream.version>Horsham.BUILD-SNAPSHOT</spring-cloud-stream.version>
<!-- Has to be a stable version (not one that depends on this version of netflix): -->
<donotreplacespring-cloud-contract.version>2.1.1.RELEASE</donotreplacespring-cloud-contract.version>

73
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonRetryIntegrationTests.java
View File

@@ -27,38 +27,47 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Ryan Baxter
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = RibbonRetryIntegrationTestBase.RetryableTestConfig.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = {
"zuul.retryable: false", /* Disable retry by default, have each route enable it */
"ribbon.okhttp.enabled: true",
"hystrix.command.default.execution.timeout.enabled: false", /*
* Disable hystrix so
* its timeout doesnt
* get in the way
*/
"ribbon.ReadTimeout: 1000", /*
* Make sure ribbon will timeout before the thread is
* done sleeping
*/
"zuul.routes.retryable.id: retryable",
"zuul.routes.retryable.path: /retryable/**",
"zuul.routes.retryable.retryable: true",
"retryable.ribbon.OkToRetryOnAllOperations: true",
"retryable.ribbon.retryableStatusCodes: 404",
"retryable.ribbon.MaxAutoRetries: 1",
"retryable.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.getretryable.id: getretryable",
"zuul.routes.getretryable.path: /getretryable/**",
"zuul.routes.getretryable.retryable: true",
"getretryable.ribbon.MaxAutoRetries: 1",
"getretryable.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.disableretry.path: /disableretry/**",
"zuul.routes.disableretry.path: /disableretry/**",
"zuul.routes.disableretry.retryable: false", /* This will override the global */
"disableretry.ribbon.MaxAutoRetries: 1",
"disableretry.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.globalretrydisabled: /globalretrydisabled/**",
"globalretrydisabled.ribbon.MaxAutoRetries: 1",
"globalretrydisabled.ribbon.MaxAutoRetriesNextServer: 1" })
@SpringBootTest(classes = RibbonRetryIntegrationTestBase.RetryableTestConfig.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
value = { "zuul.retryable: false", /*
* Disable retry by default, have each route
* enable it
*/
"ribbon.okhttp.enabled: true",
"hystrix.command.default.execution.timeout.enabled: false", /*
* Disable
* hystrix so
* its timeout
* doesnt get
* in the way
*/
"ribbon.ReadTimeout: 1000", /*
* Make sure ribbon will timeout before the
* thread is done sleeping
*/
"zuul.routes.retryable.id: retryable",
"zuul.routes.retryable.path: /retryable/**",
"zuul.routes.retryable.retryable: true",
"retryable.ribbon.OkToRetryOnAllOperations: true",
"retryable.ribbon.retryableStatusCodes: 404",
"retryable.ribbon.MaxAutoRetries: 1",
"retryable.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.getretryable.id: getretryable",
"zuul.routes.getretryable.path: /getretryable/**",
"zuul.routes.getretryable.retryable: true",
"getretryable.ribbon.MaxAutoRetries: 1",
"getretryable.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.disableretry.path: /disableretry/**",
"zuul.routes.disableretry.path: /disableretry/**",
"zuul.routes.disableretry.retryable: false", /*
* This will override the
* global
*/
"disableretry.ribbon.MaxAutoRetries: 1",
"disableretry.ribbon.MaxAutoRetriesNextServer: 1",
"zuul.routes.globalretrydisabled: /globalretrydisabled/**",
"globalretrydisabled.ribbon.MaxAutoRetries: 1",
"globalretrydisabled.ribbon.MaxAutoRetriesNextServer: 1" })
@DirtiesContext
public class OkHttpRibbonRetryIntegrationTests extends RibbonRetryIntegrationTestBase {