nickname svc refatoring (#5006)
* nickname svc refatoring * moving things around * cleanup * gitignore * removing factory * added changelog * version bump * fixing test * fix test --------- Co-authored-by: leif stawnyczy <leifstawnyczy@leifs-mbp.home>
This commit is contained in:
TipzCM
GitHub
parent
20a9ad0985
commit
d7bdabb91b
|
|
@ -167,6 +167,6 @@ Snap.*
|
|||
.vscode
|
||||
|
||||
|
||||
/database/
|
||||
/database*/
|
||||
/activemq-data/
|
||||
/.run/
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-bom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<packaging>pom</packaging>
|
||||
<name>HAPI FHIR BOM</name>
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-cli</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
type: fix
|
||||
issue: 5005
|
||||
title: "
|
||||
Nickname Service Config has been moved out of search parameters
|
||||
as an optional config to add.
|
||||
Nickname service now has an interface to allow flexibility
|
||||
in implementation.
|
||||
"
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
package ca.uhn.fhir.jpa.nickname;
|
||||
|
||||
import org.springframework.core.io.Resource;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public interface INicknameSvc {
|
||||
|
||||
/**
|
||||
* Set a custom nickname resource to use.
|
||||
* If not used, a default will be used instead.
|
||||
*/
|
||||
void setNicknameResource(Resource theNicknameResource);
|
||||
|
||||
/**
|
||||
* The number of nicknames in the nickname svc
|
||||
*/
|
||||
int size();
|
||||
|
||||
/**
|
||||
* If using a custom nickname resource,
|
||||
* processing will keep track of any badly
|
||||
* formatted rows.
|
||||
* These badly formatted rows can be accessed with this api.
|
||||
*/
|
||||
List<String> getBadRows();
|
||||
|
||||
/**
|
||||
* Gets a list of nicknames for the provided name
|
||||
* @param theName - the provided name
|
||||
* @return - a collection of similar/nicknames
|
||||
*/
|
||||
Collection<String> getEquivalentNames(String theName);
|
||||
}
|
||||
|
|
@ -45,15 +45,13 @@ import java.util.Set;
|
|||
* -
|
||||
* If one is to be provided, it must be provided before nickname svc is invoked
|
||||
*/
|
||||
public class NicknameSvc {
|
||||
public class NicknameSvc implements INicknameSvc {
|
||||
private static final Logger ourLog = LoggerFactory.getLogger(NicknameSvc.class);
|
||||
|
||||
private NicknameMap myNicknameMap;
|
||||
|
||||
private Resource myNicknameResource;
|
||||
|
||||
public NicknameSvc() {
|
||||
|
||||
}
|
||||
|
||||
public void setNicknameResource(Resource theNicknameResource) {
|
||||
|
|
@ -98,6 +96,7 @@ public class NicknameSvc {
|
|||
|
||||
private void ensureMapInitialized() {
|
||||
if (myNicknameResource == null) {
|
||||
ourLog.debug("Loading defaults");
|
||||
myNicknameResource = new ClassPathResource("/nickname/names.csv");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -20,21 +20,19 @@
|
|||
package ca.uhn.fhir.jpa.mdm.config;
|
||||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.jpa.searchparam.config.NicknameServiceConfig;
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.mdm.api.IMdmSettings;
|
||||
import ca.uhn.fhir.mdm.interceptor.MdmSearchExpandingInterceptor;
|
||||
import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.IMatcherFactory;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.MdmMatcherFactory;
|
||||
import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
|
||||
import ca.uhn.fhir.mdm.svc.MdmLinkDeleteSvc;
|
||||
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
|
||||
@Import(NicknameServiceConfig.class)
|
||||
@Configuration
|
||||
public class MdmCommonConfig {
|
||||
@Bean
|
||||
|
|
@ -53,10 +51,21 @@ public class MdmCommonConfig {
|
|||
}
|
||||
|
||||
@Bean
|
||||
@Lazy
|
||||
MdmResourceMatcherSvc mdmResourceComparatorSvc(
|
||||
FhirContext theFhirContext,
|
||||
IMatcherFactory theIMatcherFactory,
|
||||
IMdmSettings theMdmSettings
|
||||
) {
|
||||
return new MdmResourceMatcherSvc(theFhirContext, theIMatcherFactory, theMdmSettings);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@Lazy
|
||||
public IMatcherFactory matcherFactory(
|
||||
FhirContext theFhirContext,
|
||||
IMdmSettings theSettings,
|
||||
NicknameSvc theNicknameSvc
|
||||
INicknameSvc theNicknameSvc
|
||||
) {
|
||||
return new MdmMatcherFactory(
|
||||
theFhirContext,
|
||||
|
|
|
|||
|
|
@ -48,8 +48,6 @@ import ca.uhn.fhir.jpa.mdm.svc.candidate.FindCandidateByLinkSvc;
|
|||
import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchCriteriaBuilderSvc;
|
||||
import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
|
||||
import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmGoldenResourceFindingSvc;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.IMatcherFactory;
|
||||
import ca.uhn.fhir.mdm.util.MdmPartitionHelper;
|
||||
import ca.uhn.fhir.jpa.partition.IRequestPartitionHelperSvc;
|
||||
import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
|
||||
import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
|
||||
|
|
@ -69,10 +67,10 @@ import ca.uhn.fhir.mdm.interceptor.MdmStorageInterceptor;
|
|||
import ca.uhn.fhir.mdm.log.Logs;
|
||||
import ca.uhn.fhir.mdm.provider.MdmControllerHelper;
|
||||
import ca.uhn.fhir.mdm.provider.MdmProviderLoader;
|
||||
import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
|
||||
import ca.uhn.fhir.mdm.svc.MdmSearchParamSvc;
|
||||
import ca.uhn.fhir.mdm.util.EIDHelper;
|
||||
import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
|
||||
import ca.uhn.fhir.mdm.util.MdmPartitionHelper;
|
||||
import ca.uhn.fhir.mdm.util.MessageHelper;
|
||||
import ca.uhn.fhir.validation.IResourceLoader;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -91,7 +89,9 @@ public class MdmConsumerConfig {
|
|||
}
|
||||
|
||||
@Bean
|
||||
IMdmSurvivorshipService mdmSurvivorshipService() { return new MdmSurvivorshipSvcImpl(); }
|
||||
IMdmSurvivorshipService mdmSurvivorshipService() {
|
||||
return new MdmSurvivorshipSvcImpl();
|
||||
}
|
||||
|
||||
@Bean
|
||||
MdmQueueConsumerLoader mdmQueueConsumerLoader(IChannelFactory theChannelFactory, IMdmSettings theMdmSettings, MdmMessageHandler theMdmMessageHandler) {
|
||||
|
|
@ -107,6 +107,7 @@ public class MdmConsumerConfig {
|
|||
MdmMessageKeySvc mdmMessageKeySvc() {
|
||||
return new MdmMessageKeySvc();
|
||||
}
|
||||
|
||||
@Bean
|
||||
MdmMatchLinkSvc mdmMatchLinkSvc() {
|
||||
return new MdmMatchLinkSvc();
|
||||
|
|
@ -205,15 +206,6 @@ public class MdmConsumerConfig {
|
|||
return new MdmCandidateSearchCriteriaBuilderSvc();
|
||||
}
|
||||
|
||||
@Bean
|
||||
MdmResourceMatcherSvc mdmResourceComparatorSvc(
|
||||
FhirContext theFhirContext,
|
||||
IMatcherFactory theIMatcherFactory,
|
||||
IMdmSettings theMdmSettings
|
||||
) {
|
||||
return new MdmResourceMatcherSvc(theFhirContext, theIMatcherFactory, theMdmSettings);
|
||||
}
|
||||
|
||||
@Bean
|
||||
EIDHelper eidHelper(FhirContext theFhirContext, IMdmSettings theMdmSettings) {
|
||||
return new EIDHelper(theFhirContext, theMdmSettings);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import ca.uhn.fhir.interceptor.model.RequestPartitionId;
|
|||
import ca.uhn.fhir.jpa.mdm.BaseMdmR4Test;
|
||||
import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
|
||||
import ca.uhn.fhir.jpa.mdm.svc.candidate.TooManyCandidatesException;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.jpa.searchparam.MatchUrlService;
|
||||
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
|
||||
import ca.uhn.fhir.jpa.searchparam.nickname.NicknameInterceptor;
|
||||
|
|
@ -38,7 +38,7 @@ public class MdmCandidateSearchSvcIT extends BaseMdmR4Test {
|
|||
MatchUrlService myMatchUrlService;
|
||||
|
||||
@Autowired
|
||||
NicknameSvc myNicknameSvc;
|
||||
INicknameSvc myNicknameSvc;
|
||||
|
||||
private NicknameInterceptor myNicknameInterceptor;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
*/
|
||||
package ca.uhn.fhir.jpa.searchparam.config;
|
||||
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.jpa.searchparam.nickname.NicknameInterceptor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
|
@ -28,14 +29,14 @@ import org.springframework.context.annotation.Lazy;
|
|||
@Configuration
|
||||
public class NicknameServiceConfig {
|
||||
|
||||
@Lazy
|
||||
@Bean
|
||||
public NicknameInterceptor nicknameInterceptor(NicknameSvc theNicknameSvc) {
|
||||
return new NicknameInterceptor(theNicknameSvc);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public NicknameSvc nicknameSvc() {
|
||||
public INicknameSvc nicknameSvc() {
|
||||
return new NicknameSvc();
|
||||
}
|
||||
|
||||
@Lazy
|
||||
@Bean
|
||||
public NicknameInterceptor nicknameInterceptor(INicknameSvc theNicknameSvc) {
|
||||
return new NicknameInterceptor(theNicknameSvc);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,13 +47,9 @@ import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
|
||||
@Import({
|
||||
NicknameServiceConfig.class
|
||||
})
|
||||
@Configuration
|
||||
public class SearchParamConfig {
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.searchparam.nickname;
|
|||
|
||||
import ca.uhn.fhir.interceptor.api.Hook;
|
||||
import ca.uhn.fhir.interceptor.api.Pointcut;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
|
||||
import ca.uhn.fhir.model.api.IQueryParameterType;
|
||||
import ca.uhn.fhir.rest.param.StringParam;
|
||||
|
|
@ -37,9 +37,9 @@ import java.util.Map;
|
|||
public class NicknameInterceptor {
|
||||
private static final Logger ourLog = LoggerFactory.getLogger(NicknameInterceptor.class);
|
||||
|
||||
private final NicknameSvc myNicknameSvc;
|
||||
private final INicknameSvc myNicknameSvc;
|
||||
|
||||
public NicknameInterceptor(NicknameSvc theNicknameSvc) {
|
||||
public NicknameInterceptor(INicknameSvc theNicknameSvc) {
|
||||
myNicknameSvc = theNicknameSvc;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
public class ResourceProviderRevIncludeTest extends BaseResourceProviderR4Test {
|
||||
|
||||
|
|
@ -91,13 +93,49 @@ public class ResourceProviderRevIncludeTest extends BaseResourceProviderR4Test {
|
|||
.execute();
|
||||
|
||||
List<IBaseResource> foundResources = BundleUtil.toListOfResources(myFhirContext, bundle);
|
||||
Patient patient = (Patient) foundResources.get(0);
|
||||
Group group = (Group) foundResources.get(1);
|
||||
CareTeam careTeam = (CareTeam) foundResources.get(2);
|
||||
DetectedIssue detectedIssue = (DetectedIssue) foundResources.get(3);
|
||||
Patient patient = null;
|
||||
boolean patientFound = false;
|
||||
boolean groupFound = false;
|
||||
boolean careTeamFound = false;
|
||||
boolean detectedIssueFound = false;
|
||||
for (IBaseResource foundResource : foundResources) {
|
||||
String type = foundResource.getIdElement().getResourceType();
|
||||
switch (type) {
|
||||
case "Patient":
|
||||
if (foundResource.getIdElement().getIdPart().equals(pid.getIdPart())) {
|
||||
patientFound = true;
|
||||
patient = (Patient) foundResource;
|
||||
}
|
||||
break;
|
||||
case "Group":
|
||||
if (foundResource.getIdElement().getIdPart().equals(gid.getIdPart())) {
|
||||
groupFound = true;
|
||||
}
|
||||
break;
|
||||
case "CareTeam":
|
||||
if (foundResource.getIdElement().getIdPart().equals(ctid.getIdPart())) {
|
||||
careTeamFound = true;
|
||||
}
|
||||
break;
|
||||
case "DetectedIssue":
|
||||
if (dids.contains(foundResource.getIdElement())) {
|
||||
detectedIssueFound = true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
ourLog.warn(type + " found but not expected");
|
||||
}
|
||||
|
||||
if (patientFound && groupFound && careTeamFound && detectedIssueFound) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
assertTrue(patientFound);
|
||||
assertTrue(groupFound);
|
||||
assertTrue(careTeamFound);
|
||||
assertNotNull(patient);
|
||||
assertEquals(pid.getIdPart(), patient.getIdElement().getIdPart());
|
||||
assertEquals(gid.getIdPart(), group.getIdElement().getIdPart());
|
||||
assertEquals(ctid.getIdPart(), careTeam.getIdElement().getIdPart());
|
||||
assertEquals(methodName, patient.getName().get(0).getFamily());
|
||||
|
||||
//Ensure that the revincludes are included in the query list of the sql trace.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import ca.uhn.fhir.jpa.config.PackageLoaderConfig;
|
|||
import ca.uhn.fhir.jpa.config.r4.JpaR4Config;
|
||||
import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil;
|
||||
import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect;
|
||||
import ca.uhn.fhir.jpa.searchparam.config.NicknameServiceConfig;
|
||||
import ca.uhn.fhir.jpa.util.CircularQueueCaptureQueriesListener;
|
||||
import ca.uhn.fhir.jpa.util.CurrentThreadCaptureQueriesListener;
|
||||
import ca.uhn.fhir.rest.api.Constants;
|
||||
|
|
@ -69,7 +70,8 @@ import static org.junit.jupiter.api.Assertions.fail;
|
|||
TestJPAConfig.class,
|
||||
TestHSearchAddInConfig.DefaultLuceneHeap.class,
|
||||
JpaBatch2Config.class,
|
||||
Batch2JobsConfig.class
|
||||
Batch2JobsConfig.class,
|
||||
NicknameServiceConfig.class
|
||||
})
|
||||
public class TestR4Config {
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package ca.uhn.fhir.mdm.rules.matcher;
|
|||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.context.phonetic.PhoneticEncoderEnum;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.mdm.api.IMdmSettings;
|
||||
import ca.uhn.fhir.mdm.log.Logs;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.fieldmatchers.EmptyFieldMatcher;
|
||||
|
|
@ -45,12 +45,12 @@ public class MdmMatcherFactory implements IMatcherFactory {
|
|||
private final FhirContext myFhirContext;
|
||||
private final IMdmSettings myMdmSettings;
|
||||
|
||||
private final NicknameSvc myNicknameSvc;
|
||||
private final INicknameSvc myNicknameSvc;
|
||||
|
||||
public MdmMatcherFactory(
|
||||
FhirContext theFhirContext,
|
||||
IMdmSettings theSettings,
|
||||
NicknameSvc theNicknameSvc
|
||||
INicknameSvc theNicknameSvc
|
||||
) {
|
||||
myFhirContext = theFhirContext;
|
||||
myMdmSettings = theSettings;
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
*/
|
||||
package ca.uhn.fhir.mdm.rules.matcher.fieldmatchers;
|
||||
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.mdm.rules.json.MdmMatcherJson;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.models.IMdmFieldMatcher;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.util.StringMatcherUtils;
|
||||
import org.hl7.fhir.instance.model.api.IBase;
|
||||
import org.hl7.fhir.instance.model.api.IPrimitiveType;
|
||||
|
|
@ -30,9 +30,9 @@ import java.util.Collection;
|
|||
import java.util.Locale;
|
||||
|
||||
public class NicknameMatcher implements IMdmFieldMatcher {
|
||||
private final NicknameSvc myNicknameSvc;
|
||||
private final INicknameSvc myNicknameSvc;
|
||||
|
||||
public NicknameMatcher(NicknameSvc theNicknameSvc) {
|
||||
public NicknameMatcher(INicknameSvc theNicknameSvc) {
|
||||
myNicknameSvc = theNicknameSvc;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package ca.uhn.fhir.mdm.rules.matcher;
|
||||
|
||||
import ca.uhn.fhir.jpa.nickname.INicknameSvc;
|
||||
import ca.uhn.fhir.jpa.nickname.NicknameSvc;
|
||||
import ca.uhn.fhir.mdm.rules.json.MdmMatcherJson;
|
||||
import ca.uhn.fhir.mdm.rules.matcher.fieldmatchers.NicknameMatcher;
|
||||
|
|
@ -12,7 +13,7 @@ import org.junit.jupiter.api.Test;
|
|||
class NicknameMatcherTest {
|
||||
IMdmFieldMatcher matcher;
|
||||
|
||||
NicknameSvc myNicknameSvc = new NicknameSvc();
|
||||
INicknameSvc myNicknameSvc = new NicknameSvc();
|
||||
|
||||
@BeforeEach
|
||||
public void begin() {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<artifactId>hapi-fhir-serviceloaders</artifactId>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<artifactId>hapi-fhir-serviceloaders</artifactId>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-caching-api</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<artifactId>hapi-fhir-serviceloaders</artifactId>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-spring-boot-samples</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>hapi-fhir-spring-boot-sample-client-apache</artifactId>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-spring-boot-samples</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-spring-boot-samples</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-spring-boot</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-deployable-pom</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -7,7 +7,7 @@
|
|||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<name>HAPI-FHIR</name>
|
||||
<description>An open-source implementation of the FHIR specification in Java.</description>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>6.7.8-SNAPSHOT</version>
|
||||
<version>6.7.9-SNAPSHOT</version>
|
||||
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
|
|
|||
Loading…
Reference in New Issue