From dbe5a36f26910495d76f799701b28d762b8e5ebb Mon Sep 17 00:00:00 2001 From: Diederik Muylwyk Date: Mon, 9 Sep 2019 18:44:25 -0400 Subject: [PATCH] Reset schedule for pre-expansions. Ready for review. --- .../java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java | 3 +-- .../main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java index ea2ee08dd6e..b08eb880834 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java @@ -1829,8 +1829,7 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc, ourLog.info("Done storing TermConceptMap[{}]", termConceptMap.getId()); } - // FIXME: DM 2019-09-05 - Return to 600000 before merging into master. - @Scheduled(fixedDelay = 6000) // 10 minutes. + @Scheduled(fixedDelay = 600000) // 10 minutes. @Override public synchronized void preExpandDeferredValueSetsToTerminologyTables() { if (isNotSafeToPreExpandValueSets()) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java index e0845156c09..a5648798df3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java @@ -121,7 +121,7 @@ public class HapiTerminologySvcR4 extends BaseHapiTerminologySvcImpl implements } @Override - public List expandValueSet(String theValueSet) {//FIXME: DM COWABUNGA + public List expandValueSet(String theValueSet) { ValueSet vs = myValidationSupport.fetchResource(myContext, ValueSet.class, theValueSet); if (vs == null) { super.throwInvalidValueSet(theValueSet);