fixes for support of R4B / 6.2.0 (#455)

src/main/java/ca/uhn/fhir/jpa/starter/annotations/OnEitherVersion.java

@@ -28,6 +28,10 @@ public class OnEitherVersion extends AnyNestedCondition {
   static class OnR4 {
   }
 
+	@Conditional(OnR4BCondition.class)
+	static class OnR4B {
+	}
+
   @Conditional(OnR5Condition.class)
   static class OnR5 {
   }

src/main/java/ca/uhn/fhir/jpa/starter/annotations/OnR4BCondition.java

@@ -0,0 +1,18 @@
+package ca.uhn.fhir.jpa.starter.annotations;
+
+import ca.uhn.fhir.context.FhirVersionEnum;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class OnR4BCondition implements Condition {
+	@Override
+	public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata metadata) {
+		String version = conditionContext.
+			getEnvironment()
+			.getProperty("hapi.fhir.fhir_version")
+			.toUpperCase();
+
+		return FhirVersionEnum.R4B.name().equals(version);
+	}
+}

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigR4B.java

@@ -0,0 +1,17 @@
+package ca.uhn.fhir.jpa.starter.common;
+
+import ca.uhn.fhir.jpa.config.r4b.JpaR4BConfig;
+import ca.uhn.fhir.jpa.starter.annotations.OnR4BCondition;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@Conditional(OnR4BCondition.class)
+@Import({
+	JpaR4BConfig.class,
+	StarterJpaConfig.class,
+	ElasticsearchConfig.class
+})
+public class FhirServerConfigR4B {
+}

src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java

@@ -26,7 +26,6 @@ import ca.uhn.fhir.jpa.dao.IFulltextSearchSvc;
 import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDaoJpaImpl;
 import ca.uhn.fhir.jpa.dao.search.HSearchSortHelperImpl;
 import ca.uhn.fhir.jpa.dao.search.IHSearchSortHelper;
-import ca.uhn.fhir.jpa.dao.tx.HapiTransactionService;
 import ca.uhn.fhir.jpa.delete.ThreadSafeResourceDeleterSvc;
 import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
 import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor;
@@ -423,7 +422,6 @@ public class StarterJpaConfig {
 	public static IServerConformanceProvider<?> calculateConformanceProvider(IFhirSystemDao fhirSystemDao, RestfulServer fhirServer, DaoConfig daoConfig, ISearchParamRegistry searchParamRegistry, IValidationSupport theValidationSupport) {
 		FhirVersionEnum fhirVersion = fhirSystemDao.getContext().getVersion().getVersion();
 		if (fhirVersion == FhirVersionEnum.DSTU2) {
-
 			JpaConformanceProviderDstu2 confProvider = new JpaConformanceProviderDstu2(fhirServer, fhirSystemDao, daoConfig);
 			confProvider.setImplementationDescription("HAPI FHIR DSTU2 Server");
 			return confProvider;
@@ -437,6 +435,11 @@ public class StarterJpaConfig {
 			JpaCapabilityStatementProvider confProvider = new JpaCapabilityStatementProvider(fhirServer, fhirSystemDao, daoConfig, searchParamRegistry, theValidationSupport);
 			confProvider.setImplementationDescription("HAPI FHIR R4 Server");
 			return confProvider;
+		} else if (fhirVersion == FhirVersionEnum.R4B) {
+
+			JpaCapabilityStatementProvider confProvider = new JpaCapabilityStatementProvider(fhirServer, fhirSystemDao, daoConfig, searchParamRegistry, theValidationSupport);
+			confProvider.setImplementationDescription("HAPI FHIR R4B Server");
+			return confProvider;
 		} else if (fhirVersion == FhirVersionEnum.R5) {
 
 			JpaCapabilityStatementProvider confProvider = new JpaCapabilityStatementProvider(fhirServer, fhirSystemDao, daoConfig, searchParamRegistry, theValidationSupport);

src/main/java/ca/uhn/fhir/jpa/starter/common/validation/RepositoryValidationInterceptorFactoryR4B.java

@@ -0,0 +1,77 @@
+package ca.uhn.fhir.jpa.starter.common.validation;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
+import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
+import ca.uhn.fhir.jpa.interceptor.validation.IRepositoryValidatingRule;
+import ca.uhn.fhir.jpa.interceptor.validation.RepositoryValidatingInterceptor;
+import ca.uhn.fhir.jpa.interceptor.validation.RepositoryValidatingRuleBuilder;
+import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
+import ca.uhn.fhir.jpa.starter.annotations.OnR4BCondition;
+import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.param.TokenParam;
+import org.hl7.fhir.r4b.model.StructureDefinition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static ca.uhn.fhir.jpa.starter.common.validation.IRepositoryValidationInterceptorFactory.ENABLE_REPOSITORY_VALIDATING_INTERCEPTOR;
+
+/**
+ * This class can be customized to enable the {@link RepositoryValidatingInterceptor}
+ * on this server.
+ * <p>
+ * The <code>enable_repository_validating_interceptor</code> property must be enabled in <code>application.yaml</code>
+ * in order to use this class.
+ */
+@ConditionalOnProperty(prefix = "hapi.fhir", name = ENABLE_REPOSITORY_VALIDATING_INTERCEPTOR, havingValue = "true")
+@Configuration
+@Conditional(OnR4BCondition.class)
+public class RepositoryValidationInterceptorFactoryR4B implements IRepositoryValidationInterceptorFactory {
+
+	private final FhirContext fhirContext;
+	private final RepositoryValidatingRuleBuilder repositoryValidatingRuleBuilder;
+	private final IFhirResourceDao structureDefinitionResourceProvider;
+
+	public RepositoryValidationInterceptorFactoryR4B(RepositoryValidatingRuleBuilder repositoryValidatingRuleBuilder, DaoRegistry daoRegistry) {
+		this.repositoryValidatingRuleBuilder = repositoryValidatingRuleBuilder;
+		this.fhirContext = daoRegistry.getSystemDao().getContext();
+		structureDefinitionResourceProvider = daoRegistry.getResourceDao("StructureDefinition");
+
+	}
+
+	@Override
+	public RepositoryValidatingInterceptor buildUsingStoredStructureDefinitions() {
+
+		IBundleProvider results = structureDefinitionResourceProvider.search(new SearchParameterMap().add(StructureDefinition.SP_KIND, new TokenParam("resource")));
+		Map<String, List<StructureDefinition>> structureDefintions = results.getResources(0, results.size())
+			.stream()
+			.map(StructureDefinition.class::cast)
+			.collect(Collectors.groupingBy(StructureDefinition::getType));
+
+		structureDefintions.forEach((key, value) -> {
+			String[] urls = value.stream().map(StructureDefinition::getUrl).toArray(String[]::new);
+			repositoryValidatingRuleBuilder.forResourcesOfType(key).requireAtLeastOneProfileOf(urls).and().requireValidationToDeclaredProfiles();
+		});
+
+		List<IRepositoryValidatingRule> rules = repositoryValidatingRuleBuilder.build();
+		return new RepositoryValidatingInterceptor(fhirContext, rules);
+	}
+
+	@Override
+	public RepositoryValidatingInterceptor build() {
+
+		// Customize the ruleBuilder here to have the rules you want! We will give a simple example
+		// of enabling validation for all Patient resources
+		repositoryValidatingRuleBuilder.forResourcesOfType("Patient").requireAtLeastProfile("http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient").and().requireValidationToDeclaredProfiles();
+
+		// Do not customize below this line
+		List<IRepositoryValidatingRule> rules = repositoryValidatingRuleBuilder.build();
+		return new RepositoryValidatingInterceptor(fhirContext, rules);
+	}
+
+}

src/main/resources/application.yaml

@@ -48,8 +48,8 @@ spring:
 #      hibernate.search.backend.directory.root: target/lucenefiles
 #      hibernate.search.backend.lucene_version: lucene_current
   ### elastic parameters ===> see also elasticsearch section below <===
-      hibernate.search.backend.type: elasticsearch
-      hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiHSearchAnalysisConfigurers$HapiElasticAnalysisConfigurer
+#      hibernate.search.backend.type: elasticsearch
+#      hibernate.search.backend.analysis.configurer: ca.uhn.fhir.jpa.search.HapiHSearchAnalysisConfigurers$HapiElasticAnalysisConfigurer
 hapi:
   fhir:
     ### This enables the swagger-ui at /fhir/swagger-ui/index.html as well as the /fhir/api-docs (see https://hapifhir.io/hapi-fhir/docs/server_plain/openapi.html)