Merge remote-tracking branch 'origin/issue/393_Fix_2.0.0-RC1_Bugs' into

develop_2

Author: hhund

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/ProcessPluginApiFactory.java

@@ -24,12 +24,12 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import dev.dsf.bpe.v2.config.ProxyConfig;
+import dev.dsf.bpe.v2.service.ClientConfigProvider;
 import dev.dsf.bpe.v2.service.CompressionService;
 import dev.dsf.bpe.v2.service.CryptoService;
 import dev.dsf.bpe.v2.service.DataLogger;
 import dev.dsf.bpe.v2.service.DsfClientProvider;
 import dev.dsf.bpe.v2.service.EndpointProvider;
-import dev.dsf.bpe.v2.service.FhirClientConfigProvider;
 import dev.dsf.bpe.v2.service.FhirClientProvider;
 import dev.dsf.bpe.v2.service.MailService;
 import dev.dsf.bpe.v2.service.MimeTypeService;
@@ -63,12 +63,12 @@ public ProcessPluginApi get()
 	{
 		return new ProcessPluginApiImpl(processPluginDefinition, fromParent(ProxyConfig.class),
 				fromParent(EndpointProvider.class), fromParent(FhirContext.class), fromParent(DsfClientProvider.class),
-				fromParent(FhirClientProvider.class), fromParent(FhirClientConfigProvider.class),
+				fromParent(FhirClientProvider.class), fromParent(ClientConfigProvider.class),
 				fromParent(OidcClientProvider.class), fromParent(MailService.class), fromParent(MimeTypeService.class),
 				fromParent(ObjectMapper.class), fromParent(OrganizationProvider.class),
 				fromParent(ProcessAuthorizationHelper.class), fromParent(QuestionnaireResponseHelper.class),
 				fromParent(ReadAccessHelper.class), fromParent(TaskHelper.class), fromParent(CompressionService.class),
 				fromParent(CryptoService.class), fromParent(TargetProvider.class), fromParent(DataLogger.class),
 				fromParent(ValidationServiceProvider.class));
 	}
-}
+}

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/ProcessPluginApiImpl.java

@@ -23,12 +23,12 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import dev.dsf.bpe.v2.config.ProxyConfig;
+import dev.dsf.bpe.v2.service.ClientConfigProvider;
 import dev.dsf.bpe.v2.service.CompressionService;
 import dev.dsf.bpe.v2.service.CryptoService;
 import dev.dsf.bpe.v2.service.DataLogger;
 import dev.dsf.bpe.v2.service.DsfClientProvider;
 import dev.dsf.bpe.v2.service.EndpointProvider;
-import dev.dsf.bpe.v2.service.FhirClientConfigProvider;
 import dev.dsf.bpe.v2.service.FhirClientProvider;
 import dev.dsf.bpe.v2.service.MailService;
 import dev.dsf.bpe.v2.service.MimeTypeService;
@@ -49,7 +49,7 @@ public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
 	private final FhirContext fhirContext;
 	private final DsfClientProvider dsfClientProvider;
 	private final FhirClientProvider fhirClientProvider;
-	private final FhirClientConfigProvider fhirClientConfigProvider;
+	private final ClientConfigProvider fhirClientConfigProvider;
 	private final OidcClientProvider oidcClientProvider;
 	private final MailService mailService;
 	private final MimeTypeService mimeTypeService;
@@ -67,7 +67,7 @@ public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
 
 	public ProcessPluginApiImpl(ProcessPluginDefinition processPluginDefinition, ProxyConfig proxyConfig,
 			EndpointProvider endpointProvider, FhirContext fhirContext, DsfClientProvider dsfClientProvider,
-			FhirClientProvider fhirClientProvider, FhirClientConfigProvider fhirClientConfigProvider,
+			FhirClientProvider fhirClientProvider, ClientConfigProvider fhirClientConfigProvider,
 			OidcClientProvider oidcClientProvider, MailService mailService, MimeTypeService mimeTypeService,
 			ObjectMapper objectMapper, OrganizationProvider organizationProvider,
 			ProcessAuthorizationHelper processAuthorizationHelper,
@@ -161,7 +161,7 @@ public FhirClientProvider getFhirClientProvider()
 	}
 
 	@Override
