diff options
Diffstat (limited to 'src/main/java/dev/dnpm')
3 files changed, 26 insertions, 21 deletions
diff --git a/src/main/java/dev/dnpm/etl/processor/consent/GicsConsentService.java b/src/main/java/dev/dnpm/etl/processor/consent/GicsConsentService.java index 0a00d1f..b232df1 100644 --- a/src/main/java/dev/dnpm/etl/processor/consent/GicsConsentService.java +++ b/src/main/java/dev/dnpm/etl/processor/consent/GicsConsentService.java @@ -35,12 +35,12 @@ import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; import org.slf4j.LoggerFactory; +import org.springframework.core.retry.RetryException; +import org.springframework.core.retry.RetryTemplate; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.retry.TerminatedRetryException; -import org.springframework.retry.support.RetryTemplate; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; @@ -169,7 +169,7 @@ public class GicsConsentService extends AbstractConsentService { new HttpEntity<>(parameterAsXml, this.headersWithHttpBasicAuth()); try { var responseEntity = - retryTemplate.execute(ctx -> + retryTemplate.execute(() -> restTemplate.exchange( endpointUri(endpoint), HttpMethod.POST, requestEntity, String.class)); @@ -188,15 +188,20 @@ public class GicsConsentService extends AbstractConsentService { log.error(msg); return null; - } catch (TerminatedRetryException terminatedRetryException) { + } catch (RetryException retryException) { + if (retryException.getCause() instanceof URISyntaxException) { + var msg = + String.format( + "Invalid URI for consents status request: '%s'", + retryException.getCause().getMessage()); + log.error(msg); + return null; + } + var msg = String.format( "Get consents status process has been terminated. termination reason: '%s", - terminatedRetryException.getMessage()); - log.error(msg); - return null; - } catch (URISyntaxException e) { - var msg = String.format("Invalid URI for consents status request: '%s'", e.getMessage()); + retryException.getMessage()); log.error(msg); return null; } diff --git a/src/main/java/dev/dnpm/etl/processor/consent/GicsGetBroadConsentService.java b/src/main/java/dev/dnpm/etl/processor/consent/GicsGetBroadConsentService.java index eb99ebf..9ba0591 100644 --- a/src/main/java/dev/dnpm/etl/processor/consent/GicsGetBroadConsentService.java +++ b/src/main/java/dev/dnpm/etl/processor/consent/GicsGetBroadConsentService.java @@ -29,11 +29,11 @@ import org.hl7.fhir.r4.model.Bundle; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; import org.slf4j.LoggerFactory; +import org.springframework.core.retry.RetryException; +import org.springframework.core.retry.RetryTemplate; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.retry.TerminatedRetryException; -import org.springframework.retry.support.RetryTemplate; import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; @@ -129,7 +129,7 @@ public class GicsGetBroadConsentService extends AbstractConsentService { } final var response = - this.retryTemplate.execute(retryContext -> + this.retryTemplate.execute(() -> this.restTemplate.exchange( uri, HttpMethod.GET, new HttpEntity<>(requestHeaders), String.class)); if (response.getStatusCode().is2xxSuccessful()) { @@ -142,20 +142,20 @@ public class GicsGetBroadConsentService extends AbstractConsentService { log.error(msg); return null; } + } catch (URISyntaxException e) { + var msg = String.format("Invalid URI for consents status request: '%s'", e.getMessage()); + log.error(msg); + return null; } catch (RestClientException e) { var msg = String.format("Get consents status request failed reason: '%s", e.getMessage()); log.error(msg); return null; - } catch (TerminatedRetryException terminatedRetryException) { + } catch (RetryException retryException) { var msg = String.format( "Get consents status process has been terminated. termination reason: '%s", - terminatedRetryException.getMessage()); - log.error(msg); - return null; - } catch (URISyntaxException e) { - var msg = String.format("Invalid URI for consents status request: '%s'", e.getMessage()); + retryException.getMessage()); log.error(msg); return null; } diff --git a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java index 2e8adf7..79db2c3 100644 --- a/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java +++ b/src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java @@ -37,8 +37,8 @@ import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.retry.RetryTemplate; import org.springframework.http.*; -import org.springframework.retry.support.RetryTemplate; import org.springframework.web.client.HttpClientErrorException.BadRequest; import org.springframework.web.client.HttpClientErrorException.Unauthorized; import org.springframework.web.client.RestTemplate; @@ -152,8 +152,8 @@ public class GpasPseudonymGenerator implements Generator { try { var targetUrl = buildRequestUrl(apiEndpoint); ResponseEntity<String> responseEntity = - retryTemplate.execute(ctx -> - restTemplate.exchange(targetUrl, HttpMethod.POST, requestEntity, String.class)); + retryTemplate.execute( + () -> restTemplate.exchange(targetUrl, HttpMethod.POST, requestEntity, String.class)); if (responseEntity.getStatusCode().is2xxSuccessful()) { log.debug("API request succeeded. Response: {}", responseEntity.getStatusCode()); return responseEntity; |