From 5d60b90b81d63d0ae0614b6bcf0676658491a332 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Mon, 17 Sep 2018 08:29:47 -0400 Subject: [PATCH] Update refererence server to avoid long calls --- .../src/main/java/ca/uhn/fhirtest/config/TestDstu2Config.java | 1 + .../src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java | 1 + .../src/main/java/ca/uhn/fhirtest/config/TestR4Config.java | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu2Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu2Config.java index a1f9138e93f..c3a16ae5e1d 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu2Config.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu2Config.java @@ -82,6 +82,7 @@ public class TestDstu2Config extends BaseJavaConfigDstu2 { } retVal.setUsername(myDbUsername); retVal.setPassword(myDbPassword); + retVal.setDefaultQueryTimeout(20); return retVal; } diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java index 9c90da410f6..6435d24bf9c 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu3Config.java @@ -88,6 +88,7 @@ public class TestDstu3Config extends BaseJavaConfigDstu3 { } retVal.setUsername(myDbUsername); retVal.setPassword(myDbPassword); + retVal.setDefaultQueryTimeout(20); return retVal; } diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java index 89256cc3195..c2188e087ad 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java @@ -12,7 +12,6 @@ import ca.uhn.fhirtest.interceptor.PublicSecurityInterceptor; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.time.DateUtils; import org.hibernate.dialect.PostgreSQL94Dialect; -import org.hibernate.jpa.HibernatePersistenceProvider; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -33,7 +32,7 @@ import java.util.Properties; @EnableTransactionManagement() public class TestR4Config extends BaseJavaConfigR4 { public static final String FHIR_DB_USERNAME = "${fhir.db.username}"; - public static final String FHIR_DB_PASSWORD = "${fhir.db.password}"; + public static final String FHIR_DB_PASSWORD = "${fhir.db.password}"; public static final String FHIR_LUCENE_LOCATION_R4 = "${fhir.lucene.location.r4}"; public static final Integer COUNT_SEARCH_RESULTS_UP_TO = 50000; @@ -74,6 +73,7 @@ public class TestR4Config extends BaseJavaConfigR4 { } retVal.setUsername(myDbUsername); retVal.setPassword(myDbPassword); + retVal.setDefaultQueryTimeout(20); return retVal; }