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

Use updated valueset definitions

This commit is contained in:
James Agnew 2015-09-30 16:35:51 -04:00
parent c385384269
commit 9664174b6a
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hapi-tinder-plugin/pom.xml
View File

@ -31,17 +31,22 @@
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId> <artifactId>hapi-fhir-structures-dstu</artifactId>
<version>1.1</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId> <artifactId>hapi-fhir-structures-dstu2</artifactId>
<version>1.1</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId> <artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
<version>1.1</version> <version>1.2</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
<version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>

7
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java
View File

@ -228,7 +228,7 @@ public class TinderStructuresMojo extends AbstractMojo {
String dtOutputDir = "target/generated-sources/tinder/ca/uhn/fhir/model/dev/composite"; String dtOutputDir = "target/generated-sources/tinder/ca/uhn/fhir/model/dev/composite";
ResourceGeneratorUsingSpreadsheet rp = new ResourceGeneratorUsingSpreadsheet("dstu2", "."); ResourceGeneratorUsingSpreadsheet rp = new ResourceGeneratorUsingSpreadsheet("dstu2", ".");
rp.setBaseResourceNames(Arrays.asList( "bundle" rp.setBaseResourceNames(Arrays.asList( "careplan"
// //, "contract" // //, "contract"
// "valueset", "organization", "location" // "valueset", "organization", "location"
// , "observation", "conformance" // , "observation", "conformance"
@ -252,11 +252,12 @@ public class TinderStructuresMojo extends AbstractMojo {
rp.getLocalImports().putAll(datatypeLocalImports); rp.getLocalImports().putAll(datatypeLocalImports);
datatypeLocalImports.putAll(rp.getLocalImports()); datatypeLocalImports.putAll(rp.getLocalImports());
String vsOutputDir = "target/generated-sources/tinder/ca/uhn/fhir/model/dev/valueset";
vsp.writeMarkedValueSets(new File(vsOutputDir), "ca.uhn.fhir.model.dev");
dtp.writeAll(new File(dtOutputDir), null, "ca.uhn.fhir.model.dev"); dtp.writeAll(new File(dtOutputDir), null, "ca.uhn.fhir.model.dev");
rp.writeAll(new File(rpOutputDir), new File(rpSOutputDir), "ca.uhn.fhir.model.dev"); rp.writeAll(new File(rpOutputDir), new File(rpSOutputDir), "ca.uhn.fhir.model.dev");
String vsOutputDir = "target/generated-sources/tinder/ca/uhn/fhir/model/dev/valueset";
vsp.writeMarkedValueSets(new File(vsOutputDir), "ca.uhn.fhir.model.dev");
} }
public static class ProfileFileDefinition { public static class ProfileFileDefinition {

6
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java
View File

@ -79,7 +79,11 @@ public class ValueSetGenerator {
version = "dstu2"; version = "dstu2";
} }
String vs = IOUtils.toString(ValueSetGenerator.class.getResourceAsStream("/vs/" + version + "/all-valuesets-bundle.xml")); String name = "/vs/" + version + "/all-valuesets-bundle.xml";
if (version.equals("dstu2")) {
name = "/org/hl7/fhir/instance/model/valueset/valuesets.xml";
}
String vs = IOUtils.toString(ValueSetGenerator.class.getResourceAsStream(name));
if ("dstu".equals(myVersion)) { if ("dstu".equals(myVersion)) {
Bundle bundle = newXmlParser.parseBundle(vs); Bundle bundle = newXmlParser.parseBundle(vs);
for (BundleEntry next : bundle.getEntries()) { for (BundleEntry next : bundle.getEntries()) {

5
src/changes/changes.xml
View File

@ -101,6 +101,11 @@
profiled datatype name instead of the base datatype name as required by the FHIR profiled datatype name instead of the base datatype name as required by the FHIR
spec. Thanks to Nehashri Puttu Lokesh for reporting! spec. Thanks to Nehashri Puttu Lokesh for reporting!
</action> </action>
<action type="fix">
Some generated Enum types in DSTU2 HAPI structures
did not have latest valueset definitions applied. Thanks
to Bill de Beaubien for reporting!
</action>
</release> </release>
<release version="1.2" date="2015-09-18"> <release version="1.2" date="2015-09-18">
<action type="add"> <action type="add">