refactor to try and handle duplicated search parameter

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -419,6 +419,17 @@ class ModelScanner {
 					throw new ConfigurationException(Msg.code(1721) + "Search param " + searchParam.name()
 							+ " has an invalid type: " + searchParam.type());
 				}
+				/*
+				 * This is a HACK!
+				 * tinder generator jpa_resource_provider.vm already has _lastUpdated
+				 * manually added, so we're just going to manually skip this value
+				 * so we don't corrupt the PatientResourceProvider.java.
+				 *
+				 */
+				if (searchParam.name().equalsIgnoreCase("_lastUpdated")) {
+					continue;
+				}
+
 				Set<String> providesMembershipInCompartments;
 				providesMembershipInCompartments = new HashSet<>();
 				for (Compartment next : searchParam.providesMembershipIn()) {

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6208-searches-on-last-update-can-sometimes-produce-errors.yaml

@@ -1,8 +1,11 @@
 ---
 type: fix
 issue: 6208
-title: "Searching for resources by adding a parameter of `_lastUpdated` to the parameter
+title: "Tinder generated ResourceProvider files were pulling in a duplicate `_lastUpdated` value.
-        map (but not using the `_lastUpdated` special use-case parameter) while using
+        This results in a broken signature for the providers, and a broken search.
-        full text search could sometimes produce null pointers.
+        As a workaround, we will skip search parameters named `_lastUpdated` because
-        This has been fixed.
+        these are already manually added to the search parameter map in jpa_resource_provider.vm.
+
+        THIS IS ONLY TO FIX A REGRESSION FOR RELEASE!
+        A REAL FIX IS FORTHCOMING IN A FUTHRE VERSION.
 "

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/ExtendedHSearchSearchBuilder.java

@@ -270,10 +270,10 @@ public class ExtendedHSearchSearchBuilder {
 					break;
 
 				case DATE:
-					List<List<IQueryParameterType>> dateAndOrTerms =
+					boolean isLastUpdate = nextParam.equalsIgnoreCase("_lastupdated");
-							nextParam.equalsIgnoreCase("_lastupdated") && searchParameterMap.getLastUpdated() != null
+					List<List<IQueryParameterType>> dateAndOrTerms = isLastUpdate && searchParameterMap.getLastUpdated() != null
-									? getLastUpdatedAndOrList(searchParameterMap)
+							? getLastUpdatedAndOrList(searchParameterMap)
-									: searchParameterMap.removeByNameUnmodified(nextParam);
+							: searchParameterMap.removeByNameUnmodified(nextParam);
 					theBuilder.addDateUnmodifiedSearch(nextParam, dateAndOrTerms);
 					break;
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchStrategyFactory.java

@@ -59,11 +59,11 @@ public class SearchStrategyFactory {
 	public boolean isSupportsHSearchDirect(
 			String theResourceType, SearchParameterMap theParams, RequestDetails theRequestDetails) {
 		return myFulltextSearchSvc != null
-			&& myStorageSettings.isStoreResourceInHSearchIndex()
+				&& myStorageSettings.isStoreResourceInHSearchIndex()
-			&& myStorageSettings.isAdvancedHSearchIndexing()
+				&& myStorageSettings.isAdvancedHSearchIndexing()
-			&& myFulltextSearchSvc.supportsAllOf(theParams)
+				&& myFulltextSearchSvc.supportsAllOf(theParams)
-			&& theParams.getSummaryMode() == null
+				&& theParams.getSummaryMode() == null
-			&& theParams.getSearchTotalMode() == null;
+				&& theParams.getSearchTotalMode() == null;
 	}
 
 	public ISearchStrategy makeDirectStrategy(

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4SearchFtTest.java

@@ -7,9 +7,6 @@ import ca.uhn.fhir.jpa.search.autocomplete.ValueSetAutocompleteOptions;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
 import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.rest.api.server.IBundleProvider;
-import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
-import ca.uhn.fhir.rest.param.DateParam;
 import ca.uhn.fhir.rest.param.QuantityParam;
 import ca.uhn.fhir.rest.param.StringAndListParam;
 import ca.uhn.fhir.rest.param.StringOrListParam;
@@ -20,7 +17,6 @@ import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
 import jakarta.servlet.http.HttpServletRequest;
 import org.assertj.core.api.AssertionsForInterfaceTypes;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.r4.model.DateType;
 import org.hl7.fhir.r4.model.Device;
 import org.hl7.fhir.r4.model.Observation;
 import org.hl7.fhir.r4.model.Observation.ObservationStatus;
@@ -31,12 +27,10 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hl7.fhir.r4.model.Observation.SP_VALUE_QUANTITY;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 
@@ -506,38 +500,6 @@ public class FhirResourceDaoR4SearchFtTest extends BaseJpaR4Test {
 		}
 	}
 
-	@Test
-	public void testSearchByUrl() {
-		// setup
-		DateType dt = new DateType(new Date());
-		String nowStr = dt.getValueAsString();
-
-		SearchParameterMap map = new SearchParameterMap();
-		map.setLoadSynchronous(true);
-		// we are explicitly not setting the _lastUpdated parameter
-		// but using a _lastUpdated parameter key
-		map.add("_lastUpdated", new DateParam(nowStr));
-
-		boolean storeResourceInHSearch = myStorageSettings.isStoreResourceInHSearchIndex();
-		boolean advancedHSearch = myStorageSettings.isAdvancedHSearchIndexing();
-
-		try {
-			// use full text search
-			myStorageSettings.setStoreResourceInHSearchIndex(true);
-			myStorageSettings.setAdvancedHSearchIndexing(true);
-
-			// test
-			IBundleProvider result = myPatientDao.search(map, new SystemRequestDetails());
-
-			// we just expect something - ie, no errors
-			assertNotNull(result);
-		} finally {
-			// reset back to previous
-			myStorageSettings.setAdvancedHSearchIndexing(advancedHSearch);
-			myStorageSettings.setStoreResourceInHSearchIndex(storeResourceInHSearch);
-		}
-	}
-
 	@Test
 	public void testResourceQuantitySearch() {
 		Observation obs1 = new Observation();

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java

@@ -29,6 +29,7 @@ import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.model.primitive.UriDt;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.parser.StrictErrorHandler;
+import ca.uhn.fhir.rest.api.CacheControlDirective;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.PreferReturnEnum;
@@ -1112,6 +1113,35 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 
 	}
 
+	@Test
+	public void testSearchByUrl() {
+		// setup
+		DateType dt = new DateType(new Date());
+		String nowStr = dt.getValueAsString();
+
+		boolean storeResourceInHSearch = myStorageSettings.isStoreResourceInHSearchIndex();
+		boolean advancedHSearch = myStorageSettings.isAdvancedHSearchIndexing();
+
+		try {
+			// use full text search
+			myStorageSettings.setStoreResourceInHSearchIndex(true);
+			myStorageSettings.setAdvancedHSearchIndexing(true);
+
+			// test
+			Bundle b = myClient.search()
+				.byUrl("Patient?_lastUpdated=" + nowStr)
+				.returnBundle(Bundle.class)
+				.cacheControl(CacheControlDirective.noCache())
+					.execute();
+
+			assertNotNull(b);
+		} finally {
+			// reset back to previous
+			myStorageSettings.setAdvancedHSearchIndexing(advancedHSearch);
+			myStorageSettings.setStoreResourceInHSearchIndex(storeResourceInHSearch);
+		}
+	}
+
 	@Test
 	public void testCreateConditionalWithPreferRepresentation() {
 		Patient p = new Patient();

hapi-tinder-plugin/src/main/resources/vm/jpa_resource_provider.vm

@@ -167,6 +167,8 @@ public class ${className}ResourceProvider extends
 #if ( $version != 'dstu' )
 			paramMap.setRevIncludes(theRevIncludes);
 			paramMap.setLastUpdated(theLastUpdated);
+			// we will add this manually here because ModelScanner ignores it
+			paramMap.add(ca.uhn.fhir.rest.api.Constants.PARAM_LASTUPDATED, theLastUpdated);
 #end
 			paramMap.setIncludes(theIncludes);
 			paramMap.setSort(theSort);