honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate dependency (MemberMatcherR4Helper) from JpaConfig that was present in both JpaConfig and JpaR4Config. (#4390) 

* Remove duplicate dependency (MemberMatcherR4Helper) from JpaConfig that was present in both JpaConfig and JpaR4Config.

* Add back @Import for JpaConfig to JpaDstu2Config to resolve DSTU2 unit test issue in jpaserver-starter.
This commit is contained in:
Luke deGruchy 2022-12-22 13:12:30 -05:00 committed by GitHub
parent cfa6c13262
commit e4ad370314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,6 @@ import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider; import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider;
import ca.uhn.fhir.jpa.provider.ValueSetOperationProvider; import ca.uhn.fhir.jpa.provider.ValueSetOperationProvider;
import ca.uhn.fhir.jpa.provider.ValueSetOperationProviderDstu2; import ca.uhn.fhir.jpa.provider.ValueSetOperationProviderDstu2;
import ca.uhn.fhir.jpa.provider.r4.IConsentExtensionProvider;
import ca.uhn.fhir.jpa.provider.r4.MemberMatcherR4Helper;
import ca.uhn.fhir.jpa.sched.AutowiringSpringBeanJobFactory; import ca.uhn.fhir.jpa.sched.AutowiringSpringBeanJobFactory;
import ca.uhn.fhir.jpa.sched.HapiSchedulerServiceImpl; import ca.uhn.fhir.jpa.sched.HapiSchedulerServiceImpl;
import ca.uhn.fhir.jpa.search.ISynchronousSearchSvc; import ca.uhn.fhir.jpa.search.ISynchronousSearchSvc;
@ -149,9 +147,6 @@ import ca.uhn.fhir.rest.server.interceptor.partition.RequestTenantPartitionInter
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
import ca.uhn.hapi.converters.canonical.VersionCanonicalizer; import ca.uhn.hapi.converters.canonical.VersionCanonicalizer;
import org.hl7.fhir.common.hapi.validation.support.UnknownCodeSystemWarningValidationSupport; import org.hl7.fhir.common.hapi.validation.support.UnknownCodeSystemWarningValidationSupport;
import org.hl7.fhir.r4.model.Consent;
import org.hl7.fhir.r4.model.Coverage;
import org.hl7.fhir.r4.model.Patient;
import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices; import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices;
import org.hl7.fhir.utilities.npm.PackageClient; import org.hl7.fhir.utilities.npm.PackageClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -746,20 +741,6 @@ public class JpaConfig {
return new UnknownCodeSystemWarningValidationSupport(theFhirContext); return new UnknownCodeSystemWarningValidationSupport(theFhirContext);
} }
@Lazy
@Bean
public MemberMatcherR4Helper memberMatcherR4Helper(
@Autowired FhirContext theContext,
@Autowired IFhirResourceDao<Coverage> theCoverageDao,
@Autowired IFhirResourceDao<Patient> thePatientDao,
@Autowired IFhirResourceDao<Consent> theConsentDao,
@Autowired(required = false) IConsentExtensionProvider theExtensionProvider
) {
return new MemberMatcherR4Helper(
theContext, theCoverageDao, thePatientDao, theConsentDao, theExtensionProvider
);
}
@Lazy @Lazy
@Bean @Bean
public NicknameInterceptor nicknameInterceptor() throws IOException { public NicknameInterceptor nicknameInterceptor() throws IOException {

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaDstu2Config.java
View File

@ -38,7 +38,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement @EnableTransactionManagement
@Import({ @Import({
FhirContextDstu2Config.class, FhirContextDstu2Config.class,
GeneratedDaoAndResourceProviderConfigDstu2.class GeneratedDaoAndResourceProviderConfigDstu2.class,
JpaConfig.class
}) })
public class JpaDstu2Config { public class JpaDstu2Config {
@Bean @Bean