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

Complete R3 merge

This commit is contained in:
James 2017-04-19 05:18:49 -04:00
parent 64fb9cfa68
commit 15424572ef
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
package org.hl7.fhir.convertors;
/*-
@ -37,22 +36,3 @@ public interface VersionConvertorAdvisor {
CodeSystem getCodeSystem(ValueSet src);
}
=======
package org.hl7.fhir.convertors;
import org.hl7.fhir.dstu3.model.CodeSystem;
import org.hl7.fhir.dstu3.model.ValueSet;
import org.hl7.fhir.exceptions.FHIRException;
public interface VersionConvertorAdvisor {
boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src);
// called ?
org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException;
// called when an r2 value set has a codeSystem in it
void handleCodeSystem(CodeSystem tgtcs, ValueSet source);
CodeSystem getCodeSystem(ValueSet src);
}
>>>>>>> dstu3_latest_structs