loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[java][resttemplate] rethrow original exception when retry limits exceeded (#17488)

Browse Source 
in rest template, when the retry limits exceeded
rethrow the original exception

also add 429 (Too many requests) status code to the
retry logic

fix #17478
This commit is contained in:
Ilamparithi Natarajan 2024-01-05 01:57:24 +00:00 committed by GitHub
parent 23bd5d413c
commit ddc7d4b1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 144 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache vendored
View File

@ -31,6 +31,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -772,20 +773,29 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -688,20 +689,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -631,20 +632,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -680,20 +681,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -680,20 +681,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -680,20 +681,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -27,6 +27,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -743,20 +744,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {

26
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -22,6 +22,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -738,20 +739,29 @@ public class ApiClient extends JavaTimeFormatter {
try { try {
responseEntity = restTemplate.exchange(requestEntity, returnType); responseEntity = restTemplate.exchange(requestEntity, returnType);
break; break;
} catch (HttpServerErrorException ex) { } catch (HttpServerErrorException | HttpClientErrorException ex) {
attempts++; if (ex instanceof HttpServerErrorException
if (attempts < maxAttemptsForRetry) { || ((HttpClientErrorException) ex)
try { .getStatusCode()
Thread.sleep(waitTimeMillis); .equals(HttpStatus.TOO_MANY_REQUESTS)) {
} catch (InterruptedException e) { attempts++;
Thread.currentThread().interrupt(); if (attempts < maxAttemptsForRetry) {
try {
Thread.sleep(waitTimeMillis);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} else {
throw ex;
} }
} else {
throw ex;
} }
} }
} }
if (responseEntity == null) { if (responseEntity == null) {
throw new RestClientException("API returned HttpServerErrorException"); throw new RestClientException("ResponseEntity is null");
} }
if (responseEntity.getStatusCode().is2xxSuccessful()) { if (responseEntity.getStatusCode().is2xxSuccessful()) {