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

fix test

This commit is contained in:
Ken Stevens 2020-01-24 09:27:20 -05:00
parent b465a7b781
commit 39c7642d8c
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
View File

@ -319,20 +319,6 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
return extractSearchParams(theResource, extractor, RestSearchParameterTypeEnum.URI);
}
// @Override
// public SearchParamSet<ResourceIndexedSearchParamCoords> extractSearchParamCoords(IBaseResource theResource) {
// IExtractor<ResourceIndexedSearchParamCoords> extractor = (params, searchParam, value, path) -> {
// if (value.getClass().equals(myLocationPositionDefinition.getImplementingClass())) {
// String resourceType = toRootTypeName(theResource);
// addCoords_Position(resourceType, params, searchParam, value);
// } else {
// addUnexpectedDatatypeWarning(params, searchParam, value);
// }
// };
//
// return extractSearchParams(theResource, extractor, RestSearchParameterTypeEnum.TOKEN);
// }
@Override
public SearchParamSet<ResourceIndexedSearchParamDate> extractSearchParamDates(IBaseResource theResource) {
IExtractor<ResourceIndexedSearchParamDate> extractor = (params, searchParam, value, path) -> {
@ -396,6 +382,10 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
public SearchParamSet<ResourceIndexedSearchParamQuantity> extractSearchParamQuantity(IBaseResource theResource) {
IExtractor<ResourceIndexedSearchParamQuantity> extractor = (params, searchParam, value, path) -> {
if (value.getClass().equals(myLocationPositionDefinition.getImplementingClass())) {
return;
}
String nextType = toRootTypeName(value);
String resourceType = toRootTypeName(theResource);
switch (nextType) {

2
hapi-fhir-jpaserver-searchparam/src/test/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorMegaTest.java
View File

@ -191,7 +191,7 @@ public class SearchParamExtractorMegaTest {
theIndexesCounter.addAndGet(set.size());
set = theExtractor.extractSearchParamQuantity(resource);
assertEquals(0, set.getWarnings().size());
assertEquals(String.join("\n", set.getWarnings()), 0, set.getWarnings().size());
theIndexesCounter.addAndGet(set.size());
set = theExtractor.extractSearchParamTokens(resource);