-	public FhirClientConfigProvider getFhirClientConfigProvider()
+	public ClientConfigProvider getFhirClientConfigProvider()
 	{
 		return fhirClientConfigProvider;
 	}

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/dsf/AbstractDsfClientJerseyWithRetry.java

@@ -34,18 +34,20 @@ public abstract class AbstractDsfClientJerseyWithRetry
 
 	protected final DsfClientJersey delegate;
 	private final int nTimes;
-	private final Duration delay;
+	private final DelayStrategy delayStrategy;
 
-	protected AbstractDsfClientJerseyWithRetry(DsfClientJersey delegate, int nTimes, Duration delay)
+	protected AbstractDsfClientJerseyWithRetry(DsfClientJersey delegate, int nTimes, DelayStrategy delayStrategy)
 	{
 		this.delegate = delegate;
 		this.nTimes = nTimes;
-		this.delay = delay;
+		this.delayStrategy = delayStrategy;
 	}
 
 	protected final <R> R retry(Supplier<R> supplier)
 	{
 		RuntimeException caughtException = null;
+		Duration delay = delayStrategy.getFirstDelay();
+
 		for (int tryNumber = 0; tryNumber <= nTimes || nTimes == RetryClient.RETRY_FOREVER; tryNumber++)
 		{
 			try
@@ -63,8 +65,11 @@ else if (nTimes != RetryClient.RETRY_FOREVER)
 				{
 					if (tryNumber < nTimes || nTimes == RetryClient.RETRY_FOREVER)
 					{
-						logger.warn("Caught {} - {}; trying again in {}s{}", e.getClass(), e.getMessage(),
-								delay.toSeconds(),
+						if (tryNumber > 0)
+							delay = delayStrategy.getNextDelay(delay);
+
+						logger.warn("Caught {} - {}; trying again in {}{}", e.getClass(), e.getMessage(),
+								delay.toString(),
 								nTimes == RetryClient.RETRY_FOREVER ? " (retry " + (tryNumber + 1) + ")" : "");
 
 						try

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/dsf/BasicDsfClientWithRetryImpl.java

@@ -16,24 +16,24 @@
 package dev.dsf.bpe.v2.client.dsf;
 
 import java.io.InputStream;
-import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
 import org.hl7.fhir.r4.model.Binary;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.CapabilityStatement;
 import org.hl7.fhir.r4.model.IdType;
+import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Resource;
 import org.hl7.fhir.r4.model.StructureDefinition;
 
 import jakarta.ws.rs.core.MediaType;
 
 class BasicDsfClientWithRetryImpl extends AbstractDsfClientJerseyWithRetry implements BasicDsfClient
 {
-	BasicDsfClientWithRetryImpl(DsfClientJersey delegate, int nTimes, Duration delay)
+	BasicDsfClientWithRetryImpl(DsfClientJersey delegate, int nTimes, DelayStrategy delayStrategy)
 	{
-		super(delegate, nTimes, delay);
+		super(delegate, nTimes, delayStrategy);
 	}
 
 	@Override
@@ -218,4 +218,31 @@ public Bundle history(Class<? extends Resource> resourceType, String id, int pag
 	{
 		return retry(() -> delegate.history(resourceType, id, page, count));
 	}
+
+	@Override
+	public <R extends Resource> R operation(String operationName, Parameters parameters, Class<R> returnType)
+	{
+		return retry(() -> delegate.operation(operationName, parameters, returnType));
+	}
+
+	@Override
+	public <R extends Resource, T extends Resource> R operation(Class<T> resourceType, String operationName,
+			Parameters parameters, Class<R> returnType)
+	{
+		return retry(() -> delegate.operation(resourceType, operationName, parameters, returnType));
+	}
+
+	@Override
+	public <R extends Resource, T extends Resource> R operation(Class<T> resourceType, String id, String operationName,
+			Parameters parameters, Class<R> returnType)
+	{
+		return retry(() -> delegate.operation(resourceType, id, operationName, parameters, returnType));
+	}
+
+	@Override
+	public <R extends Resource, T extends Resource> R operation(Class<T> resourceType, String id, String version,
+			String operationName, Parameters parameters, Class<R> returnType)
+	{
+		return retry(() -> delegate.operation(resourceType, id, version, operationName, parameters, returnType));
+	}
 }