honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-02 01:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release new version

Browse Source
This commit is contained in:
Grahame Grieve 2019-11-14 07:54:21 +11:00
parent 5262c88fb2
commit d453b3b3bb
6 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -2922,7 +2922,10 @@ public class ProfileUtilities extends TranslatingUtilities {
} else { } else {
StructureDefinition sd = context.fetchTypeDefinition(t); StructureDefinition sd = context.fetchTypeDefinition(t);
if (sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE) { if (sd == null) {
System.out.println("Unable to find "+t);
sd = context.fetchTypeDefinition(t);
} else if (sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE) {
choicerow.getCells().add(gen.new Cell(null, null, tail(element.getPath()).replace("[x]", Utilities.capitalize(t)), sd.getDescription(), null)); choicerow.getCells().add(gen.new Cell(null, null, tail(element.getPath()).replace("[x]", Utilities.capitalize(t)), sd.getDescription(), null));
choicerow.getCells().add(gen.new Cell()); choicerow.getCells().add(gen.new Cell());
choicerow.getCells().add(gen.new Cell(null, null, "", null, null)); choicerow.getCells().add(gen.new Cell(null, null, "", null, null));

22
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
View File

@ -124,18 +124,18 @@ public abstract class BaseWorkerContext implements IWorkerContext {
private Map<String, Map<String, Resource>> allResourcesById = new HashMap<String, Map<String, Resource>>(); private Map<String, Map<String, Resource>> allResourcesById = new HashMap<String, Map<String, Resource>>();
// all maps are to the full URI // all maps are to the full URI
private MetadataResourceManager<CodeSystem> codeSystems = new MetadataResourceManager<CodeSystem>(); private MetadataResourceManager<CodeSystem> codeSystems = new MetadataResourceManager<CodeSystem>(false);
private Set<String> supportedCodeSystems = new HashSet<String>(); private Set<String> supportedCodeSystems = new HashSet<String>();
private MetadataResourceManager<ValueSet> valueSets = new MetadataResourceManager<ValueSet>(); private MetadataResourceManager<ValueSet> valueSets = new MetadataResourceManager<ValueSet>(false);
private MetadataResourceManager<ConceptMap> maps = new MetadataResourceManager<ConceptMap>(); private MetadataResourceManager<ConceptMap> maps = new MetadataResourceManager<ConceptMap>(false);
protected MetadataResourceManager<StructureMap> transforms = new MetadataResourceManager<StructureMap>(); protected MetadataResourceManager<StructureMap> transforms = new MetadataResourceManager<StructureMap>(false);
private MetadataResourceManager<StructureDefinition> structures = new MetadataResourceManager<StructureDefinition>(); private MetadataResourceManager<StructureDefinition> structures = new MetadataResourceManager<StructureDefinition>(false);
private MetadataResourceManager<ImplementationGuide> guides = new MetadataResourceManager<ImplementationGuide>(); private MetadataResourceManager<ImplementationGuide> guides = new MetadataResourceManager<ImplementationGuide>(false);
private MetadataResourceManager<CapabilityStatement> capstmts = new MetadataResourceManager<CapabilityStatement>(); private MetadataResourceManager<CapabilityStatement> capstmts = new MetadataResourceManager<CapabilityStatement>(false);
private MetadataResourceManager<SearchParameter> searchParameters = new MetadataResourceManager<SearchParameter>(); private MetadataResourceManager<SearchParameter> searchParameters = new MetadataResourceManager<SearchParameter>(false);
private MetadataResourceManager<Questionnaire> questionnaires = new MetadataResourceManager<Questionnaire>(); private MetadataResourceManager<Questionnaire> questionnaires = new MetadataResourceManager<Questionnaire>(false);
private MetadataResourceManager<OperationDefinition> operations = new MetadataResourceManager<OperationDefinition>(); private MetadataResourceManager<OperationDefinition> operations = new MetadataResourceManager<OperationDefinition>(false);
private MetadataResourceManager<PlanDefinition> plans = new MetadataResourceManager<PlanDefinition>(); private MetadataResourceManager<PlanDefinition> plans = new MetadataResourceManager<PlanDefinition>(false);
private List<NamingSystem> systems = new ArrayList<NamingSystem>(); private List<NamingSystem> systems = new ArrayList<NamingSystem>();
private UcumService ucumService; private UcumService ucumService;

17
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/MetadataResourceManager.java
View File

@ -48,9 +48,16 @@ public class MetadataResourceManager<T extends MetadataResource> {
} }
private boolean enforceUniqueId;
private List<T> list = new ArrayList<>(); private List<T> list = new ArrayList<>();
private Map<String, T> map = new HashMap<>(); private Map<String, T> map = new HashMap<>();
public MetadataResourceManager(boolean enforceUniqueId) {
super();
this.enforceUniqueId = enforceUniqueId;
}
public void copy(MetadataResourceManager<T> source) { public void copy(MetadataResourceManager<T> source) {
list.clear(); list.clear();
map.clear(); map.clear();
@ -62,7 +69,7 @@ public class MetadataResourceManager<T extends MetadataResource> {
if (!r.hasId()) { if (!r.hasId()) {
r.setId(UUID.randomUUID().toString()); r.setId(UUID.randomUUID().toString());
} }
if (map.containsKey(r.getId())) { if (enforceUniqueId && map.containsKey(r.getId())) {
drop(r.getId()); drop(r.getId());
} }
list.add(r); list.add(r);
@ -98,7 +105,9 @@ public class MetadataResourceManager<T extends MetadataResource> {
} }
} }
if (latest != null) { // might be null if it's not using semver if (latest != null) { // might be null if it's not using semver
map.put(url+"|"+VersionUtilities.getMajMin(latest.getVersion()), rl.get(rl.size()-1)); String lv = VersionUtilities.getMajMin(latest.getVersion());
if (lv != null && !lv.equals(version))
map.put(url+"|"+lv, rl.get(rl.size()-1));
} }
} }
} }
@ -176,5 +185,9 @@ public class MetadataResourceManager<T extends MetadataResource> {
public Set<String> keys() { public Set<String> keys() {
return map.keySet(); return map.keySet();
} }
public boolean isEnforceUniqueId() {
return enforceUniqueId;
}
} }

2
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/MetadataResourceManagerTester.java
View File

@ -10,7 +10,7 @@ import org.junit.Test;
public class MetadataResourceManagerTester { public class MetadataResourceManagerTester {
private MetadataResourceManager<ValueSet> mrm = new MetadataResourceManager<>(); private MetadataResourceManager<ValueSet> mrm = new MetadataResourceManager<>(true);
@Test @Test
public void testSingleNoVersion() { public void testSingleNoVersion() {

2
pom.xml
View File

@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR. HAPI FHIR.
--> -->
<version>4.1.1</version> <version>4.1.1-SNAPSHOT</version>
<properties> <properties>
<hapi_fhir_version>4.1.0</hapi_fhir_version> <hapi_fhir_version>4.1.0</hapi_fhir_version>

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off @echo off
set oldver=4.0.35 set oldver=4.1.1
set newver=4.0.36 set newver=4.1.2
echo .. echo ..
echo ===================================================================== echo =====================================================================