honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a test regression

This commit is contained in:
James Agnew 2019-04-15 11:34:13 -04:00
parent cff79e6aef
commit f7ad0bc0d8
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/src/main/java/example/IRestfulClient.java
View File

@ -33,7 +33,7 @@ public interface IRestfulClient extends IBasicClient {
/** /**
* The "@Search" annotation indicates that this method supports the * The "@Search" annotation indicates that this method supports the
* search operation. You may have many different method annotated with * search operation. You may have many different methods annotated with
* this annotation, to support many different search criteria. This * this annotation, to support many different search criteria. This
* example searches by family name. * example searches by family name.
* *

2
examples/src/main/java/example/RestfulObservationResourceProvider.java
View File

@ -55,7 +55,7 @@ public class RestfulObservationResourceProvider implements IResourceProvider {
/** /**
* The "@Search" annotation indicates that this method supports the * The "@Search" annotation indicates that this method supports the
* search operation. You may have many different method annotated with * search operation. You may have many different methods annotated with
* this annotation, to support many different search criteria. This * this annotation, to support many different search criteria. This
* example searches by family name. * example searches by family name.
* *

2
examples/src/main/java/example/RestfulPatientResourceProvider.java
View File

@ -56,7 +56,7 @@ public class RestfulPatientResourceProvider implements IResourceProvider {
/** /**
* The "@Search" annotation indicates that this method supports the * The "@Search" annotation indicates that this method supports the
* search operation. You may have many different method annotated with * search operation. You may have many different methods annotated with
* this annotation, to support many different search criteria. This * this annotation, to support many different search criteria. This
* example searches by family name. * example searches by family name.
* *

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/index/SearchParamWithInlineReferencesExtractor.java
View File

@ -276,7 +276,7 @@ public class SearchParamWithInlineReferencesExtractor {
myEntityManager.persist(next); myEntityManager.persist(next);
haveNewParams = true; haveNewParams = true;
} }
if (theEntity.getParamsCompositeStringUnique().size() > 0 || haveNewParams) { if (theParams.myCompositeStringUniques.size() > 0 || haveNewParams) {
theEntity.setParamsCompositeStringUniquePresent(true); theEntity.setParamsCompositeStringUniquePresent(true);
} else { } else {
theEntity.setParamsCompositeStringUniquePresent(false); theEntity.setParamsCompositeStringUniquePresent(false);

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchOptimizedTest.java
View File

@ -887,6 +887,7 @@ public class FhirResourceDaoR4SearchOptimizedTest extends BaseJpaR4Test {
* Select the version from HFJ_RES_VER * Select the version from HFJ_RES_VER
* Select the current token indexes * Select the current token indexes
*/ */
myCaptureQueriesListener.logSelectQueriesForCurrentThread();
assertEquals(3, myCaptureQueriesListener.countSelectQueriesForCurrentThread()); assertEquals(3, myCaptureQueriesListener.countSelectQueriesForCurrentThread());
assertEquals(0, myCaptureQueriesListener.countDeleteQueriesForCurrentThread()); assertEquals(0, myCaptureQueriesListener.countDeleteQueriesForCurrentThread());
assertEquals(1, myCaptureQueriesListener.countInsertQueriesForCurrentThread()); // Add an entry to HFJ_RES_VER assertEquals(1, myCaptureQueriesListener.countInsertQueriesForCurrentThread()); // Add an entry to HFJ_RES_VER