Add a bit of logging for search parameters when they can't be found

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java

@@ -73,14 +73,17 @@ public abstract class BaseConfig implements SchedulingConfigurer {
 	@Autowired
 	protected Environment myEnv;
 
-	@Autowired
-	protected DaoRegistry myDaoRegistry;
 
 	@Override
 	public void configureTasks(@Nonnull ScheduledTaskRegistrar theTaskRegistrar) {
 		theTaskRegistrar.setTaskScheduler(taskScheduler());
 	}
 
+	@Bean("myDaoRegistry")
+	public DaoRegistry daoRegistry() {
+		return new DaoRegistry();
+	}
+
 	@Bean(autowire = Autowire.BY_TYPE)
 	public DatabaseBackedPagingProvider databaseBackedPagingProvider() {
 		return new DatabaseBackedPagingProvider();
@@ -182,7 +185,7 @@ public abstract class BaseConfig implements SchedulingConfigurer {
 	 * Subclasses may override
 	 */
 	protected boolean isSupported(String theResourceType) {
-		return myDaoRegistry.getResourceDao(theResourceType) != null;
+		return daoRegistry().getResourceDao(theResourceType) != null;
 	}
 
 	public static void configureEntityManagerFactory(LocalContainerEntityManagerFactoryBean theFactory, FhirContext theCtx) {

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

@@ -35,13 +35,20 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Component("myDaoRegistry")
 public class DaoRegistry implements ApplicationContextAware {
 	private ApplicationContext myAppCtx;
 
 	@Autowired
 	private FhirContext myContext;
 
+	/**
+	 * Constructor
+	 */
+	public DaoRegistry() {
+		super();
+	}
+
+
 	private volatile Map<String, IFhirResourceDao<?>> myResourceNameToResourceDao;
 	private volatile IFhirSystemDao<?, ?> mySystemDao;
 	private Set<String> mySupportedResourceTypes;

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

@@ -1027,6 +1027,7 @@ public class FhirResourceDaoR4UniqueSearchParamTest extends BaseJpaR4Test {
 	}
 
 
+
 	@Test
 	public void testUniqueValuesAreIndexed_DateAndToken() {
 		createUniqueBirthdateAndGenderSps();

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/BaseSearchParamRegistry.java

@@ -24,6 +24,9 @@ import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.context.RuntimeSearchParam;
 import ca.uhn.fhir.jpa.model.entity.ModelConfig;
+import ca.uhn.fhir.jpa.model.interceptor.api.IInterceptorBroadcaster;
+import ca.uhn.fhir.jpa.model.interceptor.api.Pointcut;
+import ca.uhn.fhir.jpa.model.search.PerformanceMessage;
 import ca.uhn.fhir.jpa.searchparam.JpaRuntimeSearchParam;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.searchparam.retry.Retrier;
@@ -41,6 +44,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
@@ -63,6 +67,9 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 	private volatile Map<String, Map<String, RuntimeSearchParam>> myActiveSearchParams;
 	private volatile long myLastRefresh;
 
+	@Autowired
+	private IInterceptorBroadcaster myInterceptorBroadcaster;
+
 	@Override
 	public RuntimeSearchParam getActiveSearchParam(String theResourceName, String theParamName) {
 
@@ -121,6 +128,7 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 	}
 
 	private void populateActiveSearchParams(Map<String, Map<String, RuntimeSearchParam>> theActiveSearchParams) {
+
 		Map<String, List<JpaRuntimeSearchParam>> activeUniqueSearchParams = new HashMap<>();
 		Map<String, Map<Set<String>, List<JpaRuntimeSearchParam>>> activeParamNamesToUniqueSearchParams = new HashMap<>();
 
@@ -133,8 +141,13 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 		for (Map.Entry<String, Map<String, RuntimeSearchParam>> nextResourceNameToEntries : theActiveSearchParams.entrySet()) {
 			List<JpaRuntimeSearchParam> uniqueSearchParams = activeUniqueSearchParams.computeIfAbsent(nextResourceNameToEntries.getKey(), k -> new ArrayList<>());
 			Collection<RuntimeSearchParam> nextSearchParamsForResourceName = nextResourceNameToEntries.getValue().values();
+
+			ourLog.trace("Resource {} has {} params", nextResourceNameToEntries.getKey(), nextResourceNameToEntries.getValue().size());
+
 			for (RuntimeSearchParam nextCandidate : nextSearchParamsForResourceName) {
 
+				ourLog.trace("Resource {} has parameter {} with ID {}", nextResourceNameToEntries.getKey(), nextCandidate.getName(), nextCandidate.getId());
+
 				if (nextCandidate.getId() != null) {
 					idToRuntimeSearchParam.put(nextCandidate.getId().toUnqualifiedVersionless().getValue(), nextCandidate);
 				}
@@ -150,6 +163,8 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 
 		}
 
+		ourLog.trace("Have {} search params loaded", idToRuntimeSearchParam.size());
+
 		Set<String> haveSeen = new HashSet<>();
 		for (JpaRuntimeSearchParam next : jpaSearchParams) {
 			if (!haveSeen.add(next.getId().toUnqualifiedVersionless().getValue())) {
@@ -164,7 +179,14 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 					next.getCompositeOf().add(componentTarget);
 					paramNames.add(componentTarget.getName());
 				} else {
-					ourLog.warn("Search parameter {} refers to unknown component {}", next.getId().toUnqualifiedVersionless().getValue(), nextRef);
+					String existingParams = idToRuntimeSearchParam
+						.keySet()
+						.stream()
+						.sorted()
+						.collect(Collectors.joining(", "));
+					String message = "Search parameter " + next.getId().toUnqualifiedVersionless().getValue() + " refers to unknown component " + nextRef + ", ignoring this parameter (valid values: " + existingParams + ")";
+					ourLog.warn(message);
+					myInterceptorBroadcaster.callHooks(Pointcut.PERFTRACE_MESSAGE, new PerformanceMessage().setMessage(message));
 				}
 			}
 
@@ -182,6 +204,8 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 			}
 		}
 
+		ourLog.trace("Have {} unique search params", activeParamNamesToUniqueSearchParams.size());
+
 		myActiveUniqueSearchParams = activeUniqueSearchParams;
 		myActiveParamNamesToUniqueSearchParams = activeParamNamesToUniqueSearchParams;
 	}
@@ -225,12 +249,15 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 			IBundleProvider allSearchParamsBp = mySearchParamProvider.search(params);
 			int size = allSearchParamsBp.size();
 
+			ourLog.trace("Loaded {} search params from the DB", size);
+
 			// Just in case..
 			if (size >= MAX_MANAGED_PARAM_COUNT) {
 				ourLog.warn("Unable to support >" + MAX_MANAGED_PARAM_COUNT + " search params!");
 				size = MAX_MANAGED_PARAM_COUNT;
 			}
 
+			int overriddenCount = 0;
 			List<IBaseResource> allSearchParams = allSearchParamsBp.getResources(0, size);
 			for (IBaseResource nextResource : allSearchParams) {
 				SP nextSp = (SP) nextResource;
@@ -252,11 +279,14 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 					String name = runtimeSp.getName();
 					if (myModelConfig.isDefaultSearchParamsCanBeOverridden() || !searchParamMap.containsKey(name)) {
 						searchParamMap.put(name, runtimeSp);
+						overriddenCount++;
 					}
 
 				}
 			}
 
+			ourLog.trace("Have overridden {} built-in search parameters", overriddenCount);
+
 			Map<String, Map<String, RuntimeSearchParam>> activeSearchParams = new HashMap<>();
 			for (Map.Entry<String, Map<String, RuntimeSearchParam>> nextEntry : searchParams.entrySet()) {
 				for (RuntimeSearchParam nextSp : nextEntry.getValue().values()) {
@@ -323,7 +353,7 @@ public abstract class BaseSearchParamRegistry<SP extends IBaseResource> implemen
 
 	int refreshCacheWithRetry() {
 		Retrier<Integer> refreshCacheRetrier = new Retrier(() -> {
-			synchronized(BaseSearchParamRegistry.this) {
+			synchronized (BaseSearchParamRegistry.this) {
 				return mySearchParamProvider.refreshCache(this, REFRESH_INTERVAL);
 			}
 		}, MAX_RETRIES);