Spotless

hapifhir · Nov 6, 2024 · 3cc1fb7 · 3cc1fb7
1 parent 5484a88
commit 3cc1fb7
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 41 deletions.
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java
@@ -2708,8 +2708,8 @@ private Condition createPredicateSearchParameter(
 					}
 
 				} else {
-					RuntimeSearchParam notEnabledForSearchParam =
-							mySearchParamRegistry.getActiveSearchParam(theResourceName, theParamName, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
+					RuntimeSearchParam notEnabledForSearchParam = mySearchParamRegistry.getActiveSearchParam(
+							theResourceName, theParamName, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
 					if (notEnabledForSearchParam == null) {
 						String msg = myFhirContext
 								.getLocalizer()

diff --git a/...aserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/InstanceReindexServiceImpl.java b/...aserver-base/src/main/java/ca/uhn/fhir/jpa/search/reindex/InstanceReindexServiceImpl.java
@@ -441,7 +441,8 @@ Parameters buildIndexResponse(
 	private void fillInParamNames(
 			ResourceTable theEntity, Collection<SearchParamPresentEntity> theTarget, String theResourceName) {
 		Map<Long, String> hashes = new HashMap<>();
-		ResourceSearchParams searchParams = mySearchParamRegistry.getActiveSearchParams(theResourceName, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
+		ResourceSearchParams searchParams = mySearchParamRegistry.getActiveSearchParams(
+				theResourceName, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
 		for (RuntimeSearchParam next : searchParams.values()) {
 			hashes.put(
 					SearchParamPresentEntity.calculateHashPresence(

diff --git a/...archparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java b/...archparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java
@@ -116,7 +116,9 @@ public SearchParamRegistryImpl() {
 
 	@Override
 	public RuntimeSearchParam getActiveSearchParam(
-		@Nonnull String theResourceName, @Nonnull String theParamName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull String theParamName,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		requiresActiveSearchParams();
 
 		// Can still be null in unit test scenarios
@@ -134,7 +136,8 @@ public RuntimeSearchParam getActiveSearchParam(
 
 	@Nonnull
 	@Override
-	public ResourceSearchParams getActiveSearchParams(@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+	public ResourceSearchParams getActiveSearchParams(
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		requiresActiveSearchParams();
 		return getActiveSearchParams().getSearchParamMap(theResourceName).toFilteredForContext(theContext);
 	}
@@ -148,20 +151,24 @@ private void requiresActiveSearchParams() {
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		return filteredForContext(myJpaSearchParamCache.getActiveComboSearchParams(theResourceName), theContext);
 	}
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull ComboSearchParamType theParamType, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull ComboSearchParamType theParamType,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return filteredForContext(
 				myJpaSearchParamCache.getActiveComboSearchParams(theResourceName, theParamType), theContext);
 	}
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull Set<String> theParamNames, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull Set<String> theParamNames,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return filteredForContext(
 				myJpaSearchParamCache.getActiveComboSearchParams(theResourceName, theParamNames), theContext);
 	}
@@ -173,7 +180,8 @@ public Optional<IndexedSearchParam> getIndexedSearchParamByHashIdentity(Long the
 
 	@Nullable
 	@Override
-	public RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
+	public RuntimeSearchParam getActiveSearchParamByUrl(
+			@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
 		if (myActiveSearchParams != null) {
 			RuntimeSearchParam param = myActiveSearchParams.getByUrl(theUrl);
 			if (isAllowedForContext(param, theContext)) {
@@ -184,7 +192,8 @@ public RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Non
 	}
 
 	@Override
-	public Optional<RuntimeSearchParam> getActiveComboSearchParamById(@Nonnull String theResourceName, @Nonnull IIdType theId) {
+	public Optional<RuntimeSearchParam> getActiveComboSearchParamById(
+			@Nonnull String theResourceName, @Nonnull IIdType theId) {
 		return myJpaSearchParamCache.getActiveComboSearchParamById(theResourceName, theId);
 	}
 

diff --git a/...ir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java b/...ir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/JpaParamUtil.java
@@ -162,7 +162,8 @@ public static List<RuntimeSearchParam> resolveCompositeComponentsDeclaredOrder(
 		List<RuntimeSearchParam.Component> components = theParamDef.getComponents();
 		for (RuntimeSearchParam.Component next : components) {
 			String url = next.getReference();
-			RuntimeSearchParam componentParam = theSearchParamRegistry.getActiveSearchParamByUrl(url, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
+			RuntimeSearchParam componentParam = theSearchParamRegistry.getActiveSearchParamByUrl(
+					url, ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
 			if (componentParam == null) {
 				throw new InternalErrorException(Msg.code(499) + "Can not find SearchParameter: " + url);
 			}

diff --git a/...ription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java b/...ription/src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionLoader.java
@@ -71,7 +71,9 @@ public int doSyncSubscriptionsForUnitTest() {
 	protected SearchParameterMap getSearchParameterMap() {
 		SearchParameterMap map = new SearchParameterMap();
 
-		if (mySearchParamRegistry.getActiveSearchParam("Subscription", "status", ISearchParamRegistry.SearchParamLookupContextEnum.ALL) != null) {
+		if (mySearchParamRegistry.getActiveSearchParam(
+						"Subscription", "status", ISearchParamRegistry.SearchParamLookupContextEnum.ALL)
+				!= null) {
 			map.add(
 					Subscription.SP_STATUS,
 					new TokenOrListParam()

diff --git a/...r-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/topic/SubscriptionTopicLoader.java b/...r-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/topic/SubscriptionTopicLoader.java
@@ -71,7 +71,9 @@ public void registerListener() {
 	protected SearchParameterMap getSearchParameterMap() {
 		SearchParameterMap map = new SearchParameterMap();
 
-		if (mySearchParamRegistry.getActiveSearchParam("SubscriptionTopic", "status", ISearchParamRegistry.SearchParamLookupContextEnum.ALL) != null) {
+		if (mySearchParamRegistry.getActiveSearchParam(
+						"SubscriptionTopic", "status", ISearchParamRegistry.SearchParamLookupContextEnum.ALL)
+				!= null) {
 			map.add(SubscriptionTopic.SP_STATUS, new TokenParam(null, Enumerations.PublicationStatus.ACTIVE.toCode()));
 		}
 		map.setLoadSynchronousUpTo(SubscriptionConstants.MAX_SUBSCRIPTION_RESULTS);

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java
@@ -421,13 +421,15 @@ private String createNamedQueryName(SearchMethodBinding searchMethodBinding) {
 
 	@Override
 	public RuntimeSearchParam getActiveSearchParam(
-		@Nonnull String theResourceName, @Nonnull String theParamName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull String theParamName,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return getActiveSearchParams(theResourceName, theContext).get(theParamName);
 	}
 
 	@Override
 	public ResourceSearchParams getActiveSearchParams(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		Validate.notBlank(theResourceName, "theResourceName must not be null or blank");
 
 		ResourceSearchParams retval = new ResourceSearchParams(theResourceName);
@@ -444,7 +446,8 @@ public ResourceSearchParams getActiveSearchParams(
 
 	@Nullable
 	@Override
-	public RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
+	public RuntimeSearchParam getActiveSearchParamByUrl(
+			@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
 		throw new UnsupportedOperationException(Msg.code(286));
 	}
 

diff --git a/...hir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java b/...hir-server/src/main/java/ca/uhn/fhir/rest/server/util/FhirContextSearchParamRegistry.java
@@ -57,12 +57,15 @@ public void forceRefresh() {
 
 	@Override
 	public RuntimeSearchParam getActiveSearchParam(
-		@Nonnull String theResourceName, @Nonnull String theParamName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull String theParamName,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return getActiveSearchParams(theResourceName, theContext).get(theParamName);
 	}
 
 	@Override
-	public ResourceSearchParams getActiveSearchParams(@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+	public ResourceSearchParams getActiveSearchParams(
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		ResourceSearchParams retval = new ResourceSearchParams(theResourceName);
 		RuntimeResourceDefinition nextResDef = myCtx.getResourceDefinition(theResourceName);
 		for (RuntimeSearchParam nextSp : nextResDef.getSearchParams()) {
@@ -86,13 +89,16 @@ public void addSearchParam(RuntimeSearchParam theSearchParam) {
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull Set<String> theParamNames, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull Set<String> theParamNames,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		throw new UnsupportedOperationException(Msg.code(2066));
 	}
 
 	@Nullable
 	@Override
-	public RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
+	public RuntimeSearchParam getActiveSearchParamByUrl(
+			@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext) {
 		// simple implementation for test support
 		return myCtx.getResourceTypes().stream()
 				.flatMap(type -> getActiveSearchParams(type, theContext).values().stream())
@@ -103,18 +109,21 @@ public RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Non
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		throw new UnsupportedOperationException(Msg.code(2068));
 	}
 
 	@Override
 	public List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull ComboSearchParamType theParamType, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull ComboSearchParamType theParamType,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		throw new UnsupportedOperationException(Msg.code(2209));
 	}
 
 	@Override
-	public Optional<RuntimeSearchParam> getActiveComboSearchParamById(@Nonnull String theResourceName, @Nonnull IIdType theId) {
+	public Optional<RuntimeSearchParam> getActiveComboSearchParamById(
+			@Nonnull String theResourceName, @Nonnull IIdType theId) {
 		throw new UnsupportedOperationException(Msg.code(2211));
 	}
 

diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java
@@ -54,8 +54,7 @@ default boolean isInitialized() {
 	 * @deprecated Use {@link #getActiveSearchParam(String, String, SearchParamLookupContextEnum)}
 	 */
 	@Deprecated(since = "8.0.0", forRemoval = true)
-	default RuntimeSearchParam getActiveSearchParam(
-		String theResourceName, String theParamName) {
+	default RuntimeSearchParam getActiveSearchParam(String theResourceName, String theParamName) {
 		return getActiveSearchParam(theResourceName, theParamName, SearchParamLookupContextEnum.ALL);
 	}
 
@@ -64,14 +63,15 @@ default RuntimeSearchParam getActiveSearchParam(
 	 * @return Returns {@literal null} if no match
 	 */
 	RuntimeSearchParam getActiveSearchParam(
-		@Nonnull String theResourceName, @Nonnull String theParamName, @Nonnull SearchParamLookupContextEnum theContext);
+			@Nonnull String theResourceName,
+			@Nonnull String theParamName,
+			@Nonnull SearchParamLookupContextEnum theContext);
 
 	/**
 	 * @deprecated Use {@link #getActiveSearchParam(String, String, SearchParamLookupContextEnum)}
 	 */
 	@Deprecated(since = "8.0.0", forRemoval = true)
-	default ResourceSearchParams getActiveSearchParams(
-			String theResourceName) {
+	default ResourceSearchParams getActiveSearchParams(String theResourceName) {
 		return getActiveSearchParams(theResourceName, SearchParamLookupContextEnum.ALL);
 	}
 
@@ -80,7 +80,7 @@ default ResourceSearchParams getActiveSearchParams(
 	 * @return Returns all active search params for the given resource
 	 */
 	ResourceSearchParams getActiveSearchParams(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext);
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext);
 
 	/**
 	 * Request that the cache be refreshed now, in the current thread
@@ -104,26 +104,31 @@ default void setPhoneticEncoder(IPhoneticEncoder thePhoneticEncoder) {}
 	 * @param theContext The context to return active search params for, or {@literal null} to return any active search params
 	 */
 	default List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		return Collections.emptyList();
 	}
 
 	// TODO ND remove default implementation
 	default List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull ComboSearchParamType theParamType, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull ComboSearchParamType theParamType,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return Collections.emptyList();
 	}
 
 	// TODO ND remove default implementation
-	default Optional<RuntimeSearchParam> getActiveComboSearchParamById(@Nonnull String theResourceName, @Nonnull IIdType theId) {
+	default Optional<RuntimeSearchParam> getActiveComboSearchParamById(
+			@Nonnull String theResourceName, @Nonnull IIdType theId) {
 		return Optional.empty();
 	}
 
 	/**
 	 * @param theContext The context to return active search params for, or {@literal null} to return any active search params
 	 */
 	default List<RuntimeSearchParam> getActiveComboSearchParams(
-		@Nonnull String theResourceName, @Nonnull Set<String> theParamNames, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName,
+			@Nonnull Set<String> theParamNames,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		return Collections.emptyList();
 	}
 
@@ -135,7 +140,7 @@ default List<RuntimeSearchParam> getActiveComboSearchParams(
 	 * @param theContext The context to return active search params for, or {@literal null} to return any active search params
 	 */
 	default Collection<String> getValidSearchParameterNamesIncludingMeta(
-		@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceName, @Nonnull SearchParamLookupContextEnum theContext) {
 		TreeSet<String> retval;
 		ResourceSearchParams activeSearchParams = getActiveSearchParams(theResourceName, theContext);
 		if (activeSearchParams == null) {
@@ -155,7 +160,8 @@ default Collection<String> getValidSearchParameterNamesIncludingMeta(
 	 * @return Returns <code>null</code> if it can't be found
 	 */
 	@Nullable
-	RuntimeSearchParam getActiveSearchParamByUrl(@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext);
+	RuntimeSearchParam getActiveSearchParamByUrl(
+			@Nonnull String theUrl, @Nonnull SearchParamLookupContextEnum theContext);
 
 	/**
 	 * Find a search param for a resource. First, check the resource itself, then check the top-level `Resource` resource.
@@ -166,7 +172,9 @@ default Collection<String> getValidSearchParameterNamesIncludingMeta(
 	 * @return the {@link RuntimeSearchParam} that is found.
 	 */
 	default RuntimeSearchParam getRuntimeSearchParam(
-		@Nonnull String theResourceType, @Nonnull String theParamName, @Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceType,
+			@Nonnull String theParamName,
+			@Nonnull SearchParamLookupContextEnum theContext) {
 		RuntimeSearchParam availableSearchParamDef = getActiveSearchParam(theResourceType, theParamName, theContext);
 		if (availableSearchParamDef == null) {
 			availableSearchParamDef = getActiveSearchParam("Resource", theParamName, theContext);
@@ -186,7 +194,7 @@ default RuntimeSearchParam getRuntimeSearchParam(
 	 * @return the {@link ResourceSearchParams} that has all the search params.
 	 */
 	default ResourceSearchParams getRuntimeSearchParams(
-		@Nonnull String theResourceType,@Nonnull SearchParamLookupContextEnum theContext) {
+			@Nonnull String theResourceType, @Nonnull SearchParamLookupContextEnum theContext) {
 		ResourceSearchParams availableSearchParams =
 				getActiveSearchParams(theResourceType, theContext).makeCopy();
 		ResourceSearchParams resourceSearchParams = getActiveSearchParams("Resource", theContext);

diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java
@@ -530,7 +530,9 @@ public void translateRawParameters(Map<String, List<String>> theSource, SearchPa
 				Collection<String> validNames = mySearchParamRegistry.getValidSearchParameterNamesIncludingMeta(
 						getResourceName(), ISearchParamRegistry.SearchParamLookupContextEnum.SEARCH);
 				RuntimeSearchParam notEnabledForSearchParam = mySearchParamRegistry.getActiveSearchParam(
-						getResourceName(), qualifiedParamName.getParamName(), ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
+						getResourceName(),
+						qualifiedParamName.getParamName(),
+						ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
 				if (notEnabledForSearchParam != null) {
 					String msg = getContext()
 							.getLocalizer()

diff --git a/...hir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java b/...hir-storage/src/main/java/ca/uhn/fhir/jpa/dao/validation/SearchParameterDaoValidator.java
@@ -73,8 +73,8 @@ public void validate(SearchParameter searchParameter) {
 		if (myStorageSettings.isDefaultSearchParamsCanBeOverridden() == false) {
 			for (IPrimitiveType<?> nextBaseType : searchParameter.getBase()) {
 				String nextBase = nextBaseType.getValueAsString();
-				RuntimeSearchParam existingSearchParam =
-						mySearchParamRegistry.getActiveSearchParam(nextBase, searchParameter.getCode(), ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
+				RuntimeSearchParam existingSearchParam = mySearchParamRegistry.getActiveSearchParam(
+						nextBase, searchParameter.getCode(), ISearchParamRegistry.SearchParamLookupContextEnum.ALL);
 				if (existingSearchParam != null) {
 					boolean isBuiltIn = existingSearchParam.getId() == null;
 					isBuiltIn |= existingSearchParam.getUri().startsWith("http://hl7.org/fhir/SearchParameter/");
@@ -221,7 +221,8 @@ private void validateCompositeSearchParameterComponents(SearchParameter theSearc
 				.filter(SearchParameter.SearchParameterComponentComponent::hasDefinition)
 				.map(SearchParameter.SearchParameterComponentComponent::getDefinition)
 				.filter(Objects::nonNull)
-				.map((String url) -> mySearchParamRegistry.getActiveSearchParamByUrl(url, ISearchParamRegistry.SearchParamLookupContextEnum.ALL))
+				.map((String url) -> mySearchParamRegistry.getActiveSearchParamByUrl(
+						url, ISearchParamRegistry.SearchParamLookupContextEnum.ALL))
 				.filter(Objects::nonNull)
 				.forEach(theRuntimeSp -> validateComponentSpTypeAgainstWhiteList(
 						theRuntimeSp, getAllowedSearchParameterTypes(theSearchParameter)));