honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-02 01:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP track server requests

Browse Source
This commit is contained in:
dotasek 2021-12-07 16:08:28 -05:00
parent a9320e3cbb
commit 1c1e7d22ca
5 changed files with 15 additions and 1 deletions
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network
FhirRequestBuilder.java
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network
FhirRequestBuilder.java
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network
FhirRequestBuilder.java
org.hl7.fhir.utilities
pom.xml
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests
ValidationTests.java

2
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/network/FhirRequestBuilder.java

@ -12,6 +12,7 @@ import org.hl7.fhir.dstu3.utils.ResourceUtilities;
import org.hl7.fhir.dstu3.utils.client.EFhirClientException;
import org.hl7.fhir.dstu3.utils.client.ResourceFormat;
import org.hl7.fhir.utilities.ToolingClientLogger;
import org.hl7.fhir.utilities.TxInterceptor;
import java.io.IOException;
import java.util.ArrayList;
@ -162,6 +163,7 @@ public class FhirRequestBuilder {
return okHttpClient.newBuilder()
.addInterceptor(new RetryInterceptor(retryCount))
.addInterceptor(TxInterceptor.getInstance())
.connectTimeout(timeout, timeoutUnit)
.writeTimeout(timeout, timeoutUnit)
.readTimeout(timeout, timeoutUnit)

3
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java

@ -12,6 +12,7 @@ import org.hl7.fhir.r4.utils.ResourceUtilities;
import org.hl7.fhir.r4.utils.client.EFhirClientException;
import org.hl7.fhir.r4.utils.client.ResourceFormat;
import org.hl7.fhir.utilities.ToolingClientLogger;
import org.hl7.fhir.utilities.TxInterceptor;
import java.io.IOException;
import java.util.ArrayList;
@ -165,6 +166,8 @@ public class FhirRequestBuilder {
if (logger != null) builder.addInterceptor(logger);
builder.addInterceptor(new RetryInterceptor(retryCount));
builder.addInterceptor(TxInterceptor.getInstance());
return builder.connectTimeout(timeout, timeoutUnit)
.addInterceptor(new RetryInterceptor(retryCount))
.connectTimeout(timeout, timeoutUnit)

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/FhirRequestBuilder.java

@ -12,6 +12,7 @@ import org.hl7.fhir.r5.utils.ResourceUtilities;
import org.hl7.fhir.r5.utils.client.EFhirClientException;
import org.hl7.fhir.r5.utils.client.ResourceFormat;
import org.hl7.fhir.utilities.ToolingClientLogger;
import org.hl7.fhir.utilities.TxInterceptor;
import java.io.IOException;
import java.util.ArrayList;
@ -164,7 +165,7 @@ public class FhirRequestBuilder {
OkHttpClient.Builder builder = okHttpClient.newBuilder();
if (logger != null) builder.addInterceptor(logger);
builder.addInterceptor(new RetryInterceptor(retryCount));
builder.addInterceptor(TxInterceptor.getInstance());
return builder.connectTimeout(timeout, timeoutUnit)
.writeTimeout(timeout, timeoutUnit)
.readTimeout(timeout, timeoutUnit)

7
org.hl7.fhir.utilities/pom.xml

@ -42,6 +42,13 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
<optional>true</optional>
</dependency>
<!-- JSON Utilities -->
<dependency>
<groupId>com.google.code.gson</groupId>

1
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java

@ -155,6 +155,7 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
}
vCurr = ve.get(version);
vCurr.getContext().setUserAgent("fhir/test-cases");
//vCurr.getContext().initTS("");
igLoader = new IgLoader(vCurr.getPcm(), vCurr.getContext(), vCurr.getVersion(), true);
if (TestingUtilities.fcontexts == null) {
TestingUtilities.fcontexts = new HashMap<>();