Bump HAPI FHIR Core to 6.5.17 (#6769)

* Bumping Core to 6.5.11

* Bumped version of core to 6.5.13, fixed label of message

Signed-off-by: Michele Adduci <[email protected]>

* Fixing parser for contained resources

* Fixed all the structure tests

* Fixed R4 Tests

* Bumped core to 6.5.15

* Fixed DSTU3 validation issue with update

* Fixed expected text from test

* Bump to 6.5.17

* Corrected expected error message for Slice R4 Tests

* Corrected expected error message for R4 JPA

---------

Signed-off-by: Michele Adduci <[email protected]>

Author: madduci

hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/executor/InterceptorService.java

@@ -39,16 +39,17 @@ public class InterceptorService extends BaseInterceptorService<Pointcut>
 	 * Constructor which uses a default name of "default"
 	 */
 	public InterceptorService() {
-		this("default");
+		super(Pointcut.class);
 	}
 
 	/**
 	 * Constructor
 	 *
 	 * @param theName The name for this registry (useful for troubleshooting)
 	 */
+	@Deprecated(since = "8.0.0", forRemoval = true)
 	public InterceptorService(String theName) {
-		super(Pointcut.class, theName);
+		super(Pointcut.class);
 	}
 
 	@Override

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java

@@ -399,7 +399,7 @@ public void wereBack() {
 				myErrorHandler.containedResourceWithNoId(null);
 			} else {
 				if (!res.getId().isLocal()) {
-					res.setId(new IdDt('#' + res.getId().getIdPart()));
+					res.setId(new IdDt(res.getId().getIdPart()));
 				}
 				getPreResourceState().getContainedResources().put(res.getId().getValueAsString(), res);
 			}
@@ -439,7 +439,7 @@ public void wereBack() {
 				// need an ID to be referred to)
 				myErrorHandler.containedResourceWithNoId(null);
 			} else {
-				res.getIdElement().setValue('#' + res.getIdElement().getIdPart());
+				res.getIdElement().setValue(res.getIdElement().getIdPart());
 				getPreResourceState()
 						.getContainedResources()
 						.put(res.getIdElement().getValue(), res);
@@ -1238,7 +1238,8 @@ void weaveContainedResources() {
 				String ref = nextRef.getReferenceElement().getValue();
 				if (isNotBlank(ref)) {
 					if (ref.startsWith("#") && ref.length() > 1) {
-						IBaseResource target = myContainedResources.get(ref);
+						String refId = ref.substring(1);
+						IBaseResource target = myContainedResources.get(refId);
 						if (target != null) {
 							ourLog.debug("Resource contains local ref {}", ref);
 							nextRef.setResource(target);
@@ -1285,13 +1286,11 @@ public void wereBack() {
 			super.wereBack();
 
 			IResource nextResource = (IResource) getCurrentElement();
+			// for DSTU2, we cannot use directly "nextResource.getId().getVersionIdPart();"
 			String version = ResourceMetadataKeyEnum.VERSION.get(nextResource);
 			String resourceName = myContext.getResourceType(nextResource);
 			String bundleIdPart = nextResource.getId().getIdPart();
 			if (isNotBlank(bundleIdPart)) {
-				// if (isNotBlank(entryBaseUrl)) {
-				// nextResource.setId(new IdDt(entryBaseUrl, resourceName, bundleIdPart, version));
-				// } else {
 				IdDt previousId = nextResource.getId();
 				nextResource.setId(new IdDt(null, resourceName, bundleIdPart, version));
 				// Copy extensions
@@ -1300,7 +1299,6 @@ public void wereBack() {
 						nextResource.getId().addUndeclaredExtension(ext);
 					}
 				}
-				// }
 			}
 		}
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IGenericClient.java

@@ -62,6 +62,7 @@ public interface IGenericClient extends IRestfulClient {
 	 *
 	 * @deprecated As of HAPI 3.0.0 this method has been deprecated, as the operation is now called "capabilities". Use {@link #capabilities()} instead
 	 */
+	@Deprecated(since = "3.0.0", forRemoval = true)
 	IFetchConformanceUntyped fetchConformance();
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ParametersUtil.java

@@ -52,10 +52,12 @@
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 /**
- * Utilities for dealing with parameters resources in a version indepenedent way
+ * Utilities for dealing with parameters resources in a version independent way
  */
 public class ParametersUtil {
 
+	private ParametersUtil() {}
+
 	public static Optional<String> getNamedParameterValueAsString(
 			FhirContext theCtx, IBaseParameters theParameters, String theParameterName) {
 		Function<IPrimitiveType<?>, String> mapper = t -> defaultIfBlank(t.getValueAsString(), null);
@@ -323,7 +325,7 @@ public static IBaseParameters newInstance(FhirContext theContext) {
 	@SuppressWarnings("unchecked")
 	public static void addParameterToParametersBoolean(
 			FhirContext theCtx, IBaseParameters theParameters, String theName, boolean theValue) {
-		addParameterToParameters(theCtx, theParameters, theName, theCtx.getPrimitiveBoolean(theValue));
+		addParameterToParameters(theCtx, theParameters, theName, theCtx.newPrimitiveBoolean(theValue));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -429,7 +431,7 @@ public static void addPartUrl(FhirContext theContext, IBase theParameter, String
 	}
 
 	public static void addPartBoolean(FhirContext theContext, IBase theParameter, String theName, Boolean theValue) {
-		addPart(theContext, theParameter, theName, theContext.getPrimitiveBoolean(theValue));
+		addPart(theContext, theParameter, theName, theContext.newPrimitiveBoolean(theValue));
 	}
 
 	public static void addPartDecimal(FhirContext theContext, IBase theParameter, String theName, Double theValue) {

hapi-fhir-base/src/main/resources/ca/uhn/fhir/context/support/HapiFhirStorageResponseCode.json

@@ -56,5 +56,8 @@
   }, {
     "code": "SUCCESSFUL_CONDITIONAL_PATCH_NO_CHANGE",
     "display": "Conditional patch succeeded: No changes were detected so no action was taken."
+  }, {
+    "code": "AUTOMATICALLY_CREATED_PLACEHOLDER_RESOURCE",
+    "display": "Automatically created placeholder resource."
   } ]
 }

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_2_0/6769-upgraded-core-library.yaml

@@ -0,0 +1,5 @@
+---
+type: change
+issue: 6769
+title: "The org.hl7.fhir.core has been updated to the 6.5.15 version. This new version includes
+  a number of bug fixes and improvements, plus some changes in the API of the validators."

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

@@ -464,7 +464,7 @@ public HapiTransactionService hapiTransactionService() {
 
 	@Bean
 	public IInterceptorService jpaInterceptorService() {
-		return new InterceptorService("JPA");
+		return new InterceptorService();
 	}
 
 	@Bean

hapi-fhir-jpaserver-hfql/src/test/java/ca/uhn/fhir/jpa/fql/executor/HfqlExecutorTest.java

@@ -198,7 +198,7 @@ select foo()
 		IHfqlExecutionResult result = myHfqlExecutor.executeInitialSearch(statement, null, mySrd);
 		IHfqlExecutionResult.Row row = result.getNextRow();
 		assertEquals(IHfqlExecutionResult.ROW_OFFSET_ERROR, row.getRowOffset());
-		assertEquals("Failed to evaluate FHIRPath expression \"foo()\". Error: HAPI-2404: Error in ?? at 1, 1: The name foo is not a valid function name", row.getRowValues().get(0));
+		assertEquals("Failed to evaluate FHIRPath expression \"foo()\". Error: HAPI-2404: Error @1, 1: The name foo is not a valid function name", row.getRowValues().get(0));
 		assertFalse(result.hasNext());
 	}
 

hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/StorageSettings.java

@@ -1144,7 +1144,7 @@ public boolean isAutoSupportDefaultSearchParams() {
 	/**
 	 * If this is disabled by setting this to {@literal false} (default is {@literal true}),
 	 * the server will not automatically implement and support search parameters that
-	 * are not explcitly created in the repository.
+	 * are not explicitly created in the repository.
 	 * <p>
 	 * Disabling this can have a dramatic improvement on performance (especially write performance)
 	 * in servers that only need to support a small number of search parameters, or no search parameters at all.
@@ -1158,15 +1158,15 @@ public void setAutoSupportDefaultSearchParams(boolean theAutoSupportDefaultSearc
 	}
 
 	/**
-	 * @return Should the {@literal _lamguage} SearchParameter be supported on this server? Defaults to {@literal false}.
+	 * @return Should the {@literal _language} SearchParameter be supported on this server? Defaults to {@literal false}.
 	 * @since 7.0.0
 	 */
 	public boolean isLanguageSearchParameterEnabled() {
 		return myLanguageSearchParameterEnabled;
 	}
 
 	/**
-	 * Should the {@literal _lamguage} SearchParameter be supported on this server? Defaults to {@literal false}.
+	 * Should the {@literal _language} SearchParameter be supported on this server? Defaults to {@literal false}.
 	 *
 	 * @since 7.0.0
 	 */

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java

@@ -208,5 +208,10 @@ public boolean conformsToProfile(FHIRPathEngine engine, Object appContext, Base
 		public ValueSet resolveValueSet(FHIRPathEngine engine, Object appContext, String url) {
 			return null;
 		}
+
+		@Override
+		public boolean paramIsType(String name, int index) {
+			return false;
+		}
 	}
 }